knife-essentials 0.8.3 → 0.8.4

data/spec/support/integration_helper.rb

@@ -33,20 +33,25 @@ module IntegrationSupport
         raise "Can only create one directory per test" if @repository_dir
         @repository_dir = Dir.mktmpdir('chef_repo')
         @old_chef_repo_path = Chef::Config.chef_repo_path
-        @old_cookbook_path = Chef::Config.cookbook_path
+        @old_paths = {}
         Chef::Config.chef_repo_path = @repository_dir
-        Chef::Config.cookbook_path = File.join(@repository_dir, 'cookbooks')
+        %w(client cookbook data_bag environment node role user).each do |object_name|
+          @old_paths[object_name] = Chef::Config["#{object_name}_path".to_sym]
+          Chef::Config["#{object_name}_path".to_sym] = nil
+        end
       end
 
       after :each do
         if @repository_dir
           begin
+            %w(client cookbook data_bag environment node role user).each do |object_name|
+              Chef::Config["#{object_name}_path".to_sym] = @old_paths[object_name]
+            end
             Chef::Config.chef_repo_path = @old_chef_repo_path
-            Chef::Config.cookbook_path = @old_cookbook_path
             FileUtils.remove_entry_secure(@repository_dir)
           ensure
             @old_chef_repo_path = nil
-            @old_cookbook_path = nil
+            @old_paths = nil
             @repository_dir = nil
           end
         end

data/spec/support/knife_support.rb

@@ -60,6 +60,10 @@ module KnifeSupport
       @exit_code = exit_code
     end
 
+    attr_reader :stdout
+    attr_reader :stderr
+    attr_reader :exit_code
+
     def should_fail(*args)
       expected = {}
       args.each do |arg|
@@ -96,9 +100,17 @@ module KnifeSupport
       # TODO make this go away
       stderr_actual = @stderr.sub(/^WARNING: No knife configuration file found\n/, '')
 
-      @stdout.should == expected[:stdout]
-      stderr_actual.should == expected[:stderr]
+      if expected[:stderr].is_a?(Regexp)
+        stderr_actual.should =~ expected[:stderr]
+      else
+        stderr_actual.should == expected[:stderr]
+      end
       @exit_code.should == expected[:exit_code]
+      if expected[:stdout].is_a?(Regexp)
+        @stdout.should =~ expected[:stdout]
+      else
+        @stdout.should == expected[:stdout]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -61,6 +61,7 @@ files:
 - lib/chef_fs/file_system/data_bag_dir.rb
 - lib/chef_fs/file_system/data_bag_item.rb
 - lib/chef_fs/file_system/data_bags_dir.rb
+- lib/chef_fs/file_system/environments_dir.rb
 - lib/chef_fs/file_system/file_system_entry.rb
 - lib/chef_fs/file_system/file_system_error.rb
 - lib/chef_fs/file_system/file_system_root_dir.rb
@@ -69,6 +70,8 @@ files:
 - lib/chef_fs/file_system/nodes_dir.rb
 - lib/chef_fs/file_system/nonexistent_fs_object.rb
 - lib/chef_fs/file_system/not_found_error.rb
+- lib/chef_fs/file_system/operation_not_allowed_error.rb
+- lib/chef_fs/file_system/operation_skipped_error.rb
 - lib/chef_fs/file_system/rest_list_dir.rb
 - lib/chef_fs/file_system/rest_list_entry.rb
 - lib/chef_fs/file_system.rb
@@ -82,16 +85,22 @@ files:
 - spec/chef_fs/file_system/cookbooks_dir_spec.rb
 - spec/chef_fs/file_system/data_bags_dir_spec.rb
 - spec/chef_fs/file_system_spec.rb
+- spec/integration/chef_repo_path_spec.rb
 - spec/integration/chef_repository_file_system_spec.rb
+- spec/integration/chefignore_spec.rb
 - spec/integration/deps_spec.rb
+- spec/integration/diff_spec.rb
+- spec/integration/download_spec.rb
 - spec/integration/list_spec.rb
+- spec/integration/upload_spec.rb
 - spec/support/file_system_support.rb
 - spec/support/integration_helper.rb
 - spec/support/knife_support.rb
 - spec/support/spec_helper.rb
 - spec/support/stickywicket.pem
 homepage: http://www.opscode.com
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: