cheffish 0.4 → 0.4.1

data/lib/cheffish.rb

@@ -8,6 +8,16 @@ module Cheffish
     BasicChefClient.inline_resource(provider, provider_action, &block)
   end
 
+  def self.default_chef_server
+    {
+      :chef_server_url => Chef::Config[:chef_server_url],
+      :options => {
+        :client_name => Chef::Config[:node_name],
+        :signing_key_filename => Chef::Config[:client_key]
+      }
+    }
+  end
+
   NOT_PASSED=Object.new
 
   def self.node_attributes(klass)

data/lib/cheffish/basic_chef_client.rb

@@ -1,3 +1,4 @@
+require 'cheffish/version'
 require 'chef/dsl/recipe'
 require 'chef/event_dispatch/base'
 require 'chef/event_dispatch/dispatcher'
@@ -13,9 +14,9 @@ module Cheffish
     def initialize(node = nil, events = nil)
       if !node
         node = Chef::Node.new
-        node.name 'basic_client'
-        node.automatic[:platform] = 'test'
-        node.automatic[:platform_version] = 'test'
+        node.name 'basic_chef_client'
+        node.automatic[:platform] = 'basic_chef_client'
+        node.automatic[:platform_version] = Cheffish::VERSION
       end
 
       @event_catcher = BasicChefClientEvents.new
@@ -23,7 +24,7 @@ module Cheffish
       dispatcher.register(events) if events
       @run_context = Chef::RunContext.new(node, {}, dispatcher)
       @updated = []
-      @cookbook_name = 'basic_client'
+      @cookbook_name = 'basic_chef_client'
     end
 
     extend Forwardable
@@ -53,7 +54,7 @@ module Cheffish
 
     def self.inline_resource(provider, provider_action, &block)
       events = ProviderEventForwarder.new(provider, provider_action)
-      client = BasicChefClient.new(provider.node)
+      client = BasicChefClient.new(provider.node, events)
       client.load_block(&block)
       client.converge
       client.updated?

data/lib/cheffish/chef_provider_base.rb

@@ -97,23 +97,23 @@ module Cheffish
             end
           else
             if print_values
-              result << "add #{name == '' ? new_key : "#{name}.#{new_key}"} = #{new_value.inspect}"
+              result << "  add #{name == '' ? new_key : "#{name}.#{new_key}"} = #{new_value.inspect}"
             else
-              result << "add #{name == '' ? new_key : "#{name}.#{new_key}"}"
+              result << "  add #{name == '' ? new_key : "#{name}.#{new_key}"}"
             end
           end
         end
         removed_keys.keys.each do |removed_key|
-          result << "remove #{name == '' ? removed_key : "#{name}.#{removed_key}"}"
+          result << "  remove #{name == '' ? removed_key : "#{name}.#{removed_key}"}"
         end
       else
         old_json = old_json.to_s if old_json.kind_of?(Symbol)
         new_json = new_json.to_s if new_json.kind_of?(Symbol)
         if old_json != new_json
           if print_values
-            result << "update #{name} from #{old_json.inspect} to #{new_json.inspect}"
+            result << "  update #{name} from #{old_json.inspect} to #{new_json.inspect}"
           else
-            result << "update #{name}"
+            result << "  update #{name}"
           end
         end
       end

data/lib/cheffish/chef_run_data.rb

@@ -5,13 +5,7 @@ module Cheffish
   class ChefRunData
     def initialize
       @local_servers = []
-      @current_chef_server = {
-        :chef_server_url => Chef::Config[:chef_server_url],
-        :options => {
-          :client_name => Chef::Config[:node_name],
-          :signing_key_filename => Chef::Config[:client_key]
-        }
-      }
+      @current_chef_server = Cheffish.default_chef_server
     end
 
     extend Cheffish::WithPattern

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.4'
+  VERSION = '0.4.1'
 end

data/spec/integration/chef_client_spec.rb

@@ -15,7 +15,7 @@ describe Chef::Resource::ChefClient do
       end
 
       context 'and we run a recipe that creates client "blah"' do
-        with_recipe do
+        with_converge do
           chef_client 'blah' do
             source_key_path "#{repo_path}/blah.pem"
           end
@@ -31,7 +31,7 @@ describe Chef::Resource::ChefClient do
       end
 
       context 'and we run a recipe that creates client "blah" with output_key_path' do
-        with_recipe do
+        with_converge do
           chef_client 'blah' do
             source_key_path "#{repo_path}/blah.pem"
             output_key_path "#{repo_path}/blah.pub"

data/spec/integration/chef_node_spec.rb

@@ -7,7 +7,7 @@ describe Chef::Resource::ChefNode do
 
   when_the_chef_server 'is empty' do
     context 'and we run a recipe that creates node "blah"' do
-      with_recipe do
+      with_converge do
         chef_node 'blah'
       end
 
@@ -31,7 +31,7 @@ describe Chef::Resource::ChefNode do
 
       context 'and a recipe is run that creates node "blah" on the second chef server using with_chef_server' do
 
-        with_recipe do
+        with_converge do
           with_chef_server 'http://127.0.0.1:8899'
           chef_node 'blah'
         end
@@ -45,7 +45,7 @@ describe Chef::Resource::ChefNode do
 
       context 'and a recipe is run that creates node "blah" on the second chef server using chef_server' do
 
-        with_recipe do
+        with_converge do
           chef_node 'blah' do
             chef_server({ :chef_server_url => 'http://127.0.0.1:8899' })
           end
@@ -64,7 +64,7 @@ describe Chef::Resource::ChefNode do
   when_the_chef_server 'has a node named "blah"' do
     node 'blah', {}
 
-    with_recipe do
+    with_converge do
       chef_node 'blah'
     end
 
@@ -79,7 +79,7 @@ describe Chef::Resource::ChefNode do
     }
 
     context 'with chef_node "blah" that sets attributes' do
-      with_recipe do
+      with_converge do
         chef_node 'blah' do
           attributes({})
         end
@@ -91,7 +91,7 @@ describe Chef::Resource::ChefNode do
     end
 
     context 'with chef_node "blah" that sets attributes with tags in them' do
-      with_recipe do
+      with_converge do
         chef_node 'blah' do
           attributes 'tags' => [ 'c', 'd' ]
         end
@@ -114,7 +114,7 @@ describe Chef::Resource::ChefNode do
     }
 
     context 'with chef_node "blah"' do
-      with_recipe do
+      with_converge do
         chef_node 'blah'
       end
 
@@ -124,7 +124,7 @@ describe Chef::Resource::ChefNode do
     end
 
     context 'with chef_node "blah" with complete true' do
-      with_recipe do
+      with_converge do
         chef_node 'blah' do
           complete true
         end

data/spec/integration/chef_user_spec.rb

@@ -15,7 +15,7 @@ describe Chef::Resource::ChefUser do
       end
 
       context 'and we run a recipe that creates user "blah"'do
-        with_recipe do
+        with_converge do
           chef_user 'blah' do
             source_key_path "#{repo_path}/blah.pem"
           end
@@ -31,7 +31,7 @@ describe Chef::Resource::ChefUser do
       end
 
       context 'and we run a recipe that creates client "blah" with output_key_path' do
-        with_recipe do
+        with_converge do
           chef_client 'blah' do
             source_key_path "#{repo_path}/blah.pem"
             output_key_path "#{repo_path}/blah.pub"

data/spec/integration/private_key_spec.rb

@@ -25,9 +25,17 @@ describe Chef::Resource::PrivateKey do
       IO.read("#{repo_path}/blah").should start_with('-----BEGIN')
       OpenSSL::PKey.read(IO.read("#{repo_path}/blah")).kind_of?(OpenSSL::PKey::RSA).should be_true
     end
+  end
+
+  context 'with a private key' do
+    before :each do
+      Cheffish::BasicChefClient.converge_block do
+        private_key "#{repo_path}/blah"
+      end
+    end
 
     context 'and a private_key that copies it in der format' do
-      with_recipe do
+      with_converge do
         private_key "#{repo_path}/blah.der" do
           source_key_path "#{repo_path}/blah"
           format :der
@@ -74,22 +82,31 @@ describe Chef::Resource::PrivateKey do
       "#{repo_path}/blah.der".should match_private_key("#{repo_path}/blah")
     end
 
-    context 'and a public_key' do
-      with_recipe do
+    context 'and a public_key recipe' do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key_path "#{repo_path}/blah"
         end
       end
 
       it 'the public_key is created' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should start_with('ssh-rsa ')
         "#{repo_path}/blah.pub".should be_public_key_for "#{repo_path}/blah"
       end
+    end
 
-      context 'and another public_key based off the first public_key' do
-        with_recipe do
+    context 'and a public key' do
+      before :each do
+        Cheffish::BasicChefClient.converge_block do
+          public_key "#{repo_path}/blah.pub" do
+            source_key_path "#{repo_path}/blah"
+          end
+        end
+      end
+
+      context 'and public_key resource based off the public key file' do
+        with_converge do
           public_key "#{repo_path}/blah.pub2" do
             source_key_path "#{repo_path}/blah.pub"
           end
@@ -103,7 +120,7 @@ describe Chef::Resource::PrivateKey do
       end
 
       context 'and another public_key based off the first public_key in-memory in a string' do
-        with_recipe do
+        with_converge do
           public_key "#{repo_path}/blah.pub2" do
             source_key IO.read("#{repo_path}/blah.pub")
           end
@@ -131,7 +148,7 @@ describe Chef::Resource::PrivateKey do
       end
 
       context 'and another public_key in :pem format based off the first public_key' do
-        with_recipe do
+        with_converge do
           public_key "#{repo_path}/blah.pub2" do
             source_key_path "#{repo_path}/blah.pub"
             format :pem
@@ -146,7 +163,7 @@ describe Chef::Resource::PrivateKey do
       end
 
       context 'and another public_key in :der format based off the first public_key' do
-        with_recipe do
+        with_converge do
           public_key "#{repo_path}/blah.pub2" do
             source_key_path "#{repo_path}/blah.pub"
             format :pem
@@ -161,8 +178,8 @@ describe Chef::Resource::PrivateKey do
       end
     end
 
-    context 'and a public key in pem format' do
-      with_recipe do
+    context 'and a public_key resource in pem format' do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key_path "#{repo_path}/blah"
           format :pem
@@ -170,15 +187,14 @@ describe Chef::Resource::PrivateKey do
       end
 
       it 'the public_key is created' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should start_with('-----BEGIN')
         "#{repo_path}/blah.pub".should be_public_key_for "#{repo_path}/blah"
       end
     end
 
-    context 'and a public key in der format' do
-      with_recipe do
+    context 'and a public_key resource in der format' do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key_path "#{repo_path}/blah"
           format :der
@@ -186,7 +202,6 @@ describe Chef::Resource::PrivateKey do
       end
 
       it 'the public_key is created in openssh format' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should_not start_with('-----BEGIN')
         IO.read("#{repo_path}/blah.pub").should_not start_with('ssh-rsa')
@@ -207,16 +222,25 @@ describe Chef::Resource::PrivateKey do
       IO.read("#{repo_path}/blah").should_not start_with('-----BEGIN')
       OpenSSL::PKey.read(IO.read("#{repo_path}/blah")).kind_of?(OpenSSL::PKey::RSA).should be_true
     end
+  end
+
+  context 'with a private key in der format' do
+    before :each do
+      Cheffish::BasicChefClient.converge_block do
+        private_key "#{repo_path}/blah" do
+          format :der
+        end
+      end
+    end
 
     context 'and a public_key' do
-      with_recipe do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key_path "#{repo_path}/blah"
         end
       end
 
       it 'the public_key is created in openssh format' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should start_with('ssh-rsa ')
         "#{repo_path}/blah.pub".should be_public_key_for "#{repo_path}/blah"
@@ -225,7 +249,7 @@ describe Chef::Resource::PrivateKey do
   end
 
   context 'with a recipe with a private_key with a pass_phrase' do
-    with_recipe do
+    with_converge do
       private_key "#{repo_path}/blah" do
         pass_phrase 'hello'
       end
@@ -236,9 +260,19 @@ describe Chef::Resource::PrivateKey do
       IO.read("#{repo_path}/blah").should start_with('-----BEGIN')
       OpenSSL::PKey.read(IO.read("#{repo_path}/blah"), 'hello').kind_of?(OpenSSL::PKey::RSA).should be_true
     end
+  end
+
+  context 'with a private key with a pass phrase' do
+    before :each do
+      Cheffish::BasicChefClient.converge_block do
+        private_key "#{repo_path}/blah" do
+          pass_phrase 'hello'
+        end
+      end
+    end
 
     context 'and a private_key that copies it in der format' do
-      with_recipe do
+      with_converge do
         private_key "#{repo_path}/blah.der" do
           source_key_path "#{repo_path}/blah"
           source_key_pass_phrase 'hello'
@@ -255,7 +289,7 @@ describe Chef::Resource::PrivateKey do
       end
     end
 
-    it 'a private_key that copies it from in-memory as a string succeeds' do
+    it 'a private_key resource that copies it from in-memory as a string succeeds' do
       run_recipe do
         private_key "#{repo_path}/blah.der" do
           source_key IO.read("#{repo_path}/blah")
@@ -272,7 +306,7 @@ describe Chef::Resource::PrivateKey do
     end
 
     context 'and a public_key' do
-      with_recipe do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key_path "#{repo_path}/blah"
           source_key_pass_phrase 'hello'
@@ -280,7 +314,6 @@ describe Chef::Resource::PrivateKey do
       end
 
       it 'the public_key is created in openssh format' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should start_with('ssh-rsa ')
         "#{repo_path}/blah.pub".should be_public_key_for "#{repo_path}/blah", 'hello'
@@ -288,7 +321,7 @@ describe Chef::Resource::PrivateKey do
     end
 
     context 'and a public_key derived from the private key in an in-memory string' do
-      with_recipe do
+      with_converge do
         public_key "#{repo_path}/blah.pub" do
           source_key IO.read("#{repo_path}/blah")
           source_key_pass_phrase 'hello'
