Plugin structure change

MikeKlem · Nov 18, 2014 · d5f1cb3 · d5f1cb3
1 parent 2e6237d
commit d5f1cb3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 186 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-gem 'rake'
-gem 'gem_publisher'
-gem 'archive-tar-minitar'
+gemspec
+gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
diff --git a/Rakefile b/Rakefile
@@ -4,3 +4,4 @@ task :default do
   system("rake -T")
 end
 
+require "logstash/devutils/rake"
diff --git a/logstash-input-file.gemspec b/logstash-input-file.gemspec
@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '0.1.1'
+  s.version         = '0.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from files."
-  s.description     = "Stream events from files."
+  s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elasticsearch"]
   s.email           = '[email protected]'
-  s.homepage        = "http://logstash.net/"
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
   # Files
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { "logstash_plugin" => "true", "group" => "input" }
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
   s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
@@ -26,5 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'filewatch', ['0.5.1']
 
+  s.add_development_dependency 'logstash-devutils'
 end
 
diff --git a/rakelib/publish.rake b/rakelib/publish.rake
diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake
diff --git a/spec/inputs/file_spec.rb b/spec/inputs/file_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "spec_helper"
+require "logstash/devutils/rspec/spec_helper"
 require "tempfile"
 
 describe "inputs/file" do
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ task :default do
		system("rake -T")
		end

		require "logstash/devutils/rake"