knife-solo 0.0.12 → 0.0.13

data/lib/chef/knife/cook.rb

@@ -20,6 +20,8 @@ class Chef
       include KnifeSolo::KitchenCommand
       include KnifeSolo::Tools
 
+      class WrongCookError < KnifeSolo::KnifeSoloError; end
+
       banner "knife cook [user@]hostname [json] (options)"
 
       option :skip_chef_check,
@@ -37,9 +39,16 @@ class Chef
         :boolean => true,
         :description => "Skip Ruby syntax checks"
 
+      option :syntax_check_only,
+        :long => '--syntax-check-only',
+        :boolean => true,
+        :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
@@ -63,6 +72,7 @@ class Chef
             raise "Syntax error in #{json}: #{error.message}"
           end
         end
+        Chef::Log.info "cookbook and json syntax is ok"
       end
 
       def node_config
@@ -109,7 +119,7 @@ class Chef
         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?
       end
-
+      
       def cook
         logging_arg = "-l debug" if config[:verbosity] > 0
 
@@ -119,6 +129,11 @@ class Chef
                          #{logging_arg}
         BASH
       end
+
+      def validate_params!
+        validate_first_cli_arg_is_a_hostname!(WrongCookError)
+      end
+      
     end
   end
 end

data/lib/chef/knife/prepare.rb

@@ -15,7 +15,7 @@ class Chef
       class WrongPrepareError < KnifeSolo::KnifeSoloError
         alias :message :to_s
       end
-      
+
       banner "knife prepare [user@]hostname (options)"
 
       option :omnibus_version,
@@ -46,9 +46,7 @@ class Chef
       end
 
       def validate_params!
-        unless @name_args.first =~ /\A.+\@.+\z/
-          raise WrongPrepareError.new "need to pass a [user@]hostname as the first argument"
-        end
+        validate_first_cli_arg_is_a_hostname!(WrongPrepareError)
       end
     end
   end

data/lib/knife-solo/bootstraps.rb

@@ -23,6 +23,10 @@ module KnifeSolo
     end
 
     module Delegates
+      def stream_command(cmd)
+        prepare.stream_command(cmd)
+      end
+
       def run_command(cmd)
         prepare.run_command(cmd)
       end
@@ -52,18 +56,25 @@ module KnifeSolo
       end
 
       def http_client_get_url(url)
-        "wget #{url}"
+        file = File.basename(url)
+        stream_command <<-BASH
+          if which curl 2>/dev/null; then
+            curl -L -o #{file} #{url}
+          else
+            wget -O #{file} #{url}
+          fi
+        BASH
       end
 
       def omnibus_install
-        run_command(http_client_get_url("http://opscode.com/chef/install.sh"))
+        http_client_get_url("http://opscode.com/chef/install.sh")
 
         # `release_version` within install.sh will be installed if
         # `omnibus_version` is not provided.
         install_command = "sudo bash install.sh"
         install_command << " -v #{prepare.config[:omnibus_version]}" if prepare.config[:omnibus_version]
 
-        run_command(install_command)
+        stream_command(install_command)
       end
 
       def ubuntu_omnibus_install
@@ -80,7 +91,7 @@ module KnifeSolo
         release = "rubygems-1.8.10"
         file = "#{release}.tgz"
         url = "http://production.cf.rubygems.org/rubygems/#{file}"
-        run_command(http_client_get_url(url))
+        http_client_get_url(url)
         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/bootstraps/darwin.rb

@@ -8,7 +8,7 @@ module KnifeSolo::Bootstraps
     def gem_packages
       ['chef']
     end
-    
+
     def distro
       case issue
       when %r{10.5}
@@ -25,11 +25,6 @@ module KnifeSolo::Bootstraps
       result.success?
     end
 
-    def http_client_get_url(url)
-      filename = url.split("/").last
-      "curl '#{url}' >> #{filename}"
-    end
-
     def run_pre_bootstrap_checks
       raise 'xcode not installed, which is required to do anything.  please install and run again.' unless has_xcode_installed?
     end

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

