capstrap 0.3.2 → 0.3.3

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 0.3.3
+
+  * Add call to apt-get update pre-package install
+  * Set ruby as rvm default by default (of course)
+  * Record the elapsed time on a capstrap execution.
+
 # 0.3.2
 
   * Install chef gem to rvm default gemset rather than @global

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capstrap (0.3.0)
+    capstrap (0.3.2)
       capistrano (~> 2.5.19)
       thor (~> 0.14.3)
 

data/lib/capistrano/ext/capstrap/apt.rb

@@ -15,6 +15,14 @@ module Capstrap
         end
 
         namespace :apt do
+          desc "Resynchronizes the package index files."
+          task :update do
+            unless @updated
+              apt_update
+              @updated = true
+            end
+          end
+
           namespace :install do
             desc "Installs packages for running RVM"
             task :rvm_depends do
@@ -33,6 +41,9 @@ module Capstrap
             end
           end
         end
+
+        before "apt:install:rvm_depends", "apt:update"
+        before "apt:install:mri_depends", "apt:update"
       end
     end
   end

data/lib/capistrano/ext/capstrap/core.rb

@@ -46,6 +46,12 @@ def apt_install(pkg, check=false)
   end
 end
 
+##
+# Updates package repository via apt-get.
+def apt_update
+  run %{apt-get update -y}
+end
+
 def rvm_env
   %{[[ -s "/usr/local/lib/rvm" ]] && source /usr/local/lib/rvm; }
 end

data/lib/capstrap/cli.rb

@@ -13,42 +13,50 @@ module Capstrap
     end
     
     desc "ruby HOST", "Install an RVM ruby on remote SSH host HOST"
-    method_option "default", :type => :boolean, :desc => 
-      "Set this ruby to be RVM default."
     def ruby(ssh_host)
-      @ssh_host = ssh_host
-      setup_config options
-      exec_ruby
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        exec_ruby
+      end
     end
 
     desc "chef HOST", "Install chef gem on remote SSH host HOST"
     def chef(ssh_host)
-      @ssh_host = ssh_host
-      setup_config options
-      exec_chef
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        exec_chef
+      end
     end
 
     desc "solo HOST", "Install chef cookbooks & config on remote SSH host HOST"
     def solo(ssh_host)
-      @ssh_host = ssh_host
-      setup_config options
-      assert_repos_set
-      exec_solo
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        assert_repos_set
+        exec_solo
+      end
     end
 
     desc "execute HOST", "Executes chef solo config on remote SSH host HOST"
     def execute(ssh_host)
-      @ssh_host = ssh_host
-      setup_config options
-      assert_repos_set
-      exec_execute
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        assert_repos_set
+        exec_execute
+      end
     end
 
     desc "update HOST", "Updates and executes chef solo on remote SSH host HOST"
     def update(ssh_host)
-      @ssh_host = ssh_host
-      setup_config options
-      exec_update
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        exec_update
+      end
     end
 
     [:ruby, :chef, :solo, :execute, :update].each do |task|
@@ -107,9 +115,7 @@ module Capstrap
 
     def exec_ruby
       config.find_and_execute_task "rvm:install:#{config.fetch(:ruby)}"
-      if options[:default]
-        config.find_and_execute_task "rvm:default:#{config.fetch(:ruby)}"
-      end
+      config.find_and_execute_task "rvm:default:#{config.fetch(:ruby)}"
     end
 
     def exec_chef
@@ -176,5 +182,16 @@ module Capstrap
         config.set(var[:sym], options[var[:opt]])
       end
     end
+
+    def track_time(&block)
+      start = Time.now
+      yield
+      elapsed = Time.now - start
+      if elapsed < 60.0
+        puts "\n\n  * Elapsed time: #{(Time.now - start)} seconds.\n"
+      else
+        puts "\n\n  * Elapsed time: #{(Time.now - start) / 60.0} minutes.\n"
+      end
+    end
   end
 end

data/lib/capstrap/version.rb

@@ -1,3 +1,3 @@
 module Capstrap
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capstrap
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 -07:00
+date: 2010-12-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency