knife-solo 0.3.0.pre3 → 0.3.0.pre4

data/test/solo_init_test.rb

@@ -2,6 +2,9 @@ require 'test_helper'
 require 'support/kitchen_helper'
 
 require 'chef/knife/solo_init'
+require 'fileutils'
+require 'knife-solo/berkshelf'
+require 'knife-solo/librarian'
 
 class SoloInitTest < TestCase
   include KitchenHelper
@@ -34,16 +37,115 @@ class SoloInitTest < TestCase
     end
   end
 
+  def test_bootstraps_berkshelf_if_berksfile_found
+    outside_kitchen do
+      FileUtils.touch "Berksfile"
+      KnifeSolo::Berkshelf.any_instance.expects(:bootstrap)
+      command(".").run
+    end
+  end
+
+  def test_wont_bootstrap_berkshelf_if_cheffile_found
+    outside_kitchen do
+      FileUtils.touch "Cheffile"
+      KnifeSolo::Berkshelf.any_instance.expects(:bootstrap).never
+      command(".").run
+      refute File.exist?("Berksfile")
+    end
+  end
+
+  def test_wont_create_berksfile_by_default
+    outside_kitchen do
+      command("new_kitchen").run
+      refute File.exist?("new_kitchen/Berksfile")
+    end
+  end
+
+  def test_creates_berksfile_if_requested
+    outside_kitchen do
+      cmd = command("new_kitchen", "--berkshelf")
+      KnifeSolo::Berkshelf.expects(:load_gem).never
+      cmd.run
+      assert File.exist?("new_kitchen/Berksfile")
+    end
+  end
+
+  def test_wont_overwrite_berksfile
+    outside_kitchen do
+      File.open("Berksfile", "w") do |f|
+        f << "testdata"
+      end
+      command(".", "--berkshelf").run
+      assert_equal "testdata", IO.read("Berksfile")
+    end
+  end
+
+  def test_wont_create_berksfile_if_denied
+    outside_kitchen do
+      cmd = command("new_kitchen", "--no-berkshelf")
+      KnifeSolo::Berkshelf.expects(:load_gem).never
+      cmd.run
+      refute File.exist?("new_kitchen/Berksfile")
+    end
+  end
+
+  def test_wont_create_berksfile_if_librarian_requested
+    outside_kitchen do
+      cmd = command("new_kitchen", "--librarian")
+      KnifeSolo::Berkshelf.expects(:load_gem).never
+      cmd.run
+      refute File.exist?("new_kitchen/Berksfile")
+    end
+  end
+
+  def test_creates_berksfile_if_gem_installed
+    outside_kitchen do
+      cmd = command(".")
+      KnifeSolo::Berkshelf.expects(:load_gem).returns(true)
+      cmd.run
+      assert File.exist?("Berksfile")
+    end
+  end
+
+  def test_wont_create_berksfile_if_gem_missing
+    outside_kitchen do
+      cmd = command(".")
+      KnifeSolo::Berkshelf.expects(:load_gem).returns(false)
+      cmd.run
+      refute File.exist?("Berksfile")
+    end
+  end
+
+  def test_bootstraps_librarian_if_cheffile_found
+    outside_kitchen do
+      FileUtils.touch "Cheffile"
+      KnifeSolo::Librarian.any_instance.expects(:bootstrap)
+      command(".").run
+    end
+  end
+
+  def test_wont_bootstrap_librarian_if_berksfile_found
+    outside_kitchen do
+      FileUtils.touch "Berksfile"
+      KnifeSolo::Librarian.any_instance.expects(:bootstrap).never
+      command(".").run
+      refute File.exist?("Cheffile")
+    end
+  end
+
   def test_wont_create_cheffile_by_default
-    in_kitchen do
+    outside_kitchen do
+      command(".").run
       refute File.exist?("Cheffile")
     end
   end
 
-  def test_creates_cheffile_if_specified
+  def test_creates_cheffile_if_requested
     outside_kitchen do
-      command("foo", "--librarian").run
-      assert File.exist?("foo/Cheffile")
+      cmd = command(".", "--librarian")
+      KnifeSolo::Librarian.expects(:load_gem).never
+      cmd.run
+      assert File.exist?("Cheffile")
     end
   end
 
@@ -57,21 +159,59 @@ class SoloInitTest < TestCase
     end
   end
 
-  def test_creates_gitignore_for_librarian
+  def test_wont_create_cheffile_if_denied
+    outside_kitchen do
+      cmd = command("new_kitchen", "--no-librarian")
+      KnifeSolo::Librarian.expects(:load_gem).never
+      cmd.run
+      refute File.exist?("new_kitchen/Cheffile")
+    end
+  end
+
+  def test_wont_create_cheffile_if_berkshelf_requested
+    outside_kitchen do
+      cmd = command(".", "--berkshelf")
+      KnifeSolo::Librarian.expects(:load_gem).never
+      cmd.run
+      refute File.exist?("Cheffile")
+    end
+  end
+
+  def test_creates_cheffile_if_gem_installed
+    outside_kitchen do
+      cmd = command(".")
+      KnifeSolo::Librarian.expects(:load_gem).returns(true)
+      cmd.run
+      assert File.exist?("Cheffile")
+    end
+  end
+
+  def test_wont_create_cheffile_if_gem_missing
+    outside_kitchen do
+      cmd = command(".")
+      KnifeSolo::Librarian.expects(:load_gem).returns(false)
+      cmd.run
+      refute File.exist?("Cheffile")
+    end
+  end
+
+  def test_gitignores_cookbooks_directory
     outside_kitchen do
-      command("bar", "--librarian").run
-      assert File.exist?("bar/.gitignore")
+      command("bar").run
+      assert_equal "/cookbooks/", IO.read("bar/.gitignore").chomp
     end
   end
 
-  def test_wont_create_gitignore_for_librarian_if_denied
+  def test_wont_create_gitignore_if_denied
     outside_kitchen do
-      command(".", "--librarian", "--no-git").run
+      command(".", "--no-git").run
       refute File.exist?(".gitignore")
     end
   end
 
   def command(*args)
+    KnifeSolo::Berkshelf.stubs(:load_gem).returns(false)
+    KnifeSolo::Librarian.stubs(:load_gem).returns(false)
     knife_command(Chef::Knife::SoloInit, *args)
   end
 end

data/test/ssh_command_test.rb

@@ -112,6 +112,33 @@ class SshCommandTest < TestCase
     assert_exits { cmd.validate_ssh_options! }
   end
 
+  def test_run_with_fallbacks_returns_first_successful_result
+    cmds = sequence("cmds")
+    cmd = command
+    cmd.expects(:run_command).with("first", {}).returns(result(1, "fail")).in_sequence(cmds)
+    cmd.expects(:run_command).with("second", {}).returns(result(0, "w00t")).in_sequence(cmds)
+    cmd.expects(:run_command).never
+
+    res = cmd.run_with_fallbacks(["first", "second", "third"])
+    assert_equal "w00t", res.stdout
+    assert res.success?
+  end
+
+  def test_run_with_fallbacks_returns_error_if_all_fail
+    cmd = command
+    cmd.expects(:run_command).twice.returns(result(64, "fail"))
+    
+    res = cmd.run_with_fallbacks(["foo", "bar"])
+    assert_equal "", res.stdout
+    assert_equal 1, res.exit_code
+  end
+
+  def result(code, stdout = "")
+    res = KnifeSolo::SshCommand::ExecResult.new(code)
+    res.stdout = stdout
+    res
+  end
+
   def command(*args)
     Net::SSH::Config.stubs(:default_files)
     knife_command(DummySshCommand, *args)

data/test/support/ec2_runner.rb

@@ -39,7 +39,7 @@ class EC2Runner < MiniTest::Unit
     server.wait_for { ready? }
     logger.info "#{test.class} server (#{server.dns_name}) reported ready, trying to connect to ssh..."
     server.wait_for do
-      `nc #{public_ip_address} 22 -w 1 -q 0 </dev/null`
+      `nc #{dns_name} 22 -w 1 -q 0 </dev/null`
       $?.success?
     end
     logger.info "Sleeping 10s to avoid Net::SSH locking up by connecting too early..."
@@ -79,7 +79,7 @@ class EC2Runner < MiniTest::Unit
       end
       sleep 20
       servers.each do |server|
-        logger.info "Destroying #{server.public_ip_address}..."
+        logger.info "Destroying #{server.dns_name}..."
         server.destroy
       end
     end

data/test/support/integration_test.rb

@@ -39,7 +39,7 @@ class IntegrationTest < TestCase
     @kitchen = $base_dir.join('support', 'kitchens', self.class.to_s)
     FileUtils.remove_entry_secure(@kitchen, true)
     @kitchen.dirname.mkpath
-    system "knife solo init #{@kitchen} >> #{log_file}"
+    system "knife solo init #{@kitchen} --no-berkshelf --no-librarian >> #{log_file}"
     @start_dir = Dir.pwd
     Dir.chdir(@kitchen)
     prepare_server
@@ -52,7 +52,7 @@ class IntegrationTest < TestCase
 
   # Writes out the given node hash as a json file
   def write_nodefile(node)
-    write_json_file("nodes/#{server.public_ip_address}.json", node)
+    write_json_file("nodes/#{server.dns_name}.json", node)
   end
 
   # Writes out an object to the given file as JSON
@@ -82,7 +82,7 @@ class IntegrationTest < TestCase
 
   # The ssh-style connection string used to connect to the current node
   def connection_string
-    "-i #{key_file} #{user}@#{server.public_ip_address}"
+    "-i #{key_file} #{user}@#{server.dns_name}"
   end
 
   # Asserts that a knife command is successful

data/test/support/kitchen_helper.rb

@@ -6,7 +6,7 @@ module KitchenHelper
 
   def in_kitchen
     outside_kitchen do
-      knife_command(Chef::Knife::SoloInit, ".").run
+      knife_command(Chef::Knife::SoloInit, ".", "--no-berkshelf", "--no-librarian").run
       yield
     end
   end

data/test/support/secret_cookbook/metadata.rb

@@ -1,3 +1,4 @@
+name             "secret_cookbook"
 maintainer       "Mat Schaffer"
 maintainer_email "mat@schaffer.me"
 license          "MIT"

metadata

@@ -1,166 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre3
-  prerelease: 6
+  version: 0.3.0.pre4
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: fog
   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: librarian-chef
   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: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: mocha
   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: parallel
   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: 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: rdoc
   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: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.12'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
     - - <
@@ -169,9 +163,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
     - - <
@@ -180,7 +173,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,7 +180,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,14 +205,18 @@ files:
 - lib/chef/knife/solo_prepare.rb
 - lib/chef/knife/wash_up.rb
 - lib/knife-solo.rb
+- lib/knife-solo/berkshelf.rb
 - lib/knife-solo/bootstraps.rb
 - lib/knife-solo/bootstraps/darwin.rb
 - lib/knife-solo/bootstraps/freebsd.rb
 - lib/knife-solo/bootstraps/linux.rb
 - lib/knife-solo/bootstraps/sun_os.rb
+- lib/knife-solo/cookbook_manager.rb
+- lib/knife-solo/cookbook_manager_selector.rb
 - lib/knife-solo/deprecated_command.rb
 - lib/knife-solo/gitignore.rb
 - lib/knife-solo/info.rb
+- lib/knife-solo/librarian.rb
 - lib/knife-solo/node_config_command.rb
 - lib/knife-solo/resources/knife.rb
 - lib/knife-solo/resources/solo.rb.erb
@@ -229,6 +224,8 @@ files:
 - lib/knife-solo/tools.rb
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
+- test/gemfiles/Gemfile.chef-10
+- test/gemfiles/Gemfile.chef-11
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
@@ -237,7 +234,8 @@ files:
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/cases/knife_bootstrap.rb
-- test/integration/centos5_6_test.rb
+- test/integration/centos5_8_test.rb
+- test/integration/centos6_3_test.rb
 - test/integration/debian6_bootstrap_test.rb
 - test/integration/debian7_knife_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb
@@ -300,38 +298,42 @@ files:
 - lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_search.rb
 homepage: http://matschaffer.github.io/knife-solo/
 licenses: []
-post_install_message: ! "Thanks for installing knife-solo!\n\nIf you run into any
-  issues please let us know at:\n  https://github.com/matschaffer/knife-solo/issues\n\nIf
-  you are upgrading knife-solo please uninstall any old versions by\nrunning `gem
-  clean knife-solo` to avoid any errors.\n\nSee http://bit.ly/CHEF-3255 for more information
-  on the knife bug\nthat causes this."
+metadata: {}
+post_install_message: |-
+  Thanks for installing knife-solo!
+
+  If you run into any issues please let us know at:
+    https://github.com/matschaffer/knife-solo/issues
+
+  If you are upgrading knife-solo please uninstall any old versions by
+  running `gem clean knife-solo` to avoid any errors.
+
+  See http://bit.ly/CHEF-3255 for more information on the knife bug
+  that causes this.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 281010758936316492
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A collection of knife plugins for dealing with chef solo
 test_files:
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
+- test/gemfiles/Gemfile.chef-10
+- test/gemfiles/Gemfile.chef-11
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
@@ -340,7 +342,8 @@ test_files:
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/cases/knife_bootstrap.rb
-- test/integration/centos5_6_test.rb
+- test/integration/centos5_8_test.rb
+- test/integration/centos6_3_test.rb
 - test/integration/debian6_bootstrap_test.rb
 - test/integration/debian7_knife_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb