knife-essentials 0.9.2 → 0.9.3

data/spec/support/integration_helper.rb

@@ -1,6 +1,7 @@
 #
 # Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Ho-Sheng Hsiao (<hosh@opscode.com>)
+# Copyright:: Copyright (c) 2012, 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +28,8 @@ require 'support/spec_helper'
 module IntegrationSupport
   include ChefZero::RSpec
 
+  # Integration DSL
+
   def when_the_repository(description, *args, &block)
     context "When the local repository #{description}", *args do
       before :each do
@@ -70,11 +73,15 @@ module IntegrationSupport
         dir = File.dirname(filename)
         FileUtils.mkdir_p(dir) unless dir == '.'
         File.open(filename, 'w') do |file|
-          if contents.is_a? Hash
-            file.write(JSON.pretty_generate(contents))
-          else
-            file.write(contents)
-          end
+          raw = case contents
+                when Hash
+                  JSON.pretty_generate(contents)
+                when Array
+                  contents.join("\n")
+                else
+                  contents
+                end
+          file.write(raw)
         end
       end
 
@@ -125,4 +132,24 @@ module IntegrationSupport
       instance_eval(&block)
     end
   end
+
+  # Versioned cookbooks
+
+  def with_versioned_cookbooks(_metadata = {}, &block)
+    _m = { :versioned_cookbooks => true }.merge(_metadata)
+    context 'with versioned cookbooks', _m do
+      before(:each) { Chef::Config[:versioned_cookbooks] = true }
+      after(:each)  { Chef::Config[:versioned_cookbooks] = false }
+      instance_eval(&block)
+    end
+  end
+
+  def without_versioned_cookbooks(_metadata = {}, &block)
+    _m = { :versioned_cookbooks => false }.merge(_metadata)
+    context 'with versioned cookbooks', _m do
+      # Just make sure this goes back to default
+      before(:each) { Chef::Config[:versioned_cookbooks] = false }
+      instance_eval(&block)
+    end
+  end
 end

data/spec/support/knife_support.rb

@@ -4,6 +4,7 @@ require 'logger'
 require 'chef/log'
 
 module KnifeSupport
+  DEBUG = ENV['DEBUG']
   def knife(*args, &block)
     # Allow knife('role from file roles/blah.json') rather than requiring the
     # arguments to be split like knife('role', 'from', 'file', 'roles/blah.json')
@@ -21,6 +22,7 @@ module KnifeSupport
     old_loggers = Chef::Log.loggers
     old_log_level = Chef::Log.level
     begin
+      puts "knife: #{args.join(' ')}" if DEBUG
       subcommand_class = Chef::Knife.subcommand_class_from(args)
       subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
       instance = subcommand_class.new(args)
@@ -29,12 +31,12 @@ module KnifeSupport
       instance.ui = Chef::Knife::UI.new(stdout, stderr, STDIN, {})
 
       # Don't print stuff
-      Chef::Config[:verbosity] = 0
+      Chef::Config[:verbosity] = ( DEBUG ? 2 : 0 )
       instance.configure_chef
       logger = Logger.new(stderr)
       logger.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
       Chef::Log.use_log_devices([logger])
-      Chef::Log.level = :warn
+      Chef::Log.level = ( DEBUG ? :debug : :warn )
       Chef::Log::Formatter.show_time = false
       instance.run
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !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: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
 executables: []
@@ -92,6 +108,7 @@ files:
 - spec/chef_fs/diff_spec.rb
 - spec/chef_fs/file_pattern_spec.rb
 - spec/chef_fs/file_system/chef_server_root_dir_spec.rb
+- spec/chef_fs/file_system/cookbook_dir_spec.rb
 - 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