logstash-core 1.5.0.rc1-java → 1.5.0.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d118a0e92699678542cd88cef4ff7e99cd6980
-  data.tar.gz: 117cb22618db17bab2c236cb3dce199e8f5a7871
+  metadata.gz: 9e7eb61ec148650d979bffdf8c4642ebace2b333
+  data.tar.gz: 2b81cce46d0432cb99cdf3853dc5baac44773411
 SHA512:
-  metadata.gz: 486160e5c6f3d9241bfb585600d7169caceabed0742fdf09c2f7ce204383d5cd07d4a4ddb1e91389bbdbc685e2842ab59e9d42b3105650cc4ddadca9ad7fcf89
-  data.tar.gz: 5ca0751b466b36ba4848f9e8e77a76832c3e107ee427d5d82980e38c428c863c6c13b866efc60a7270924a8709d64312175eeddb4c42985be2547f1ebdf29633
+  metadata.gz: 2b9c60fc16d3a1522c6d5a69ab06173501f9668feb8ecb3d0c4cc7275c6bc488e80333fe17035e4fa903ef4e4d5893c87150a56f9dc179873680398fd978d3ff
+  data.tar.gz: 70450f11d30824b347a337082e741582a35a29d54466fe8ebff3c0058f0f9542f6a7fbc1176e68bb6a189915967d36c20ff0e122f91085f83d6fafba437139e1

data/lib/logstash/config/mixin.rb

@@ -451,7 +451,7 @@ module LogStash::Config::Mixin
               return false, "Expected password (one value), got #{value.size} values?"
             end
 
-            result = ::LogStash::Util::Password.new(value.first)
+            result = value.first.is_a?(::LogStash::Util::Password) ? value.first : ::LogStash::Util::Password.new(value.first)
           when :path
             if value.size > 1 # Only 1 value wanted
               return false, "Expected path (one value), got #{value.size} values?"

data/lib/logstash/gemfile.rb

@@ -15,12 +15,6 @@ module LogStash
       @gemset = nil
     end
 
-    def self.open(file_path)
-      gemfile = new(::File.new(file_path, "r+"))
-      gemfile.load
-      gemfile
-    end
-
     def load
       @gemset ||= DSL.parse(@io.read)
       self
@@ -57,11 +51,6 @@ module LogStash
     def remove(name)
       @gemset.remove_gem(name)
     end
-
-    def close
-      save if @gemset
-      @io.close
-    end
   end
 
   class Gemset

data/lib/logstash/pluginmanager/install.rb

@@ -32,7 +32,7 @@ class LogStash::PluginManager::Install < Clamp::Command
     end
     raise(LogStash::PluginManager::Error, "File #{LogStash::Environment::GEMFILE_PATH} does not exist or is not writable, aborting") unless File.writable?(LogStash::Environment::GEMFILE_PATH)
 
-    gemfile = LogStash::Gemfile.open(LogStash::Environment::GEMFILE_PATH)
+    gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
     # keep a copy of the gemset to revert on error
     original_gemset = gemfile.gemset.copy
 
@@ -58,8 +58,17 @@ class LogStash::PluginManager::Install < Clamp::Command
       end if verify?
 
       # at this point we know that we either have a valid gem name & version or a valid .gem file path
+
+      # if LogStash::PluginManager.plugin_file?(plugin)
+      #   raise(LogStash::PluginManager::Error) unless cache_gem_file(plugin)
+      #   spec = LogStash::PluginManager.plugin_file_spec(plugin)
+      #   gemfile.update(spec.name, spec.version.to_s)
+      # else
+      #   plugins.each{|tuple| gemfile.update(*tuple)}
+      # end
     end
 
+
     install_list = LogStash::PluginManager.merge_duplicates(install_list)
     install_list.each{|plugin, version| gemfile.update(plugin, version)}
     gemfile.save
@@ -85,9 +94,6 @@ class LogStash::PluginManager::Install < Clamp::Command
     end
 
     puts("Installation successful")
-
-  ensure
-    gemfile.close if gemfile
   end
 
   # copy .gem file into bundler cache directory, log any error to $stderr

data/lib/logstash/pluginmanager/uninstall.rb

@@ -15,7 +15,7 @@ class LogStash::PluginManager::Uninstall < Clamp::Command
   def execute
     raise(LogStash::PluginManager::Error, "File #{LogStash::Environment::GEMFILE_PATH} does not exist or is not writable, aborting") unless File.writable?(LogStash::Environment::GEMFILE_PATH)
 
-    gemfile = LogStash::Gemfile.open(LogStash::Environment::GEMFILE_PATH)
+    gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
     # keep a copy of the gemset to revert on error
     original_gemset = gemfile.gemset.copy
 
@@ -45,7 +45,5 @@ class LogStash::PluginManager::Uninstall < Clamp::Command
         raise(LogStash::PluginManager::Error, "Uninstall aborted")
       end
     end
-  ensure
-    gemfile.close if gemfile
   end
 end

data/lib/logstash/pluginmanager/update.rb

@@ -12,7 +12,7 @@ class LogStash::PluginManager::Update < Clamp::Command
   parameter "[PLUGIN] ...", "Plugin name(s) to upgrade to latest version"
 
   def execute
-    gemfile = LogStash::Gemfile.open(LogStash::Environment::GEMFILE_PATH)
+    gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
     # keep a copy of the gemset to revert on error
     original_gemset = gemfile.gemset.copy
 
@@ -60,8 +60,6 @@ class LogStash::PluginManager::Update < Clamp::Command
       end
     end
     puts("No plugin updated") if update_count.zero?
-  ensure
-    gemfile.close
   end
 
   private

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "1.5.0.rc1"
+LOGSTASH_VERSION = "1.5.0.rc2"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc1
+  version: 1.5.0.rc2
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin