chef_cap 0.3.1 → 0.3.2

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/recipes/lib/chef_cap_configuration.rb

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

data/spec/chef_cap_configuration_spec.rb

@@ -5,6 +5,12 @@ describe ChefCapConfiguration do
     context "the repository specific settings" do
       before do
         ENV["rev"] = "SOME_REV"
+        ENV["branch"] = "SOME_BRANCH"
+      end
+
+      after do
+        ENV["rev"] = nil
+        ENV["branch"] = nil
       end
 
       it "should set repository values for a git repository" do
@@ -15,6 +21,7 @@ describe ChefCapConfiguration do
         configuration.should_receive(:default_run_options).and_return({})
         configuration.should_receive(:depend).with(:remote, :command, "git")
         configuration.should_receive(:set).with(:revision, anything)
+        configuration.should_receive(:set).with(:branch, anything)
         ChefCapConfiguration.configuration = configuration
 
         ChefCapConfiguration.set_repository_settings
@@ -22,26 +29,35 @@ describe ChefCapConfiguration do
 
       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)
-
+        configuration.should_receive(:set).with(:branch, anything)
+        ChefCapConfiguration.configuration = configuration
         ChefCapConfiguration.set_repository_settings
       end
     end
 
     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 => nil)
+      ENV["branch"] = "SOME_BRANCH"
+      configuration.should_receive(:set).with(:branch, anything)
       ENV["rev"] = "SOME_REV"
       configuration.should_receive(:set).with(:revision, "SOME_REV")
-
+      ChefCapConfiguration.configuration = configuration
       ChefCapConfiguration.set_repository_settings
-      ENV["rev"] = nil
     end
 
+    it "should set the branch variable so other capistrano tasks will have the right branch value" do
+      configuration = mock("Configuration")
+      configuration.stub!(:repository => nil)
+      configuration.should_receive(:set).with(:revision, anything)
+      ENV["branch"] = "SOME_BRANCH"
+      configuration.should_receive(:set).with(:branch, "SOME_BRANCH")
+      ChefCapConfiguration.configuration = configuration
+      ChefCapConfiguration.set_repository_settings
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153613140 !ruby/object:Gem::Requirement
+  requirement: &2153316960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153613140
+  version_requirements: *2153316960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153611720 !ruby/object:Gem::Requirement
+  requirement: &2153316420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2153611720
+  version_requirements: *2153316420
 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: -3052557005427320202
+      hash: -2180159314980717012
 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: -3052557005427320202
+      hash: -2180159314980717012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11