knife-solo 0.0.14 → 0.0.15

data/lib/chef/knife/cook.rb

@@ -1,11 +1,8 @@
-require 'pathname'
-
 require 'chef/knife'
-require 'chef/config'
-require 'chef/cookbook/chefignore'
 
 require 'knife-solo/ssh_command'
 require 'knife-solo/kitchen_command'
+require 'knife-solo/node_config_command'
 require 'knife-solo/tools'
 
 class Chef
@@ -14,13 +11,20 @@ class Chef
     # Copyright 2009, Trotter Cashion
     class Cook < Knife
       OMNIBUS_EMBEDDED_PATHS  = ["/opt/chef/embedded/bin", "/opt/opscode/embedded/bin"]
+      OMNIBUS_EMBEDDED_GEM_PATHS  = ["/opt/chef/embedded/lib/ruby/gems/1.9.1", "/opt/opscode/embedded/lib/ruby/gems/1.9.1"]
       CHEF_VERSION_CONSTRAINT = ">=0.10.4"
 
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
+      include KnifeSolo::NodeConfigCommand
       include KnifeSolo::Tools
 
-      class WrongCookError < KnifeSolo::KnifeSoloError; end
+      deps do
+        require 'chef/cookbook/chefignore'
+        require 'pathname'
+        KnifeSolo::SshCommand.load_deps
+        KnifeSolo::NodeConfigCommand.load_deps
+      end
 
       banner "knife cook [user@]hostname [json] (options)"
 
@@ -34,53 +38,25 @@ class Chef
         :boolean => false,
         :description => "Only sync the cookbook - do not run Chef"
 
-      option :skip_syntax_check,
-        :long => '--skip-syntax-check',
-        :boolean => true,
-        :description => "Skip Ruby syntax checks"
+      option :why_run,
+        :short        => '-W',
+        :long         => '--why-run',
+        :boolean      => true,
+        :description  => "Enable whyrun mode"
 
-      option :syntax_check_only,
-        :long => '--syntax-check-only',
-        :boolean => true,
-        :description => "Only run syntax checks - do not run Chef"
-      
       def run
         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]
+          generate_node_config
           rsync_kitchen
           add_patches
           cook unless config[:sync_only]
         end
       end
 
-      def check_syntax
-        ui.msg('Checking cookbook syntax...')
-        chefignore.remove_ignores_from(Dir["**/*.rb"]).each do |recipe|
-          ok = system "ruby -c #{recipe} >/dev/null 2>&1"
-          raise "Syntax error in #{recipe}" if not ok
-        end
-
-        chefignore.remove_ignores_from(Dir["**/*.json"]).each do |json|
-          begin
-            require 'json'
-            # parse without instantiating Chef classes
-            JSON.parse File.read(json), :create_additions => false
-          rescue => error
-            raise "Syntax error in #{json}: #{error.message}"
-          end
-        end
-        Chef::Log.info "cookbook and json syntax is ok"
-      end
-
-      def node_config
-        @name_args[1] || super
-      end
-
       def chef_path
         Chef::Config.file_cache_path
       end
@@ -103,26 +79,30 @@ class Chef
         (%w{revision-deploys tmp '.*'} + chefignore.ignores).uniq
       end
 
+      def debug?
+        config[:verbosity] and config[:verbosity] > 0
+      end
+
       # Time a command
       def time(msg)
-        return yield if config[:verbosity] == 0
-        puts "Starting #{msg}"
+        return yield unless debug?
+        ui.msg "Starting '#{msg}'"
         start = Time.now
         yield
-        puts "#{msg} finished in #{Time.now - start} seconds"
+        ui.msg "#{msg} finished in #{Time.now - start} seconds"
       end
 
       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)}}
-          puts cmd unless config[:verbosity] == 0
+          ui.msg cmd if debug?
           system! cmd
         end
       end
 
       def add_patches
         run_portable_mkdir_p(patch_path)
-        Dir[Pathname.new(__FILE__).dirname.join("patches", "*.rb")].each do |patch|
+        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)}}
           end
@@ -130,28 +110,28 @@ class Chef
       end
 
       def check_chef_version
