chef_cap 0.0.7 → 0.1.1

data/README.rdoc

@@ -34,6 +34,40 @@ Then run:
 
 Which will overwrite your Capfile and create a chef directory with sample files unless one already exists.
 
+=== Tasks
+
+Remove all chef-cap files from /tmp
+
+  $ cap <environment> chef:cleanup
+
+Run chef-solo on the server(s)
+
+  $ cap <environment> chef:deploy
+
+Setup chef solo on the server(s)
+
+  $ cap <environment> chef:setup
+
+Run chef without deploy
+
+  $ cap <environment> cook
+
+=== 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": [] }
+
+Optional JSON keys:
+
+{ "environments": { ENVIRONMENT: { "role_order": { FIRST_ROLE: [OTHER_ROLES] } } } }
+{ "environments": { ENVIRONMENT: { "environment_settings": ENV_HASH } } }
+
+
 == REQUIREMENTS
 
 * Capistrano 2.x

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.0.7"
-end
+  VERSION = "0.1.1"
+end

data/recipes/chef_cap.rb

@@ -28,6 +28,7 @@ if ChefDnaParser.parsed["environments"]
     task environment.to_sym do
       set :environment_settings, environment_hash
       set :rails_env, environment_hash["rails_env"] || environment
+      set :role_order, environment_hash["role_order"] || {}
       default_environment["RAILS_ENV"] = rails_env
 
       ChefCapHelper.parse_hash(environment_hash)
@@ -182,12 +183,20 @@ namespace :chef do
   end
 
   task :run_chef_solo do
-    db = find_servers(:roles => [:db]).map(&:host)
-    app_and_web_only = find_servers(:roles => [:app, :web]).map(&:host) - db
-
     run_chef_solo = "env PATH=$PATH:/usr/sbin rvm default exec chef-solo -c /tmp/chef-cap-solo-#{rails_env}.rb -j /tmp/chef-cap-#{rails_env}-`hostname`.json #{ENV['DEBUG'] ? '-l debug' : ''}"
-    sudo(run_chef_solo, :hosts => db) if db.any?
-    sudo(run_chef_solo, :hosts => app_and_web_only) if app_and_web_only.any?
+
+    unless role_order.empty?
+      role_order.each do |role, dependent_roles|
+        role_hosts = find_servers(:roles => [role.to_sym]).map(&:host)
+        dependent_hosts = find_servers(:roles => dependent_roles.map(&:to_sym)).map(&:host) - role_hosts
+
+        sudo(run_chef_solo, :hosts => role_hosts) if role_hosts.any?
+        sudo(run_chef_solo, :hosts => dependent_hosts) if dependent_hosts.any?
+      end
+    else
+      sudo(run_chef_solo)
+    end
+
   end
 
   desc "Remove all chef-cap files from /tmp"

data/spec/chef_cap_mock_cap.rb

@@ -13,10 +13,12 @@ end
 def find_servers(options = {})
   servers = []
   options[:roles].each do |role|
-    if @servers.has_key? role
+    if @servers && @servers.has_key?(role)
       @servers[role][:servers].each do |server|
         servers << TestCapServer.new(server)
       end
+    else
+      raise ArgumentError, "unknown role `#{role}'" unless roles.include?(role)
     end
   end
   servers

data/spec/chef_cap_spec.rb

@@ -351,20 +351,20 @@ describe "chef_cap" do
             server_session.things_that_were_set["node_hash_for_localhost"].should == {
               "environments" => {"some_env"=>{ "rails_env" => "myenv",
                 "servers"=>[ {"hostname"=>"localhost", "roles"=>["role1", "role2"] }, {"hostname"=>"otherhost.com", "roles"=>["role1"]}]}},
-              "chef" => {"root"=>"path_to_cookbooks"},
-              "run_list" => ["foo", "bar"],
-              "environment" => {"rails_env" => "myenv", "servers"=>[ {"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"] },
-                                                                     {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
-              "roles" => {"role1" => {"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
+                "chef" => {"root"=>"path_to_cookbooks"},
+                "run_list" => ["foo", "bar"],
+                "environment" => {"rails_env" => "myenv", "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"
             server_session.things_that_were_set["node_hash_for_otherhost"].should == {
-               "environments" => {"some_env"=>{ "rails_env" => "myenv",
-                 "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"]},
-                                                                   {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
-               "roles"=>{"role1"=>{"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
+              "environments" => {"some_env"=>{ "rails_env" => "myenv",
+                "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"]},
+                  {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
+                  "roles"=>{"role1"=>{"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
           end
         end
       end
@@ -419,9 +419,9 @@ describe "chef_cap" do
     end
 
     describe "task :run_chef_solo" do
-
-      before do
-        @test_dna = <<-JS
+      context "with a db role" do
+        before do
+          @test_dna = <<-JS
         {
           "chef": {
             "root": "path_to_cookbooks"
@@ -429,6 +429,7 @@ describe "chef_cap" do
           "environments": {
             "some_env": {
               "rails_env": "myenv",
+              "role_order": { "db": ["app"] },
               "servers": [
                 {
                   "hostname": "dbhost",
@@ -446,18 +447,54 @@ describe "chef_cap" do
             "app": { "run_list": [] }
           }
         }
-        JS
+          JS
 
-        chef_cap.cap_task[:some_env].should_not be_nil
-        chef_cap.cap_task[:some_env].call
+          chef_cap.cap_task[:some_env].should_not be_nil
+          chef_cap.cap_task[:some_env].call
+        end
+
+        it "invokes chef-solo on db hosts then app and web only hosts" do
+          chef_cap.cap_servers.should_not be_empty
+
+          chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["dbhost"]).and_return("mocked")
+          chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["apphost"]).and_return("mocked")
+          chef_cap.cap_task["chef:run_chef_solo"].call
+        end
       end
 
-      it "invokes chef-solo on db hosts then app and web only hosts" do
-        chef_cap.cap_servers.should_not be_empty
+      context "without a db role" do
+        before do
+          @test_dna = <<-JS
+            {
+              "chef": {
+                "root": "path_to_cookbooks"
+              },
+              "environments": {
+                "some_env": {
+                  "rails_env": "some_env",
+                  "servers": [
+                    {
+                      "hostname": "somehost",
+                      "roles": ["somerole"]
+                    }
+                  ]
+                }
+              },
+              "roles": {
+                "somerole": { "run_list": [] }
+              }
+            }
+          JS
+
+          chef_cap.cap_task[:some_env].should_not be_nil
+          chef_cap.cap_task[:some_env].call
+        end
 
-        chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["dbhost"]).and_return("mocked")
-        chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["apphost"]).and_return("mocked")
-        chef_cap.cap_task["chef:run_chef_solo"].call
+
+        it "works" do
+          chef_cap.stub!(:sudo)
+          chef_cap.cap_task["chef:run_chef_solo"].call
+        end
       end
     end
 
@@ -646,8 +683,8 @@ describe "chef_cap" do
         chef_cap.parallel_sessions.each do |server_session|
           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"]}]}
+              "something_else"=>"okay",
+              "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]}
           end
         end
       end
@@ -795,12 +832,12 @@ 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"}}}
-        )
+                                                 {"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_cap.cap_task["chef:deploy"].call
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 7
-  version: 0.0.7
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency