cheffish 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de0b0a59e8705c145dce86b294d9ec4ab0e43c4
-  data.tar.gz: 6239ca45f2db3ae775172f41666283c48ba78d39
+  metadata.gz: 6d87a0c1a1ae6b0add50c5a3acbbba29b51f013f
+  data.tar.gz: 085e01de9f5f36232031015b9fd961b16e4b5c4e
 SHA512:
-  metadata.gz: ac3f5b8b7a9f8d79846a9784225b1bc3babc07ec08c96d4c42ac61ee36ac65e8bb68ff36f0bb6f2d2ee6e9bbdd0441beb95f90b7b6db11e9e7b795b378d55bd1
-  data.tar.gz: 32907291f4a2ddfb3cdddaf69b44e4a5380eff0aeb0b7975a51fc450374f0747962f6eb19989e5c317fc1e1cf59395cd5e0bc6c840fe438fd8913a1f25831993
+  metadata.gz: c83499b0c969323e430b31376722f12b4645ad5cc8d0b1192507cd5e537cab747f8338fb5cbbd986c4f5ce13b55c8c7bc16ad258af2190be2a2c48b170bf4186
+  data.tar.gz: d4455ba139415aa2d1ec32e6d9d244372b76ec1910cbee0abf38691b953b4114946295876812f99487ac000ce0512882a21499c625f2657fdfef9ac93a6ba584

data/lib/chef/provider/chef_data_bag_item.rb

@@ -170,7 +170,7 @@ class Chef::Provider::ChefDataBagItem < Cheffish::ChefProviderBase
         result = current_decrypted.merge(new_resource.raw_data || {})
       end
       result['id'] = new_resource.id
-      apply_modifiers(new_resource.raw_data_modifiers, result)
+      result = apply_modifiers(new_resource.raw_data_modifiers, result)
     end
   end
 

data/lib/cheffish/chef_provider_base.rb

@@ -156,7 +156,11 @@ module Cheffish
             hash[path_part] = {} if !hash[path_part]
             hash[path_part]
           end
-          parent[path[-1]] = value
+          if path.size > 0
+            parent[path[-1]] = value
+          else
+            json = value
+          end
         end
       end
       json

data/lib/cheffish/recipe_dsl.rb

@@ -72,14 +72,22 @@ class Chef
 
           # Ensure all paths are given
           %w(acl client cookbook container data_bag environment group node role).each do |type|
-            options["#{type}_path"] ||= begin
+            # Set the options as symbol keys and then copy to string keys
+            string_key = "#{type}_path"
+            symbol_key = "#{type}_path".to_sym
+
+            options[symbol_key] ||= begin
               if options[:chef_repo_path].kind_of?(String)
                 Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
               else
                 options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s")}
               end
             end
-          end
+
+            # Copy over to string keys for things that use string keys (ChefFS)...
+            # TODO: Fix ChefFS to take symbols or use something that is insensitive to the difference
+            options[string_key] = options[symbol_key]
+          end 
 
           chef_fs = Chef::ChefFS::Config.new(options).local_fs
           chef_fs.write_pretty_json = true

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/integration/chef_node_spec.rb

@@ -445,6 +445,20 @@ describe Chef::Resource::ChefNode do
               'chef_environment' => 'desert'
             )
           end
+
+          it 'chef_node with attribute [], {} clears all attributes' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute([], {})
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => { },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
         end
 
         context 'delete' do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '11.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '11.8'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: A library to manipulate Chef in Chef.
@@ -144,12 +144,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -159,4 +159,3 @@ signing_key:
 specification_version: 4
 summary: A library to manipulate Chef in Chef.
 test_files: []
-has_rdoc: