knife-solo 0.0.8 → 0.0.9

data/lib/chef/knife/cook.rb

@@ -2,9 +2,11 @@ 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/tools'
 
 class Chef
   class Knife
@@ -13,6 +15,7 @@ class Chef
     class Cook < Knife
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
+      include KnifeSolo::Tools
 
       banner "knife cook [user@]hostname [json] (options)"
 
@@ -21,24 +24,34 @@ class Chef
         :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 :skip_syntax_check,
+        :long => '--skip-syntax-check',
+        :boolean => true,
+        :description => "Skip Ruby syntax checks"
+
       def run
         super
-        check_syntax
+        check_syntax unless config[:skip_syntax_check]
         Chef::Config.from_file('solo.rb')
         check_chef_version unless config[:skip_chef_check]
         rsync_kitchen
         add_patches
-        cook
+        cook unless config[:sync_only]
       end
 
       def check_syntax
         ui.msg('Checking cookbook syntax...')
-        Dir["**/*.rb"].each do |recipe|
+        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
 
-        Dir["**/*.json"].each do |json|
+        chefignore.remove_ignores_from(Dir["**/*.json"]).each do |json|
           begin
             require 'json'
             # parse without instantiating Chef classes
@@ -57,31 +70,55 @@ class Chef
         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 rsync_kitchen