-        ui.msg('Checking 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?
       end
-      
+
       def cook
-        logging_arg = "-l debug" if config[:verbosity] > 0
+        cmd = "sudo chef-solo -c #{chef_path}/solo.rb -j #{chef_path}/#{node_config}"
+        cmd << " -l debug" if debug?
+        cmd << " -N #{config[:chef_node_name]}" if config[:chef_node_name]
+        cmd << " -W" if config[:why_run]
 
-        stream_command <<-BASH
-          sudo chef-solo -c #{chef_path}/solo.rb \
-                         -j #{chef_path}/#{node_config} \
-                         #{logging_arg}
-        BASH
+        stream_command cmd
       end
 
       def validate_params!
-        validate_first_cli_arg_is_a_hostname!(WrongCookError)
+        validate_first_cli_arg_is_a_hostname!
       end
-      
+
     end
   end
 end

data/lib/chef/knife/kitchen.rb

@@ -5,16 +5,41 @@ class Chef
     class Kitchen < Knife
       include FileUtils
 
+      deps do
+        require 'knife-solo/knife_solo_error'
+      end
+
       banner "knife kitchen NAME or initialize current directory with '.'"
 
       def run
-        name = @name_args.first
-        mkdir name if name != '.'
-        %w(nodes roles data_bags site-cookbooks cookbooks).each do |dir|
-          mkdir name + "/#{dir}"
-          touch name + "/#{dir}/.gitkeep"
+        raise KnifeSolo::KnifeSoloError.new(banner) unless base = @name_args.first
+
+        create_kitchen base
+        create_cupboards base, %w(nodes roles data_bags site-cookbooks cookbooks)
+        create_solo_config base
+      end
+
+      private
+
+      def create_cupboards(base, dirs)
+        dirs.each do |dir|
+          cupboard_dir = File.join(base, dir)
+          unless File.exist?(cupboard_dir)
+            mkdir cupboard_dir
+            touch File.join(cupboard_dir, '.gitkeep')
+          end
         end
-        File.open(name + "/solo.rb", 'w') do |f|
+      end
+
+      def create_kitchen(base)
+        mkdir base unless base == '.'
+      end
+
+      def create_solo_config(base)
+        solo_file = File.join(base, 'solo.rb')
+        return if File.exist? solo_file
+
+        File.open(solo_file, 'w') do |f|
           f << <<-RUBY.gsub(/^ {12}/, '')
             file_cache_path           "/tmp/chef-solo"
             data_bag_path             "/tmp/chef-solo/data_bags"

data/lib/chef/knife/prepare.rb

@@ -1,8 +1,7 @@
 require 'chef/knife'
 require 'knife-solo/ssh_command'
 require 'knife-solo/kitchen_command'
-require 'knife-solo/bootstraps'
-require 'knife-solo/knife_solo_error'
+require 'knife-solo/node_config_command'
 
 class Chef
   class Knife
@@ -11,12 +10,15 @@ class Chef
     class Prepare < Knife
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
+      include KnifeSolo::NodeConfigCommand
 
-      class WrongPrepareError < KnifeSolo::KnifeSoloError
-        alias :message :to_s
+      deps do
+        require 'knife-solo/bootstraps'
+        KnifeSolo::SshCommand.load_deps
+        KnifeSolo::NodeConfigCommand.load_deps
       end
 
-      banner "knife prepare [user@]hostname (options)"
+      banner "knife prepare [user@]hostname [json] (options)"
 
       option :omnibus_version,
         :long => "--omnibus-version VERSION",
@@ -38,23 +40,16 @@ class Chef
       end
 
       def bootstrap
+        ui.msg "Bootstrapping Chef..."
         KnifeSolo::Bootstraps.class_for_operating_system(operating_system()).new(self)
       end
 
-      def generate_node_config
-        File.open(node_config, 'w') do |f|
-          f.print <<-JSON.gsub(/^\s+/, '')
-            { "run_list": [] }
-          JSON
-        end unless node_config.exist?
-      end
-
       def operating_system
         @operating_system ||= run_command('uname -s').stdout.strip
       end
 
       def validate_params!
-        validate_first_cli_arg_is_a_hostname!(WrongPrepareError)
+        validate_first_cli_arg_is_a_hostname!
       end
     end
   end

data/lib/chef/knife/wash_up.rb

@@ -11,6 +11,7 @@ class Chef
       banner "knife wash_up [user@]hostname"
 
       def run
+        validate_first_cli_arg_is_a_hostname!
         super
         Chef::Config.from_file('solo.rb')
         run_command "rm -rf #{Chef::Config.file_cache_path}"

data/lib/knife-solo/bootstraps.rb

@@ -66,7 +66,7 @@ module KnifeSolo
       end
 
       def omnibus_install
-        url = prepare.config[:omnibus_url] || "http://opscode.com/chef/install.sh"
+        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
@@ -78,13 +78,20 @@ module KnifeSolo
         stream_command(install_command)
       end
 
-      def ubuntu_omnibus_install
+      def yum_omnibus_install
+        omnibus_install
+        # Make sure we have rsync on builds that don't include it by default
+        # (for example Scientific Linux minimal)
+        run_command("sudo yum -y install rsync")
+      end
+
+      def debianoid_omnibus_install
         omnibus_install
         # Update to avoid out-of-date package caches
         run_command("sudo apt-get update")
         # Make sure we have rsync on builds that don't include it by default
-        # (observed on linode's ubuntu 10.04 images)
-        run_command("sudo apt-get install rsync")
+        # (for example linode's ubuntu 10.04 images)
+        run_command("sudo apt-get -y install rsync")
       end
 
       def gem_install

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

@@ -5,6 +5,11 @@ module KnifeSolo::Bootstraps
       prepare.run_command("cat /etc/issue").stdout.strip || perepare.run_command("lsb_release -d -s").stdout.strip
     end
 
+    def x86?
+      machine = run_command('uname -m').stdout.strip
+      %w{i686 x86 x86_64}.include?(machine)
+    end
+
     def package_list
       @packages.join(' ')
     end
@@ -68,14 +73,14 @@ module KnifeSolo::Bootstraps
       return @distro if @distro
       @distro = case issue
       when %r{Debian GNU/Linux 5}
-        {:type => "omnibus", :version => "lenny"}
+        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "lenny"}
       when %r{Debian GNU/Linux 6}
