cheffish 0.2.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c768248960ee1fe2711d0207f64fe5490d2954f7
-  data.tar.gz: 4afe8736f72242618444b6cccfc7445332951551
+  metadata.gz: 5f6b8abbcddf03b097bc9380a4bad5367f760f2f
+  data.tar.gz: 3f17d2781c140a66a869ecbedfd4c0c74326f1f9
 SHA512:
-  metadata.gz: 40cd6c19536b07623598b3e65cf6a5ddb710484c034dcc024f57905f03c1fb19f475bcc6dd93834b6e4adaee0e25efcd8376451c42fee8edd10140518e2b2e8c
-  data.tar.gz: 7f88593e7f4fb9b7473cb24a7ff9a4242a7f497778785cfc608e695c84e4f21624a88ea71adea2ba86cf957adba1c3aa72c83c70d8fe631f4499c7adef84f4c2
+  metadata.gz: 798aeb7bfd711164e71e613c2a3124aaf2cb2a8a344010aa6b97e17637802fc6ded341525677f97adc388f96360f7c28ce67145e519cf2ccc5b22fc199acd9b7
+  data.tar.gz: 0cbe97227f83d68327b8023f4ba23eaa81459f034fe31f5ee3e9a69bdb395cfdaaf7785b3dc1a458513312d32ff8a984ef10a6a210133d4462f3a77728f5433a

data/lib/chef/provider/chef_node.rb

@@ -47,12 +47,15 @@ class Chef::Provider::ChefNode < Cheffish::ChefProviderBase
   end
 
   def augment_new_json(json)
+    # Preserve tags even if "attributes" was overwritten directly
+    json['normal']['tags'] = current_json['normal']['tags'] unless json['normal']['tags']
     # Apply modifiers
     json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
-    json['default'] = apply_modifiers(new_resource.default_modifiers, json['default'])
-    json['normal'] = apply_modifiers(new_resource.normal_modifiers, json['normal'])
-    json['override'] = apply_modifiers(new_resource.override_modifiers, json['override'])
-    json['automatic'] = apply_modifiers(new_resource.automatic_modifiers, json['automatic'])
+    json['normal'] = apply_modifiers(new_resource.attribute_modifiers, json['normal'])
+    # Preserve default/override/automatic even when "complete true"
+    json['default'] = current_json['default']
+    json['override'] = current_json['override']
+    json['automatic'] = current_json['automatic']
     json
   end
 
@@ -73,10 +76,7 @@ class Chef::Provider::ChefNode < Cheffish::ChefProviderBase
       'name' => :name,
       'chef_environment' => :chef_environment,
       'run_list' => :run_list,
-      'default' => :default_attributes,
-      'normal' => :normal_attributes,
-      'override' => :override_attributes,
-      'automatic' => :automatic_attributes
+      'normal' => :attributes
     }
   end
 end

data/lib/cheffish/chef_provider_base.rb

@@ -69,8 +69,10 @@ module Cheffish
     def json_to_resource(json)
       resource = resource_class.new(new_resource.name)
       keys.each do |json_key, resource_key|
-        resource.send(resource_key, json[json_key])
+        resource.send(resource_key, json.delete(json_key))
       end
+      # Set the leftover to raw_json
+      resource.raw_json json
       resource
     end
 

data/lib/cheffish/recipe_dsl.rb

@@ -94,5 +94,18 @@ class Chef
 
       with_chef_server(chef_zero_server.url, &block)
     end
+
+    def self.stop_local_servers
+      # Just in case we're running this out of order:
+      @@local_servers ||= []
+
+      # Stop the servers
+      @@local_servers.each do |server|
+        server.stop
+      end
+
+      # Clean up after ourselves (don't want to stop a server twice)
+      @@local_servers = []
+    end
   end
 end

data/lib/cheffish/version.rb

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

data/lib/cheffish.rb

@@ -60,10 +60,7 @@ module Cheffish
       attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
       attribute :chef_environment, :kind_of => String, :regex => Cheffish::NAME_REGEX
       attribute :run_list, :kind_of => Array # We should let them specify it as a series of parameters too
