knife-solo 0.0.15 → 0.1.0.pre1

data/lib/chef/knife/kitchen.rb

@@ -1,55 +1,10 @@
-require 'chef/knife'
+require 'chef/knife/solo_init'
+require 'knife-solo/deprecated_command'
 
 class Chef
   class Knife
-    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
-        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
-      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"
-            encrypted_data_bag_secret "/tmp/chef-solo/data_bag_key"
-            cookbook_path             [ "/tmp/chef-solo/site-cookbooks",
-                                        "/tmp/chef-solo/cookbooks" ]
-            role_path                 "/tmp/chef-solo/roles"
-          RUBY
-        end
-      end
+    class Kitchen < SoloInit
+      include KnifeSolo::DeprecatedCommand
     end
   end
 end

data/lib/chef/knife/prepare.rb

@@ -1,56 +1,10 @@
-require 'chef/knife'
-require 'knife-solo/ssh_command'
-require 'knife-solo/kitchen_command'
-require 'knife-solo/node_config_command'
+require 'chef/knife/solo_prepare'
+require 'knife-solo/deprecated_command'
 
 class Chef
   class Knife
-    # Approach ported from littlechef (https://github.com/tobami/littlechef)
-    # Copyright 2010, 2011, Miquel Torres <tobami@googlemail.com>
-    class Prepare < Knife
-      include KnifeSolo::SshCommand
-      include KnifeSolo::KitchenCommand
-      include KnifeSolo::NodeConfigCommand
-
-      deps do
-        require 'knife-solo/bootstraps'
-        KnifeSolo::SshCommand.load_deps
-        KnifeSolo::NodeConfigCommand.load_deps
-      end
-
-      banner "knife prepare [user@]hostname [json] (options)"
-
-      option :omnibus_version,
-        :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
-        bootstrap.bootstrap!
-        generate_node_config
-      end
-
-      def bootstrap
-        ui.msg "Bootstrapping Chef..."
-        KnifeSolo::Bootstraps.class_for_operating_system(operating_system()).new(self)
-      end
-
-      def operating_system
-        @operating_system ||= run_command('uname -s').stdout.strip
-      end
-
-      def validate_params!
-        validate_first_cli_arg_is_a_hostname!
-      end
+    class Prepare < SoloPrepare
+      include KnifeSolo::DeprecatedCommand
     end
   end
 end

data/lib/chef/knife/solo_bootstrap.rb

@@ -0,0 +1,51 @@
+require 'chef/knife'
+require 'chef/knife/solo_cook'
+require 'chef/knife/solo_prepare'
+
+require 'knife-solo/kitchen_command'
+require 'knife-solo/ssh_command'
+
+class Chef
+  class Knife
+    class SoloBootstrap < Knife
+      include KnifeSolo::KitchenCommand
+      include KnifeSolo::SshCommand
+
+      deps do
+        KnifeSolo::SshCommand.load_deps
+        SoloPrepare.load_deps
+        SoloCook.load_deps
+      end
+
+      banner "knife solo bootstrap [USER@]HOSTNAME [JSON] (options)"
+
+      # Use (some) options from prepare and cook commands
+      self.options = SoloPrepare.options
+      [:sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
+
+      def run
+        validate!
+
+        prepare = command_with_same_args(SoloPrepare)
+        prepare.run
+
+        cook = command_with_same_args(SoloCook)
+        cook.config[:skip_chef_check] = true
+        cook.run
+      end
+
+      def validate!
+        validate_first_cli_arg_is_a_hostname!
+        validate_kitchen!
+      end
+
+      def command_with_same_args(klass)
+        cmd = klass.new
+        cmd.ui = ui
+        cmd.name_args = @name_args
+        cmd.config = config
+        cmd
+      end
+    end
+  end
+end

data/lib/chef/knife/solo_clean.rb

@@ -0,0 +1,25 @@
+require 'chef/knife'
+require 'knife-solo/ssh_command'
+require 'knife-solo/kitchen_command'
+
+class Chef
+  class Knife
+    class SoloClean < Knife
+      include KnifeSolo::SshCommand
+      include KnifeSolo::KitchenCommand
+
+      banner "knife solo clean [USER@]HOSTNAME"
+
+      def run
+        validate!
+        Chef::Config.from_file('solo.rb')
+        run_command "rm -rf #{Chef::Config.file_cache_path}"
+      end
+
+      def validate!
+        validate_first_cli_arg_is_a_hostname!
+        validate_kitchen!
+      end
+    end
+  end
+end

data/lib/chef/knife/solo_cook.rb

@@ -0,0 +1,137 @@
+require 'chef/knife'
+
+require 'knife-solo/ssh_command'
+require 'knife-solo/kitchen_command'
+require 'knife-solo/node_config_command'
+require 'knife-solo/tools'
+
+class Chef
+  class Knife
+    # Approach ported from spatula (https://github.com/trotter/spatula)
+    # Copyright 2009, Trotter Cashion
+    class SoloCook < 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
+
+      deps do
+        require 'chef/cookbook/chefignore'
+        require 'pathname'
+        KnifeSolo::SshCommand.load_deps
+        KnifeSolo::NodeConfigCommand.load_deps
+      end
+
+      banner "knife solo cook [USER@]HOSTNAME [JSON] (options)"
+
+      option :skip_chef_check,
+        :long => '--skip-chef-check',
+        :boolean => true,
+        :description => "Skip the version check on the Chef gem"
+
+      option :sync_only,
+        :long => '--sync-only',
+        :boolean => false,
+        :description => "Only sync the cookbook - do not run Chef"
+
+      option :why_run,
+        :short        => '-W',
+        :long         => '--why-run',
+        :boolean      => true,
+        :description  => "Enable whyrun mode"
+
+      def run
+        time('Run') do
+          validate!
+          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 validate!
+        validate_first_cli_arg_is_a_hostname!
+        validate_kitchen!
+      end
+
+      def chef_path
+        Chef::Config.file_cache_path
+      end
+
+      def chefignore
+        @chefignore ||= ::Chef::Cookbook::Chefignore.new("./")
+      end
+
+      # cygwin rsync path must be adjusted to work
+      def adjust_rsync_path(path)
+        return path unless windows_node?
+        path.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+      end
+
+      def patch_path
+        Array(Chef::Config.cookbook_path).first + "/chef_solo_patches/libraries"
+      end
+
+      def rsync_exclude
+        (%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 unless debug?
+        ui.msg "Starting '#{msg}'"
+        start = Time.now
+        yield
+        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)}}
+          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").to_s].each do |patch|
+          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"
+          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
+        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]
+
+        result = stream_command cmd
+        raise "chef-solo failed. See output above." unless result.success?
+      end
+    end
+  end
+end

data/lib/chef/knife/solo_init.rb

@@ -0,0 +1,59 @@
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class SoloInit < Knife
+      include FileUtils
+
+      banner "knife solo init DIRECTORY"
+
+      def run
+        validate!
+        base = @name_args.first
+        create_kitchen base
+        create_cupboards base, %w(nodes roles data_bags site-cookbooks cookbooks)
+        create_solo_config base
+      end
+
+      def validate!
+        unless @name_args.first
+          show_usage
+          ui.fatal "You must specify a directory. Use '.' to initialize the current one."
+          exit 1
+        end
+      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
+      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"
+            encrypted_data_bag_secret "/tmp/chef-solo/data_bag_key"
+            cookbook_path             [ "/tmp/chef-solo/site-cookbooks",
+                                        "/tmp/chef-solo/cookbooks" ]
+            role_path                 "/tmp/chef-solo/roles"
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/solo_prepare.rb

@@ -0,0 +1,56 @@
+require 'chef/knife'
+require 'knife-solo/ssh_command'
+require 'knife-solo/kitchen_command'
+require 'knife-solo/node_config_command'
+
+class Chef
+  class Knife
+    # Approach ported from littlechef (https://github.com/tobami/littlechef)
+    # Copyright 2010, 2011, Miquel Torres <tobami@googlemail.com>
+    class SoloPrepare < Knife
+      include KnifeSolo::SshCommand
+      include KnifeSolo::KitchenCommand
+      include KnifeSolo::NodeConfigCommand
+
+      deps do
+        require 'knife-solo/bootstraps'
+        KnifeSolo::SshCommand.load_deps
+        KnifeSolo::NodeConfigCommand.load_deps
+      end
+
+      banner "knife solo prepare [USER@]HOSTNAME [JSON] (options)"
+
+      option :omnibus_version,
+        :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!
+        bootstrap.bootstrap!
+        generate_node_config
+      end
+
+      def validate!
+        validate_first_cli_arg_is_a_hostname!
+        validate_kitchen!
+      end
+
+      def bootstrap
+        ui.msg "Bootstrapping Chef..."
+        KnifeSolo::Bootstraps.class_for_operating_system(operating_system()).new(self)
+      end
+
+      def operating_system
+        @operating_system ||= run_command('uname -s').stdout.strip
+      end
+    end
+  end
+end