-        system %Q{rsync -rlP --rsh="ssh #{ssh_args}" --delete --exclude '.*' ./ :#{chef_path}}
+        system! %Q{rsync -rl --rsh="ssh #{ssh_args}" --delete #{rsync_exclude.collect{ |ignore| "--exclude #{ignore} " }.join} ./ :#{adjust_rsync_path(chef_path)}}
       end
 
       def add_patches
-        run_command "mkdir -p #{patch_path}"
+        run_portable_mkdir_p(patch_path)
         Dir[Pathname.new(__FILE__).dirname.join("patches", "*.rb")].each do |patch|
-          system %Q{rsync -rlP --rsh="ssh #{ssh_args}" #{patch} :#{patch_path}}
+          system! %Q{rsync -rl --rsh="ssh #{ssh_args}" #{patch} :#{adjust_rsync_path(patch_path)}}
         end
       end
 
       def check_chef_version
         constraint = "~>0.10.4"
         result = run_command <<-BASH
-          ruby -rubygems -e "gem 'chef', '#{constraint}'"
+          opscode_ruby="/opt/opscode/embedded/bin/ruby"
+
+          if command -v $opscode_ruby &>/dev/null
+          then
+            ruby_bin=$opscode_ruby
+          else
+            ruby_bin="ruby"
+          fi
+
+          $ruby_bin -rubygems -e "gem 'chef', '#{constraint}'"
         BASH
         raise "The chef gem on #{host} is out of date. Please run `#{$0} prepare #{ssh_args}` to upgrade Chef to #{constraint}." unless result.success?
       end
 
       def cook
         logging_arg = "-l debug" if config[:verbosity] > 0
+
         stream_command <<-BASH
           sudo chef-solo -c #{chef_path}/solo.rb \
                          -j #{chef_path}/#{node_config} \

data/lib/knife-solo/bootstraps.rb

@@ -2,7 +2,7 @@ class OperatingSystemNotSupportedError < StandardError ; end
 
 module KnifeSolo
   module Bootstraps
-    class OperatingSystemNotImplementedError < StandardError 
+    class OperatingSystemNotImplementedError < StandardError
     end
 
     def self.class_exists_for?(os_name)
@@ -55,6 +55,11 @@ module KnifeSolo
         "wget #{url}"
       end
 
+      def omnibus_install
+        run_command(http_client_get_url("http://opscode.com/chef/install.sh"))
+        run_command("sudo bash install.sh")
+      end
+
       def gem_install
         ui.msg "Installing rubygems from source..."
         release = "rubygems-1.8.10"
@@ -81,7 +86,7 @@ module KnifeSolo
       # run right before we run #{distro[:type]}_install method
       # barf out here if need be
     end
-    
+
   end # Bootstraps
 end
 

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

@@ -2,7 +2,7 @@ module KnifeSolo::Bootstraps
   class Linux < Base
 
     def issue
-      prepare.run_command("cat /etc/issue").stdout.strip
+      prepare.run_command("cat /etc/issue").stdout.strip || perepare.run_command("lsb_release -d -s").stdout.strip
     end
 
     def package_list
@@ -26,6 +26,7 @@ module KnifeSolo::Bootstraps
     def emerge_gem_install
       ui.msg("Installing required packages...")
       run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
+      gem_install
     end
 
     def add_yum_repos(repo_path)
@@ -71,32 +72,35 @@ module KnifeSolo::Bootstraps
       return @distro if @distro
       @distro = case issue
       when %r{Debian GNU/Linux 5}
-        {:type => "debian_gem", :version => "lenny"}
+        {:type => "omnibus", :version => "lenny"}
       when %r{Debian GNU/Linux 6}
-        {:type => "debian_gem", :version => "squeeze"}
+        {:type => "omnibus", :version => "squeeze"}
       when %r{Debian GNU/Linux wheezy}
         {:type => "debian_gem", :version => "wheezy"}
       when %r{Ubuntu}
         version = run_command("lsb_release -cs").stdout.strip
         {:type => "debian_gem", :version => version}
+      when %r{Linaro}
+        version = run_command("lsb_release -cs").stdout.strip
+        {:type => "debian_gem", :version => version}
       when %r{CentOS.*? 5}
-        {:type => "yum", :version => "RHEL5"}
+        {:type => "omnibus", :version => "RHEL5"}
       when %r{CentOS.*? 6}
-        {:type => "yum", :version => "RHEL6"}
+        {:type => "omnibus", :version => "RHEL6"}
       when %r{Red Hat Enterprise.*? 5}
-        {:type => "yum", :version => "RHEL5"}
+        {:type => "omnibus", :version => "RHEL5"}
       when %r{Red Hat Enterprise.*? 6}
-        {:type => "yum", :version => "RHEL6"}
+        {:type => "omnibus", :version => "RHEL6"}
       when %r{Scientific Linux.*? 5}
-        {:type => "yum", :version => "RHEL5"}
+        {:type => "omnibus", :version => "RHEL5"}
       when %r{Scientific Linux.*? 6}
-        {:type => "yum", :version => "RHEL6"}
+        {:type => "omnibus", :version => "RHEL6"}
       when %r{SUSE Linux Enterprise Server 11 SP1}
         {:type => "zypper_gem", :version => "SLES11"}
       when %r{openSUSE 11.4}
         {:type => "zypper_gem", :version => "openSUSE"}
-      when %r{This is \\n\.\\O (\\s \\m \\r) \\t}
-        {:type => "gentoo_gem", :version => "Gentoo"}
+      when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
+        {:type => "emerge_gem", :version => "Gentoo"}
       else
         raise "Distro not recognized from looking at /etc/issue. Please fork https://github.com/matschaffer/knife-solo and add support for your distro."
       end

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.0.8'
+    '0.0.9'
   end
 end

data/lib/knife-solo/ssh_command.rb

@@ -9,8 +9,8 @@ module KnifeSolo
         end
 
         option :ssh_config,
-          :short => "-F configfile",
-          :long => "--ssh-config-file configfile",
+          :short => "-F CONFIG_FILE",
+          :long => "--ssh-config-file CONFIG_FILE",
           :description => "Alternate location for ssh config file"
 
         option :ssh_password,
@@ -24,8 +24,8 @@ module KnifeSolo
           :description => "The ssh identity file"
 
         option :ssh_port,
-          :short => "-p FILE",
-          :long => "--ssh-port FILE",
+          :short => "-p PORT",
+          :long => "--ssh-port PORT",
           :description => "The ssh port"
 
         option :startup_script,
@@ -134,6 +134,13 @@ module KnifeSolo
       end
     end
 
+    def windows_node?
+      return @windows_node unless @windows_node.nil?
+      @windows_node = run_command('ver', :process_sudo => false).stdout =~ /Windows/i
+      Chef::Log.debug("Windows node detected") if @windows_node
+      @windows_node
+    end
+
     def sudo_available?
       return @sudo_available unless @sudo_available.nil?
       @sudo_available = run_command('sudo -V', :process_sudo => false).success?
@@ -209,5 +216,18 @@ module KnifeSolo
       end
       result
     end
+
+    # TODO:
+    # - move this to a dedicated "portability" module?
+    # - use ruby in all cases instead?
+    def run_portable_mkdir_p(folder)
+      if windows_node?
+        # no mkdir -p on windows - fake it
+        run_command %Q{ruby -e "require 'fileutils'; FileUtils.mkdir_p('#{folder}')"}
+      else
+        run_command "mkdir -p #{folder}"
+      end
+    end
+
   end
 end

data/lib/knife-solo/tools.rb

@@ -0,0 +1,7 @@
+module KnifeSolo
+  module Tools
+    def system!(command)
+      raise "Failed to launch command #{command}" unless system(command)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70146380288440 !ruby/object:Gem::Requirement
+  requirement: &70342129968000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146380288440
+  version_requirements: *70342129968000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70146380288020 !ruby/object:Gem::Requirement
+  requirement: &70342129967580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146380288020
-- !ruby/object:Gem::Dependency
-  name: virtualbox
-  requirement: &70146380287600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70146380287600
+  version_requirements: *70342129967580
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70146380287100 !ruby/object:Gem::Requirement
+  requirement: &70342129967080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +43,21 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70146380287100
+  version_requirements: *70342129967080
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70146380286600 !ruby/object:Gem::Requirement
+  requirement: &70342129966560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70146380286600
+  version_requirements: *70342129966560
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -83,6 +75,7 @@ files:
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
 - lib/knife-solo/ssh_command.rb
+- lib/knife-solo/tools.rb
 - lib/knife-solo.rb
 homepage: https://github.com/matschaffer/knife-solo
 licenses: []
@@ -104,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A collection of knife plugins for dealing with chef solo