knife-solo 0.0.9 → 0.0.10

data/lib/chef/knife/cook.rb

@@ -113,7 +113,7 @@ class Chef
 
           $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?
+        raise "Couldn't find Chef #{constraint} on #{host}. Please run `#{$0} prepare #{ssh_args}` to ensure Chef is installed and up to date." unless result.success?
       end
 
       def cook

data/lib/chef/knife/kitchen.rb

@@ -5,11 +5,11 @@ class Chef
     class Kitchen < Knife
       include FileUtils
 
-      banner "knife kitchen NAME"
+      banner "knife kitchen NAME or initialize current directory with '.'"
 
       def run
         name = @name_args.first
-        mkdir name
+        mkdir name if name != '.'
         %w(nodes roles data_bags site-cookbooks cookbooks).each do |dir|
           mkdir name + "/#{dir}"
           touch name + "/#{dir}/.gitkeep"

data/lib/chef/knife/wash_up.rb

@@ -0,0 +1,20 @@
+require 'chef/knife'
+require 'knife-solo/ssh_command'
+require 'knife-solo/kitchen_command'
+
+class Chef
+  class Knife
+    class WashUp < Knife
+      include KnifeSolo::SshCommand
+      include KnifeSolo::KitchenCommand
+
+      banner "knife wash_up [user@]hostname"
+
+      def run
+        super
+        Chef::Config.from_file('solo.rb')
+        run_command "rm -rf #{Chef::Config.file_cache_path}"
+      end
+    end
+  end
+end

data/lib/knife-solo/bootstraps.rb

@@ -60,6 +60,15 @@ module KnifeSolo
         run_command("sudo bash install.sh")
       end
 
+      def ubuntu_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")
+      end
+
       def gem_install
         ui.msg "Installing rubygems from source..."
         release = "rubygems-1.8.10"

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

@@ -79,7 +79,7 @@ module KnifeSolo::Bootstraps
         {:type => "debian_gem", :version => "wheezy"}
       when %r{Ubuntu}
         version = run_command("lsb_release -cs").stdout.strip
-        {:type => "debian_gem", :version => version}
+        {:type => "ubuntu_omnibus", :version => version}
       when %r{Linaro}
         version = run_command("lsb_release -cs").stdout.strip
         {:type => "debian_gem", :version => version}

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/ssh_command.rb

@@ -154,7 +154,7 @@ module KnifeSolo
       else
         replacement = ''
       end
-      command.sub(/^\s*sudo/, replacement)
+      command.gsub(/sudo/, replacement)
     end
 
     def process_startup_file(command)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-05-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70342129968000 !ruby/object:Gem::Requirement
+  requirement: &70171470744280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342129968000
+  version_requirements: *70171470744280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70342129967580 !ruby/object:Gem::Requirement
+  requirement: &70171470743860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342129967580
+  version_requirements: *70171470743860
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70342129967080 !ruby/object:Gem::Requirement
+  requirement: &70171470743360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70342129967080
+  version_requirements: *70171470743360
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70342129966560 !ruby/object:Gem::Requirement
+  requirement: &70171470742840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,18 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70342129966560
+  version_requirements: *70171470742840
+- !ruby/object:Gem::Dependency
+  name: librarian
+  requirement: &70171470742120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.20
+  type: :runtime
+  prerelease: false
+  version_requirements: *70171470742120
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -69,6 +80,7 @@ files:
 - lib/chef/knife/patches/parser.rb
 - lib/chef/knife/patches/search_patch.rb
 - lib/chef/knife/prepare.rb
+- lib/chef/knife/wash_up.rb
 - lib/knife-solo/bootstraps/darwin.rb
 - lib/knife-solo/bootstraps/linux.rb
 - lib/knife-solo/bootstraps.rb