cap-strap 0.1.1 → 0.1.2

data/cap-strap.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "cap-strap"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/cap-strap"

data/lib/cap-strap/helpers.rb

@@ -1,3 +1,5 @@
+RVM_PATH = '/usr/local/rvm/bin/rvm'
+
 def _cset(name, *args, &block)
   unless exists?(name)
     set(name, *args, &block)
@@ -5,14 +7,14 @@ def _cset(name, *args, &block)
 end
 
 def add_user_to_group(user, group)
-  sudo "usermod -a -G #{group} #{user}"
+  run "#{sudo} usermod -a -G #{group} #{user}"
 end
 
 def install_packages(packages)
   unless packages.empty?
-    sudo "apt-get update"
+    run "#{sudo} apt-get update"
     packages.each do |pkg|
-      sudo "apt-get -y install #{pkg}"
+      run "#{sudo} apt-get -y install #{pkg}"
     end
   end
 end
@@ -22,23 +24,23 @@ def create_user(user, password)
     command = "useradd -s /bin/bash -d /home/#{user}"
     command << " -p `perl -e 'print crypt(#{password}, salt)'`" if password
     command << " -m #{user}"
-    sudo command
+    run "#{sudo} #{command}"
   end
 end
 
 def add_group_to_sudoers(group)
   unless group_has_sudo?(group)
     puts "********* Adding #{group} to sudoers"
-    sudo "cp /etc/sudoers /etc/sudoers.bak"
-    sudo "chmod a+w /etc/sudoers.bak"
-    sudo "echo %rvm ALL=NOPASSWD:ALL >> /etc/sudoers.bak"
-    sudo "chmod a-w /etc/sudoers.bak"
-    sudo "mv /etc/sudoers.bak /etc/sudoers"
+    run "#{sudo} cp /etc/sudoers /etc/sudoers.bak"
+    run "#{sudo} chmod a+w /etc/sudoers.bak"
+    run "#{sudo} echo %rvm ALL=NOPASSWD:ALL >> /etc/sudoers.bak"
+    run "#{sudo} chmod a-w /etc/sudoers.bak"
+    run "#{sudo} mv /etc/sudoers.bak /etc/sudoers"
   end
 end
 
 def group_has_sudo?(group)
-  sudoer_test = "sudo bash -c \"if grep -Fxq '%#{group} ALL=NOPASSWD:ALL' /etc/sudoers; then echo 'true'; else echo 'false'; fi\""
+  sudoer_test = "#{sudo} bash -c \"if grep -Fxq '%#{group} ALL=NOPASSWD:ALL' /etc/sudoers; then echo 'true'; else echo 'false'; fi\""
   return capture(sudoer_test).include?("true")
 end
 
@@ -55,19 +57,19 @@ end
 
 def ruby_installed?(ruby)
   ruby_test = "source /etc/profile.d/rvm.sh && if rvm list | grep -q '#{ruby} '; then echo 'true'; else echo 'false'; fi"
-  return capture(rvm_wrapper(ruby_test)).include?("true")
+  return capture(ruby_test).include?("true")
 end
 
 def install_ruby(ruby, patch = nil)
   unless ruby_installed?(ruby)
-    command = "/usr/local/rvm/bin/rvm install #{ruby}"
+    command = "#{RVM_PATH} install #{ruby}"
     command << " --patch #{patch}" if patch
-    sudo command
+    run "#{sudo} #{command}"
   end
 end
 
 def install_global_gem(ruby, gem)
-  sudo rvm_wrapper("rvm use #{ruby}@global --create && gem install #{gem} --no-rdoc --no-ri")
+  run "#{sudo} #{RVM_PATH} #{ruby}@global --create do gem install #{gem} --no-rdoc --no-ri"
 end
 
 def rvm_wrapper(command)
@@ -90,8 +92,9 @@ TEXT
 end
 
 def make_directory(location, opts={})
-  sudo "mkdir -p #{location}"
+  run "#{sudo} mkdir -p #{location}"
   if opts[:mode]
-    sudo "chmod #{opts[:mode]} #{location}"
+    run "#{sudo} chmod #{opts[:mode]} #{location}"
   end
 end
+

data/lib/cap-strap/recipes/bootstrap.rb

@@ -20,6 +20,8 @@ module Capistrano::CapStrap
           _cset(:bootstrap_password) { Capistrano::CLI.ui.ask("bootstrap root user password: ") }
           _cset(:known_hosts) { default_known_hosts }
           _cset(:packages) { [] }
+          _cset :authorized_keys_file, ""
+          _cset :deploy_key_file, ""
 
           set (:user) { bootstrap_user }
           set (:password) { bootstrap_password }

data/lib/cap-strap/recipes/rvm.rb

@@ -6,9 +6,9 @@ module Capistrano::CapStrap
     def self.load_into(configuration)
       configuration.load do
 
-        _cset :default_ruby , "1.9.3-p125"
+        _cset :default_ruby , "1.9.3"
         _cset :gemset, "global"
-        _cset :rubies, ["1.9.3-p125"]
+        _cset :rubies, ["1.9.3"]
         _cset(:user) { Capistrano::CLI.ui.ask("bootstrap root user: ") }
         _cset :global_gems, ["bundler"]
 
@@ -26,8 +26,7 @@ module Capistrano::CapStrap
           end
 
           task :install_system_wide_rvm do
-            command = "curl -L get.rvm.io | "
-            command << "sudo bash -s stable"
+            command = "curl -L https://get.rvm.io | #{sudo} bash -s stable"
             run command
           end
 
@@ -48,11 +47,11 @@ module Capistrano::CapStrap
           end
 
           task :create_default_gemset do
-            sudo rvm_wrapper("rvm use #{default_ruby}@#{gemset} --create")
+            run "#{sudo} #{RVM_PATH} use #{default_ruby}@#{gemset} --create"
           end
 
           task :set_default_ruby do
-            sudo rvm_wrapper("rvm use #{default_ruby} --default")
+            run "#{sudo} #{RVM_PATH} use #{default_ruby} --default"
           end
 
           task :add_user_to_rvm_group do
@@ -61,7 +60,7 @@ module Capistrano::CapStrap
 
           task :add_gemrc do
             put gemrc, "gemrc"
-            sudo "mv ~/gemrc /etc/"
+            run "#{sudo} mv ~/gemrc /etc/"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,12 +178,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3071073874735159760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3071073874735159760
 requirements: []
 rubyforge_project: cap-strap
 rubygems_version: 1.8.24