capistrano-chef 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6fda58b605a057ec49aa6e530aab00762acfda1b
+  data.tar.gz: df7ed8c88d4dde0e068750f634c6c54915ee20bb
+SHA512:
+  metadata.gz: 84b577561de62e2171dbbabded81ab66f2ece5d212b637d9a95ea8c82abdaf0ac05ffde6ba794ffe440155b142498d928ccb06359ab2d64370a79f28c9860211
+  data.tar.gz: e97ddf807fd2fb8eebc96fc856577a3e002f6f0f12b2eeebf30c49cf496196133924d360ed444bfd381281c82423fb1421d62797d54744eb3b49cc49d2718e13

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 group :test do
   gem 'rake'

data/README.md

@@ -42,6 +42,10 @@ This defines the same roles using Chef's [search feature](http://wiki.opscode.co
 
 The `limit` attribute of the options hash will make it so only that the given number of items will be returned from a search.
 
+You can also define multiple roles at the same time if the host list is identical. Instead of running multiple searches to the Chef server, you can pass an Array to `chef_role`:
+
+    chef_role [:web, :app], 'roles:web'
+
 ## Data Bags
 
 Chef [Data Bags](http://wiki.opscode.com/display/chef/Data+Bags) let you store arbitrary JSON data. A common pattern is to use an _apps_ data bag to store data about an application for use in configuration and deployment.

data/lib/capistrano/chef.rb

@@ -52,7 +52,12 @@ module Capistrano::Chef
         # 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])
+          hosts = capistrano_chef.search_chef_nodes(query, options.delete(:attribute), options.delete(:limit)) + [options]
+          if name.is_a?(Array)
+            name.each { |n| role n, *hosts }
+          else
+            role name, *hosts
+          end
         end
       end
 

data/lib/capistrano/chef/version.rb

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

data/spec/capistrano/chef_spec.rb

@@ -120,14 +120,31 @@ describe Capistrano::Chef do
   end
 
   describe '#chef_role' do
-    it 'add nodes to the role' do
-      Capistrano::Chef.stub!(:search_chef_nodes).and_return(['10.0.0.2'])
-      @search = mock('Chef::Search::Query')
-      @configuration.should respond_to :chef_role
+    context 'when adding nodes to the role' do
+      before do
+        Capistrano::Chef.stub!(:search_chef_nodes).and_return(['10.0.0.2'])
+        @search = mock('Chef::Search::Query')
+      end
+
+      it 'add nodes to one role' do
+        @configuration.should respond_to :chef_role
+        @configuration.chef_role(:test)
+        @configuration.roles.should have_key :test
+        @configuration.roles[:test].to_a[0].host.should === '10.0.0.2'
+      end
 
-      @configuration.chef_role(:test)
-      @configuration.roles.should have_key :test
-      @configuration.roles[:test].to_a[0].host.should === '10.0.0.2'
+      it 'supports defining multiple roles in one go to avoid multiple searches' do
+        @configuration.chef_role([:test, :test2])
+        @configuration.roles.should have_key :test
+        @configuration.roles.should have_key :test2
+        @configuration.roles[:test].to_a[0].host.should === '10.0.0.2'
+        @configuration.roles[:test2].to_a[0].host.should === '10.0.0.2'
+      end
+
+      it 'does not call search more than once when defining multiple Cap roles' do
+        Capistrano::Chef.should_receive(:search_chef_nodes).once
+        @configuration.chef_role([:test, :test2])
+      end
     end
 
     it 'defaults to calling search with :ipaddress as the attribute and 1000 as the limit when giving a query' do

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Nathan L Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
 description: Allows capistrano to use Chef data for deployment
@@ -65,33 +60,26 @@ files:
 homepage: https://github.com/cramerdev/capistrano-chef
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1809424377071996865
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1809424377071996865
 requirements: []
 rubyforge_project: capistrano-chef
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Capistrano extensions for Chef integration
 test_files:
 - spec/capistrano/chef_spec.rb