test-kitchen 1.0.0.alpha.5 → 1.0.0.alpha.6

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.0.0.alpha.6 / 2013-05-08
+
+### New features
+
+* Pull request [#77][]: Support encrypted data bag secrets ([@arunthampi][])
+* Issue [#92][]: Support single cookbook with no dependencies and no Berksfile. ([@fnichol][])
+
+### Bug fixes
+
+* Fix Omnibus installation on nodes using plain sh (vs. bash). ([@fnichol][])
+
+### Improvements
+
+* Issue [#84][]: Fix `kitchen list` heading alignment. ([@fnichol][])
+
+
 ## 1.0.0.alpha.5 / 2013-04-23
 
 ### Improvements
@@ -81,18 +97,22 @@
 The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#61]: https://github.com/opscode/test/issues/61
-[#64]: https://github.com/opscode/test/issues/64
-[#65]: https://github.com/opscode/test/issues/65
-[#71]: https://github.com/opscode/test/issues/71
-[#73]: https://github.com/opscode/test/issues/73
-[#74]: https://github.com/opscode/test/issues/74
-[#76]: https://github.com/opscode/test/issues/76
-[#80]: https://github.com/opscode/test/issues/80
-[#81]: https://github.com/opscode/test/issues/81
-[#82]: https://github.com/opscode/test/issues/82
+[#61]: https://github.com/opscode/test-kitchen/issues/61
+[#64]: https://github.com/opscode/test-kitchen/issues/64
+[#65]: https://github.com/opscode/test-kitchen/issues/65
+[#71]: https://github.com/opscode/test-kitchen/issues/71
+[#73]: https://github.com/opscode/test-kitchen/issues/73
+[#74]: https://github.com/opscode/test-kitchen/issues/74
+[#76]: https://github.com/opscode/test-kitchen/issues/76
+[#77]: https://github.com/opscode/test-kitchen/issues/77
+[#80]: https://github.com/opscode/test-kitchen/issues/80
+[#81]: https://github.com/opscode/test-kitchen/issues/81
+[#82]: https://github.com/opscode/test-kitchen/issues/82
+[#84]: https://github.com/opscode/test-kitchen/issues/84
+[#92]: https://github.com/opscode/test-kitchen/issues/92
 [@ChrisLundquist]: https://github.com/ChrisLundquist
+[@arunthampi]: https://github.com/arunthampi
 [@bryanwb]: https://github.com/bryanwb
 [@fnichol]: https://github.com/fnichol
 [@mattray]: https://github.com/mattray
-[@reset]: https://github.com/reset
+[@reset]: https://github.com/reset

data/lib/kitchen/chef_data_uploader.rb

@@ -46,6 +46,7 @@ module Kitchen
         upload_cookbooks  scp
         upload_data_bags  scp if instance.suite.data_bags_path
         upload_roles      scp if instance.suite.roles_path
+        upload_secret scp if instance.suite.encrypted_data_bag_secret_key_path
       end
     end
 
@@ -82,6 +83,11 @@ module Kitchen
       upload_path(scp, instance.suite.roles_path)
     end
 
+    def upload_secret(scp)
+      scp.upload!(instance.suite.encrypted_data_bag_secret_key_path,
+        "#{chef_home}/encrypted_data_bag_secret")
+    end
+
     def upload_path(scp, path, dir = File.basename(path))
       dest = "#{chef_home}/#{dir}"
 
@@ -101,6 +107,10 @@ module Kitchen
       if instance.suite.data_bags_path
         solo << %{data_bag_path "#{chef_home}/data_bags"}
       end
+      if instance.suite.encrypted_data_bag_secret_key_path
+        secret = "#{chef_home}/encrypted_data_bag_secret"
+        solo << %{encrypted_data_bag_secret "#{secret}"}
+      end
       solo.join("\n")
     end
 
@@ -117,9 +127,12 @@ module Kitchen
         run_resolver("Librarian", "librarian-chef", tmpdir)
       elsif File.directory?(File.join(kitchen_root, "cookbooks"))
         cp_cookbooks(tmpdir)
+      elsif File.exists?(File.join(kitchen_root, "metadata.rb"))
+        cp_this_cookbook(tmpdir)
       else
         FileUtils.rmtree(tmpdir)
-        fatal("Berksfile, Cheffile or cookbooks/ must exist in #{kitchen_root}")
+        fatal("Berksfile, Cheffile, cookbooks/, or metadata.rb" +
+          " must exist in #{kitchen_root}")
         raise UserError, "Cookbooks could not be found"
       end
     end

data/lib/kitchen/cli.rb

@@ -304,7 +304,7 @@ module Kitchen
       when nil then set_color("<Not Created>", :red)
       else set_color("<Unknown>", :white)
       end
-      [instance.name, action]
+      [set_color(instance.name, :on_black), action]
     end
 
     def update_config!

data/lib/kitchen/driver/ssh_base.rb

@@ -116,9 +116,9 @@ module Kitchen
 
           if [ ! -d "/opt/chef" ] || should_update_chef ; then
             echo "-----> Installing Chef Omnibus (#{flag})"
-            if command -v wget &>/dev/null ; then
+            if command -v wget >/dev/null ; then
               wget #{url} -O - | sudo bash #{version}
-            elif command -v curl &>/dev/null ; then
+            elif command -v curl >/dev/null ; then
               curl -sSL #{url} | sudo bash #{version}
             else
               echo ">>>>>> Neither wget nor curl found on this instance."

data/lib/kitchen/suite.rb

@@ -40,6 +40,10 @@ module Kitchen
     #   not exist
     attr_reader :data_bags_path
 
+    # @return [String] local path to the suite's encrypted data bag secret
+    #   key path, or nil if one does not exist
+    attr_reader :encrypted_data_bag_secret_key_path
+
     # @return [String] local path to the suite's roles, or nil if one does
     #   not exist
     attr_reader :roles_path
@@ -54,6 +58,8 @@ module Kitchen
     # @option options [String] :excludes Array of names of excluded platforms
     # @option options [String] :data_bags_path path to data bags
     # @option options [String] :roles_path path to roles
+    # @option options [String] :encrypted_data_bag_secret_key_path path to
+    #   secret key file
     def initialize(options = {})
       validate_options(options)
 
@@ -63,6 +69,7 @@ module Kitchen
       @excludes = options[:excludes]     || Array.new
       @data_bags_path = options[:data_bags_path]
       @roles_path = options[:roles_path]
+      @encrypted_data_bag_secret_key_path = options[:encrypted_data_bag_secret_key_path]
     end
 
     private

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.alpha.5"
+  VERSION = "1.0.0.alpha.6"
 end

data/spec/kitchen/suite_spec.rb

@@ -52,13 +52,18 @@ describe Kitchen::Suite do
     suite.roles_path.must_be_nil
   end
 
+  it "returns nil given no encrypted_data_bag_secret_key_path" do
+    suite.encrypted_data_bag_secret_key_path.must_be_nil
+  end
+
   it "returns attributes from constructor" do
     opts.merge!({ :attributes => { :a => 'b' }, :data_bags_path => 'crazy',
-      :roles_path => 'town' })
+      :roles_path => 'town', :encrypted_data_bag_secret_key_path => 'secret' })
     suite.name.must_equal 'suitezy'
     suite.run_list.must_equal ['doowah']
     suite.attributes.must_equal({ :a => 'b' })
     suite.data_bags_path.must_equal 'crazy'
     suite.roles_path.must_equal 'town'
+    suite.encrypted_data_bag_secret_key_path.must_equal 'secret'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.5
+  version: 1.0.0.alpha.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid