knife-solo 0.3.0.pre3 → 0.3.0.pre4

data/lib/knife-solo/cookbook_manager_selector.rb

@@ -0,0 +1,75 @@
+require 'knife-solo/berkshelf'
+require 'knife-solo/librarian'
+
+module KnifeSolo
+  class CookbookManagerSelector
+    attr_reader :config, :ui
+
+    def initialize(config, ui)
+      @config = config
+      @ui = ui
+    end
+
+    def select(base)
+      Chef::Log.debug "Selecting cookbook manager..."
+
+      if (selected = select_or_disable_by_chef_config!)
+        return selected
+      elsif managers.empty?
+        Chef::Log.debug "All disabled by configuration"
+        return nil
+      end
+
+      selected = select_by_existing_conf_file(base) || select_by_installed_gem
+      if selected.nil?
+        Chef::Log.debug "Nothing selected"
+        # TODO: ui.msg "Recommended to use a cookbook manager"
+      end
+      selected
+    end
+
+    private
+
+    def managers
+      @managers ||= [
+        KnifeSolo::Berkshelf.new(config, ui),
+        KnifeSolo::Librarian.new(config, ui)
+      ]
+    end
+
+    def select_or_disable_by_chef_config!
+      managers.select! do |manager|
+        if (conf = manager.enabled_by_chef_config?)
+          Chef::Log.debug "#{manager} selected by configuration"
+          return manager
+        elsif conf == false
+          Chef::Log.debug "#{manager} disabled by configuration"
+          false
+        else # conf == nil
+          true
+        end
+      end
+      nil
+    end
+
+    def select_by_existing_conf_file(base)
+      managers.each do |manager|
+        if manager.conf_file_exists?(@base)
+          Chef::Log.debug "#{manager} selected because of existing #{manager.conf_file}"
+          return manager
+        end
+      end
+      nil
+    end
+
+    def select_by_installed_gem
+      managers.each do |manager|
+        if manager.gem_installed?
+          Chef::Log.debug "#{manager} selected because of installed gem"
+          return manager
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/knife-solo/deprecated_command.rb

@@ -8,6 +8,11 @@ module KnifeSolo
         end
 
         banner deprecated
+        self.options = superclass.options
+
+        def self.load_deps
+          superclass.load_deps
+        end
       end
     end
 

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.3.0.pre3'
+    '0.3.0.pre4'
   end
 
   def self.post_install_message

data/lib/knife-solo/librarian.rb

@@ -0,0 +1,39 @@
+require 'knife-solo/cookbook_manager'
+
+module KnifeSolo
+  class Librarian
+    include CookbookManager
+
+    def self.gem_libraries
+      %w[librarian/action librarian/chef]
+    end
+
+    def self.conf_file_name
+      'Cheffile'
+    end
+
+    def self.gem_name
+      'librarian-chef'
+    end
+
+    def install!
+      ui.msg "Installing Librarian cookbooks..."
+      ::Librarian::Action::Resolve.new(env).run
+      ::Librarian::Action::Install.new(env).run
+      env.install_path
+    end
+
+    def env
+      @env ||= ::Librarian::Chef::Environment.new
+    end
+
+    def initial_config
+      "site 'http://community.opscode.com/api/v1'"
+    end
+
+    # Returns an array of strings to gitignore when bootstrapping
+    def gitignores
+      %w[/tmp/librarian/]
+    end
+  end
+end

data/lib/knife-solo/node_config_command.rb

@@ -32,9 +32,18 @@ module KnifeSolo
       end
     end
 
+    def nodes_path
+      path = Chef::Config[:node_path]
+      path && File.exist?(path) ? path : 'nodes'
+    end
+
     def node_config
+      Pathname.new(@name_args[1] || "#{nodes_path}/#{node_name}.json")
+    end
+
+    def node_name
       # host method must be defined by the including class
-      Pathname.new(@name_args[1] || "nodes/#{config[:chef_node_name] || host}.json")
+      config[:chef_node_name] || host
     end
 
     def generate_node_config

data/lib/knife-solo/resources/knife.rb

@@ -1,4 +1,7 @@
 cookbook_path ["cookbooks", "site-cookbooks"]
+node_path     "nodes"
 role_path     "roles"
 data_bag_path "data_bags"
 #encrypted_data_bag_secret "data_bag_key"
+
+knife[:berkshelf_path] = "cookbooks"

data/lib/knife-solo/resources/solo.rb.erb

@@ -1,5 +1,6 @@
 base = File.expand_path('..', __FILE__)
 
+nodes_path                File.join(base, 'nodes')
 role_path                 File.join(base, 'roles')
 data_bag_path             File.join(base, 'data_bags')
 encrypted_data_bag_secret File.join(base, 'data_bag_key')

data/lib/knife-solo/ssh_command.rb

@@ -154,7 +154,8 @@ module KnifeSolo
     class ExecResult
       attr_accessor :stdout, :stderr, :exit_code
 