@@ -296,7 +329,6 @@ describe Chef::Resource::PrivateKey do
       end
 
       it 'the public_key is created in openssh format' do
-        chef_run.should have_updated "private_key[#{repo_path}/blah]", :create
         chef_run.should have_updated "public_key[#{repo_path}/blah.pub]", :create
         IO.read("#{repo_path}/blah.pub").should start_with('ssh-rsa ')
         "#{repo_path}/blah.pub".should be_public_key_for "#{repo_path}/blah", 'hello'
@@ -305,7 +337,7 @@ describe Chef::Resource::PrivateKey do
   end
 
   context 'with a recipe with a private_key and public_key_path' do
-    with_recipe do
+    with_converge do
       private_key "#{repo_path}/blah" do
         public_key_path "#{repo_path}/blah.pub"
       end
@@ -321,7 +353,7 @@ describe Chef::Resource::PrivateKey do
   end
 
   context 'with a recipe with a private_key and public_key_path and public_key_format' do
-    with_recipe do
+    with_converge do
       private_key "#{repo_path}/blah" do
         public_key_path "#{repo_path}/blah.pub.der"
         public_key_format :der
@@ -353,4 +385,3 @@ describe Chef::Resource::PrivateKey do
   end
 
 end
-

data/spec/integration/recipe_dsl_spec.rb

@@ -9,7 +9,7 @@ describe 'Cheffish Recipe DSL' do
   context 'when we include with_chef_local_server' do
     before :each do
       @tmp_repo = tmp_repo = Dir.mktmpdir('chef_repo')
-      run_recipe do
+      load_recipe do
         with_chef_local_server :chef_repo_path => tmp_repo
       end
     end

data/spec/support/spec_support.rb

@@ -1,11 +1,7 @@
 require 'chef_zero/rspec'
-require 'chef/recipe'
-require 'chef/run_context'
-require 'chef/event_dispatch/dispatcher'
-require 'chef/cookbook/cookbook_collection'
-require 'chef/runner'
 require 'chef/server_api'
 require 'cheffish'
+require 'cheffish/basic_chef_client'
 
 module SpecSupport
   include ChefZero::RSpec
@@ -17,34 +13,61 @@ module SpecSupport
       end
 
       def chef_run
-        @event_sink.events
+        converge if !@converged
+        event_sink.events
       end
 
-      def run_context
-        @run_context ||= begin
-          node = Chef::Node.new
-          node.name 'test'
-          node.automatic[:platform] = 'test'
-          node.automatic[:platform_version] = 'test'
-          Chef::RunContext.new(node, {}, Chef::EventDispatch::Dispatcher.new(event_sink))
+      def event_sink
+        @event_sink ||= EventSink.new
+      end
+
+      def basic_chef_client
+        @basic_chef_client ||= begin
+          Cheffish::BasicChefClient.new(nil, event_sink)
         end
       end
 
-      def event_sink
-        @event_sink ||= EventSink.new
+      def load_recipe(&block)
+        basic_chef_client.load_block(&block)
       end
 
       def run_recipe(&block)
-        recipe = Chef::Recipe.new('test', 'test', run_context)
-        recipe.instance_eval(&block)
-        Chef::Runner.new(run_context).converge
+        load_recipe(&block)
+        converge
+      end
+
+      def reset_chef_client
+        @event_sink = nil
+        @basic_chef_client = nil
+        @converged = false
+      end
+
+      def converge
+        if @converged
+          raise "Already converged! Cannot converge twice, that's bad mojo."
+        end
+        @converged = true
+        basic_chef_client.converge
       end
     end
   end
 
   def with_recipe(&block)
     before :each do
-      run_recipe(&block)
+      load_recipe(&block)
+    end
+
+    after :each do
+      if !@converged
+        raise "Never tried to converge!"
+      end
+    end
+  end
+
+  def with_converge(&block)
+    before :each do
+      load_recipe(&block) if block_given?
+      converge
     end
   end
 

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
+  prerelease: 
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: openssl_pkcs8
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A library to manipulate Chef in Chef.
@@ -117,26 +126,27 @@ files:
 - spec/support/spec_support.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A library to manipulate Chef in Chef.
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2c99e67f4f2af51e4be1bb7f4d127973b0060789
-  data.tar.gz: e8547a16bc4df37aa4d29b00f6f36af3ec57c381
-SHA512:
-  metadata.gz: 5ac67f69abb511dab697a2a6d77b058dcfb665864d0d647b332a7a820cb59e576406fbabb1fb22a417c2dbb4cb66b7683d537ebe1b97dfa1779a4e985577dcea
-  data.tar.gz: 85e3d63ac54c4b1665d2b4957be6982731f1a701cab9709537e545890c7415331773c47ff187cbf31a1b5328813cd6c8c6d361ad1aa9a4404f8a73a49c1b0f89