knife-solo 0.1.0 → 0.2.0.pre1

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+# 0.2.0: _Not released yet_
+
+## Changes and new features
+
+* Support Chef 11 (#183)
+* Rename Cook command's `--skip-chef-check` option to `--no-chef-check (#162)
+* Rename `--ssh-identity` option to `--identity-file` (#178)
+* Add `--ssh-user option` (#179)
+* Add `--no-librarian` option to bootstrap and cook commands (#180)
+* Generate Cheffile and .gitignore on `knife solo init --librarian` (#182)
+* Windows client compatibility (#156, #91)
+* Support unknown/unreleased Debian versions by using the
+  gem installer (#172)
+* Drop support for Debian 5.0 Lenny (#172)
+* Integration tests for Debian 6 and 7 (74c6ed1 - f299a6)
+* Travis tests for both Chef 10 and 11 (#183)
+
+## Fixes
+
+* Fix Debian 7.0 Wheezy support by using gem installer (#172)
+* Fix compatibility with Ruby 1.8.7 on work station (#170)
+* Fix Chef version checking if sudo promts password (#190)
+* Fix compatibility (net-ssh dependency) with Chef 10.20.0 and 11.2.0 (#188)
+* Other fixes: #166, #168, #173
+
+## Thanks to our contributors!
+
+* [Russell Cardullo][russellcardullo]
+* "[tknerr][]"
+* [Shaun Dern][smdern]
+
 # 0.1.0: January 12, 2013
 
 ## Changes and new features
@@ -228,8 +259,11 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [rmoriz]:        https://github.com/rmoriz
 [rosstimson]:    https://github.com/rosstimson
 [rubiojr]:       https://github.com/rubiojr
+[russellcardullo]: https://github.com/russellcardullo
 [ryandub]:       https://github.com/ryandub
 [skyeagle]:      https://github.com/skyeagle
+[smdern]:        https://github.com/smdern
+[tknerr]:        https://github.com/tknerr
 [tmatilai]:      https://github.com/tmatilai
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph

data/Rakefile

@@ -18,7 +18,7 @@ task :manifest do
   git_files = `git ls-files`.split("\n")
 
   File.open('Manifest.txt', 'w') do |f|
-    f.puts (git_files - MANIFEST_IGNORES).join("\n")
+    f.puts((git_files - MANIFEST_IGNORES).join("\n"))
   end
 end
 task :release => :manifest
@@ -76,4 +76,3 @@ end
 desc "Alias for test:units"
 task :test => ['test:units']
 task :default => :test
-

data/lib/chef/knife/solo_bootstrap.rb

@@ -21,7 +21,7 @@ class Chef
 
       # Use (some) options from prepare and cook commands
       self.options = SoloPrepare.options
-      [:sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
+      [:librarian, :sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
 
       def run
         validate!
@@ -30,12 +30,12 @@ class Chef
         prepare.run
 
         cook = command_with_same_args(SoloCook)
-        cook.config[:skip_chef_check] = true
+        cook.config[:chef_check] = false
         cook.run
       end
 
       def validate!
-        validate_first_cli_arg_is_a_hostname!
+        validate_ssh_options!
         validate_kitchen!
       end
 

data/lib/chef/knife/solo_clean.rb

@@ -17,7 +17,7 @@ class Chef
       end
 
       def validate!
-        validate_first_cli_arg_is_a_hostname!
+        validate_ssh_options!
         validate_kitchen!
       end
     end

data/lib/chef/knife/solo_cook.rb

@@ -10,9 +10,7 @@ class Chef
     # Approach ported from spatula (https://github.com/trotter/spatula)
     # Copyright 2009, Trotter Cashion
     class SoloCook < Knife
-      OMNIBUS_EMBEDDED_PATHS     ||= %w[/opt/chef/embedded/bin /opt/opscode/embedded/bin]
-      OMNIBUS_EMBEDDED_GEM_PATHS ||= %w[/opt/chef/embedded/lib/ruby/gems/1.9.1 /opt/opscode/embedded/lib/ruby/gems/1.9.1]
-      CHEF_VERSION_CONSTRAINT    ||= ">=0.10.4"
+      CHEF_VERSION_CONSTRAINT    = ">=0.10.4" unless defined? CHEF_VERSION_CONSTRAINT
 
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
@@ -30,14 +28,24 @@ class Chef
 
       banner "knife solo cook [USER@]HOSTNAME [JSON] (options)"
 
+      option :chef_check,
+        :long        => '--no-chef-check',
+        :description => 'Skip the Chef version check on the node',
+        :default     => true
+
       option :skip_chef_check,
         :long        => '--skip-chef-check',
-        :description => 'Skip the version check on the Chef gem'
+        :description => 'Deprecated. Replaced with --no-chef-check.'
 
       option :sync_only,
         :long        => '--sync-only',
         :description => 'Only sync the cookbook - do not run Chef'
 
+      option :librarian,
+        :long        => '--no-librarian',
+        :description => 'Skip librarian-chef install',
+        :default    => true
+
       option :why_run,
         :short       => '-W',
         :long        => '--why-run',
@@ -45,11 +53,16 @@ class Chef
 
       def run
         time('Run') do
+          if config[:skip_chef_check]
+            ui.warn '`--skip-chef-check` is deprecated, please use `--no-chef-check`.'
+            config[:chef_check] = false
+          end
+
           validate!
           Chef::Config.from_file('solo.rb')
-          check_chef_version unless config[:skip_chef_check]
+          check_chef_version if config[:chef_check]
           generate_node_config
-          librarian_install
+          librarian_install if config[:librarian]
           rsync_kitchen
           add_patches
           cook unless config[:sync_only]
@@ -57,7 +70,7 @@ class Chef
       end
 
       def validate!
-        validate_first_cli_arg_is_a_hostname!
+        validate_ssh_options!
         validate_kitchen!
       end
 
@@ -71,15 +84,29 @@ class Chef
 
       # cygwin rsync path must be adjusted to work
       def adjust_rsync_path(path)
-        return path unless windows_node?
         path.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
       end
 
+      def adjust_rsync_path_on_node(path)
+        return path unless windows_node?
+        adjust_rsync_path(path)
+      end
+
+      def adjust_rsync_path_on_client(path)
+        return path unless windows_client?
+        adjust_rsync_path(path)
+      end
+
+      # see http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+      def rsync_permissions
+        '--chmod=ugo=rwX' if windows_client?
+      end
+
       def patch_path
         Array(Chef::Config.cookbook_path).first + "/chef_solo_patches/libraries"
       end
 
-      def rsync_exclude
+      def rsync_excludes
         (%w{revision-deploys tmp '.*'} + chefignore.ignores).uniq
       end
 
@@ -109,9 +136,7 @@ class Chef
 
       def rsync_kitchen
         time('Rsync kitchen') do
-          cmd = %Q{rsync -rl --rsh="ssh #{ssh_args}" --delete #{rsync_exclude.collect{ |ignore| "--exclude #{ignore} " }.join} ./ :#{adjust_rsync_path(chef_path)}}
-          ui.msg cmd if debug?
-          system! cmd
+          rsync('./', chef_path, '--delete')
         end
       end
 
@@ -119,19 +144,28 @@ class Chef
         run_portable_mkdir_p(patch_path)
         Dir[Pathname.new(__FILE__).dirname.join("patches", "*.rb").to_s].each do |patch|
           time(patch) do
-            system! %Q{rsync -rl --rsh="ssh #{ssh_args}" #{patch} :#{adjust_rsync_path(patch_path)}}
+            rsync(patch, patch_path)
           end
         end
       end
 
+      def rsync(source_path, target_path, extra_opts = '')
+        cmd = %Q{rsync -rl #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts} #{rsync_excludes.collect{ |ignore| "--exclude #{ignore} " }.join} #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
+        ui.msg cmd if debug?
+        system! cmd
+      end
+
       def check_chef_version
         ui.msg "Checking Chef version..."
-        result = run_command <<-BASH
-          export PATH="#{OMNIBUS_EMBEDDED_PATHS.join(":")}:$PATH"
-          export GEM_PATH="#{OMNIBUS_EMBEDDED_GEM_PATHS.join(":")}:$GEM_PATH"
-          ruby -rubygems -e "gem 'chef', '#{CHEF_VERSION_CONSTRAINT}'"
-        BASH
-        raise "Couldn't find Chef #{CHEF_VERSION_CONSTRAINT} on #{host}. Please run `#{$0} prepare #{ssh_args}` to ensure Chef is installed and up to date." unless result.success?
+        unless Gem::Requirement.new(CHEF_VERSION_CONSTRAINT).satisfied_by? Gem::Version.new(chef_version)
+          raise "Couldn't find Chef #{CHEF_VERSION_CONSTRAINT} on #{host}. Please run `knife solo prepare #{ssh_args}` to ensure Chef is installed and up to date."
+        end
+      end
+
+      # Parses "Chef: x.y.z" from the chef-solo version output
+      def chef_version
+        v = run_command('sudo chef-solo --version').stdout.split(':')
+        v[0].strip == 'Chef' ? v[1].strip : ''
       end
 
       def cook

data/lib/chef/knife/solo_init.rb

@@ -5,27 +5,41 @@ class Chef
     class SoloInit < Knife
       include FileUtils
 
+      deps do
+        require 'knife-solo/gitignore'
+      end
+
       banner "knife solo init DIRECTORY"
 
+      option :git,
+        :long => '--no-git',
+        :description => 'Do not generate .gitignore',
+        :default => true
+
+      option :librarian,
+        :long => '--librarian',
+        :description => 'Initialize Librarian'
+
       def run
+        @base = @name_args.first
         validate!
-        base = @name_args.first
-        create_kitchen base
-        create_cupboards base, %w(nodes roles data_bags site-cookbooks cookbooks)
-        create_solo_config base
+        create_kitchen
+        create_cupboards %w[nodes roles data_bags site-cookbooks cookbooks]
+        librarian_init if config[:librarian]
+        create_solo_config
       end
 
       def validate!
-        unless @name_args.first
+        unless @base
           show_usage
           ui.fatal "You must specify a directory. Use '.' to initialize the current one."
           exit 1
         end
       end
 
-      def create_cupboards(base, dirs)
+      def create_cupboards(dirs)
         dirs.each do |dir|
-          cupboard_dir = File.join(base, dir)
+          cupboard_dir = File.join(@base, dir)
           unless File.exist?(cupboard_dir)
             mkdir cupboard_dir
             touch File.join(cupboard_dir, '.gitkeep')
@@ -33,12 +47,12 @@ class Chef
         end
       end
 
-      def create_kitchen(base)
-        mkdir base unless base == '.'
+      def create_kitchen
+        mkdir @base unless @base == '.'
       end
 
-      def create_solo_config(base)
-        solo_file = File.join(base, 'solo.rb')
+      def create_solo_config
+        solo_file = File.join(@base, 'solo.rb')
         return if File.exist? solo_file
 
         File.open(solo_file, 'w') do |f|
@@ -52,6 +66,22 @@ class Chef
           RUBY
         end
       end
+
+      def librarian_init
+        cheffile = File.join(@base, 'Cheffile')
+        unless File.exist?(cheffile)
+          File.open(cheffile, 'w') do |f|
+            f.puts("site 'http://community.opscode.com/api/v1'")
+          end
+        end
+        gitignore %w[/cookbooks/ /tmp/librarian/]
+      end
+
+      def gitignore(*entries)
+        if config[:git]
+          KnifeSolo::Gitignore.new(@base).add(*entries)
+        end
+      end
     end
   end
 end

data/lib/chef/knife/solo_prepare.rb

@@ -20,10 +20,6 @@ class Chef
 
       banner "knife solo prepare [USER@]HOSTNAME [JSON] (options)"
 
-      option :omnibus_version,
-        :long        => '--omnibus-version VERSION',
-        :description => 'The version of Omnibus to install'
-
       option :omnibus_url,
         :long        => '--omnibus-url URL',
         :description => 'URL to download install.sh from'
@@ -32,24 +28,32 @@ class Chef
         :long        => '--omnibus-options "OPTIONS"',
         :description => 'Pass options to the install.sh script'
 
+      option :omnibus_version,
+        :long        => '--omnibus-version VERSION',
+        :description => 'The version of Omnibus to install'
+
       def run
+        if config[:omnibus_version]
+          config[:omnibus_options] = "#{config[:omnibus_options]} -v #{config[:omnibus_version]}".strip
+        end
+
         validate!
         bootstrap.bootstrap!
         generate_node_config
       end
 
       def validate!
-        validate_first_cli_arg_is_a_hostname!
+        validate_ssh_options!
         validate_kitchen!
       end
 
       def bootstrap
         ui.msg "Bootstrapping Chef..."
-        KnifeSolo::Bootstraps.class_for_operating_system(operating_system()).new(self)
+        KnifeSolo::Bootstraps.class_for_operating_system(operating_system).new(self)
       end
 
       def operating_system
-        @operating_system ||= run_command('uname -s').stdout.strip
+        run_command('uname -s').stdout.strip
       end
     end
   end

data/lib/knife-solo/bootstraps.rb

@@ -69,12 +69,8 @@ module KnifeSolo
         url = prepare.config[:omnibus_url] || "https://www.opscode.com/chef/install.sh"
         file = File.basename(url)
         http_client_get_url(url, file)
-        # `release_version` within install.sh will be installed if
-        # `omnibus_version` is not provided.
-        install_command = "sudo bash #{file}"
-        install_command << " -v #{prepare.config[:omnibus_version]}" if prepare.config[:omnibus_version]
-        install_command << " #{prepare.config[:omnibus_options]}" if prepare.config[:omnibus_options]
 
+        install_command = "sudo bash #{file} #{prepare.config[:omnibus_options]}"
         stream_command(install_command)
       end
 

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

@@ -10,6 +10,10 @@ module KnifeSolo::Bootstraps
       %w{i686 x86 x86_64}.include?(machine)
     end
 
+    def lsb_release_codename
+      run_command("lsb_release -cs").stdout.strip
+    end
+
     def package_list
       @packages.join(' ')
     end
@@ -18,12 +22,6 @@ module KnifeSolo::Bootstraps
       ['ruby-shadow','chef']
     end
 
-    def zypper_gem_install
-      ui.msg("Installing required packages...")
-      run_command("sudo zypper --non-interactive install ruby-devel make gcc rsync")
-      gem_install
-    end
-
     def emerge_gem_install
       ui.msg("Installing required packages...")
       run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
@@ -72,20 +70,14 @@ module KnifeSolo::Bootstraps
     def distro
       return @distro if @distro
       @distro = case issue
-      when %r{Debian GNU/Linux 5}
-        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "lenny"}
       when %r{Debian GNU/Linux 6}
-        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "squeeze"}
-      when %r{Debian GNU/Linux 7}
-        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "wheezy"}
-      when %r{Debian GNU/Linux wheezy}
-        {:type => "debian_gem", :version => "wheezy"}
+        {:type => (x86? ? "debianoid_omnibus" : "debian_gem"), :version => "squeeze"}
+      when %r{Debian}
+        {:type => "debian_gem", :version => lsb_release_codename}
       when %r{Ubuntu}i
-        version = run_command("lsb_release -cs").stdout.strip
-        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => version}
+        {:type => (x86? ? "debianoid_omnibus" : "debian_gem"), :version => lsb_release_codename}
       when %r{Linaro}
-        version = run_command("lsb_release -cs").stdout.strip
-        {:type => "debian_gem", :version => version}
+        {:type => "debian_gem", :version => lsb_release_codename}
       when %r{CentOS.*? 5}
         {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{CentOS.*? 6}

data/lib/knife-solo/gitignore.rb

@@ -0,0 +1,26 @@
+module KnifeSolo
+  class Gitignore
+    include Enumerable
+
+    attr_accessor :ignore_file
+
+    def initialize(dir)
+      @ignore_file = File.join(dir, '.gitignore')
+    end
+
+    def each
+      if File.exist? ignore_file
+        File.new(ignore_file).each do |line|
+          yield line.chomp
+        end
+      end
+    end
+
+    def add(*new_entries)
+      new_entries = (entries + new_entries.flatten).uniq
+      File.open(ignore_file, 'w') do |f|
+        f.puts new_entries
+      end
+    end
+  end
+end

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/node_config_command.rb

@@ -23,12 +23,12 @@ module KnifeSolo
           :proc        => lambda { |o| o.split(/[\s,]+/) },
           :default     => []
 
-        option :first_boot_attributes,
+        option :json_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     => {}
+          :default     => nil
       end
     end
 
@@ -43,7 +43,7 @@ module KnifeSolo
       else
         ui.msg "Generating node config '#{node_config}'..."
         File.open(node_config, 'w') do |f|
-          attributes = config[:first_boot_attributes] || {}
+          attributes = config[:json_attributes] || config[:first_boot_attributes] || {}
           run_list = { :run_list => config[:run_list] || [] }
           f.print attributes.merge(run_list).to_json
         end

data/lib/knife-solo/ssh_command.rb

@@ -26,14 +26,23 @@ module KnifeSolo
           :long        => '--ssh-config-file CONFIG_FILE',
           :description => 'Alternate location for ssh config file'
 
+        option :ssh_user,
+          :short       => '-x USERNAME',
+          :long        => '--ssh-user USERNAME',
+          :description => 'The ssh username'
+
         option :ssh_password,
           :short       => '-P PASSWORD',
           :long        => '--ssh-password PASSWORD',
           :description => 'The ssh password'
 
         option :ssh_identity,
-          :short       => '-i FILE',
           :long        => '--ssh-identity FILE',
+          :description => 'Deprecated. Replaced with --identity-file.'
+
+        option :identity_file,
+          :short       => '-i IDENTITY_FILE',
+          :long        => '--identity-file FILE',
           :description => 'The ssh identity file'
 
         option :ssh_port,
@@ -52,12 +61,19 @@ module KnifeSolo
       @name_args.first =~ /\A([^@]+(?>@)[^@]+|[^@]+?(?!@))\z/
     end
 
-    def validate_first_cli_arg_is_a_hostname!
+    def validate_ssh_options!
+      if config[:ssh_identity]
+        ui.warn '`--ssh-identity` is deprecated, please use `--identity-file`.'
+        config[:identity_file] ||= config[:ssh_identity]
+      end
       unless first_cli_arg_is_a_hostname?
         show_usage
         ui.fatal "You must specify [<user>@]<hostname> as the first argument"
         exit 1
       end
+      if config[:ssh_user]
+        host_descriptor[:user] ||= config[:ssh_user]
+      end
     end
 
     def host_descriptor
@@ -101,7 +117,7 @@ module KnifeSolo
       options = config_file_options
       options[:port] = config[:ssh_port] if config[:ssh_port]
       options[:password] = config[:ssh_password] if config[:ssh_password]
-      options[:keys] = [config[:ssh_identity]] if config[:ssh_identity]
+      options[:keys] = [config[:identity_file]] if config[:identity_file]
       options
     end
 
@@ -125,7 +141,7 @@ module KnifeSolo
     def ssh_args
       host_arg = [user, host].compact.join('@')
       config_arg = "-F #{config[:ssh_config]}" if config[:ssh_config]
-      ident_arg = "-i #{config[:ssh_identity]}" if config[:ssh_identity]
+      ident_arg = "-i #{config[:identity_file]}" if config[:identity_file]
       port_arg = "-p #{config[:ssh_port]}" if config[:ssh_port]
 
       [host_arg, config_arg, ident_arg, port_arg].compact.join(' ')

data/lib/knife-solo/tools.rb

@@ -3,5 +3,9 @@ module KnifeSolo
     def system!(command)
       raise "Failed to launch command #{command}" unless system(command)
     end
+
+    def windows_client?
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    end
   end
 end

data/test/bootstraps_test.rb

@@ -16,40 +16,31 @@ 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()
+      bootstrap_instance.distro()
     end
   end
 
   def test_gem_packages_raises_if_not_implemented
-    bootstrap = bootstrap_instance()
-
     assert_raises RuntimeError do
-      bootstrap.gem_packages()
+      bootstrap_instance.gem_packages()
     end
   end
 
   def test_bootstrap_calls_appropriate_install_method
-    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(mock)
+    bootstrap = bootstrap_instance
     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
 
@@ -62,9 +53,7 @@ class BootstrapsTest < TestCase
 
   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
@@ -73,10 +62,21 @@ class BootstrapsTest < TestCase
   end
 
   def test_omnibus_install_methdod
-    bootstrap = KnifeSolo::Bootstraps::StubOS2.new(mock)
+    bootstrap = bootstrap_instance
     bootstrap.stubs(:distro).returns({:type => "omnibus"})
-
     bootstrap.expects(:omnibus_install)
+    bootstrap.bootstrap!
+  end
+
+  def test_passes_omnibus_options
+    bootstrap = bootstrap_instance
+    bootstrap.stubs(:distro).returns({:type => "omnibus"})
+    bootstrap.stubs(:http_client_get_url)
+
+    options = "-v 10.16.4"
+    matcher = regexp_matches(/\s#{Regexp.quote(options)}(\s|$)/)
+    bootstrap.prepare.stubs(:config).returns({:omnibus_options => options})
+    bootstrap.prepare.expects(:stream_command).with(matcher).returns(SuccessfulResult.new)
 
     bootstrap.bootstrap!
   end
@@ -84,7 +84,7 @@ class BootstrapsTest < TestCase
   # ***
 
   def bootstrap_instance
-    @prepare = mock('Knife::Chef::SoloPrepare')
-    KnifeSolo::Bootstraps::StubOS.new(@prepare)
+    prepare = mock('Knife::Chef::SoloPrepare')
+    KnifeSolo::Bootstraps::StubOS.new(prepare)
   end
 end

data/test/gitignore_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+require 'support/kitchen_helper'
+
+require 'knife-solo/gitignore'
+
+class GitignoreTest < TestCase
+  include KitchenHelper
+
+  def test_creates_with_one_entry
+    outside_kitchen do
+      KnifeSolo::Gitignore.new('.').add("foo")
+      assert_equal "foo\n", IO.read('.gitignore')
+    end
+  end
+
+  def test_creates_with_multiple_entries
+    outside_kitchen do
+      KnifeSolo::Gitignore.new('.').add("foo", "/bar")
+      assert_equal "foo\n/bar\n", IO.read('.gitignore')
+    end
+  end
+
+  def test_creates_with_array
+    outside_kitchen do
+      KnifeSolo::Gitignore.new('.').add(%w[foo/ bar])
+      assert_equal "foo/\nbar\n", IO.read('.gitignore')
+    end
+  end
+
+  def test_appends_new_entries
+    outside_kitchen do
+      File.open(".gitignore", "w") do |f|
+        f.puts "foo"
+      end
+      KnifeSolo::Gitignore.new('.').add(["bar.*"])
+      assert_equal "foo\nbar.*\n", IO.read('.gitignore')
+    end
+  end
+
+  def test_appends_only_new_entries
+    outside_kitchen do
+      File.open(".gitignore", "w") do |f|
+        f.puts "*.foo"
+      end
+      KnifeSolo::Gitignore.new('.').add("!foo", "*.foo")
+      assert_equal "*.foo\n!foo\n", IO.read('.gitignore')
+    end
+  end
+
+  def test_appends_only_if_any_new_entries
+    outside_kitchen do
+      File.open(".gitignore", "w") do |f|
+        f.puts "!foo"
+        f.puts "/bar/*.baz"
+      end
+      KnifeSolo::Gitignore.new('.').add(["!foo", "/bar/*.baz"])
+      assert_equal "!foo\n/bar/*.baz\n", IO.read('.gitignore')
+    end
+  end
+end

data/test/integration/cases/apache2_bootstrap.rb

@@ -8,7 +8,7 @@ module Apache2Bootstrap
 
   def test_apache2
     write_cheffile
-    assert_subcommand "bootstrap --run-list=recipe[apache2]"
+    assert_subcommand "bootstrap --run-list=recipe[apache2] #{omnibus_options}"
     assert_match default_apache_message, http_response
   end
 end

data/test/integration/cases/apache2_cook.rb

@@ -3,10 +3,8 @@
 module Apache2Cook
   def write_cheffile
     File.open('Cheffile', 'w') do |f|
-      f.print <<-CHEF
-            site 'http://community.opscode.com/api/v1'
-            cookbook 'apache2'
-      CHEF
+      f.puts "site 'http://community.opscode.com/api/v1'"
+      f.puts "cookbook 'apache2'"
     end
   end
 

data/test/integration/debian6_bootstrap_test.rb

@@ -0,0 +1,17 @@
+require 'integration_helper'
+
+class Debian6BootstrapTest < IntegrationTest
+  def user
+    "admin"
+  end
+
+  def image_id
+    "ami-4d20a724"
+  end
+
+  def prepare_server
+    # Do nothing as `solo bootstrap` will do everything
+  end
+
+  include Apache2Bootstrap
+end

data/test/integration/debian7_bootstrap_test.rb

@@ -0,0 +1,21 @@
+require 'integration_helper'
+
+class Debian7BootstrapTest < IntegrationTest
+  def user
+    "admin"
+  end
+
+  def image_id
+    "ami-0c8b1d65"
+  end
+
+  def prepare_server
+    # Do nothing as `solo bootstrap` will do everything
+  end
+
+  def default_apache_message
+    /It works!/
+  end
+
+  include Apache2Bootstrap
+end

data/test/node_config_command_test.rb

@@ -85,6 +85,29 @@ class NodeConfigCommandTest < TestCase
     end
   end
 
+  def test_generates_a_node_config_with_specified_json_attributes
+    in_kitchen do
+      foo_json     = '"foo":99'
+      ignored_json = '"bar":"ignored"'
+
+      cmd = command(@host)
+      cmd.config[:json_attributes]       = JSON.parse("{#{foo_json}}")
+      cmd.config[:first_boot_attributes] = JSON.parse("{#{ignored_json}}")
+      cmd.generate_node_config
+      assert_match "{#{foo_json},\"run_list\":[]}", cmd.node_config.read
+    end
+  end
+
+  def test_generates_a_node_config_with_specified_first_boot_attributes
+    in_kitchen do
+      foo_json = '"foo":null'
+      cmd = command(@host)
+      cmd.config[:first_boot_attributes] = JSON.parse("{#{foo_json}}")
+      cmd.generate_node_config
+      assert_match "{#{foo_json},\"run_list\":[]}", cmd.node_config.read
+    end
+  end
+
   def test_generates_a_node_config_with_specified_run_list_and_attributes
     in_kitchen do
       foo_json = '"foo":"bar"'

data/test/solo_cook_test.rb

@@ -17,13 +17,15 @@ class SoloCookTest < TestCase
   include ValidationHelper::ValidationTests
 
   def test_gets_destination_path_from_chef_config
-    Chef::Config.file_cache_path "/tmp/chef-solo"
-    assert_equal "/tmp/chef-solo", command.chef_path
+    cmd = command
+    Chef::Config.file_cache_path "/foo/chef-solo"
+    assert_equal "/foo/chef-solo", cmd.chef_path
   end
 
   def test_gets_patch_path_from_chef_config
-    Chef::Config.cookbook_path ["/tmp/chef-solo/cookbooks"]
-    assert_equal "/tmp/chef-solo/cookbooks/chef_solo_patches/libraries", command.patch_path
+    cmd = command
+    Chef::Config.cookbook_path ["/bar/chef-solo/cookbooks"]
+    assert_equal "/bar/chef-solo/cookbooks/chef_solo_patches/libraries", cmd.patch_path
   end
 
   def test_chefignore_is_valid_object
@@ -35,14 +37,14 @@ class SoloCookTest < TestCase
       file_to_ignore = "dummy.txt"
       File.open(file_to_ignore, 'w') {|f| f.puts "This file should be ignored"}
       File.open("chefignore", 'w') {|f| f.puts file_to_ignore}
-      assert command.rsync_exclude.include?(file_to_ignore), "#{file_to_ignore} should have been excluded"
+      assert command.rsync_excludes.include?(file_to_ignore), "#{file_to_ignore} should have been excluded"
     end
   end
 
   def test_does_not_run_librarian_if_no_cheffile
     in_kitchen do
       Librarian::Action::Install.any_instance.expects(:run).never
-      command.librarian_install
+      command("somehost").run
     end
   end
 
@@ -50,7 +52,77 @@ class SoloCookTest < TestCase
     in_kitchen do
       File.open("Cheffile", 'w') {}
       Librarian::Action::Install.any_instance.expects(:run)
-      command.librarian_install
+      command("somehost").run
+    end
+  end
+
+  def test_does_not_run_librarian_if_denied_by_option
+    in_kitchen do
+      File.open("Cheffile", 'w') {}
+      Librarian::Action::Install.any_instance.expects(:run).never
+      command("somehost", "--no-librarian").run
+    end
+  end
+
+  def test_validates_chef_version
+    in_kitchen do
+      cmd = command("somehost")
+      cmd.expects(:check_chef_version)
+      cmd.run
+    end
+  end
+
+  def test_does_not_validate_chef_version_if_denied_by_option
+    in_kitchen do
+      cmd = command("somehost", "--no-chef-check")
+      cmd.expects(:check_chef_version).never
+      cmd.run
+    end
+  end
+
+  def test_accept_valid_chef_version
+    in_kitchen do
+      cmd = command("somehost")
+      cmd.unstub(:check_chef_version)
+      cmd.stubs(:chef_version).returns("11.2.0")
+      cmd.run
+    end
+  end
+
+  def test_barks_if_chef_not_found
+    in_kitchen do
+      cmd = command("somehost")
+      cmd.unstub(:check_chef_version)
+      cmd.stubs(:chef_version).returns("")
+      assert_raises RuntimeError do
+        cmd.run
+      end
+    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")
+      cmd.unstub(:check_chef_version)
+      cmd.stubs(:chef_version).returns("0.8.0")
+      assert_raises RuntimeError do
+        cmd.run
+      end
+    end
+  end
+
+  def test_does_not_cook_if_sync_only_specified
+    in_kitchen do
+      cmd = command("somehost", "--sync-only")
+      cmd.expects(:cook).never
+      cmd.run
     end
   end
 
@@ -69,15 +141,20 @@ class SoloCookTest < TestCase
     in_kitchen do
       cmd = command("somehost", cook_option)
       cmd.expects(:stream_command).with(matcher).returns(SuccessfulResult.new)
-      cmd.cook
+      cmd.run
 
       cmd = command("somehost")
       cmd.expects(:stream_command).with(Not(matcher)).returns(SuccessfulResult.new)
-      cmd.cook
+      cmd.run
     end
   end
 
   def command(*args)
-    knife_command(Chef::Knife::SoloCook, *args)
+    cmd = knife_command(Chef::Knife::SoloCook, *args)
+    cmd.stubs(:check_chef_version)
+    cmd.stubs(:rsync_kitchen)
+    cmd.stubs(:add_patches)
+    cmd.stubs(:stream_command).returns(SuccessfulResult.new)
+    cmd
   end
 end

data/test/solo_init_test.rb

@@ -34,6 +34,43 @@ class SoloInitTest < TestCase
     end
   end
 
+  def test_wont_create_cheffile_by_default
+    in_kitchen do
+      refute File.exist?("Cheffile")
+    end
+  end
+
+  def test_creates_cheffile_if_specified
+    outside_kitchen do
+      command("foo", "--librarian").run
+      assert File.exist?("foo/Cheffile")
+    end
+  end
+
+  def test_wont_overwrite_cheffile
+    outside_kitchen do
+      File.open("Cheffile", "w") do |f|
+        f << "testdata"
+      end
+      command(".", "--librarian").run
+      assert_equal "testdata", IO.read("Cheffile")
+    end
+  end
+
+  def test_creates_gitignore_for_librarian
+    outside_kitchen do
+      command("bar", "--librarian").run
+      assert File.exist?("bar/.gitignore")
+    end
+  end
+
+  def test_wont_create_gitignore_for_librarian_if_denied
+    outside_kitchen do
+      command(".", "--librarian", "--no-git").run
+      refute File.exist?(".gitignore")
+    end
+  end
+
   def command(*args)
     knife_command(Chef::Knife::SoloInit, *args)
   end

data/test/solo_prepare_test.rb

@@ -12,17 +12,22 @@ class SoloPrepareTest < TestCase
     @host = 'someuser@somehost.domain.com'
   end
 
-  def test_will_specify_omnibus_version
+  def test_combines_omnibus_options
     in_kitchen do
-      run_command = command(@host, "--omnibus-version", "'0.10.8-3'")
-      assert_match "0.10.8-3", run_command.config[:omnibus_version]
+      bootstrap_instance = mock('mock OS bootstrap instance')
+      bootstrap_instance.stubs(:bootstrap!)
+
+      run_command = command(@host, "--omnibus-version", "0.10.8-3", "--omnibus-options", "-s")
+      run_command.stubs(:bootstrap).returns(bootstrap_instance)
+      run_command.run
+
+      assert_match "-s -v 0.10.8-3", run_command.config[:omnibus_options]
     end
   end
 
   def test_run_raises_if_operating_system_is_not_supported
     in_kitchen do
       run_command = command(@host)
-      run_command.stubs(:required_files_present?).returns(true)
       run_command.stubs(:operating_system).returns('MythicalOS')
       assert_raises KnifeSolo::Bootstraps::OperatingSystemNotImplementedError do
         run_command.run
@@ -32,14 +37,11 @@ class SoloPrepareTest < TestCase
 
   def test_run_calls_bootstrap
     in_kitchen do
-      run_command = command(@host)
       bootstrap_instance = mock('mock OS bootstrap instance')
-      run_command.stubs(:required_files_present?).returns(true)
-      run_command.stubs(:operating_system).returns('MythicalOS')
-      run_command.stubs(:bootstrap).returns(bootstrap_instance)
-
       bootstrap_instance.expects(:bootstrap!)
 
+      run_command = command(@host)
+      run_command.stubs(:bootstrap).returns(bootstrap_instance)
       run_command.run
     end
   end

data/test/ssh_command_test.rb

@@ -19,6 +19,18 @@ class SshCommandTest < TestCase
     assert_equal "test", command("10.0.0.1").user
   end
 
+  def test_takes_user_from_options
+    cmd = command("10.0.0.1", "--ssh-user=test")
+    cmd.validate_ssh_options!
+    assert_equal "test", cmd.user
+  end
+
+  def test_takes_user_as_arg
+    cmd = command("test@10.0.0.1", "--ssh-user=ignored")
+    cmd.validate_ssh_options!
+    assert_equal "test", cmd.user
+  end
+
   def test_host_regex_rejects_invalid_hostnames
     %w[@name @@name.com name@ name@@ joe@@example.com joe@name@example.com].each do |invalid|
       cmd = command(invalid)
@@ -77,12 +89,19 @@ class SshCommandTest < TestCase
     assert_equal "#{ENV['USER']}@10.0.0.1", cmd.ssh_args
 
     cmd = command("usertest@10.0.0.1", "--ssh-config-file=myconfig")
+    cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1 -F myconfig", cmd.ssh_args
 
     cmd = command("usertest@10.0.0.1", "--ssh-identity=my_rsa")
+    cmd.validate_ssh_options!
+    assert_equal "usertest@10.0.0.1 -i my_rsa", cmd.ssh_args
+
+    cmd = command("usertest@10.0.0.1", "--identity-file=my_rsa")
+    cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1 -i my_rsa", cmd.ssh_args
 
     cmd = command("usertest@10.0.0.1", "--ssh-port=222")
+    cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1 -p 222", cmd.ssh_args
   end
 
@@ -90,7 +109,7 @@ class SshCommandTest < TestCase
     cmd = command
     cmd.ui.expects(:err).with(regexp_matches(/hostname.*argument/))
     $stdout.stubs(:puts)
-    assert_exits { cmd.validate_first_cli_arg_is_a_hostname! }
+    assert_exits { cmd.validate_ssh_options! }
   end
 
   def command(*args)

data/test/support/integration_test.rb

@@ -15,7 +15,7 @@ class IntegrationTest < TestCase
   # Returns a name for the current test's server
   # that should be fairly unique.
   def server_name
-    "knife_solo-#{image_id}"
+    "knife-solo_#{self.class}"
   end
 
   # Shortcut to access the test runner
@@ -72,7 +72,14 @@ class IntegrationTest < TestCase
 
   # The prepare command to use on this server
   def prepare_command
-    "prepare"
+    "prepare #{omnibus_options}"
+  end
+
+  def omnibus_options
+    return "" if ENV['CHEF_VERSION'].to_s.empty?
+
+    v = `knife --version`.split(':')
+    v[0].strip == 'Chef' ? "--omnibus-version=#{v[1].strip}" : ''
   end
 
   # Provides the path to the runner's key file

data/test/support/test_case.rb

@@ -8,6 +8,8 @@ class TestCase < MiniTest::Unit::TestCase
     command = cmd_class.new(args)
     command.ui.stubs(:msg)
     command.ui.stubs(:err)
+    Chef::Config[:verbosity] = 0
+    command.configure_chef
     command
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.12'
   type: :runtime
@@ -136,7 +136,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.12'
 - !ruby/object:Gem::Dependency
@@ -144,17 +144,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: librarian
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +205,7 @@ files:
 - lib/knife-solo/bootstraps/linux.rb
 - lib/knife-solo/bootstraps/sun_os.rb
 - lib/knife-solo/deprecated_command.rb
+- lib/knife-solo/gitignore.rb
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
 - lib/knife-solo/node_config_command.rb
@@ -206,11 +213,14 @@ files:
 - lib/knife-solo/tools.rb
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
+- test/gitignore_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/centos5_6_test.rb
+- test/integration/debian6_bootstrap_test.rb
+- test/integration/debian7_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
@@ -258,9 +268,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -270,11 +280,14 @@ summary: A collection of knife plugins for dealing with chef solo
 test_files:
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
+- test/gitignore_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/centos5_6_test.rb
+- test/integration/debian6_bootstrap_test.rb
+- test/integration/debian7_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
@@ -307,4 +320,3 @@ test_files:
 - test/support/test_case.rb
 - test/support/validation_helper.rb
 - test/test_helper.rb
-has_rdoc: