hiera-eyaml 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 91148de066d290b4cdd6341ca54a3e20f7ae62fc
-  data.tar.gz: 349951ef92e5d63dbd56cd769e32cf9fc16eb7ec
+  data.tar.gz: ebf0bc12a2d2dee0ff34b2b5ff40a8e5947f453c
+  metadata.gz: a5513c72714f17232041547bef4ed0f0df78466c
 SHA512: 
-  metadata.gz: 633324c4a0bb00849b924fb667975650b88256e0941b4ff123499d64d6d11f14f8f47769f9c301423a44d9bd9c9a7257de9eeaa0673290473c1332420882e07f
-  data.tar.gz: 22a2eae199bae8f23f96bfe68634a440eb2dc1db512463b2c54f711085d09e318cd1f2a111232b068f8ec59967c7c8eed7f98a1c67daf638896e2e9ecb004f19
+  data.tar.gz: a825732caca0993b76700f4ad49be7c275ea58666a1d89ba78cc1aea45ca2bb0f2d019c44ea8f1396cc6ec1e6a6ad99e343fd106b03361fb4daef33155be985e
+  metadata.gz: 4e7d9bb0ea87cd0aebeae0073009288baa4a60879036abf67e2e28e09d6453d17967816e12ba8b65fb58371da977038ae70b49406c6f7067d2d4769bc43e2f29

data/.travis.yml

@@ -3,8 +3,12 @@ rvm:
   - "1.8.7-p374"
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"
+  - "2.1.5"
 before_install:
   - sudo apt-get update
   - sudo apt-get install expect
 script:
   bundle exec cucumber -f progress
+notifications:
+  email: false

data/CHANGES.md

@@ -1,6 +1,11 @@
 Change log for hiera-eyaml
 ==========================
 
+2.0.8
+-----
+
+ - (#149) - Fix to tempfile permissions and invalid editor scenario (@elyscape)
+
 2.0.7
 -----
 

data/Gemfile

@@ -4,7 +4,9 @@ gem 'highline', '~> 1.6.19'
 gem 'trollop', '~> 2.0'
 
 group :development do
-  gem "aruba"
+  gem "aruba", '~> 0.6.2'
+  gem "cucumber", '~> 1.1'
+  gem "rspec-expectations", '~> 3.1.0'
   gem "hiera-eyaml-plaintext"
   gem "puppet"
 end

data/lib/hiera/backend/eyaml.rb

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

data/lib/hiera/backend/eyaml/subcommands/edit.rb

@@ -68,15 +68,15 @@ eos
           end
 
           def self.execute
+            editor = Utils.find_editor
+
             encrypted_parser = Parser::ParserFactory.encrypted_parser
             tokens = encrypted_parser.parse Eyaml::Options[:input_data]
             decrypted_input = tokens.each_with_index.to_a.map{|(t,index)| t.to_decrypted :index => index}.join
             decrypted_file_content = Eyaml::Options[:no_preamble] ? decrypted_input : (self.preamble + decrypted_input)
-            decrypted_file = Utils.write_tempfile decrypted_file_content
-
-            editor = Utils.find_editor
 
             begin
+              decrypted_file = Utils.write_tempfile decrypted_file_content unless decrypted_file
               system "#{editor} \"#{decrypted_file}\""
               status = $?
 

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

@@ -72,9 +72,22 @@ class Hiera
           file.close!
 
           file = File.open(path, "w")
+          file.chmod(0600)
+          if ENV['OS'] == 'Windows_NT'
+            # Windows doesn't support chmod
+            icacls = 'C:\Windows\system32\icacls.exe'
+            if File.executable? icacls
+              current_user = `C:\\Windows\\system32\\whoami.exe`.chomp
+              # Use ACLs to restrict access to the current user only
+              command = %Q{#{icacls} "#{file.path}" /grant:r "#{current_user}":f /inheritance:r}
+              system "#{command} >NUL 2>&1"
+            end
+          end
           file.puts data_to_write
           file.close
 
+          Utils::debug "Wrote temporary file: #{path}"
+
           path
         end
 

data/tools/regem.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# ToDo: Remove as 'rake install' task will build and install the latest gem?
+
 gem uninstall hiera-eyaml --executables
 RAKE_OUT=`rake build`
 echo ${RAKE_OUT}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-eyaml
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-03-04 00:00:00 Z
+date: 2015-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.0"
-  version_requirements: *id001
-  prerelease: false
   type: :runtime
-  name: trollop
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.6.19
-  version_requirements: *id002
-  prerelease: false
   type: :runtime
-  name: highline
+  version_requirements: *id002
 description: Hiera backend for decrypting encrypted yaml properties
 email: 
 executables: