knife-solo 0.0.13 → 0.0.14

data/lib/chef/knife/cook.rb

@@ -45,15 +45,17 @@ class Chef
         :description => "Only run syntax checks - do not run Chef"
       
       def run
-        validate_params!
-        super
-        check_syntax unless config[:skip_syntax_check]
-        return if config[:syntax_check_only]
-        Chef::Config.from_file('solo.rb')
-        check_chef_version unless config[:skip_chef_check]
-        rsync_kitchen
-        add_patches
-        cook unless config[:sync_only]
+        time('Run') do
+          validate_params!
+          super
+          check_syntax unless config[:skip_syntax_check]
+          return if config[:syntax_check_only]
+          Chef::Config.from_file('solo.rb')
+          check_chef_version unless config[:skip_chef_check]
+          rsync_kitchen
+          add_patches
+          cook unless config[:sync_only]
+        end
       end
 
       def check_syntax
@@ -101,18 +103,34 @@ class Chef
         (%w{revision-deploys tmp '.*'} + chefignore.ignores).uniq
       end
 
+      # Time a command
+      def time(msg)
+        return yield if config[:verbosity] == 0
+        puts "Starting #{msg}"
+        start = Time.now
+        yield
+        puts "#{msg} finished in #{Time.now - start} seconds"
+      end
+
       def rsync_kitchen
-        system! %Q{rsync -rl --rsh="ssh #{ssh_args}" --delete #{rsync_exclude.collect{ |ignore| "--exclude #{ignore} " }.join} ./ :#{adjust_rsync_path(chef_path)}}
+        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)}}
+          puts cmd unless config[:verbosity] == 0
+          system! cmd
+        end
       end
 
       def add_patches
         run_portable_mkdir_p(patch_path)
         Dir[Pathname.new(__FILE__).dirname.join("patches", "*.rb")].each do |patch|
-          system! %Q{rsync -rl --rsh="ssh #{ssh_args}" #{patch} :#{adjust_rsync_path(patch_path)}}
+          time(patch) do
+            system! %Q{rsync -rl --rsh="ssh #{ssh_args}" #{patch} :#{adjust_rsync_path(patch_path)}}
+          end
         end
       end
 
       def check_chef_version
+        ui.msg('Checking Chef version')
         result = run_command <<-BASH
           export PATH="#{OMNIBUS_EMBEDDED_PATHS.join(":")}:$PATH"
           ruby -rubygems -e "gem 'chef', '#{CHEF_VERSION_CONSTRAINT}'"

data/lib/chef/knife/prepare.rb

@@ -22,6 +22,14 @@ class Chef
         :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"
+
+      option :omnibus_options,
+        :long => "--omnibus-options \"-r -n\"",
+        :description => "Pass options to the install.sh script"
+
       def run
         validate_params!
         super

data/lib/knife-solo/bootstraps.rb

@@ -55,8 +55,7 @@ module KnifeSolo
         raise "implement gem packages for #{self.class.name}"
       end
 
-      def http_client_get_url(url)
-        file = File.basename(url)
+      def http_client_get_url(url, file)
         stream_command <<-BASH
           if which curl 2>/dev/null; then
             curl -L -o #{file} #{url}
@@ -67,12 +66,14 @@ module KnifeSolo
       end
 
       def omnibus_install
-        http_client_get_url("http://opscode.com/chef/install.sh")
-
+        url = prepare.config[:omnibus_url] || "http://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 install.sh"
+        install_command = "sudo bash #{file}"
         install_command << " -v #{prepare.config[:omnibus_version]}" if prepare.config[:omnibus_version]
+        install_command << " #{prepare.config[:options]}" if prepare.config[:options]
 
         stream_command(install_command)
       end
@@ -91,7 +92,7 @@ module KnifeSolo
         release = "rubygems-1.8.10"
         file = "#{release}.tgz"
         url = "http://production.cf.rubygems.org/rubygems/#{file}"
-        http_client_get_url(url)
+        http_client_get_url(url, file)
         run_command("tar zxf #{file}")
         run_command("cd #{release} && sudo ruby setup.rb --no-format-executable")
         run_command("sudo rm -rf #{release} #{file}")

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.0.13'
+    '0.0.14'
   end
 end

data/lib/knife-solo/kitchen_command.rb

@@ -29,7 +29,7 @@ module KnifeSolo
     end
 
     def first_cli_arg_is_a_hostname?
-      @name_args.first =~ /\A.+\@.+\z/
+      @name_args.first =~ /\A([^@]+(?>@)[^@]+|[^@]+?(?!@))\z/
     end
 
     def validate_first_cli_arg_is_a_hostname!(error_class)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2696735894055258276
+      hash: 3414347062334937427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2696735894055258276
+      hash: 3414347062334937427
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24