chef_cap 0.2.9 → 0.3.0

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/recipes/chef_cap.rb

@@ -151,7 +151,7 @@ end
 if ChefDnaParser.parsed["chef"] && ChefDnaParser.parsed["chef"]["version"]
   set :chef_version, ChefDnaParser.parsed["chef"]["version"]
 else
-  default_chef_version = "0.9.16"
+  default_chef_version = "0.10.4"
   set :chef_version, default_chef_version
 end
 
@@ -168,11 +168,17 @@ namespace :chef do
 
   desc "Run chef-solo on the server(s)"
   task :deploy do
-    put "cookbook_path '/tmp/chef-cap-#{rails_env}/cookbooks'", "/tmp/chef-cap-solo-#{rails_env}.rb", :mode => "0600"
+    require "tempfile"
+    put "cookbook_path '/tmp/chef-cap-#{rails_env}/#{File.basename(chef_root_path)}/cookbooks'", "/tmp/chef-cap-solo-#{rails_env}.rb", :mode => "0600"
     sudo "rm -rf /tmp/chef-cap-#{rails_env}"
-    upload chef_root_path, "/tmp/chef-cap-#{rails_env}", :mode => "0700"
-
-
+    file = Tempfile.new("chef-cap-#{rails_env}")
+    file.close
+    compressed_chef = file.path
+    system("cd #{chef_root_path}/../ && tar cjf #{compressed_chef} #{File.basename(chef_root_path)}")
+    upload compressed_chef, "/tmp/chef-cap-#{rails_env}.tbz", :mode => "0700"
+    sudo "mkdir -p /tmp/chef-cap-#{rails_env}"
+    sudo "tar xjf /tmp/chef-cap-#{rails_env}.tbz -C /tmp/chef-cap-#{rails_env}"
+    file.unlink
     begin
       env_settings = environment_settings
     rescue

data/spec/chef_cap_spec.rb

@@ -392,6 +392,7 @@ describe "chef_cap" do
 
         chef_cap.cap_task[:some_env].should_not be_nil
         chef_cap.cap_task[:some_env].call
+        chef_cap.stub(:system).and_return(true)
       end
 
       it "exists" do
@@ -439,7 +440,6 @@ describe "chef_cap" do
       end
 
       it "that uploads the DNA.json and a solo.rb file" do
-        pending "FIXME"
         localhost_dna = JSON.parse(@test_dna).dup
         otherhost_dna = JSON.parse(@test_dna).dup
         localhost_dna["run_list"] = ["foo", "bar"]
@@ -448,20 +448,20 @@ describe "chef_cap" do
         otherhost_dna["environment"] = otherhost_dna["environments"]["some_env"]
 
         chef_cap.parallel_mocks << proc { |server_session|
-          server_session.should_receive(:put).ordered.with(localhost_dna.to_json, "/tmp/chef-cap-myenv.json", :mode => "0600", :hosts => "localhost").and_return("mocked")
-          server_session.should_receive(:put).ordered.with(otherhost_dna.to_json, "/tmp/chef-cap-myenv.json", :mode => "0600", :hosts => "otherhost.com").and_return("mocked")
+          server_session.should_receive(:put).with(anything, anything, :mode => "0600").at_least(:once).and_return("mocked")
           server_session.stub!(:set => "stubbed")
           server_session.stub!(:sudo => "stubbed")
         }
-        chef_cap.should_receive(:put).ordered.with("cookbook_path '/tmp/chef-cap-myenv/cookbooks'", "/tmp/chef-cap-solo-myenv.rb", :mode => "0600").and_return("mocked")
+        chef_cap.should_receive(:put).ordered.with("cookbook_path '/tmp/chef-cap-myenv/path_to_cookbooks/cookbooks'", "/tmp/chef-cap-solo-myenv.rb", :mode => "0600").and_return("mocked")
         chef_cap.stub!(:upload => "stubbed")
         chef_cap.stub!(:sudo => "stubbed")
         chef_cap.cap_task["chef:deploy"].call
       end
 
       it "uploads the cookbooks" do
+        Tempfile.should_receive(:new).and_return(double(:path => "/tmp/temp_file", :close => nil, :unlink => nil))
         chef_cap.stub!(:put => "stubbed")
-        chef_cap.should_receive(:upload).with("path_to_cookbooks", "/tmp/chef-cap-myenv", :mode => "0700").and_return("mocked")
+        chef_cap.should_receive(:upload).with("/tmp/temp_file", "/tmp/chef-cap-myenv.tbz", :mode => "0700").and_return("mocked")
         chef_cap.stub!(:sudo => "stubbed")
         chef_cap.parallel_mocks << proc { |server_session|
           server_session.stub!(:put => "stubbed")
@@ -723,6 +723,7 @@ describe "chef_cap" do
           "run_list": ["everything"]
         }
         JS
+        chef_cap.stub(:system).and_return(true)
       end
 
       it "merges recursively all shared and all roles data down into top level keys" do
@@ -793,6 +794,7 @@ describe "chef_cap" do
           }
         }
         JS
+        chef_cap.stub(:system).and_return(true)
       end
 
       it "puts the specified deploy_recipe at the very end of the run list" do
@@ -841,6 +843,7 @@ describe "chef_cap" do
           }
         }
         JS
+        chef_cap.stub(:system).and_return(true)
       end
 
       it "contains a copy of the structure of the environment we are in that merged with the defaults" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157483920 !ruby/object:Gem::Requirement
+  requirement: &2165476000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157483920
+  version_requirements: *2165476000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2157482840 !ruby/object:Gem::Requirement
+  requirement: &2165475040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2157482840
+  version_requirements: *2165475040
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2444766936816973139
+      hash: -4204190747426429457
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2444766936816973139
+      hash: -4204190747426429457
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12