knife-solo 0.0.15 → 0.1.0.pre1

data/lib/chef/knife/wash_up.rb

@@ -1,21 +1,10 @@
-require 'chef/knife'
-require 'knife-solo/ssh_command'
-require 'knife-solo/kitchen_command'
+require 'chef/knife/solo_clean'
+require 'knife-solo/deprecated_command'
 
 class Chef
   class Knife
-    class WashUp < Knife
-      include KnifeSolo::SshCommand
-      include KnifeSolo::KitchenCommand
-
-      banner "knife wash_up [user@]hostname"
-
-      def run
-        validate_first_cli_arg_is_a_hostname!
-        super
-        Chef::Config.from_file('solo.rb')
-        run_command "rm -rf #{Chef::Config.file_cache_path}"
-      end
+    class WashUp < SoloClean
+      include KnifeSolo::DeprecatedCommand
     end
   end
 end

data/lib/knife-solo/bootstraps.rb

@@ -112,7 +112,7 @@ module KnifeSolo
       include KnifeSolo::Bootstraps::InstallCommands
 
       def initialize(prepare)
-        # instance of Chef::Knife::Prepare
+        # instance of Chef::Knife::SoloPrepare
         @prepare = prepare
       end
 

data/lib/knife-solo/bootstraps/linux.rb

@@ -96,14 +96,16 @@ module KnifeSolo::Bootstraps
         {:type => "omnibus", :version => "FC15"}
       when %r{Fedora release.*? 16}
         {:type => "omnibus", :version => "FC16"}
+      when %r{Fedora release.*? 17}
+        {:type => "omnibus", :version => "FC17"}
       when %r{Scientific Linux.*? 5}
         {:type => "omnibus", :version => "RHEL5"}
       when %r{Scientific Linux.*? 6}
         {:type => "yum_omnibus", :version => "RHEL6"}
