chef_cap 0.2.7 → 0.2.8

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/recipes/lib/chef_cap_configuration.rb

@@ -14,6 +14,7 @@ class ChefCapConfiguration
           @configuration.send(:set, :scm, :svn)
           @configuration.send(:depend, :remote, :command, "svn")
       end
+      @configuration.send(:set, :revision, ChefCapHelper.set_revision) if ChefCapHelper.has_revision?
     end
   end
-end
+end

data/spec/chef_cap_configuration_spec.rb

@@ -2,26 +2,46 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe ChefCapConfiguration do
   describe ".set_repository_settings" do
-    it "should set repository values for a git repository" do
-      configuration = mock("Configuration")
-      configuration.stub!(:repository => "git@somegitrepo")
-      configuration.should_receive(:set).with(:scm, :git)
-      configuration.should_receive(:set).with(:git_enable_submodules, 1)
-      configuration.should_receive(:default_run_options).and_return({})
-      configuration.should_receive(:depend).with(:remote, :command, "git")
-      ChefCapConfiguration.configuration = configuration
+    context "the repository specific settings" do
+      before do
+        ENV["rev"] = "SOME_REV"
+      end
 
-      ChefCapConfiguration.set_repository_settings
+      it "should set repository values for a git repository" do
+        configuration = mock("Configuration")
+        configuration.stub!(:repository => "git@somegitrepo")
+        configuration.should_receive(:set).with(:scm, :git)
+        configuration.should_receive(:set).with(:git_enable_submodules, 1)
+        configuration.should_receive(:default_run_options).and_return({})
+        configuration.should_receive(:depend).with(:remote, :command, "git")
+        configuration.should_receive(:set).with(:revision, anything)
+        ChefCapConfiguration.configuration = configuration
+
+        ChefCapConfiguration.set_repository_settings
+      end
+
+      it "should set repository values for an svn repository" do
+        configuration = mock("Configuration")
+        ChefCapConfiguration.configuration = configuration
+        configuration.stub!(:repository => "svn://somesvnrepo")
+        configuration.should_receive(:set).with(:scm, :svn)
+        configuration.should_receive(:depend).with(:remote, :command, "svn")
+        configuration.should_receive(:set).with(:revision, anything)
+
+        ChefCapConfiguration.set_repository_settings
+      end
     end
 
-    it "should set repository values for an svn repository" do
+    it "should set the revision variable so other capistrano tasks will have the right revision value" do
       configuration = mock("Configuration")
       ChefCapConfiguration.configuration = configuration
-      configuration.stub!(:repository => "svn://somesvnrepo")
-      configuration.should_receive(:set).with(:scm, :svn)
-      configuration.should_receive(:depend).with(:remote, :command, "svn")
+      configuration.stub!(:repository => nil)
+      ENV["rev"] = "SOME_REV"
+      configuration.should_receive(:set).with(:revision, "SOME_REV")
 
       ChefCapConfiguration.set_repository_settings
+      ENV["rev"] = nil
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2151808920 !ruby/object:Gem::Requirement
+  requirement: &2165477760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2151808920
+  version_requirements: *2165477760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2151807980 !ruby/object:Gem::Requirement
+  requirement: &2165476780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2151807980
+  version_requirements: *2165476780
 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: -2296147763617098582
+      hash: 1089902353298414569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,10 +100,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2296147763617098582
+      hash: 1089902353298414569
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"