capistrano-chef 0.0.4 → 0.0.5

data/README.md

@@ -46,7 +46,7 @@ The `limit` attribute of the options hash will make it so only that the given nu
 
 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.
 
-Chef also has a [Deploy Resource](http://wiki.opscode.com/display/chef/Deploy+Resource) described in on of their blog posts, [Data Driven Application Deployment with Chef](http://www.opscode.com/blog/2010/05/06/data-driven-application-deployment-with-chef/). This is one method of deploying, but, if you're reading this, you're probably interested in deploying with Capistrano.
+Chef also has a [Deploy Resource](http://wiki.opscode.com/display/chef/Deploy+Resource) described in one of their blog posts, [Data Driven Application Deployment with Chef](http://www.opscode.com/blog/2010/05/06/data-driven-application-deployment-with-chef/). This is one method of deploying, but, if you're reading this, you're probably interested in deploying with Capistrano.
 
 If you create an _apps_ data bag item (let's call it _myapp_), Capistrano Chef will let you use the data in your Capistrano recipes with the `set_from_data_bag` method.
 

data/capistrano-chef.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency 'capistrano', '>= 2'
-  s.add_dependency 'chef', '>= 0.10.8'
+  s.add_dependency 'chef', '>= 0.10.10'
 end

data/lib/capistrano/chef/version.rb

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

data/lib/capistrano/chef.rb

@@ -23,7 +23,7 @@ module Capistrano::Chef
         iface, family = arg.keys.first.to_s, arg.values.first.to_s
         Proc.new do |n|
           addresses = n["network"]["interfaces"][iface]["addresses"]
-          addresses.select{|address, data| data["family"] == family }.keys.first
+          addresses.select{|address, data| data["family"] == family }.to_a.first.first
         end
       when Symbol, String
         Proc.new{|n| n[arg.to_s]}
@@ -37,12 +37,17 @@ module Capistrano::Chef
     Chef::DataBagItem.load(data_bag, id).raw_data
   end
 
+  def self.get_encrypted_data_bag_item(id, data_bag = :apps, secret = nil)
+    Chef::EncryptedDataBagItem.load(data_bag, id, secret).to_hash
+  end
+
   # Load into Capistrano
   def self.load_into(configuration)
     self.configure_chef
     configuration.set :capistrano_chef, self
     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])
       end
 
@@ -52,6 +57,13 @@ module Capistrano::Chef
           set k, v
         end
       end
+
+      def set_from_encrypted_data_bag(data_bag = :apps, secret = nil)
+        raise ':application must be set' if fetch(:application).nil?
+        capistrano_chef.get_encrypted_data_bag_item(application, data_bag, secret).each do |k, v|
+          set k, v
+        end
+      end
     end
   end
 end

data/spec/capistrano/chef_spec.rb

@@ -64,7 +64,6 @@ describe Capistrano::Chef do
     expect { described_class.to be_a Module }
   end
 
-
   describe 'search_chef_nodes' do
     before(:each) do
       Chef::Knife.new.configure_chef
@@ -90,7 +89,7 @@ describe Capistrano::Chef do
     # use Proc for more deep, complex attributes search.
     specify 'with Proc argument' do
       search_proc = Proc.new do |n|
-        n["network"]["interfaces"]["eth1"]["addresses"].select{|address, data| data["family"] == "inet" }.keys.first
+        n["network"]["interfaces"]["eth1"]["addresses"].select{|address, data| data["family"] == "inet" }.to_a.first.first
       end
       Capistrano::Chef.search_chef_nodes('*:*', search_proc).should eql ['192.168.77.101']
     end
@@ -121,13 +120,35 @@ describe Capistrano::Chef do
     @configuration.fetch(:id).should === 'other_test'
   end
 
-  specify 'chef_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
+  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
 
-    @configuration.chef_role(:test)
-    @configuration.roles.should have_key :test
-    @configuration.roles[:test].to_a[0].host.should === '10.0.0.2'
+      @configuration.chef_role(:test)
+      @configuration.roles.should have_key :test
+      @configuration.roles[:test].to_a[0].host.should === '10.0.0.2'
+    end
+
+    it 'defaults to calling search with :ipaddress as the attribute and 1000 as the limit when giving a query' do
+      query = "this is my chef query"
+      Capistrano::Chef.should_receive(:search_chef_nodes).with(query, :ipaddress, 1000).and_return(['10.0.0.2'])
+      @configuration.chef_role(:test, query)
+    end
+
+    it 'allows you to specify the attribute used in the query' do
+      query = "this is my chef query"
+      attribute = :my_attr
+      Capistrano::Chef.should_receive(:search_chef_nodes).with(query, attribute, 1000).and_return(['10.0.0.2'])
+      @configuration.chef_role(:test, query, :attribute => attribute)
+    end
+
+    it 'allows you to specify the limit used in the query' do
+      query = "this is my chef query"
+      limit = 55
+      Capistrano::Chef.should_receive(:search_chef_nodes).with(query, :ipaddress, limit).and_return(['10.0.0.2'])
+      @configuration.chef_role(:test, query, :limit => limit)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
 description: Allows capistrano to use Chef data for deployment
 email:
 - nlloyds@gmail.com
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2596942598296240051
+      hash: -2495257063042549359
 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: -2596942598296240051
+      hash: -2495257063042549359
 requirements: []
 rubyforge_project: capistrano-chef
 rubygems_version: 1.8.24