-      when %r{SUSE Linux Enterprise Server 11 SP1}
-        {:type => "zypper_gem", :version => "SLES11"}
-      when %r{openSUSE 11.4}
-        {:type => "zypper_gem", :version => "openSUSE"}
+      when %r{SUSE Linux Enterprise Server 1[12]}
+        {:type => "omnibus", :version => "SLES11"}
+      when %r{openSUSE 1[12]}
+        {:type => "omnibus", :version => "openSUSE"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem", :version => "Gentoo"}
       else

data/lib/knife-solo/bootstraps/sun_os.rb

@@ -0,0 +1,9 @@
+module KnifeSolo::Bootstraps
+  class SunOS < Base
+    def bootstrap!
+      stream_command "sudo pkg install network/rsync web/ca-bundle"
+      stream_command "sudo bash -c 'echo ca_certificate=/etc/cacert.pem >> /etc/wgetrc'"
+      omnibus_install
+    end
+  end
+end

data/lib/knife-solo/deprecated_command.rb

@@ -0,0 +1,19 @@
+module KnifeSolo
+  module DeprecatedCommand
+
+    def self.included(other)
+      other.class_eval do
+        def self.deprecated
+          "`knife #{common_name}` is deprecated! Please use:\n  #{superclass.banner}"
+        end
+
+        banner deprecated
+      end
+    end
+
+    def run
+      ui.warn self.class.deprecated
+      super
+    end
+  end
+end

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.0.15'
+    '0.1.0.pre1'
   end
 end

data/lib/knife-solo/kitchen_command.rb

@@ -1,19 +1,14 @@
-require 'knife-solo/knife_solo_error'
-
 module KnifeSolo
   module KitchenCommand
-    class OutOfKitchenError < KnifeSoloError
-      def message
-        "This command must be run inside a Chef solo kitchen."
-      end
-    end
-
     def self.required_files
       %w(solo.rb)
     end
 
-    def run
-      raise OutOfKitchenError.new unless required_files_present?
+    def validate_kitchen!
+      unless required_files_present?
+        ui.fatal "This command must be run inside a Chef solo kitchen."
+        exit 1
+      end
     end
 
     def required_files_present?

data/lib/knife-solo/node_config_command.rb

@@ -15,6 +15,20 @@ module KnifeSolo
           :short => "-N NAME",
           :long => "--node-name NAME",
           :description => "The Chef node name for your new node"
+
+        option :run_list,
+          :short => "-r RUN_LIST",
+          :long => "--run-list RUN_LIST",
+          :description => "Comma separated list of roles/recipes to put to node config (if it does not exist)",
+          :proc => lambda { |o| o.split(/[\s,]+/) },
+          :default => []
+
+        option :first_boot_attributes,
+          :short => "-j JSON_ATTRIBS",
+          :long => "--json-attributes",
+          :description => "A JSON string to be added to node config (if it does not exist)",
+          :proc => lambda { |o| JSON.parse(o) },
+          :default => {}
       end
     end
 
@@ -29,9 +43,9 @@ module KnifeSolo
       else
         ui.msg "Generating node config '#{node_config}'..."
         File.open(node_config, 'w') do |f|
-          f.print <<-JSON.gsub(/^\s+/, '')
-            { "run_list": [] }
-          JSON
+          attributes = config[:first_boot_attributes] || {}
+          run_list = { :run_list => config[:run_list] || [] }
+          f.print attributes.merge(run_list).to_json
         end
       end
     end

data/lib/knife-solo/ssh_command.rb

@@ -2,7 +2,6 @@ module KnifeSolo
   module SshCommand
 
     def self.load_deps
-      require 'knife-solo/knife_solo_error'
       require 'net/ssh'
     end
 
@@ -55,8 +54,9 @@ module KnifeSolo
 
     def validate_first_cli_arg_is_a_hostname!
       unless first_cli_arg_is_a_hostname?
-        ui.msg opt_parser.help
-        raise KnifeSoloError.new "need to pass atleast a [user@]hostname as the first argument"
+        show_usage
+        ui.fatal "You must specify [<user>@]<hostname> as the first argument"
+        exit 1
       end
     end
 

data/test/bootstraps_test.rb

@@ -0,0 +1,90 @@
+require 'test_helper'
+
+require 'knife-solo/bootstraps'
+
+class KnifeSolo::Bootstraps::StubOS < KnifeSolo::Bootstraps::Base
+end
+
+class KnifeSolo::Bootstraps::StubOS2 < KnifeSolo::Bootstraps::Base
+  def gem_packages ; ['chef'] ; end
+  def distro ; {:type => 'gem', :version => 'Fanny Faker'} ; end
+  def gem_install
+    # dont' actually install anything
+  end
+end
+
+class BootstrapsTest < TestCase
+  def test_bootstrap_class_exists_for
+    assert_equal true, KnifeSolo::Bootstraps.class_exists_for?('Stub OS')
+
+    assert_equal false, KnifeSolo::Bootstraps.class_exists_for?('Mythical OS')
+  end
+
+  def test_distro_raises_if_not_implemented
+    bootstrap = bootstrap_instance()
+
+    assert_raises RuntimeError do
+      bootstrap.distro()
+    end
+  end
+
+  def test_gem_packages_raises_if_not_implemented
+    bootstrap = bootstrap_instance()
+
+    assert_raises RuntimeError do
+      bootstrap.gem_packages()
+    end
+  end
+
+  def test_bootstrap_calls_appropriate_install_method
+    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(mock)
+    bootstrap.stubs(:distro).returns({:type => 'disco_gem'})
+
+    bootstrap.expects(:disco_gem_install)
+
+    bootstrap.bootstrap!
+  end
+
+  def test_bootstrap_calls_pre_bootstrap_checks
+    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(mock)
+
+    bootstrap.expects(:run_pre_bootstrap_checks)
+
+    bootstrap.bootstrap!
+  end
+
+  def test_bootstrap_delegates_to_knife_prepare
+    prepare = mock('chef::knife::prepare')
+    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(prepare)
+
+    assert prepare == bootstrap.prepare
+  end
+
+  def test_darwin_checks_for_xcode_install_and_barfs_if_missing
+    bootstrap = KnifeSolo::Bootstraps::Darwin.new(mock)
+    # don't want to actually run anything
+    bootstrap.stubs(:gem_install)
+
+    bootstrap.expects(:has_xcode_installed?).returns(false)
+
+    assert_raises RuntimeError do
+      bootstrap.bootstrap!
+    end
+  end
+
+  def test_omnibus_install_methdod
+    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(mock)
+    bootstrap.stubs(:distro).returns({:type => "omnibus"})
+
+    bootstrap.expects(:omnibus_install)
+
+    bootstrap.bootstrap!
+  end
+
+  # ***
+
+  def bootstrap_instance
+    @prepare = mock('Knife::Chef::SoloPrepare')
+    KnifeSolo::Bootstraps::StubOS.new(@prepare)
+  end
+end

data/test/deprecated_command_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+require 'chef/knife'
+require 'knife-solo/deprecated_command'
+
+class DummyNewCommand < Chef::Knife
+  banner "knife dummy_new_command"
+
+  def run
+    # calls #new_run so we can be sure this gets called
+    new_run
+  end
+
+  def new_run
+    # dummy
+  end
+end
+
+class DummyDeprecatedCommand < DummyNewCommand
+  include KnifeSolo::DeprecatedCommand
+end
+
+class DeprecatedCommandTest < TestCase
+  def test_help_warns_about_deprecation
+    $stdout.expects(:puts).with(regexp_matches(/deprecated!/))
+    assert_exits { command("--help") }
+  end
+
+  def test_warns_about_deprecation
+    cmd = command
+    cmd.ui.expects(:err).with(regexp_matches(/deprecated!/))
+    cmd.run
+  end
+
+  def test_runs_original_command
+    cmd = command
+    cmd.ui.stubs(:err)
+    cmd.expects(:new_run)
+    cmd.run
+  end
+
+  def command(*args)
+    DummyDeprecatedCommand.load_deps
+    DummyDeprecatedCommand.new(args)
+  end
+end

data/test/integration/cases/apache2_bootstrap.rb

@@ -0,0 +1,15 @@
+# Tries to bootstrap with apache2 cookbook and
+# verifies the "It Works!" page is present.
+
+require $base_dir.join('integration', 'cases', 'apache2_cook')
+
+module Apache2Bootstrap
+  include Apache2Cook
+
+  def test_apache2
+    write_cheffile
+    system "librarian-chef install >> #{log_file}"
+    assert_subcommand "bootstrap --run-list=recipe[apache2]"
+    assert_match default_apache_message, http_response
+  end
+end

data/test/integration/cases/apache2_cook.rb

@@ -0,0 +1,28 @@
+# Tries to cook with apache2 cookbook and
+# verifies the "It Works!" page is present.
+module Apache2Cook
+  def write_cheffile
+    File.open('Cheffile', 'w') do |f|
+      f.print <<-CHEF
+            site 'http://community.opscode.com/api/v1'
+            cookbook 'apache2'
+      CHEF
+    end
+  end
+
+  def http_response
+    Net::HTTP.get(URI.parse("http://"+server.public_ip_address))
+  end
+
+  def default_apache_message
+    /It works!/
+  end
+
+  def test_apache2
+    write_cheffile
+    system "librarian-chef install >> #{log_file}"
+    write_nodefile(run_list: ["recipe[apache2]"])
+    assert_subcommand "cook"
+    assert_match default_apache_message, http_response
+  end
+end

data/test/integration/cases/empty_cook.rb

@@ -0,0 +1,8 @@
+# Tries to run cook on the box
+module EmptyCook
+  def test_empty_cook
+    write_nodefile(run_list: [])
+    assert_subcommand "cook"
+  end
+end
+

data/test/integration/cases/encrypted_data_bag.rb

@@ -0,0 +1,27 @@
+require 'chef/encrypted_data_bag_item'
+
+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'
+    @password = "essential particles busy loud"
+    create_data_bag
+  end
+
+  def create_data_bag
+    secret = Chef::EncryptedDataBagItem.load_secret('data_bag_key')
+    data = {"id" => "passwords", "admin" => @password}
+    encrypted_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(data, secret)
+    write_json_file('data_bags/dev/passwords.json', encrypted_data)
+  end
+
+  # Test that we can read an encrypted data bag value
+  # NOTE: This shells out to ssh, so may not be windows-compatible
+  def test_reading_encrypted_data_bag
+    write_nodefile(run_list: ["recipe[secret_cookbook]"])
+    assert_subcommand "cook"
+    actual = `ssh #{connection_string} cat /etc/admin_password`
+    assert_equal @password, actual
+  end
+end

data/test/integration/centos5_6_test.rb

@@ -0,0 +1,19 @@
+require 'integration_helper'
+
+class Centos5_6Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-3fe42456"
+  end
+
+  def default_apache_message
+    /Apache 2 Test Page/
+  end
+
+  include EmptyCook
+  include Apache2Cook
+  include EncryptedDataBag
+end

data/test/integration/gentoo2011_test.rb

@@ -0,0 +1,18 @@
+require 'integration_helper'
+
+class Gentoo2011Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-ae49b7c7"
+  end
+
+  # `emerge chef` takes a very long time (~ 50 minutes) on an m1.small
+  # Uncoment this if you need to verify Gentoo operation
+
+  # include EmptyCook
+  # include Apache2Cook
+  # include EncryptedDataBag
+end