knife-solo 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96b232d89401743814910038470c0766da237b5
-  data.tar.gz: a25f75165ab5c7dbfed6580ef4973ea14dfda5b2
+  metadata.gz: 55351e6ed65fb674523ab4ba6047e769bd303644
+  data.tar.gz: ce43f7330c68a474c52ebf41a9cd147a871d2fd3
 SHA512:
-  metadata.gz: fea9648a3cab40f50ba689576b6b9f27bb32016cc091ac093f3b533232d6c38279a6838528bd52a7cbbb65790f2d526f3a3bd344571e23133dd07007ee8750c6
-  data.tar.gz: fb35993180d68d72a63a3390b0e833c595295a01184fc9c41fb4e1a62943bfbbf8128af8a0c25766feeed575a6478f908f3563b99233fa1fbb28a33092cc387f
+  metadata.gz: 9515a71ab78348df464c4d7e08034057af8d3ae50f2f1e6a480f7f29b3227d35156a2e06a4bb79e733d4025b6c66637776b559b1e2e7803d8c934a21baacacb1
+  data.tar.gz: 850e01f65af5d744e5cd4e69846ffe40c39cd2da1932d5d19079cb52ede78c264f381308b221478c794b30677c4cf01824f8f41c73dbcdbb18139a94b1f9a585

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+# 0.6.0 / 2016-05-23
+
+## Changes and new features
+
+* Added support for Mac OS 10.10 ([456][])
+* **BREAKING** Updated ssh key argument to `--ssh-identity-file` to match new knife conventions
+
+## Fixes
+
+* Loosen net-ssh requirement to gain compatibility with newer ChefDK releases ([481][])
+* Ensure non-interactive mode on Debian x86 boostrap ([471][])
+* Include user and port in control path ([468][])
+* Default control master to "no" when running from cygwin ([453][])
+* Use hashed control path (requires recent openssh) ([470][])
+* Pass node name down to solo.rb (forward port from 0.4.3) ([452][])
+* Use `const_get` to help spot bootstrap detection errors more easily ([467][])
+
+## Thanks to our contributors!
+
+* [Austin Schutz][aaadschutz]
+* [Shawn Xu][xunnanxu]
+* [Derek Tamsen][derektamsen]
+* [Przemysław Dąbek][szemek]
+* [Mark Woods][thickpaddy]
+* [Tomohiko IIDA][iidatomohiko]
+* [Jeroen Jacobs][jeroenj]
+
+[470]: https://github.com/matschaffer/knife-solo/issues/470
+[456]: https://github.com/matschaffer/knife-solo/issues/456
+[481]: https://github.com/matschaffer/knife-solo/issues/481
+[471]: https://github.com/matschaffer/knife-solo/issues/471
+[468]: https://github.com/matschaffer/knife-solo/issues/468
+[453]: https://github.com/matschaffer/knife-solo/issues/453
+[452]: https://github.com/matschaffer/knife-solo/issues/452
+[467]: https://github.com/matschaffer/knife-solo/issues/467
+
 # 0.5.1 / 2015-08-28
 
 Re-release of 0.5.0 for test & doc fixes.
@@ -65,6 +101,16 @@ Re-release of 0.5.0 for test & doc fixes.
 [440]: https://github.com/matschaffer/knife-solo/issues/440
 [339]: https://github.com/matschaffer/knife-solo/issues/339
 
+# 0.4.3 / 2015-09-10
+
+## Fixes
+
+* Pass node name down to solo.rb ([452][])
+
+## Thanks to our contributors!
+
+* [aaadschutz][aaadschutz]
+
 # 0.4.2 / 2014-06-05
 
 ## Changes and new features
@@ -583,3 +629,10 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [yozlet]:          https://github.com/yozlet
 [yugui]:           https://github.com/yugui
 [zeph]:            https://github.com/zeph
+[aaadschutz]:      https://github.com/aaadschutz
+[xunnanxu]:        https://github.com/xunnanxu
+[derektamsen]:     https://github.com/derektamsen
+[szemek]:          https://github.com/szemek
+[thickpaddy]:      https://github.com/thickpaddy
+[iidatomohiko]:    https://github.com/iidatomohiko
+[jeroenj]:         https://github.com/jeroenj

data/Rakefile

@@ -71,21 +71,18 @@ task 'gh-pages' do
   end
 end
 
-namespace :test do
-  Rake::TestTask.new(:performance) do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/performance/*_test.rb']
-  end
-
-  Rake::TestTask.new(:integration) do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/integration/*_test.rb']
+def test_task(name, glob)
+  Rake::TestTask.new(name) do |t|
+    t.libs << 'test'
+    t.warning = false
+    t.test_files = FileList[glob]
   end
+end
 
-  Rake::TestTask.new(:units) do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/*_test.rb']
-  end
+namespace :test do
+  test_task(:performance, 'test/performance/*_test.rb')
+  test_task(:integration, 'test/integration/*_test.rb')
+  test_task(:units,       'test/*_test.rb')
 
   desc 'Run both unit and integration tests'
   task :all => [:units, :integration]

data/lib/knife-solo/bootstraps.rb

@@ -8,7 +8,7 @@ module KnifeSolo
     def self.class_exists_for?(os_name)
       begin
         true if self.class_for_operating_system(os_name).class == Class
-      rescue => exception
+      rescue
         false
       end
     end
@@ -16,9 +16,9 @@ module KnifeSolo
     def self.class_for_operating_system(os_name)
       begin
         os_class_name = os_name.gsub(/\s/,'')
-        eval("KnifeSolo::Bootstraps::#{os_class_name}")
+        KnifeSolo::Bootstraps.const_get(os_class_name)
       rescue
-        raise OperatingSystemNotImplementedError.new("#{os_name} not implemented.  Feel free to add a bootstrap implementation in KnifeSolo::Bootstraps::#{os_class_name}")
+        raise OperatingSystemNotImplementedError.new("#{os_name.inspect} not implemented.  Feel free to add a bootstrap implementation in KnifeSolo::Bootstraps::#{os_class_name}")
       end
     end
 

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

@@ -7,7 +7,7 @@ module KnifeSolo::Bootstraps
 
     def distro
       case issue
-      when %r{10.[6-9]}
+      when %r{10.(?:[6-9]|10)}
         {:type => 'omnibus'}
       else
         raise "OS X version #{issue} not supported"

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

@@ -52,7 +52,7 @@ module KnifeSolo::Bootstraps
 
     def debianoid_omnibus_install
       run_command("sudo apt-get update")
-      run_command("sudo apt-get -y install rsync ca-certificates wget")
+      run_command("sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' --force-yes -f install rsync ca-certificates wget")
       omnibus_install
     end
 

data/lib/knife-solo/cookbook_manager.rb

@@ -72,7 +72,7 @@ module KnifeSolo
       end
 
       def conf_file_exists?(base = nil)
-        File.exists?(conf_file(base))
+        File.exist?(conf_file(base))
       end
 
       # Runs the manager and returns the path to the cookbook directory

data/lib/knife-solo/cookbook_manager_selector.rb

@@ -54,7 +54,7 @@ module KnifeSolo
 
     def select_by_existing_conf_file(base)
       managers.each do |manager|
-        if manager.conf_file_exists?(@base)
+        if manager.conf_file_exists?(base)
           Chef::Log.debug "#{manager} selected because of existing #{manager.conf_file}"
           return manager
         end

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.5.1'
+    '0.6.0'
   end
 
   def self.post_install_message

data/lib/knife-solo/node_config_command.rb

@@ -10,7 +10,7 @@ module KnifeSolo
       other.class_eval do
         # Lazy load our dependencies if the including class did not call
         # Knife#deps yet. See KnifeSolo::SshCommand for more information.
-        deps { KnifeSolo::NodeConfigCommand.load_deps } unless @dependency_loader
+        deps { KnifeSolo::NodeConfigCommand.load_deps } unless defined?(@dependency_loader)
 
         option :chef_node_name,
           :short       => '-N NAME',

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

@@ -1,4 +1,4 @@
-node_name <%= host.inspect %>
+node_name <%= node_name.inspect %>
 
 base = File.expand_path('..', __FILE__)
 

data/lib/knife-solo/ssh_command.rb

@@ -1,9 +1,9 @@
-
 module KnifeSolo
   module SshCommand
 
     def self.load_deps
       require 'knife-solo/ssh_connection'
+      require 'knife-solo/tools'
       require 'net/ssh'
       require 'net/ssh/gateway'
     end
@@ -22,7 +22,7 @@ module KnifeSolo
         #     KnifeSolo::SshCommand.load_deps
         #   end
         #
-        deps { KnifeSolo::SshCommand.load_deps } unless @dependency_loader
+        deps { KnifeSolo::SshCommand.load_deps } unless defined?(@dependency_loader)
 
         option :ssh_config,
           :short       => '-F CONFIG_FILE',
@@ -43,19 +43,19 @@ module KnifeSolo
           :long        => '--ssh-gateway GATEWAY',
           :description => 'The ssh gateway'
 
-        option :ssh_identity,
-          :long        => '--ssh-identity FILE',
-          :description => 'Deprecated. Replaced with --identity-file.'
-
         option :ssh_control_master,
           :long => '--ssh-control-master SETTING',
-          :description => 'Control master setting to use when running rsync (use "no" to disable)',
-          :default => 'auto'
+          :description => 'Control master setting to use when running rsync (use "auto" to enable)',
+          :default => 'no'
 
         option :identity_file,
-          :short       => '-i IDENTITY_FILE',
-          :long        => '--identity-file FILE',
-          :description => 'The ssh identity file'
+          :long => "--identity-file IDENTITY_FILE",
+          :description => "The SSH identity file used for authentication. [DEPRECATED] Use --ssh-identity-file instead."
+
+        option :ssh_identity_file,
+          :short => "-i IDENTITY_FILE",
+          :long => "--ssh-identity-file IDENTITY_FILE",
+          :description => "The SSH identity file used for authentication"
 
         option :forward_agent,
           :long        => '--forward-agent',
@@ -102,9 +102,8 @@ module KnifeSolo
     end
 
     def validate_ssh_options!
-      if config[:ssh_identity]
-        ui.warn '`--ssh-identity` is deprecated, please use `--identity-file`.'
-        config[:identity_file] ||= config[:ssh_identity]
+      if config[:identity_file]
+        ui.warn '`--identity-file` is deprecated, please use `--ssh-identity-file`.'
       end
       unless first_cli_arg_is_a_hostname?
         show_usage
@@ -123,7 +122,7 @@ module KnifeSolo
     end
 
     def host_descriptor
-      return @host_descriptor if @host_descriptor
+      return @host_descriptor if defined?(@host_descriptor)
       parts = @name_args.first.split('@')
       @host_descriptor = {
         :host => parts.pop,
@@ -160,11 +159,15 @@ module KnifeSolo
       Net::SSH::Config.for(host, config_files)
     end
 
+    def identity_file
+      config[:ssh_identity] || config[:identity_file] || config[:ssh_identity_file]
+    end
+
     def connection_options
       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[:identity_file]] if config[:identity_file]
+      options[:keys] = [identity_file] if identity_file
       options[:gateway] = config[:ssh_gateway] if config[:ssh_gateway]
       options[:forward_agent] = true if config[:forward_agent]
       if !config[:host_key_verify]
@@ -204,7 +207,7 @@ module KnifeSolo
       args << [user, host].compact.join('@')
 
       args << "-F #{config[:ssh_config]}" if config[:ssh_config]
-      args << "-i #{config[:identity_file]}" if config[:identity_file]
+      args << "-i #{identity_file}" if identity_file
       args << "-o ForwardAgent=yes" if config[:forward_agent]
       args << "-p #{config[:ssh_port]}" if config[:ssh_port]
       args << "-o UserKnownHostsFile=#{connection_options[:user_known_hosts_file]}" if config[:host_key_verify] == false
@@ -217,7 +220,7 @@ module KnifeSolo
     def ssh_control_path
       dir = File.join(ENV['HOME'], '.chef', 'knife-solo-sockets')
       FileUtils.mkdir_p(dir)
-      File.join(dir, '%h')
+      File.join(dir, '%C')
     end
 
     def custom_sudo_command

data/lib/knife-solo/ssh_connection.rb

@@ -53,7 +53,7 @@ module KnifeSolo
 
       session.open_channel do |channel|
         channel.request_pty
-        channel.exec(command) do |ch, success|
+        channel.exec(command) do |_, success|
           raise "ssh.channel.exec failure" unless success
 
           channel.on_data do |ch, data|  # stdout

data/lib/knife-solo/tools.rb

@@ -8,6 +8,10 @@ module KnifeSolo
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
+    def self.cygwin_client?
+      RbConfig::CONFIG['host_os'] =~ /cygwin/
+    end
+
     def config_value(key, default = nil)
       Tools.config_value(config, key, default)
     end

data/test/gemfiles/Gemfile.chef-10

@@ -3,3 +3,11 @@ source 'https://rubygems.org'
 gemspec :path => '../..'
 
 gem 'chef', '~> 10'
+
+platform :ruby_19 do
+  gem 'berkshelf-api-client', '~> 1.3.1'
+  gem 'varia_model', '~> 0.4.0'
+  gem 'json', '~> 1.8.1'
+  gem 'mixlib-config', '~> 1.1.2'
+  gem 'ohai', '~> 6.24.2'
+end

data/test/gemfiles/Gemfile.chef-11

@@ -3,3 +3,10 @@ source 'https://rubygems.org'
 gemspec :path => '../..'
 
 gem 'chef', '~> 11'
+
+platform :ruby_19 do
+  gem 'berkshelf-api-client', '~> 1.3.1'
+  gem 'tins', '~> 1.6.0'
+  gem 'varia_model', '~> 0.4.0'
+  gem 'ohai', '~> 7.4.1'
+end

data/test/integration/{amazon_linux_2012_09_bootstrap_test.rb → amazon_linux_2016_03_bootstrap_test.rb}

@@ -1,12 +1,12 @@
 require 'integration_helper'
 
-class AmazonLinux2012_09BootstrapTest < IntegrationTest
+class AmazonLinux2016_03BootstrapTest < IntegrationTest
   def user
     "ec2-user"
   end
 
   def image_id
-    "ami-1624987f"
+    "ami-4f111125"
   end
 
   def prepare_server

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

@@ -1,12 +1,18 @@
 require 'integration_helper'
 
-class Centos5_8Test < IntegrationTest
+class Centos7Test < IntegrationTest
+  # disable_firewall
+
+  def flavor_id
+    "m3.medium"
+  end
+
   def user
-    "root"
+    "centos"
   end
 
   def image_id
-    "ami-100e8a79"
+    "ami-6d1c2007"
   end
 
   include EmptyCook

data/test/integration/{omnios_r151004_test.rb → omnios_r151014_test.rb}

@@ -1,12 +1,12 @@
 require 'integration_helper'
 
-class OmniOSr151004Test < IntegrationTest
+class OmniOSr151014Test < IntegrationTest
   def user
     "root"
   end
 
   def image_id
-    "ami-4e2c9727"
+    "ami-79ee1b14"
   end
 
   include EmptyCook

data/test/ssh_command_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 require 'knife-solo/ssh_command'
+require 'knife-solo/tools'
 require 'chef/knife'
 require 'net/ssh'
 
@@ -69,7 +70,7 @@ class SshCommandTest < TestCase
     cmd = command("10.0.0.1", "--ssh-gateway=user@gateway")
     ssh_mock = mock 'ssh_mock'
     Net::SSH::Gateway.expects(:new).with('gateway', 'user').returns(ssh_mock)
-    ssh_mock.expects(:ssh).with(cmd.host, cmd.user, cmd.connection_options.except(:gateway))
+    ssh_mock.expects(:ssh).with(cmd.host, cmd.user, cmd.connection_options.select{|o| o != :gateway})
 
     Net::SSH.expects(:start).never
 
@@ -158,10 +159,6 @@ class SshCommandTest < TestCase
     cmd = command("usertest@10.0.0.1", "--ssh-gateway=test@host.com")
     cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1", cmd.ssh_args
-
-    cmd = command_internal("usertest@10.0.0.1", "--ssh-gateway=test@host.com")
-    cmd.validate_ssh_options!
-    assert_equal "usertest@10.0.0.1 -o ControlMaster=auto -o ControlPath=#{cmd.ssh_control_path} -o ControlPersist=3600", cmd.ssh_args
   end
 
   def test_barks_without_atleast_a_hostname
@@ -225,11 +222,6 @@ class SshCommandTest < TestCase
   end
 
   def command(*args)
-    args << '--ssh-control-master=no'
-    command_internal(*args)
-  end
-
-  def command_internal(*args)
     Net::SSH::Config.stubs(:default_files)
     knife_command(DummySshCommand, *args)
   end

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 #{dns_name} 22 -w 1 -q 0 </dev/null`
+      `echo | nc -w 1 #{dns_name} 22`
       $?.success?
     end
 

data/test/support/integration_test.rb

@@ -41,7 +41,9 @@ class IntegrationTest < TestCase
     @kitchen.dirname.mkpath
     system "knife solo init #{@kitchen} --no-berkshelf --no-librarian >> #{log_file}"
     @start_dir = Dir.pwd
+    # NOTE (matschaffer): On ruby 2.3 Dir.chdir won't set ENV['PWD'] which chef-config-12.8.1 uses for `working_directory`
     Dir.chdir(@kitchen)
+    ENV['PWD'] = @kitchen.to_s
     prepare_server
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -182,22 +182,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -281,8 +281,7 @@ files:
 - test/gemfiles/Gemfile.chef-12
 - test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
-- test/integration/amazon_linux_2012_09_bootstrap_test.rb
-- test/integration/archlinux_20131128_test.rb
+- test/integration/amazon_linux_2016_03_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/cache_path_usage.rb
@@ -291,12 +290,10 @@ files:
 - test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
 - test/integration/cases/ohai_hints.rb
-- test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
-- test/integration/debian6_bootstrap_test.rb
+- test/integration/centos7_test.rb
 - test/integration/debian7_knife_bootstrap_test.rb
-- test/integration/gentoo2011_test.rb
-- test/integration/omnios_r151004_test.rb
+- test/integration/omnios_r151014_test.rb
 - test/integration/scientific_linux_63_test.rb
 - test/integration/sles_11_test.rb
 - test/integration/ubuntu12_04_bootstrap_test.rb
@@ -365,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of knife plugins for dealing with chef solo
@@ -377,8 +374,7 @@ test_files:
 - test/gemfiles/Gemfile.chef-12
 - test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
-- test/integration/amazon_linux_2012_09_bootstrap_test.rb
-- test/integration/archlinux_20131128_test.rb
+- test/integration/amazon_linux_2016_03_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/cache_path_usage.rb
@@ -387,12 +383,10 @@ test_files:
 - test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
 - test/integration/cases/ohai_hints.rb
-- test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
-- test/integration/debian6_bootstrap_test.rb
+- test/integration/centos7_test.rb
 - test/integration/debian7_knife_bootstrap_test.rb
-- test/integration/gentoo2011_test.rb
-- test/integration/omnios_r151004_test.rb
+- test/integration/omnios_r151014_test.rb
 - test/integration/scientific_linux_63_test.rb
 - test/integration/sles_11_test.rb
 - test/integration/ubuntu12_04_bootstrap_test.rb

data/test/integration/archlinux_20131128_test.rb

@@ -1,17 +0,0 @@
-require 'integration_helper'
-
-class ArchLinux20131128Test < IntegrationTest
-  def user
-    "root"
-  end
-
-  def image_id
-    "ami-d1cbebb8"
-  end
-
-  # this install method takes over 15m on an m1.small
-  # Uncomment this if you need to verify Arch operation
-
-  # include EmptyCook
-  # include EncryptedDataBag
-end

data/test/integration/debian6_bootstrap_test.rb

@@ -1,20 +0,0 @@
-require 'integration_helper'
-
-
-class Debian6BootstrapTest < IntegrationTest
-  def user
-    "admin"
-  end
-
-  def image_id
-    # PVM 64-bit
-    # From https://wiki.debian.org/Cloud/AmazonEC2Image/Squeeze
-    "ami-5e12dc36"
-  end
-
-  def prepare_server
-    # Do nothing as `solo bootstrap` will do everything
-  end
-
-  include Apache2Bootstrap
-end

data/test/integration/gentoo2011_test.rb

@@ -1,18 +0,0 @@
-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
-  # Uncomment this if you need to verify Gentoo operation
-
-  # include EmptyCook
-  # include Apache2Cook
-  # include EncryptedDataBag
-end