cheffish 0.9.2 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edaf9501687672d10bd9f172390ed551ab53ee52
-  data.tar.gz: af33156dfc99d628b579f1dcfff6451f325fd513
+  metadata.gz: 0dd771a02b1ec79cf680acd44dbf8a86bf249ced
+  data.tar.gz: 986a7e74cb9a146bf0b16299a975567e4895d126
 SHA512:
-  metadata.gz: 1b965c4f29a566155b2fee660a43f46c5c819534d1ed977168288999811a15cb016182ade13fe4a7f8b2b207f71ed45b691303f0ba6110e77f0dd42ed859ae9e
-  data.tar.gz: 726da33032db08f09b6e1b4e61bf15247dd94842be608f4d4a22fadbb37fec360703162736a9a8d2aa5330404a17f802ff8f1cd20e145f369699880542a41e6d
+  metadata.gz: 59571d73a981523e1113cf337ad2d9333e101200f1090b66efefbb8b436b96ae3a6176f08b945786ba66e9db6a5b8e090a6a14082fc4e2f525da57a32a673e6c
+  data.tar.gz: 2d315360a501d2bee824628d4eebb7f24e26b4f9272d79fdc7ca64b3cf6a624930184e094e23d69fbbb3092d165923137d3aba4833bd0ac9616f68ae1e490b49

data/lib/cheffish/chef_provider_base.rb

@@ -60,6 +60,9 @@ module Cheffish
       json = resource.raw_json || {}
       keys.each do |json_key, resource_key|
         value = resource.send(resource_key)
+        # This takes care of Chef ImmutableMash and ImmutableArray
+        value = value.to_hash if value.is_a?(Hash)
+        value = value.to_a if value.is_a?(Array)
         json[json_key] = value if value
       end
       json

data/lib/cheffish/rspec/chef_run_support.rb

@@ -0,0 +1,106 @@
+require 'chef_zero/rspec'
+require 'chef/server_api'
+require 'cheffish/rspec/repository_support'
+require 'uri'
+require 'cheffish/basic_chef_client'
+
+module Cheffish
+  module RSpec
+    module ChefRunSupport
+      include ChefZero::RSpec
+
+      def when_the_chef_12_server(*args, &block)
+        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
+          when_the_chef_server(*args, :osc_compat => false, :single_org => false, &block)
+        end
+      end
+
+      def self.extended(klass)
+        klass.class_eval do
+          extend RepositorySupport
+
+          def rest
+            ::Chef::ServerAPI.new
+          end
+
+          def get(path, *args)
+            if path[0] == '/'
+              path = URI.join(rest.url, path)
+            end
+            rest.get(path, *args)
+          end
+
+          def chef_run
+            converge if !@converged
+            event_sink.events
+          end
+
+          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 load_recipe(&block)
+            basic_chef_client.load_block(&block)
+          end
+
+          def run_recipe(&block)
+            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
+          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
+
+      class EventSink
+        def initialize
+          @events = []
+        end
+
+        attr_reader :events
+
+        def method_missing(method, *args)
+          @events << [ method, *args ]
+        end
+      end
+
+    end
+  end
+end

data/lib/cheffish/rspec/matchers.rb

@@ -0,0 +1,67 @@
+RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
+  match do |actual|
+    actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }.map { |event, resource, action| action }
+    expect(actual_actions).to eq(expected_actions)
+  end
+  failure_message do |actual|
+    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
+    result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
+    if updates.size > 0
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+    else
+      result << " Nothing was updated."
+    end
+    result
+  end
+  failure_message_when_negated do |actual|
+    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
+    result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
+    if updates.size > 0
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+    else
+      result << " Nothing was updated."
+    end
+    result
+  end
+end
+
+RSpec::Matchers.define :update_acls do |acl_paths, expected_acls|
+
+  errors = []
+
+  match do |block|
+    orig_json = {}
+    Array(acl_paths).each do |acl_path|
+      orig_json[acl_path] = get(acl_path)
+    end
+
+    block.call
+
+    orig_json.each_pair do |acl_path, orig|
+      changed = get(acl_path)
+      expected_acls.each do |permission, hash|
+        hash.each do |type, actors|
+          actors.each do |actor|
+            if actor[0] == '-'
+              actor = actor[1..-1]
+              errors << "#{acl_path} expected to remove #{type} #{actor} from #{permission} permissions" if changed[permission][type].include?(actor)
+              orig[permission][type].delete(actor)
+            else
+              errors << "#{acl_path} expected to add #{type} #{actor} to #{permission} permissions" if !changed[permission][type].include?(actor)
+              changed[permission][type].delete(actor)
+            end
+          end
+        end
+      end
+      # After checking everything, see if the remaining acl is the same as before
+      errors << "#{acl_path} updated more than expected!\nActual:\n#{changed}\nExpected:\n#{orig}" if changed != orig
+    end
+    errors.size == 0
+  end
+
+  failure_message do |block|
+    errors.join("\n")
+  end
+
+  supports_block_expectations
+end

data/lib/cheffish/rspec/repository_support.rb

@@ -0,0 +1,108 @@
+module Cheffish
+  module RSpec
+    module RepositorySupport
+      def when_the_repository(desc, *tags, &block)
+        context("when the chef repo #{desc}", *tags) do
+          include_context "with a chef repo"
+          extend WhenTheRepositoryClassMethods
+          module_eval(&block)
+        end
+      end
+
+      RSpec.shared_context "with a chef repo" do
+        before :each do
+          raise "Can only create one directory per test" if @repository_dir
+          @repository_dir = Dir.mktmpdir('chef_repo')
+          Chef::Config.chef_repo_path = @repository_dir
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config.delete("#{object_name}_path".to_sym)
+          end
+        end
+
+        after :each do
+          if @repository_dir
+            begin
+              %w(client cookbook data_bag environment node role user).each do |object_name|
+                Chef::Config.delete("#{object_name}_path".to_sym)
+              end
+              Chef::Config.delete(:chef_repo_path)
+              FileUtils.remove_entry_secure(@repository_dir)
+            ensure
+              @repository_dir = nil
+            end
+          end
+          Dir.chdir(@old_cwd) if @old_cwd
+        end
+
+        def directory(relative_path, &block)
+          old_parent_path = @parent_path
+          @parent_path = path_to(relative_path)
+          FileUtils.mkdir_p(@parent_path)
+          instance_eval(&block) if block
+          @parent_path = old_parent_path
+        end
+
+        def file(relative_path, contents)
+          filename = path_to(relative_path)
+          dir = File.dirname(filename)
+          FileUtils.mkdir_p(dir) unless dir == '.'
+          File.open(filename, 'w') do |file|
+            raw = case contents
+                  when Hash
+                    JSON.pretty_generate(contents)
+                  when Array
+                    contents.join("\n")
+                  else
+                    contents
+                  end
+            file.write(raw)
+          end
+        end
+
+        def symlink(relative_path, relative_dest)
+          filename = path_to(relative_path)
+          dir = File.dirname(filename)
+          FileUtils.mkdir_p(dir) unless dir == '.'
+          dest_filename = path_to(relative_dest)
+          File.symlink(dest_filename, filename)
+        end
+
+        def path_to(relative_path)
+          File.expand_path(relative_path, (@parent_path || @repository_dir))
+        end
+
+        def cwd(relative_path)
+          @old_cwd = Dir.pwd
+          Dir.chdir(path_to(relative_path))
+        end
+
+        module WhenTheRepositoryClassMethods
+          def directory(*args, &block)
+            before :each do
+              directory(*args, &block)
+            end
+          end
+
+          def file(*args, &block)
+            before :each do
+              file(*args, &block)
+            end
+          end
+
+          def symlink(*args, &block)
+            before :each do
+              symlink(*args, &block)
+            end
+          end
+
+          def path_to(*args, &block)
+            before :each do
+              file(*args, &block)
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.9.2'
+  VERSION = '0.10'
 end

data/spec/integration/chef_acl_spec.rb

@@ -1,4 +1,5 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_acl'
 require 'chef/provider/chef_acl'
 require 'chef_zero/version'
@@ -6,7 +7,7 @@ require 'uri'
 
 if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
   describe Chef::Resource::ChefAcl do
-    extend SpecSupport
+    extend Cheffish::RSpec::ChefRunSupport
 
     context "Rights attributes" do
       when_the_chef_server 'has a node named x', :osc_compat => false do

data/spec/integration/chef_client_spec.rb

@@ -1,4 +1,5 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'support/key_support'
 require 'chef/resource/chef_client'
 require 'chef/provider/chef_client'
@@ -6,7 +7,7 @@ require 'chef/provider/chef_client'
 repo_path = Dir.mktmpdir('chef_repo')
 
 describe Chef::Resource::ChefClient do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'

data/spec/integration/chef_container_spec.rb

@@ -1,9 +1,10 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_container'
 require 'chef/provider/chef_container'
 
 describe Chef::Resource::ChefContainer do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'

data/spec/integration/chef_group_spec.rb

@@ -1,9 +1,10 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_group'
 require 'chef/provider/chef_group'
 
 describe Chef::Resource::ChefGroup do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'

data/spec/integration/chef_mirror_spec.rb

@@ -1,9 +1,10 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_mirror'
 require 'chef/provider/chef_mirror'
 
 describe Chef::Resource::ChefMirror do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'

data/spec/integration/chef_node_spec.rb

@@ -1,9 +1,10 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_node'
 require 'chef/provider/chef_node'
 
 describe Chef::Resource::ChefNode do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'

data/spec/integration/chef_organization_spec.rb

@@ -1,9 +1,10 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_organization'
 require 'chef/provider/chef_organization'
 
 describe Chef::Resource::ChefOrganization do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   when_the_chef_12_server 'is in multi-org mode' do
     context 'and chef_server_url is pointed at the top level' do

data/spec/integration/chef_user_spec.rb

@@ -1,4 +1,5 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'support/key_support'
 require 'chef/resource/chef_user'
 require 'chef/provider/chef_user'
@@ -6,7 +7,7 @@ require 'chef/provider/chef_user'
 repo_path = Dir.mktmpdir('chef_repo')
 
 describe Chef::Resource::ChefUser do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   with_recipe do
     private_key "#{repo_path}/blah.pem"

data/spec/integration/private_key_spec.rb

@@ -1,4 +1,5 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/private_key'
 require 'chef/provider/private_key'
 require 'chef/resource/public_key'
@@ -8,7 +9,7 @@ require 'support/key_support'
 repo_path = Dir.mktmpdir('chef_repo')
 
 describe Chef::Resource::PrivateKey do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   before :each do
     FileUtils.remove_entry_secure(repo_path)

data/spec/integration/recipe_dsl_spec.rb

@@ -1,10 +1,11 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 require 'chef/resource/chef_node'
 require 'chef/provider/chef_node'
 require 'tmpdir'
 
 describe 'Cheffish Recipe DSL' do
-  extend SpecSupport
+  extend Cheffish::RSpec::ChefRunSupport
 
   context 'when we include with_chef_local_server' do
     before :each do

data/spec/support/spec_support.rb

@@ -1,174 +1,8 @@
-require 'chef_zero/rspec'
-require 'chef/server_api'
+
 require 'cheffish'
-require 'cheffish/basic_chef_client'
 require 'chef/provider/chef_acl'
-require 'uri'
-require 'support/repository_support'
-
-module SpecSupport
-  include ChefZero::RSpec
-
-  def when_the_chef_12_server(*args, &block)
-    if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
-      when_the_chef_server(*args, :osc_compat => false, :single_org => false, &block)
-    end
-  end
-
-  def self.extended(klass)
-    klass.class_eval do
-      extend RepositorySupport
-
-      def rest
-        Chef::ServerAPI.new
-      end
-
-      def get(path, *args)
-        if path[0] == '/'
-          path = URI.join(rest.url, path)
-        end
-        rest.get(path, *args)
-      end
-
-      def chef_run
-        converge if !@converged
-        event_sink.events
-      end
-
-      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 load_recipe(&block)
-        basic_chef_client.load_block(&block)
-      end
-
-      def run_recipe(&block)
-        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
-      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
-
-  class EventSink
-    def initialize
-      @events = []
-    end
-
-    attr_reader :events
-
-    def method_missing(method, *args)
-      @events << [ method, *args ]
-    end
-  end
-end
-
-RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
-  match do |actual|
-    actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }.map { |event, resource, action| action }
-    expect(actual_actions).to eq(expected_actions)
-  end
-  failure_message do |actual|
-    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
-    if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
-    else
-      result << " Nothing was updated."
-    end
-    result
-  end
-  failure_message_when_negated do |actual|
-    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
-    if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
-    else
-      result << " Nothing was updated."
-    end
-    result
-  end
-end
-
-RSpec::Matchers.define :update_acls do |acl_paths, expected_acls|
-
-  errors = []
-
-  match do |block|
-    orig_json = {}
-    Array(acl_paths).each do |acl_path|
-      orig_json[acl_path] = get(acl_path)
-    end
-
-    block.call
-
-    orig_json.each_pair do |acl_path, orig|
-      changed = get(acl_path)
-      expected_acls.each do |permission, hash|
-        hash.each do |type, actors|
-          actors.each do |actor|
-            if actor[0] == '-'
-              actor = actor[1..-1]
-              errors << "#{acl_path} expected to remove #{type} #{actor} from #{permission} permissions" if changed[permission][type].include?(actor)
-              orig[permission][type].delete(actor)
-            else
-              errors << "#{acl_path} expected to add #{type} #{actor} to #{permission} permissions" if !changed[permission][type].include?(actor)
-              changed[permission][type].delete(actor)
-            end
-          end
-        end
-      end
-      # After checking everything, see if the remaining acl is the same as before
-      errors << "#{acl_path} updated more than expected!\nActual:\n#{changed}\nExpected:\n#{orig}" if changed != orig
-    end
-    errors.size == 0
-  end
-
-  failure_message do |block|
-    errors.join("\n")
-  end
-
-  supports_block_expectations
-end
+require 'cheffish/rspec/chef_run_support'
+require 'cheffish/rspec/matchers'
 
 RSpec.configure do |config|
   config.filter_run :focus => true

data/spec/unit/get_private_key_spec.rb

@@ -1,4 +1,5 @@
 require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
 
 describe Cheffish do
   let(:directory_that_exists) {

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: '0.10'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,10 @@ files:
 - lib/cheffish/key_formatter.rb
 - lib/cheffish/merged_config.rb
 - lib/cheffish/recipe_dsl.rb
+- lib/cheffish/rspec.rb
+- lib/cheffish/rspec/chef_run_support.rb
+- lib/cheffish/rspec/matchers.rb
+- lib/cheffish/rspec/repository_support.rb
 - lib/cheffish/server_api.rb
 - lib/cheffish/version.rb
 - lib/cheffish/with_pattern.rb
@@ -118,7 +136,6 @@ files:
 - spec/integration/private_key_spec.rb
 - spec/integration/recipe_dsl_spec.rb
 - spec/support/key_support.rb
-- spec/support/repository_support.rb
 - spec/support/spec_support.rb
 - spec/unit/get_private_key_spec.rb
 homepage: http://wiki.opscode.com/display/chef

data/spec/support/repository_support.rb

@@ -1,103 +0,0 @@
-module RepositorySupport
-  def when_the_repository(desc, *tags, &block)
-    context("when the chef repo #{desc}", *tags) do
-      include_context "with a chef repo"
-      extend WhenTheRepositoryClassMethods
-      module_eval(&block)
-    end
-  end
-
-  RSpec.shared_context "with a chef repo" do
-    before :each do
-      raise "Can only create one directory per test" if @repository_dir
-      @repository_dir = Dir.mktmpdir('chef_repo')
-      Chef::Config.chef_repo_path = @repository_dir
-      %w(client cookbook data_bag environment node role user).each do |object_name|
-        Chef::Config.delete("#{object_name}_path".to_sym)
-      end
-    end
-
-    after :each do
-      if @repository_dir
-        begin
-          %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config.delete("#{object_name}_path".to_sym)
-          end
-          Chef::Config.delete(:chef_repo_path)
-          FileUtils.remove_entry_secure(@repository_dir)
-        ensure
-          @repository_dir = nil
-        end
-      end
-      Dir.chdir(@old_cwd) if @old_cwd
-    end
-
-    def directory(relative_path, &block)
-      old_parent_path = @parent_path
-      @parent_path = path_to(relative_path)
-      FileUtils.mkdir_p(@parent_path)
-      instance_eval(&block) if block
-      @parent_path = old_parent_path
-    end
-
-    def file(relative_path, contents)
-      filename = path_to(relative_path)
-      dir = File.dirname(filename)
-      FileUtils.mkdir_p(dir) unless dir == '.'
-      File.open(filename, 'w') do |file|
-        raw = case contents
-              when Hash
-                JSON.pretty_generate(contents)
-              when Array
-                contents.join("\n")
-              else
-                contents
-              end
-        file.write(raw)
-      end
-    end
-
-    def symlink(relative_path, relative_dest)
-      filename = path_to(relative_path)
-      dir = File.dirname(filename)
-      FileUtils.mkdir_p(dir) unless dir == '.'
-      dest_filename = path_to(relative_dest)
-      File.symlink(dest_filename, filename)
-    end
-
-    def path_to(relative_path)
-      File.expand_path(relative_path, (@parent_path || @repository_dir))
-    end
-
-    def cwd(relative_path)
-      @old_cwd = Dir.pwd
-      Dir.chdir(path_to(relative_path))
-    end
-
-    module WhenTheRepositoryClassMethods
-      def directory(*args, &block)
-        before :each do
-          directory(*args, &block)
-        end
-      end
-
-      def file(*args, &block)
-        before :each do
-          file(*args, &block)
-        end
-      end
-
-      def symlink(*args, &block)
-        before :each do
-          symlink(*args, &block)
-        end
-      end
-
-      def path_to(*args, &block)
-        before :each do
-          file(*args, &block)
-        end
-      end
-    end
-  end
-end