capistrano-chef 0.0.5 → 0.0.6

data/lib/capistrano/chef.rb

@@ -8,7 +8,7 @@ module Capistrano::Chef
   def self.configure_chef
     knife = Chef::Knife.new
     # If you don't do this it gets thrown into debug mode
-    knife.config = { :verbosity => 1 }
+    Chef::Config[:verbosity] = 1 # :info
     knife.configure_chef
   end
 
@@ -48,7 +48,12 @@ module Capistrano::Chef
     configuration.load do
       def chef_role(name, query = '*:*', options = {})
         options = {:attribute => :ipaddress, :limit => 1000}.merge(options)
-        role name, *(capistrano_chef.search_chef_nodes(query, options.delete(:attribute), options.delete(:limit)) + [options])
+        # Don't do the lookup if HOSTS is used.
+        # Allows deployment from knifeless machine
+        # to specific hosts (ie. developent, staging)
+        unless ENV['HOSTS']
+          role name, *(capistrano_chef.search_chef_nodes(query, options.delete(:attribute), options.delete(:limit)) + [options])
+        end
       end
 
       def set_from_data_bag(data_bag = :apps)

data/lib/capistrano/chef/version.rb

@@ -1,3 +1,3 @@
 module CapistranoChef
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/spec/capistrano/chef_spec.rb

@@ -38,7 +38,6 @@ describe Capistrano::Chef do
     @knife = mock('Chef::Knife')
     Chef::Knife.stub!(:new).and_return(@knife)
     @knife.stub!(:configure_chef)
-    @knife.stub!(:config=)
 
     # Load into capistrano configuration
     @configuration = Capistrano::Configuration.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2495257063042549359
+      hash: -1809424377071996865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2495257063042549359
+      hash: -1809424377071996865
 requirements: []
 rubyforge_project: capistrano-chef
 rubygems_version: 1.8.24