cheffish 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a849241ed53a1895729159021b5850c05daa8c55
-  data.tar.gz: c0d56677f2fd295cc75f7698fad5a36ad7c4ca65
+  metadata.gz: c768248960ee1fe2711d0207f64fe5490d2954f7
+  data.tar.gz: 4afe8736f72242618444b6cccfc7445332951551
 SHA512:
-  metadata.gz: d94928862e7662c9f80fb21fdeb5562e3461094acf49a8acafb19c6c808ebd3252ac16976ddd340e509ef8ddb562ad2d0b8d9550cfa2f28b9f9100e760c3d26a
-  data.tar.gz: a8820984c90aa4d4d9db3a828e9bb2c2b12d96fab2b4b0aac9ba4ad18c16293c6bf0467decdff8dafe0ea4a4987e9a5f224778d0482bbd9104d1b82fb15bf278
+  metadata.gz: 40cd6c19536b07623598b3e65cf6a5ddb710484c034dcc024f57905f03c1fb19f475bcc6dd93834b6e4adaee0e25efcd8376451c42fee8edd10140518e2b2e8c
+  data.tar.gz: 7f88593e7f4fb9b7473cb24a7ff9a4242a7f497778785cfc608e695c84e4f21624a88ea71adea2ba86cf957adba1c3aa72c83c70d8fe631f4499c7adef84f4c2

data/lib/chef/provider/private_key.rb

@@ -49,7 +49,7 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
         (new_resource.regenerate_if_different &&
           (current_resource.size != new_resource.size ||
            current_resource.type != new_resource.type))
-        action = (current_resource.path == :none || ::File.exists?(current_resource.path)) ? "overwrite" : "create"
+        action = (Array(current_resource.action) == [ :delete ]) ? "create" : "overwrite"
         converge_by "#{action} #{new_resource.type} private key #{new_resource.path} (#{new_resource.size} bits#{new_resource.pass_phrase ? ", #{new_resource.cipher} password" : ""})" do
           case new_resource.type
           when :rsa
@@ -80,6 +80,11 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
           converge_by "change format of #{new_resource.type} private key #{new_resource.path} from #{current_resource.format} to #{new_resource.format}" do
             write_private_key(current_private_key)
           end
+        elsif (@current_file_mode & 0077) != 0
+          new_mode = @current_file_mode & 07700
+          converge_by "change mode of private key #{new_resource.path} to #{new_mode.to_s(8)}" do
+            ::File.chmod(new_mode, new_resource.path)
+          end
         end
       end
     end
@@ -109,8 +114,10 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
   end
 
   def write_private_key(key)
-    IO.write(new_resource.path, encode_private_key(key))
-    # TODO permissions on file?
+    ::File.open(new_resource.path, 'w') do |file|
+      file.chmod(0600)
+      file.write(encode_private_key(key))
+    end
   end
 
   def new_source_key
@@ -148,6 +155,7 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
           resource.pass_phrase key_format[:pass_phrase]
           resource.cipher key_format[:cipher]
         end
+        @current_file_mode = ::File.stat(new_resource.path).mode
       rescue
         # If there's an error reading, we assume format and type are wrong and don't futz with them
       end

data/lib/cheffish/version.rb

@@ -1,4 +1,4 @@
 module Cheffish
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef