cheffish 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e182c603b2941d06e40d833ec685f06e25f98ba
-  data.tar.gz: 0cd62ae5880554e897daa09d8794a4df5dd65227
+  metadata.gz: '009864416ce70d90ec113db22d788d8ed0eba2d5'
+  data.tar.gz: bb24eb7314fb2791dec51e44c6da5b4ec05cddcf
 SHA512:
-  metadata.gz: 0ae3152e329c4678230c35ce591d0e142ae134081e254610e5be19760668ce5f0f4dae56c0dc2d1e24404d6543968fe9bf978fe242f2baa75b510bd29ba324e6
-  data.tar.gz: 22f1b8d47e6afc666db9901fea2fc986913c2aa0fe405486c1e88977045070ebc8281e77165831054c5b54fc12493ebe09fd28f84b3d976daee5548360a46f87
+  metadata.gz: b7082e80979fc45e905a5cae7c0c97096ee9a28a72f187b46f9eb6377bfb18ba929c3112e51b7a4e7d4293790289d66bc634361cf6c317d524cabb5e9c262aae
+  data.tar.gz: 71527d52be685dda74fef2e4a5115a285360b9c2163c880725962fe9c276b97a9c2c0326fb0d972ae253ac6baee613c848d951619628c0f2b18521d8d02d509b

data/lib/chef/resource/chef_acl.rb

@@ -466,21 +466,19 @@ class Chef
         end
 
         def rest_list(path)
-          begin
             # All our rest lists are hashes where the keys are the names
-            [ rest.get(rest_url(path)).keys, nil ]
-          rescue Net::HTTPServerException => e
-            if e.response.code == "405" || e.response.code == "404"
-              parts = path.split("/").select { |p| p != "" }.to_a
-
-              # We KNOW we expect these to exist.  Other containers may or may not.
-              unless (parts.size == 1 || (parts.size == 3 && parts[0] == "organizations")) &&
-                  %w{clients containers cookbooks data environments groups nodes roles}.include?(parts[-1])
-                return [ [], "Cannot get list of #{path}: HTTP response code #{e.response.code}" ]
-              end
+          [ rest.get(rest_url(path)).keys, nil ]
+        rescue Net::HTTPServerException => e
+          if e.response.code == "405" || e.response.code == "404"
+            parts = path.split("/").select { |p| p != "" }.to_a
+
+            # We KNOW we expect these to exist.  Other containers may or may not.
+            unless (parts.size == 1 || (parts.size == 3 && parts[0] == "organizations")) &&
+                %w{clients containers cookbooks data environments groups nodes roles}.include?(parts[-1])
+              return [ [], "Cannot get list of #{path}: HTTP response code #{e.response.code}" ]
             end
-            raise
           end
+          raise
         end
       end
 

data/lib/chef/resource/chef_container.rb

@@ -27,14 +27,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_exists = rest.get("containers/#{new_resource.chef_container_name}")
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_exists = false
-            else
-              raise
-            end
+          @current_exists = rest.get("containers/#{new_resource.chef_container_name}")
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_exists = false
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_data_bag.rb

@@ -26,14 +26,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("data/#{new_resource.data_bag_name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("data/#{new_resource.data_bag_name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_environment.rb

@@ -83,14 +83,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("environments/#{new_resource.environment_name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("environments/#{new_resource.environment_name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_group.rb

@@ -44,14 +44,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("groups/#{new_resource.group_name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("groups/#{new_resource.group_name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_node.rb

@@ -38,14 +38,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("nodes/#{new_resource.name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("nodes/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_organization.rb

@@ -129,14 +129,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.organization_name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.organization_name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/chef/resource/chef_role.rb

@@ -118,14 +118,12 @@ class Chef
 
       action_class.class_eval do
         def load_current_resource
-          begin
-            @current_resource = json_to_resource(rest.get("roles/#{new_resource.role_name}"))
-          rescue Net::HTTPServerException => e
-            if e.response.code == "404"
-              @current_resource = not_found_resource
-            else
-              raise
-            end
+          @current_resource = json_to_resource(rest.get("roles/#{new_resource.role_name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
           end
         end
 

data/lib/cheffish/chef_run.rb

@@ -86,13 +86,11 @@ module Cheffish
     end
 
     def converge
-      begin
-        client.converge
-        @converged = true
-      rescue RuntimeError => e
-        @raised_exception = e
-        raise
-      end
+      client.converge
+      @converged = true
+    rescue RuntimeError => e
+      @raised_exception = e
+      raise
     end
 
     def reset

data/lib/cheffish/merged_config.rb

@@ -3,8 +3,8 @@ require "chef/mash"
 module Cheffish
   class MergedConfig
     def initialize(*configs)
-      @configs = configs.map { |config| Chef::Mash.from_hash config }
-      @merge_arrays = Chef::Mash.new
+      @configs = configs.map { |config| Mash.from_hash config.to_hash }
+      @merge_arrays = Mash.new
     end
 
     include Enumerable
@@ -48,6 +48,7 @@ module Cheffish
     end
 
     def method_missing(name, *args)
+      $stderr.puts "WARN: deprecated use of method_missing on a Cheffish::MergedConfig object at #{caller[0]}"
       if args.count > 0
         raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
       else

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "13.0.0"
+  VERSION = "13.1.0"
 end

data/spec/functional/merged_config_spec.rb

@@ -24,6 +24,13 @@ describe "merged_config" do
     Cheffish::MergedConfig.new(c1, c2)
   end
 
+  let(:nested_config) do
+    c1 = { :test => { :test => "val" } }
+    c2 = { :test => { :test2 => "val2" } }
+    mc = Cheffish::MergedConfig.new(c2)
+    Cheffish::MergedConfig.new(c1, mc)
+  end
+
   it "returns value in config" do
     expect(config.test).to eq("val")
   end
@@ -57,4 +64,8 @@ describe "merged_config" do
   it "merges values when they're hashes" do
     expect(config_hashes[:test].keys).to eq(%w{test test2})
   end
+
+  it "supports nested merged configs" do
+    expect(nested_config[:test].keys).to eq(%w{test test2})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.