-      def initialize
+      def initialize(exit_code = nil)
+        @exit_code = exit_code
         @stdout = ""
         @stderr = ""
       end
@@ -208,7 +209,7 @@ module KnifeSolo
       command
     end
 
-    def run_command(command, options={})
+    def run_command(command, options = {})
       defaults = {:process_sudo => true}
       options = defaults.merge(options)
 
@@ -254,6 +255,17 @@ module KnifeSolo
       result
     end
 
+    # Runs commands from the specified array until successful.
+    # Returns the result of the successful command or an ExecResult with
+    # exit_code 1 if all fail.
+    def run_with_fallbacks(commands, options = {})
+      commands.each do |command|
+        result = run_command(command, options)
+        return result if result.success?
+      end
+      ExecResult.new(1)
+    end
+
     # TODO:
     # - move this to a dedicated "portability" module?
     # - use ruby in all cases instead?

data/test/deprecated_command_test.rb

@@ -6,6 +6,10 @@ require 'knife-solo/deprecated_command'
 class DummyNewCommand < Chef::Knife
   banner "knife dummy_new_command"
 
+  option :foo,
+    :long        => '--foo',
+    :description => 'Foo option'
+
   def run
     # calls #new_run so we can be sure this gets called
     new_run
@@ -32,13 +36,22 @@ class DeprecatedCommandTest < TestCase
     cmd.run
   end
 
-  def test_runs_original_command
+  def test_runs_new_command
     cmd = command
     cmd.ui.stubs(:err)
     cmd.expects(:new_run)
     cmd.run
   end
 
+  def test_includes_options_from_new_command
+    assert DummyDeprecatedCommand.options.include?(:foo)
+  end
+
+  def test_loads_dependencies_from_new_command
+    DummyNewCommand.expects(:load_deps)
+    DummyDeprecatedCommand.load_deps
+  end
+
   def command(*args)
     DummyDeprecatedCommand.load_deps
     DummyDeprecatedCommand.new(args)

data/test/gemfiles/Gemfile.chef-10

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 10'

data/test/gemfiles/Gemfile.chef-11

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 11'

data/test/integration/cases/apache2_bootstrap.rb

@@ -6,8 +6,15 @@ require $base_dir.join('integration', 'cases', 'apache2_cook')
 module Apache2Bootstrap
   include Apache2Cook
 
+  def write_berksfile
+    File.open('Berksfile', 'w') do |f|
+      f.puts "site :opscode"
+      f.puts "cookbook 'apache2'"
+    end
+  end
+
   def test_apache2
-    write_cheffile
+    write_berksfile
     assert_subcommand "bootstrap --run-list=recipe[apache2]"
     assert_match default_apache_message, http_response
   end

data/test/integration/cases/cache_path_usage.rb

@@ -1,7 +1,7 @@
 module CachePathUsage
   def setup
     super
-    FileUtils.cp_r $base_dir.join('support', 'cache_using_cookbook'), 'cookbooks/cache_using_cookbook'
+    FileUtils.cp_r $base_dir.join('support', 'cache_using_cookbook'), 'site-cookbooks/cache_using_cookbook'
   end
 
   def test_changing_a_cached_directory_between_cooks

data/test/integration/cases/encrypted_data_bag.rb

@@ -4,7 +4,7 @@ module EncryptedDataBag
   def setup
     super
     FileUtils.cp $base_dir.join('support', 'data_bag_key'), 'data_bag_key'
-    FileUtils.cp_r $base_dir.join('support', 'secret_cookbook'), 'cookbooks/secret_cookbook'
+    FileUtils.cp_r $base_dir.join('support', 'secret_cookbook'), 'site-cookbooks/secret_cookbook'
     File.open('.chef/knife.rb', 'a') do |f|
       f.puts 'encrypted_data_bag_secret "data_bag_key"'
     end

data/test/integration/{centos5_6_test.rb → centos5_8_test.rb}

@@ -1,12 +1,12 @@
 require 'integration_helper'
 
-class Centos5_6Test < IntegrationTest
+class Centos5_8Test < IntegrationTest
   def user
     "root"
   end
 
   def image_id
-    "ami-3fe42456"
+    "ami-100e8a79"
   end
 
   include EmptyCook

data/test/integration/centos6_3_test.rb

@@ -0,0 +1,24 @@
+require 'integration_helper'
+
+class Centos6_3Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-86e15bef"
+  end
+
+  def prepare_server
+    disable_firewall
+    super
+  end
+
+  def disable_firewall
+    system "ssh #{connection_string} service iptables stop >> #{log_file}"
+  end
+
+  include EmptyCook
+  include Apache2Cook
+  include EncryptedDataBag
+end

data/test/integration/debian7_knife_bootstrap_test.rb

@@ -6,7 +6,7 @@ class Debian7KnifeBootstrapTest < IntegrationTest
   end
 
   def image_id
-    "ami-0c8b1d65"
+    "ami-1d620e74"
   end
 
   def prepare_server

data/test/solo_clean_test.rb

@@ -6,6 +6,12 @@ require 'chef/knife/solo_clean'
 class SoloCleanTest < TestCase
   include ValidationHelper::ValidationTests
 
+  def test_removes_provision_path
+    cmd = command('somehost', '--provisioning-path=/foo/bar')
+    cmd.expects(:run_command).with('rm -rf /foo/bar').returns(SuccessfulResult.new)
+    cmd.run
+  end
+
   def command(*args)
     knife_command(Chef::Knife::SoloClean, *args)
   end

data/test/solo_cook_test.rb

@@ -2,8 +2,12 @@ require 'test_helper'
 require 'support/kitchen_helper'
 require 'support/validation_helper'
 
+require 'berkshelf'
 require 'chef/cookbook/chefignore'
 require 'chef/knife/solo_cook'
+require 'fileutils'
+require 'knife-solo/berkshelf'
+require 'knife-solo/librarian'
 require 'librarian/action/install'
 
 class SuccessfulResult
@@ -73,6 +77,60 @@ class SoloCookTest < TestCase
     assert_equal "/some/other/path", cmd.cookbook_paths[2].to_s
   end
 
+  def test_does_not_run_berkshelf_if_no_berkfile
+    in_kitchen do
+      Berkshelf::Berksfile.any_instance.expects(:install).never
+      command("somehost").run
+    end
+  end
+
+  def test_runs_berkshelf_if_berkfile_found
+    in_kitchen do
+      FileUtils.touch "Berksfile"
+      Berkshelf::Berksfile.any_instance.expects(:install)
+      command("somehost").run
+    end
+  end
+
+  def test_does_not_run_berkshelf_if_denied_by_option
+    in_kitchen do
+      FileUtils.touch "Berksfile"
+      Berkshelf::Berksfile.any_instance.expects(:install).never
+      command("somehost", "--no-berkshelf").run
+    end
+  end
+
+  def test_complains_if_berkshelf_gem_missing
+    in_kitchen do
+      FileUtils.touch "Berksfile"
+      cmd = command("somehost")
+      cmd.ui.expects(:err).with(regexp_matches(/berkshelf gem/))
+      KnifeSolo::Berkshelf.expects(:load_gem).returns(false)
+      Berkshelf::Berksfile.any_instance.expects(:install).never
+      cmd.run
+    end
+  end
+
+  def test_wont_complain_if_berkshelf_gem_missing_but_no_berkfile
+    in_kitchen do
+      cmd = command("somehost")
+      cmd.ui.expects(:err).never
+      KnifeSolo::Berkshelf.expects(:load_gem).never
+      Berkshelf::Berksfile.any_instance.expects(:install).never
+      cmd.run
+    end
+  end
+
+  def test_adds_berkshelf_path_to_cookbooks
+    in_kitchen do
+      FileUtils.touch "Berksfile"
+      KnifeSolo::Berkshelf.any_instance.stubs(:berkshelf_path).returns("berkshelf/path")
+      cmd = command("somehost")
+      cmd.run
+      assert_equal File.join(Dir.pwd, "berkshelf/path"), cmd.cookbook_paths[0].to_s
+    end
+  end
+
   def test_does_not_run_librarian_if_no_cheffile
     in_kitchen do
       Librarian::Action::Install.any_instance.expects(:run).never
@@ -100,8 +158,8 @@ class SoloCookTest < TestCase
     in_kitchen do
       FileUtils.touch "Cheffile"
       cmd = command("somehost")
-      cmd.expects(:load_librarian).returns(false)
       cmd.ui.expects(:err).with(regexp_matches(/librarian-chef gem/))
+      KnifeSolo::Librarian.expects(:load_gem).returns(false)
       Librarian::Action::Install.any_instance.expects(:run).never
       cmd.run
     end
@@ -110,8 +168,8 @@ class SoloCookTest < TestCase
   def test_wont_complain_if_librarian_gem_missing_but_no_cheffile
     in_kitchen do
       cmd = command("somehost")
-      cmd.expects(:load_librarian).never
       cmd.ui.expects(:err).never
+      KnifeSolo::Librarian.expects(:load_gem).never
       Librarian::Action::Install.any_instance.expects(:run).never
       cmd.run
     end
@@ -163,13 +221,6 @@ class SoloCookTest < TestCase
     end
   end
 
-  def test_parses_chef_version_output
-    version_string = "\r\nChef: 11.2.0\r\n"
-    cmd = command("somehost")
-    cmd.stubs(:run_command).returns(OpenStruct.new(:stdout => version_string))
-    assert_equal '11.2.0', cmd.chef_version
-  end
-
   def test_barks_if_chef_too_old
     in_kitchen do
       cmd = command("somehost")