hiera-eyaml 2.0.5 → 2.0.6

data/CHANGES.md

@@ -1,10 +1,15 @@
 Change log for hiera-eyaml
 ==========================
 
+2.06
+----
+
+ - #131 - Fix another EDITOR bug (#130) that could erase command line flags to the specified editor (@elyscape)
+
 2.05
 ----
 
- - #128 - Fix a bug (#117) that caused `eyaml` to break when arguments were supplied in `$EDITOR`
+ - #128 - Fix a bug (#127) that caused `eyaml edit` to break when `$EDITOR` was a command on PATH rather than a path to a command (@elyscape)
 
 2.04
 ----

data/lib/hiera/backend/eyaml.rb

@@ -2,7 +2,7 @@ class Hiera
   module Backend
     module Eyaml
 
-      VERSION = "2.0.5"
+      VERSION = "2.0.6"
       DESCRIPTION = "Hiera-eyaml is a backend for Hiera which provides OpenSSL encryption/decryption for Hiera properties"
 
       class RecoverableError < StandardError

data/lib/hiera/backend/eyaml/utils.rb

@@ -44,12 +44,12 @@ class Hiera
             extensions = (ENV['PATHEXT'] || '').split(';') # handle Windows executables
             pathdirs = ENV['PATH'].split(File::PATH_SEPARATOR)
             paths += pathdirs.collect { |dir| paths.collect { |path| File.expand_path(path, dir) } }.flatten
-            paths.uniq!
             editorfile = paths.select { |path|
               FileTest.file?(path) || ! extensions.select {|ext| FileTest.file?(path + ext) }.empty?
             }.first
             raise StandardError, "Editor not found. Please set your EDITOR env variable" if editorfile.nil?
-            editor = "\"#{editorfile}\"#{editor[editorfile.size()..-1]}"
+            raw_command = paths[(paths.index editorfile) % pieces.size]
+            editor = "\"#{editorfile}\"#{editor[raw_command.size()..-1]}"
           end
           editor
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop