knife-solo 0.3.0.pre4 → 0.3.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904d74c337d53936e856d39cbba88504da008ba8
-  data.tar.gz: 450ff917a4c869ed34b664083c00b15534281244
+  metadata.gz: 2d37c6392175177322d6f010c9d1ae3184ee810a
+  data.tar.gz: 1eace0bf587cca78a01689baf2f5f6491ad8bdf7
 SHA512:
-  metadata.gz: 1ab1298a915aa64fdc6e5b84dafa6f7c792c6ad8ff279c9b02e96916c85140515f2b6e9a74d8d320f1f3fbf9f5f9441f24be54e4c93a07ce6740a0c398f595ae
-  data.tar.gz: 2049637c24941db8f9828cb8fcf7b14f1e6e644944bfb9fca1ee79e4e8be50356e3d5b7f71ba2167949deaca532abd3f51058bafbbca90be3d4c7040b218b093
+  metadata.gz: 5d1f44be1d11cfce81ba1f2266ebe9d4a1054c934ae277dd74c180e3ae5ba8a7d731f53546ad1cfeb03d936b590c78f88999a33c92c22689a30f8b725b558c2a
+  data.tar.gz: 2eaa24623d945f97da180d39b38d96cbf92977f42c5d9f29c22beb7742cbb8a84bdfa4f93defb16b113497d774fb40eaa470f119b4d191911206665fa4a21bac

data/CHANGELOG.md

@@ -17,9 +17,12 @@
 * Prepare/bootstrap now installs the same version of Chef that the workstation is running ([186])
 * Switch `--omnibus-version` flag to `--bootstrap-version` ([185])
 * Support `--override-runlist` option ([204])
+* Add proxy settings to the generated solo.rb ([254])
 * Support Fedora 18 and other new EL distros ([229], [51a581])
+* Support CloudLinux ([262])
 * Drop support for openSUSE 11
 * Upgrade chef-solo-search to v0.4.0
+* Add `--sudo-command` option to use custom remote 'sudo' command ([256])
 
 ## Fixes
 
@@ -38,6 +41,7 @@
 * Parse Chef version even if chef-solo command prints warnings ([235], [238])
 * Upgrade CentOS in integration tests to 5.8 and 6.3 ([237])
 * Default to `lsb_release` for detecting the Linux distro and add support for RHEL based systems where /etc/issue is modified ([234], [242])
+* Create the directory for node_config if it does not exist ([253])
 
 ## Thanks to our contributors!
 
@@ -47,6 +51,8 @@
 * [Łukasz Dubiel][bambuchaAdm]
 * [kmdsbng][kmdsbng]
 * [Darshan Patil][dapatil]
+* [Shin Tokiwa][tocky]
+* [Sam Martin][searlm]
 
 [1]: https://github.com/matschaffer/knife-solo/issues/1
 [86]: https://github.com/matschaffer/knife-solo/issues/86
@@ -77,6 +83,10 @@
 [237]: https://github.com/matschaffer/knife-solo/issues/237
 [238]: https://github.com/matschaffer/knife-solo/issues/238
 [242]: https://github.com/matschaffer/knife-solo/issues/242
+[253]: https://github.com/matschaffer/knife-solo/issues/253
+[254]: https://github.com/matschaffer/knife-solo/issues/254
+[256]: https://github.com/matschaffer/knife-solo/issues/256
+[262]: https://github.com/matschaffer/knife-solo/issues/262
 [d21756]: https://github.com/matschaffer/knife-solo/commit/d21756
 [1d3485]: https://github.com/matschaffer/knife-solo/commit/1d3485
 [f43ba4]: https://github.com/matschaffer/knife-solo/commit/f43ba4
@@ -358,9 +368,11 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [rubiojr]:       https://github.com/rubiojr
 [russellcardullo]: https://github.com/russellcardullo
 [ryandub]:       https://github.com/ryandub
+[searlm]:        https://github.com/searlm
 [skyeagle]:      https://github.com/skyeagle
 [smdern]:        https://github.com/smdern
 [tknerr]:        https://github.com/tknerr
 [tmatilai]:      https://github.com/tmatilai
+[tocky]:          https://github.com/tocky
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph

data/lib/chef/knife/solo_cook.rb

@@ -125,6 +125,17 @@ class Chef
         @cookbook_paths ||= expanded_config_paths(:cookbook_path) + [patch_cookbooks_path]
       end
 
+      def proxy_setting_keys
+        [:http_proxy, :https_proxy, :http_proxy_user, :http_proxy_pass, :no_proxy]
+      end
+
+      def proxy_settings
+        proxy_setting_keys.inject(Hash.new) do |ret, key|
+          ret[key] = Chef::Config[key] if Chef::Config[key]
+          ret
+        end
+      end
+
       def add_cookbook_path(path)
         path = expand_path path
         cookbook_paths.unshift(path) unless cookbook_paths.include?(path)

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

@@ -81,6 +81,8 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus"}
       when %r{Scientific Linux}
         {:type => "yum_omnibus"}
+      when %r{CloudLinux}
+        {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
         {:type => "omnibus"}
       when %r{openSUSE 12}

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/node_config_command.rb

@@ -2,6 +2,7 @@ module KnifeSolo
   module NodeConfigCommand
 
     def self.load_deps
+      require 'fileutils'
       require 'pathname'
     end
 
@@ -51,6 +52,7 @@ module KnifeSolo
         Chef::Log.debug "Node config '#{node_config}' already exists"
       else
         ui.msg "Generating node config '#{node_config}'..."
+        FileUtils.mkdir_p(node_config.dirname)
         File.open(node_config, 'w') do |f|
           attributes = config[:json_attributes] || config[:first_boot_attributes] || {}
           run_list = { :run_list => config[:run_list] || [] }

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

@@ -9,3 +9,7 @@ cookbook_path []
 <% cookbook_paths.each_with_index do |path, i| -%>
 cookbook_path << File.join(base, 'cookbooks-<%= i+1 %>') # <%= path %>
 <% end -%>
+
+<% proxy_settings.each_pair do |k, v| -%>
+<%= k %>     "<%= v %>"
+<% end -%>

data/lib/knife-solo/ssh_command.rb

@@ -54,6 +54,11 @@ module KnifeSolo
           :short       => '-s FILE',
           :long        => '--startup-script FILE',
           :description => 'The startup script on the remote server containing variable definitions'
+
+        option :sudo_command,
+          :long        => '--sudo-command SUDO_COMMAND',
+          :description => 'The command to use instead of sudo for admin privileges'
+
       end
     end
 
@@ -147,6 +152,10 @@ module KnifeSolo
       [host_arg, config_arg, ident_arg, port_arg].compact.join(' ')
     end
 
+    def sudo_command
+      config[:sudo_command]
+    end
+
     def startup_script
       config[:startup_script]
     end
@@ -187,7 +196,10 @@ module KnifeSolo
     end
 
     def process_sudo(command)
-      if sudo_available?
+      if sudo_command
+        Chef::Log.debug("Using replacement sudo command: #{sudo_command}")
+        replacement = sudo_command
+      elsif sudo_available?
         replacement = 'sudo -p \'knife sudo password: \''
       else
         replacement = ''

data/test/node_config_command_test.rb

@@ -118,6 +118,14 @@ class NodeConfigCommandTest < TestCase
     end
   end
 
+  def test_creates_the_nodes_directory_if_needed
+    outside_kitchen do
+      cmd = command(@host, "--node-name=mynode")
+      cmd.generate_node_config
+      assert cmd.node_config.exist?
+    end
+  end
+
   def command(*args)
     knife_command(DummyNodeConfigCommand, *args)
   end

data/test/solo_cook_test.rb

@@ -77,6 +77,13 @@ class SoloCookTest < TestCase
     assert_equal "/some/other/path", cmd.cookbook_paths[2].to_s
   end
 
+  def test_sets_proxy_settings
+    Chef::Config[:http_proxy] = "http://proxy:3128"
+    Chef::Config[:no_proxy] = nil
+    conf = command.proxy_settings
+    assert_equal({ :http_proxy => "http://proxy:3128" }, conf)
+  end
+
   def test_does_not_run_berkshelf_if_no_berkfile
     in_kitchen do
       Berkshelf::Berksfile.any_instance.expects(:install).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre4
+  version: 0.3.0.pre5
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf