chef_cap 0.0.5 → 0.0.7

data/.gitignore

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

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-p0@chef_cap
+rvm 1.9.2-p136@chef_cap

data/Capfile

@@ -0,0 +1,16 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)
+require File.join(File.dirname(__FILE__), "lib/chef_cap")
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+::ChefCap::Capistrano.load_recipes(self)

data/Gemfile

@@ -1,9 +1,10 @@
 source :rubygems
 
+gemspec
+
 group :development do
   gem "rspec-rails", "2.1"
   gem 'wirble'
-  gem 'capistrano'
 end
 
 group :test do

data/README.rdoc

@@ -12,9 +12,7 @@ Using chef's JSON configuration format to drive capistrano and chef-solo so you
 
 Add chef_cap to your Gemfile
 
-  group :development do
-    gem 'chef_cap'
-  end
+  gem 'chef_cap'
 
 Then run:
 

data/Rakefile

@@ -4,6 +4,9 @@ require 'rake'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 task :default => :spec
 
 desc "Run all specs in spec directory (excluding plugin specs)"

data/chef/node.json

@@ -0,0 +1,41 @@
+{
+  "application": {
+    "name": "your-app-name",
+    "repository": "your-repo"
+  },
+  "upload": [
+  ],
+  "environments": {
+    "defaults": {
+      "user": "deploy",
+      "branch": "master"
+    },
+    "production": {
+      "rails_env": "production",
+      "database": {
+        "user": "production-db-user",
+        "host": "production-db-host"
+      },
+      "servers": [
+        {
+          "hostname": "some.fq.dn",
+          "roles": ["web", "app", "db"],
+          "primary": ["web", "app", "db"]
+        }
+      ]
+    }
+  },
+  "shared": {
+    "gems": [
+      { "name": "bundler" },
+      { "name": "chef", "version": ">=0.9.12" }
+    ],
+    "run_list": ["gems"]
+  },
+  "roles": {
+    "web": {},
+    "app": {},
+    "db": {}
+  }
+  // "deploy_recipe": "yourcustomdeployrecipe",
+}

data/lib/chef_cap/version.rb

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

data/lib/chef_cap.rb

@@ -1,4 +1,4 @@
-require "chef_cap/version"
+require File.expand_path(File.join(File.dirname(__FILE__), "chef_cap/version"))
 
 module ChefCap
 

data/recipes/chef_cap.rb

@@ -134,7 +134,9 @@ end
 namespace :chef do
   desc "Setup chef solo on the server(s)"
   task :setup do
-    sudo "rvm default exec gem specification --version '>=0.9.12' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || sudo rvm default exec gem install chef --no-ri --no-rdoc && echo 'Chef Solo already on this server.'"
+    gem_check_for_chef_cmd = "gem specification --version '>=0.9.12' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
+    install_chef_cmd = "sudo rvm default exec gem install chef --no-ri --no-rdoc"
+    sudo "rvm default exec #{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
     sudo "rvm default exec which chef-solo"
   end
 
@@ -165,6 +167,7 @@ namespace :chef do
         env_settings.each { |k, v| ChefCapHelper.recursive_merge(json_to_modify["environment"] || {}, k, v) }
 
         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"])
 
         should_not_deploy = no_deploy rescue false

data/recipes/lib/chef_cap_helper.rb

@@ -49,7 +49,23 @@ class ChefCapHelper
     end
 
     def set_revision
-      ENV["rev"] || ENV["tag"] || ENV["REV"] || ENV["TAG"] || ENV["revision"] || ENV["REVISION"]
+      ["rev", "tag", "revision"].each do |word|
+        [word, word.upcase, "-S#{word}"].each do |variable|
+          return ENV[variable] if ENV[variable]
+        end
+      end
+      nil
+    end
+
+    def set_branch
+      ["branch", "BRANCH", "-Sbranch"].each do |variable|
+        return ENV[variable] if ENV[variable]
+      end
+      nil
+    end
+
+    def has_branch?
+      !set_branch.nil?
     end
 
     def has_revision?

data/spec/chef_cap_helper_spec.rb

@@ -123,4 +123,35 @@ describe ChefDnaParser do
       ChefCapHelper.intialize_primary_values(array_of_servers_hash).should == array_of_servers_hash
     end
   end
+
+  describe ".set_revision" do
+    ["rev", "tag", "revision"].each do |word|
+      [word, word.upcase, "-S#{word}"].each do |variable|
+        it "returns the value of ENV['#{variable}']" do
+          value = Time.now.to_f.to_s
+          ENV["#{variable}"] = value
+          ChefCapHelper.set_revision.should == value
+        end
+
+        after :each do
+          ENV["#{variable}"] = nil
+        end
+      end
+    end
+  end
+
+  describe ".set_branch" do
+    ["branch", "BRANCH", "-Sbranch"].each do |variable|
+      it "returns the value of ENV['#{variable}']" do
+        value = Time.now.to_f.to_s
+        ENV["#{variable}"] = value
+        ChefCapHelper.set_branch.should == value
+      end
+
+      after :each do
+        ENV["#{variable}"] = nil
+      end
+    end
+  end
+
 end

data/spec/chef_cap_spec.rb

@@ -785,6 +785,7 @@ describe "chef_cap" do
 
     it "shoves the value into the node json alongside branch" do
       ENV['rev'] = "123"
+      ENV['branch'] = "somebranch"
       chef_cap.stub!(:put => "stubbed")
       chef_cap.stub!(:upload => "stubbed")
       chef_cap.stub!(:sudo => "stubbed")
@@ -798,7 +799,7 @@ describe "chef_cap" do
            "something"=>"other", "foo"=>"bar",
            "chef"=>{"root"=>"path_to_cookbooks"},
            "run_list"=>nil, "shared"=>{"foo"=>"bar"},
-           "environment"=> {"revision"=>"123", "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]}, "roles"=>{"role1"=>{"something"=>"other"}}}
+           "environment"=> {"revision"=>"123", "branch" => "somebranch", "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]}, "roles"=>{"role1"=>{"something"=>"other"}}}
         )
       }
       chef_cap.cap_task["chef:deploy"].call

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,11 +45,12 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- Capfile
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
+- chef/node.json
 - chef_cap.gemspec
 - fixtures/parser.json
 - fixtures/ssh_deploy_key

data/Gemfile.lock

@@ -1,37 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    capistrano (2.5.19)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.0.0)
-    diff-lcs (1.1.2)
-    highline (1.6.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.0.23)
-    net-ssh-gateway (1.0.1)
-      net-ssh (>= 1.99.1)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rspec-rails (2.1.0)
-      rspec (~> 2.1.0)
-    wirble (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capistrano
-  rspec-rails (= 2.1)
-  wirble