chef_cap 0.1.8 → 0.2.1

data/Gemfile

@@ -3,11 +3,7 @@ source :rubygems
 gemspec
 
 group :development do
-  gem "rspec-rails", "2.1"
   gem "wirble"
   gem "gemcutter"
-end
-
-group :test do
-  gem "rspec-rails", "2.1"
+  gem "autotest"
 end

data/chef_cap.gemspec

@@ -10,10 +10,11 @@ Gem::Specification.new do |s|
   s.email       = ["casecommons-dev@googlegroups.com"]
   s.homepage    = "https://github.com/Casecommons/chef_cap"
   s.license     = "MIT"
-  s.add_dependency('capistrano', '>= 2.5.5')
   s.summary     = %q{capistrano + chef-solo == chef_cap"}
   s.description = %q{chef_cap uses chef"s JSON config format to drive both capistrano and chef-solo"}
 
+  s.add_dependency('capistrano', '>= 2.5.5')
+  s.add_development_dependency('rspec-rails', '>= 2.1')
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

data/recipes/chef_cap.rb

@@ -139,10 +139,17 @@ else
   raise DnaConfigurationError, "Could not find cookbooks in JSON or as a subdirectory of where your JSON is!"
 end
 
+if ChefDnaParser.parsed["chef"] && ChefDnaParser.parsed["chef"]["version"]
+  set :chef_version, ChefDnaParser.parsed["chef"]["version"]
+else
+  default_chef_version = "0.9.16"
+  set :chef_version, default_chef_version
+end
+
 namespace :chef do
   desc "Setup chef solo on the server(s)"
   task :setup do
-    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 }'"
+    gem_check_for_chef_cmd = "gem specification --version '>=#{chef_version}' 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"

data/spec/chef_cap_spec.rb

@@ -365,7 +365,8 @@ describe "chef_cap" do
         @test_dna = <<-JS
         {
           "chef": {
-            "root": "path_to_cookbooks"
+            "root": "path_to_cookbooks",
+            "version": "0.1982.1234"
           },
           "environments": {
             "some_env": {
@@ -419,7 +420,7 @@ 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"},
+                "chef" => {"root"=>"path_to_cookbooks", "version"=>"0.1982.1234"},
                 "run_list" => ["foo", "bar"],
                 "environment" => {"rails_env" => "myenv", "servers"=>[ {"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"] },
                   {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
@@ -472,7 +473,7 @@ describe "chef_cap" do
 
       it "sets up chef gem" do
         chef_cap.cap_servers.should_not be_empty
-        chef_cap.should_receive(:sudo).ordered.with("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.'").and_return("mocked")
+        chef_cap.should_receive(:sudo).ordered.with("rvm default exec gem specification --version '>=0.1982.1234' 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.'").and_return("mocked")
         chef_cap.should_receive(:sudo).ordered.with("rvm default exec which chef-solo").and_return("mocked")
         chef_cap.cap_task["chef:setup"].call
       end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef_cap
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-06-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,13 +21,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 5
         version: 2.5.5
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.1"
+  type: :development
+  version_requirements: *id002
 description: chef_cap uses chef"s JSON config format to drive both capistrano and chef-solo"
 email: 
 - casecommons-dev@googlegroups.com
@@ -91,21 +94,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"