-        {:type => "omnibus", :version => "squeeze"}
+        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "squeeze"}
       when %r{Debian GNU/Linux wheezy}
         {:type => "debian_gem", :version => "wheezy"}
       when %r{Ubuntu}i
         version = run_command("lsb_release -cs").stdout.strip
-        {:type => "ubuntu_omnibus", :version => version}
+        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => version}
       when %r{Linaro}
         version = run_command("lsb_release -cs").stdout.strip
         {:type => "debian_gem", :version => version}
@@ -94,7 +99,7 @@ module KnifeSolo::Bootstraps
       when %r{Scientific Linux.*? 5}
         {:type => "omnibus", :version => "RHEL5"}
       when %r{Scientific Linux.*? 6}
-        {:type => "omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus", :version => "RHEL6"}
       when %r{SUSE Linux Enterprise Server 11 SP1}
         {:type => "zypper_gem", :version => "SLES11"}
       when %r{openSUSE 11.4}

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/kitchen_command.rb

@@ -25,19 +25,7 @@ module KnifeSolo
     end
 
     def warn_for_required_file(file)
-      Chef::Log.warn "#{file} is a required file/directory"
+      ui.error "#{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

data/lib/knife-solo/node_config_command.rb

@@ -0,0 +1,40 @@
+module KnifeSolo
+  module NodeConfigCommand
+
+    def self.load_deps
+      require 'pathname'
+    end
+
+    def self.included(other)
+      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
+
+        option :chef_node_name,
+          :short => "-N NAME",
+          :long => "--node-name NAME",
+          :description => "The Chef node name for your new node"
+      end
+    end
+
+    def node_config
+      # host method must be defined by the including class
+      Pathname.new(@name_args[1] || "nodes/#{config[:chef_node_name] || host}.json")
+    end
+
+    def generate_node_config
+      if node_config.exist?
+        Chef::Log.debug "Node config '#{node_config}' already exists"
+      else
+        ui.msg "Generating node config '#{node_config}'..."
+        File.open(node_config, 'w') do |f|
+          f.print <<-JSON.gsub(/^\s+/, '')
+            { "run_list": [] }
+          JSON
+        end
+      end
+    end
+
+  end
+end

data/lib/knife-solo/ssh_command.rb

@@ -1,12 +1,26 @@
-require 'pathname'
-
 module KnifeSolo
   module SshCommand
+
+    def self.load_deps
+      require 'knife-solo/knife_solo_error'
+      require 'net/ssh'
+    end
+
     def self.included(other)
-      other.instance_eval do
-        deps do
-          require 'net/ssh'
-        end
+      other.class_eval do
+        # Lazy load our dependencies if the including class did not call
+        # Knife#deps yet. Later calls to #deps override previous ones, so if
+        # the outer class calls it, it should also call our #load_deps, i.e:
+        #
+        #   Include KnifeSolo::SshCommand
+        #
+        #   dep do
+        #     require 'foo'
+        #     require 'bar'
+        #     KnifeSolo::SshCommand.load_deps
+        #   end
+        #
+        deps { KnifeSolo::SshCommand.load_deps } unless @dependency_loader
 
         option :ssh_config,
           :short => "-F CONFIG_FILE",
@@ -35,8 +49,15 @@ module KnifeSolo
       end
     end
 
-    def node_config
-      Pathname.new("nodes/#{host}.json")
+    def first_cli_arg_is_a_hostname?
+      @name_args.first =~ /\A([^@]+(?>@)[^@]+|[^@]+?(?!@))\z/
+    end
+
+    def validate_first_cli_arg_is_a_hostname!
+      unless first_cli_arg_is_a_hostname?
+        ui.msg opt_parser.help
+        raise KnifeSoloError.new "need to pass atleast a [user@]hostname as the first argument"
+      end
     end
 
     def host_descriptor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
 - lib/knife-solo/knife_solo_error.rb
+- lib/knife-solo/node_config_command.rb
 - lib/knife-solo/ssh_command.rb
 - lib/knife-solo/tools.rb
 - lib/knife-solo.rb
@@ -131,18 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3414347062334937427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3414347062334937427
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24