-      attribute :default_attributes, :kind_of => Hash
-      attribute :normal_attributes, :kind_of => Hash
-      attribute :override_attributes, :kind_of => Hash
-      attribute :automatic_attributes, :kind_of => Hash
+      attribute :attributes, :kind_of => Hash
 
       # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
       # reset to their defaults)
@@ -72,82 +69,28 @@ module Cheffish
       attribute :raw_json, :kind_of => Hash
       attribute :chef_server, :kind_of => Hash
 
-      # default 'ip_address', '127.0.0.1'
-      # default [ 'pushy', 'port' ], '9000'
-      # default 'ip_addresses' do |existing_value|
+      # attribute 'ip_address', '127.0.0.1'
+      # attribute [ 'pushy', 'port' ], '9000'
+      # attribute 'ip_addresses' do |existing_value|
       #   (existing_value || []) + [ '127.0.0.1' ]
       # end
-      # default 'ip_address', :delete
-      attr_accessor :default_modifiers
-      def default(attribute_path, value=Cheffish.NOT_PASSED, &block)
-        @default_modifiers ||= []
-        if value != Cheffish.NOT_PASSED
-          @default_modifiers << [ attribute_path, value ]
-        elsif block
-          @default_modifiers << [ attribute_path, block ]
-        else
-          raise "default requires either a value or a block"
-        end
-      end
-
-      # normal 'ip_address', '127.0.0.1'
-      # normal [ 'pushy', 'port' ], '9000'
-      # normal 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # normal 'ip_address', :delete
-      attr_accessor :normal_modifiers
-      def normal(attribute_path, value=NOT_PASSED, &block)
-        @normal_modifiers ||= []
+      # attribute 'ip_address', :delete
+      attr_accessor :attribute_modifiers
+      def attribute(attribute_path, value=NOT_PASSED, &block)
+        @attribute_modifiers ||= []
         if value != NOT_PASSED
-          @normal_modifiers << [ attribute_path, value ]
+          @attribute_modifiers << [ attribute_path, value ]
         elsif block
-          @normal_modifiers << [ attribute_path, block ]
+          @attribute_modifiers << [ attribute_path, block ]
         else
-          raise "normal requires either a value or a block"
-        end
-      end
-
-      # override 'ip_address', '127.0.0.1'
-      # override [ 'pushy', 'port' ], '9000'
-      # override 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # override 'ip_address', :delete
-      attr_accessor :override_modifiers
-      def override(attribute_path, value=NOT_PASSED, &block)
-        @override_modifiers ||= []
-        if value != NOT_PASSED
-          @override_modifiers << [ attribute_path, value ]
-        elsif block
-          @override_modifiers << [ attribute_path, block ]
-        else
-          raise "override requires either a value or a block"
-        end
-      end
-
-      # automatic 'ip_address', '127.0.0.1'
-      # automatic [ 'pushy', 'port' ], '9000'
-      # automatic 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # automatic 'ip_address', :delete
-      attr_accessor :automatic_modifiers
-      def automatic(attribute_path, value=NOT_PASSED, &block)
-        @automatic_modifiers ||= []
-        if value != NOT_PASSED
-          @automatic_modifiers << [ attribute_path, value ]
-        elsif block
-          @automatic_modifiers << [ attribute_path, block ]
-        else
-          raise "automatic requires either a value or a block"
+          raise "attribute requires either a value or a block"
         end
       end
 
       # Patchy tags
       # tag 'webserver', 'apache', 'myenvironment'
       def tag(*tags)
-        normal 'tags' do |existing_tags|
+        attribute 'tags' do |existing_tags|
           existing_tags ||= []
           tags.each do |tag|
             if !existing_tags.include?(tag.to_s)
@@ -158,7 +101,7 @@ module Cheffish
         end
       end
       def remove_tag(*tags)
-        normal 'tags' do |existing_tags|
+        attribute 'tags' do |existing_tags|
           if existing_tags
             tags.each do |tag|
               existing_tags.delete(tag.to_s)
@@ -172,17 +115,13 @@ module Cheffish
       # tags :a, :b, :c # removes all other tags
       def tags(*tags)
         if tags.size == 0
-          normal('tags')
+          attribute('tags')
         else
           tags = tags[0] if tags.size == 1 && tags[0].kind_of?(Array)
-          normal 'tags', tags.map { |tag| tag.to_s }
+          attribute 'tags', tags.map { |tag| tag.to_s }
         end
       end
 
-
-      alias :attributes :normal_attributes
-      alias :attribute :normal
-
       # Order matters--if two things here are in the wrong order, they will be flipped in the run list
       # recipe 'apache', 'mysql'
       # recipe 'recipe@version'

data/spec/integration/chef_node_spec.rb

@@ -68,8 +68,78 @@ describe Chef::Resource::ChefNode do
       chef_node 'blah'
     end
 
-    it 'the node "blah" does not get created or updated' do
+    it 'chef_node "blah" does not get created or updated' do
       chef_run.should_not have_updated 'chef_node[blah]', :create
     end
   end
+
+  when_the_chef_server 'has a node named "blah" with tags' do
+    node 'blah', {
+      'normal' => { 'tags' => [ 'a', 'b' ] }
+    }
+
+    context 'with chef_node "blah" that sets attributes' do
+      with_recipe do
+        chef_node 'blah' do
+          attributes({})
+        end
+      end
+
+      it 'the tags in attributes are used' do
+        get('/nodes/blah')['normal']['tags'].should == [ 'a', 'b' ]
+      end
+    end
+
+    context 'with chef_node "blah" that sets attributes with tags in them' do
+      with_recipe do
+        chef_node 'blah' do
+          attributes 'tags' => [ 'c', 'd' ]
+        end
+      end
+
+      it 'the tags in attributes are used' do
+        get('/nodes/blah')['normal']['tags'].should == [ 'c', 'd' ]
+      end
+    end
+  end
+
+  when_the_chef_server 'has a node named "blah" with everything in it' do
+    node 'blah', {
+      'chef_environment' => 'blah',
+      'run_list'  => [ 'recipe[bjork]' ],
+      'normal'    => { 'foo' => 'bar', 'tags' => [ 'a', 'b' ] },
+      'default'   => { 'foo2' => 'bar2' },
+      'automatic' => { 'foo3' => 'bar3' },
+      'override'  => { 'foo4' => 'bar4' }
+    }
+
+    context 'with chef_node "blah"' do
+      with_recipe do
+        chef_node 'blah'
+      end
+
+      it 'nothing gets updated' do
+        chef_run.should_not have_updated 'chef_node[blah]', :create
+      end
+    end
+
+    context 'with chef_node "blah" with complete true' do
+      with_recipe do
+        chef_node 'blah' do
+          complete true
+        end
+      end
+
+      it 'default, automatic and override attributes are left alone' do
+        chef_run.should have_updated 'chef_node[blah]', :create
+        node = get('/nodes/blah')
+        node['chef_environment'].should == '_default'
+        node['run_list'].should == []
+        node['normal'].should == { 'tags' => [ 'a', 'b' ] }
+        node['default'].should == { 'foo2' => 'bar2' }
+        node['automatic'].should == { 'foo3' => 'bar3' }
+        node['override'].should == { 'foo4' => 'bar4' }
+      end
+    end
+  end
 end

data/spec/support/spec_support.rb

@@ -87,6 +87,7 @@ require 'chef/platform'
 require 'chef/provider/service/simple'
 require 'chef/provider/service/init'
 
+require 'chef/provider/batch'
 require 'chef/provider/cron'
 require 'chef/provider/cron/aix'
 require 'chef/provider/cron/solaris'
@@ -125,6 +126,7 @@ require 'chef/provider/package/solaris'
 require 'chef/provider/package/smartos'
 require 'chef/provider/package/yum'
 require 'chef/provider/package/zypper'
+require 'chef/provider/powershell_script'
 require 'chef/provider/remote_directory'
 require 'chef/provider/route'
 require 'chef/provider/ruby_block'
@@ -138,6 +140,7 @@ require 'chef/provider/service/insserv'
 require 'chef/provider/service/macosx'
 require 'chef/provider/service/redhat'
 require 'chef/provider/service/solaris'
+require 'chef/provider/service/systemd'
 require 'chef/provider/service/upstart'
 require 'chef/provider/service/windows'
 require 'chef/provider/template'
@@ -146,3 +149,4 @@ require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
 require 'chef/provider/user/solaris'
 require 'chef/provider/user/windows'
+require 'chef/provider/whyrun_safe_ruby_block'

metadata

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