chef_cap 0.3.10 → 0.3.11

data/README.rdoc

@@ -75,6 +75,18 @@ Optional JSON keys:
   { "rollback_run_list": [] }
   { "deploy_recipe": "[some_cookbook]::[some_recipe]" }
 
+=== RVM/RBENV
+
+You can set which ruby version switcher to use. RVM is the default. ruby_version can be set as well.
+
+  {
+    "environments": {
+      ENVIRONMENT: {
+        "ruby_version_switcher": "rvm",
+        "ruby_version": "1.9.3-p125"
+      }
+    }
+  }
 
 == REQUIREMENTS
 

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/recipes/rbenv.rb

@@ -1,8 +1,8 @@
 namespace :bootstrap do
   desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
   task :rbenv do
-    set :rvm_ruby_version, (ChefDnaParser.parsed["environment"]["rvm_ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
-    set :rbenv_ruby_version, rvm_ruby_version.gsub(/^ruby\-/,'')
+    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
+    set :rbenv_ruby_version, ruby_version.gsub(/^ruby\-/,'')
     standup_script = <<-SH
       #!/bin/bash
       #
@@ -11,9 +11,8 @@ namespace :bootstrap do
 
       HAVE_RBENV_ALREADY=`which rbenv 2>/dev/null`
       if [ $? != 0 ]; then
-        ## Install rbenv dependencies
-        sudo yum install -y automake gcc make libtool curl zlib zlib-devel patch readline readline-devel libffi-devel openssl openssl-devel git
-
+        echo "Install rbenv dependencies..."
+        sudo yum install -y git
         echo "Building rbenv..."
         git clone git://github.com/sstephenson/rbenv.git ~/.rbenv
         # Add rbenv to your path
@@ -36,6 +35,8 @@ namespace :bootstrap do
       # Install Ruby #{rbenv_ruby_version}
       HAVE_CORRECT_VERSION=`rbenv versions | grep '#{rbenv_ruby_version}' | wc -l`
       if [ $HAVE_CORRECT_VERSION -eq 0 ]; then
+        echo "Installing Ruby dependencies..."
+        sudo yum install -y automake gcc make libtool curl zlib zlib-devel patch readline readline-devel libffi-devel openssl openssl-devel
         echo "Installing #{rbenv_ruby_version}..."
         rbenv install #{rbenv_ruby_version}
         rbenv global #{rbenv_ruby_version}

data/recipes/ruby.rb

@@ -2,7 +2,7 @@ namespace :bootstrap do
   desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
   task :ruby do
     local_rvs = ruby_version_switcher rescue 'rvm'
-    local_env = rails_env rescue 'unkown'
+    local_env = rails_env rescue 'unknown'
 
     case local_rvs
     when 'rbenv'

data/recipes/rvm.rb

@@ -1,7 +1,7 @@
 namespace :bootstrap do
   desc "Create a standalone rvm installation with a default ruby to use with chef-solo"
   task :rvm do
-    set :rvm_ruby_version, (ChefDnaParser.parsed["environment"]["rvm_ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
+    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
     rvm_standup_script = <<-SH
       #!/bin/bash
       #
@@ -14,14 +14,14 @@ namespace :bootstrap do
         which rvm > /tmp/.chef_cap_rvm_path
         `cat /tmp/.chef_cap_rvm_path` list | grep "No rvm rubies installed"
         if [ $? -eq 0 ]; then
-          echo "No rvm rubies installed. Installing from capistrano setting :rvm_ruby_version #{rvm_ruby_version}"
-          `cat /tmp/.chef_cap_rvm_path` install #{rvm_ruby_version}
-          `cat /tmp/.chef_cap_rvm_path` --default use #{rvm_ruby_version}
+          echo "No rvm rubies installed. Installing from capistrano setting :ruby_version #{ruby_version}"
+          `cat /tmp/.chef_cap_rvm_path` install #{ruby_version}
+          `cat /tmp/.chef_cap_rvm_path` --default use #{ruby_version}
         fi
         `cat /tmp/.chef_cap_rvm_path` list | grep "Default ruby not set"
         if [ $? -eq 0 ]; then
           echo "No rvm default set."
-          `cat /tmp/.chef_cap_rvm_path` alias create default #{rvm_ruby_version}
+          `cat /tmp/.chef_cap_rvm_path` alias create default #{ruby_version}
         fi
         exit 0
       else
@@ -39,10 +39,10 @@ namespace :bootstrap do
         which rvm > /tmp/.chef_cap_rvm_path
         `cat /tmp/.chef_cap_rvm_path` list | grep "No rvm rubies installed"
         if [ $? -eq 0 ]; then
-          echo "No rvm rubies installed. Installing from capistrano setting :rvm_ruby_version #{rvm_ruby_version}"
-          `cat /tmp/.chef_cap_rvm_path` install #{rvm_ruby_version}
-          `cat /tmp/.chef_cap_rvm_path` --default use #{rvm_ruby_version}
-          `cat /tmp/.chef_cap_rvm_path` alias create default #{rvm_ruby_version}
+          echo "No rvm rubies installed. Installing from capistrano setting :ruby_version #{ruby_version}"
+          `cat /tmp/.chef_cap_rvm_path` install #{ruby_version}
+          `cat /tmp/.chef_cap_rvm_path` --default use #{ruby_version}
+          `cat /tmp/.chef_cap_rvm_path` alias create default #{ruby_version}
         fi
       else
         echo "FATAL ERROR: I have no idea how to download RVM without curl!"

data/spec/chef_cap_spec.rb

@@ -47,7 +47,10 @@ describe "chef_cap" do
         },
         "environments": {
           "defaults": {
-            "user": "myuser"
+            "user": "myuser",
+            "ruby": {
+              "version": "1.9.2-HEAD"
+            }
           },
           "some_env": {
             "user": "newenvuser",
@@ -66,6 +69,7 @@ describe "chef_cap" do
     chef_cap.cap_variable[:repository].should == "git@somehost:user/repo.git"
     chef_cap.cap_variable[:scm].should == :git
     chef_cap.cap_variable[:user].should == "myuser"
+    chef_cap.cap_variable[:ruby_version].should == "1.9.2-HEAD"
 
     chef_cap.cap_variable[:rails_env].should be_nil
     chef_cap.cap_task[:some_env].should_not be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70167065111120 !ruby/object:Gem::Requirement
+  requirement: &2239810400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70167065111120
+  version_requirements: *2239810400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70167065110620 !ruby/object:Gem::Requirement
+  requirement: &2239809900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70167065110620
+  version_requirements: *2239809900
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2439517596644042865
+      hash: 2890703575138462946
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2439517596644042865
+      hash: 2890703575138462946
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"