@@ -0,0 +1,57 @@
+module KnifeSolo::Bootstraps
+  class FreeBSD < Base
+    def issue
+      run_command("uname -sr").stdout.strip
+    end
+
+    def gem_packages
+      ['chef']
+    end
+
+    def prepare_make_conf
+      ui.msg "Preparing make.conf"
+      run_command <<-EOF
+        echo 'RUBY_DEFAULT_VER=1.9' >> /etc/make.conf
+      EOF
+    end
+
+    def freebsd_port_install
+      ui.msg "Updating ports tree..."
+
+      if Dir["/usr/ports/*"].empty?
+        run_command("portsnap fetch extract")
+      else
+        run_command("portsnap update")
+      end
+
+      prepare_make_conf
+
+      ui.msg "Installing required ports..."
+      packages = %w(net/rsync ftp/curl lang/ruby19 devel/ruby-gems
+                    converters/ruby-iconv devel/rubygem-rake
+                    shells/bash)
+
+      packages.each do |p|
+        ui.msg "Installing #{p}..."
+        result = run_command <<-SH
+          cd /usr/ports/#{p} && make -DBATCH -DFORCE_PKG_REGISTER install clean
+        SH
+        raise "Couldn't install #{p} from ports." unless result.success?
+      end
+
+      ui.msg "...done installing ports."
+
+      gem_install # chef
+    end
+
+    def distro
+      return @distro if @distro
+      case issue
+      when %r{FreeBSD 9.0-RELEASE}
+        {:type => 'freebsd_port'}
+      else
+        raise "#{issue} not supported"
+      end
+    end
+  end
+end

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

@@ -13,10 +13,6 @@ module KnifeSolo::Bootstraps
       ['ruby-shadow','chef']
     end
 
-    def http_client_get_url(url)
-      "curl -LO #{url}"
-    end
-
     def zypper_gem_install
       ui.msg("Installing required packages...")
       run_command("sudo zypper --non-interactive install ruby-devel make gcc rsync")

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/kitchen_command.rb

@@ -8,28 +8,36 @@ module KnifeSolo
       end
     end
 
-    def self.required_directories
-      %w(nodes roles cookbooks data_bags site-cookbooks)
-    end
-
     def self.required_files
       %w(solo.rb)
     end
 
-    def self.all_requirements
-      required_files + required_directories
-    end
-
     def run
       raise OutOfKitchenError.new unless required_files_present?
     end
 
     def required_files_present?
-      KitchenCommand.all_requirements.inject(true) do |m, f|
+      KitchenCommand.required_files.inject(true) do |m, f|
         check = File.exists?(f)
-        Chef::Log.warn "#{f} is a required file/directory" unless check
+        warn_for_required_file(f) unless check
         m && check
       end
     end
+
+    def warn_for_required_file(file)
+      Chef::Log.warn "#{file} is a required file/directory"
+    end
+
+    def first_cli_arg_is_a_hostname?
+      @name_args.first =~ /\A.+\@.+\z/
+    end
+
+    def validate_first_cli_arg_is_a_hostname!(error_class)
+      unless first_cli_arg_is_a_hostname?
+        ui.msg opt_parser.help
+        raise error_class.new "need to pass atleast a [user@]hostname as the first argument"
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +110,7 @@ files:
 - lib/chef/knife/prepare.rb
 - lib/chef/knife/wash_up.rb
 - lib/knife-solo/bootstraps/darwin.rb
+- lib/knife-solo/bootstraps/freebsd.rb
 - lib/knife-solo/bootstraps/linux.rb
 - lib/knife-solo/bootstraps.rb
 - lib/knife-solo/info.rb
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4402118030036500865
+      hash: 2696735894055258276
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4402118030036500865
+      hash: 2696735894055258276
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24