chef_cap 0.2.4 → 0.2.5

data/.gitignore

@@ -1,3 +1,4 @@
+.vimlog
 .DS_Store
 *.gem
-Gemfile.lock
+Gemfile.lock

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-p136@chef_cap
+rvm 1.9.2-p180-patched@chef_cap --create

data/README.rdoc

@@ -52,20 +52,26 @@ Run chef without deploy
 
   $ cap <environment> cook
 
+Deploy a particular Git branch, tag, or revision (overriding the default)
+
+  $ cap <environment> deploy BRANCH=my_branch
+  $ cap <environment> deploy TAG=my_tag
+  $ cap <environment> deploy REVISION=abc1234
+
 === chef/node.json
 
 The following JSON keys are required in your node.json file:
 
-{ "application": { "name": NAME } }
-{ "application": { "repository": REPOSITORY } }
-{ "environments": { ENVIRONMENT: { "rails_env": RAILS_ENV } } }
-{ "roles": { ROLE: { "run_list": [] } } }
-{ "run_list": [] }
+  { "application": { "name": NAME } }
+  { "application": { "repository": REPOSITORY } }
+  { "environments": { ENVIRONMENT: { "rails_env": RAILS_ENV } } }
+  { "roles": { ROLE: { "run_list": [] } } }
+  { "run_list": [] }
 
 Optional JSON keys:
 
-{ "environments": { ENVIRONMENT: { "role_order": { FIRST_ROLE: [OTHER_ROLES] } } } }
-{ "environments": { ENVIRONMENT: { "environment_settings": ENV_HASH } } }
+  { "environments": { ENVIRONMENT: { "role_order": { FIRST_ROLE: [OTHER_ROLES] } } } }
+  { "environments": { ENVIRONMENT: { "environment_settings": ENV_HASH } } }
 
 
 == REQUIREMENTS

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/recipes/chef_cap.rb

@@ -183,6 +183,7 @@ namespace :chef do
         json_to_modify["environment"] ||= json_to_modify["environments"]["defaults"] || {} rescue {}
         env_settings.each { |k, v| ChefCapHelper.recursive_merge(json_to_modify["environment"] || {}, k, v) }
 
+        json_to_modify["environment"]["roles"] = roles_for_host
         json_to_modify["environment"]["revision"] = ChefCapHelper.set_revision if ChefCapHelper.has_revision?
         json_to_modify["environment"]["branch"] = ChefCapHelper.set_branch if ChefCapHelper.has_branch?
         json_to_modify["environment"]["servers"] = ChefCapHelper.intialize_primary_values(json_to_modify["environment"]["servers"])
@@ -193,7 +194,7 @@ namespace :chef do
         set "node_hash_for_#{channel[:host].gsub(/\./, "_")}", json_to_modify
         put json_to_modify.to_json, "/tmp/chef-cap-#{rails_env}-#{channel[:host]}.json", :mode => "0600"
       end
-      end
+    end
 
     chef.run_chef_solo
   end

data/spec/chef_cap_spec.rb

@@ -422,7 +422,7 @@ describe "chef_cap" do
                 "servers"=>[ {"hostname"=>"localhost", "roles"=>["role1", "role2"] }, {"hostname"=>"otherhost.com", "roles"=>["role1"]}]}},
                 "chef" => {"root"=>"path_to_cookbooks", "version"=>"0.1982.1234"},
                 "run_list" => ["foo", "bar"],
-                "environment" => {"rails_env" => "myenv", "servers"=>[ {"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"] },
+                "environment" => {"rails_env" => "myenv", "roles" => ["role1", "role2"], "servers"=>[ {"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"] },
                   {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
                   "roles" => {"role1" => {"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
           elsif server_session.things_that_were_set.keys.include? "node_hash_for_otherhost"
@@ -431,7 +431,7 @@ describe "chef_cap" do
                 "servers"=>[{"hostname"=>"localhost", "roles"=>["role1", "role2"]}, {"hostname"=>"otherhost.com", "roles"=>["role1"]}]}},
                 "chef"=>{"root"=>"path_to_cookbooks"},
                 "run_list"=>["foo"],
-                "environment"=>{"rails_env" => "myenv", "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]},
+                "environment"=>{"rails_env" => "myenv", "roles" => ["role1"], "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]},
                   {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
                   "roles"=>{"role1"=>{"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
           end
@@ -757,7 +757,8 @@ describe "chef_cap" do
           if server_session.things_that_were_set.keys.include? "node_hash_for_localhost"
             server_session.things_that_were_set["node_hash_for_localhost"]["environment"].should == {"some_default"=>"yes",
               "something_else"=>"okay",
-              "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]}
+              "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}],
+              "roles" => []}
           end
         end
       end
@@ -905,12 +906,18 @@ describe "chef_cap" do
         server_session.stub!(:put => "stubbed")
         server_session.stub!(:sudo => "stubbed")
         server_session.should_receive(:set).with("node_hash_for_localhost",
-                                                 {"environments" => { "some_env"=>{"servers"=>[{"hostname"=>"localhost", "roles"=>["role1", "role2"]}]}},
-                                                   "something"=>"other", "foo"=>"bar",
-                                                   "chef"=>{"root"=>"path_to_cookbooks"},
-                                                   "run_list"=>nil, "shared"=>{"foo"=>"bar"},
-                                                   "environment"=> {"revision"=>"123", "branch" => "somebranch", "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]}, "roles"=>{"role1"=>{"something"=>"other"}}}
-                                                )
+          {
+          "chef"=>{"root"=>"path_to_cookbooks"},
+          "environments" => { "some_env"=>{"servers"=>[{"hostname"=>"localhost", "roles"=>["role1", "role2"]}]}},
+          "shared"=>{"foo"=>"bar"},
+          "foo"=>"bar",
+          "something"=>"other",
+          "environment"=> {"revision"=>"123", "branch" => "somebranch",
+            "roles" => ["role1"],
+            "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]},
+            "roles"=>{"role1"=>{"something"=>"other"}},
+          "run_list"=>nil
+        })
       }
       chef_cap.cap_task["chef:deploy"].call
     end

metadata

@@ -1,50 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chef_cap
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153395380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153395380
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2153394260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
-  version_requirements: *id002
-description: chef_cap uses chef"s JSON config format to drive both capistrano and chef-solo"
-email: 
+  prerelease: false
+  version_requirements: *2153394260
+description: chef_cap uses chef"s JSON config format to drive both capistrano and
+  chef-solo"
+email:
 - casecommons-dev@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -80,35 +76,38 @@ files:
 - spec/chef_cap_spec.rb
 - spec/chef_dna_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/Casecommons/chef_cap
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3095980632773080420
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3095980632773080420
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"
-test_files: 
+test_files:
 - spec/chef_cap_configuration_spec.rb
 - spec/chef_cap_helper_spec.rb
 - spec/chef_cap_mock_cap.rb