cap-strap 0.0.5 → 0.0.6

data/README.md

@@ -28,6 +28,8 @@ You may re-run the deploy_key task by `$ cap <stage> bootstrap:upload_deploy_key
 
 In your deploy.rb, you may override the following variables:
 
+You may specificy any additional packages for installation by setting the :packages.
+
 Note: Paths are relative to the root
 
 * `set :deploy_user, "<name of user for future deployes>"`
@@ -44,6 +46,7 @@ Note: Paths are relative to the root
                 ]`
 * `set :gemset, "<default gemset>"` - Default is global
 * `set :global_gems, ["bundler", "other-gem"]` - Default is ["bundler"]
+* `set :packages, ["git", "vim"]` - default: []
 
 Note: Run from project root
 
@@ -51,9 +54,14 @@ Note: Run from project root
 
 ## Testing
 
- We're https://github.com/technicalpickles/capistrano-spec for testing the capistrano
+ We're https://github.com/fnichol/minitest-capistrano for testing the capistrano
 configuration.
 
+Running Tests:
+
+* `rake test` - manually run the tests
+* `bundle exec guard start` - Use guard to watch for changes and run tests automatically.
+
 ### Testing with Vagrant
 
 Vagrant will fetch a lucid-64 box and boot it up. Once started, it will run

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.0.5"
+  s.version     = "0.0.6"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/cap-strap"

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

@@ -18,6 +18,7 @@ module Capistrano::CapStrap
         _cset(:authorized_keys_file) { Capistrano::CLI.ui.ask("Location of authorized keys relative to root to upload: ") }
         _cset(:deploy_key_file) { Capistrano::CLI.ui.ask("Location of deploy key for upload, press enter to skip: ") }
         _cset(:known_hosts) { default_known_hosts }
+        _cset(:packages) { [] }
 
         namespace :bootstrap do
           desc "Bootstraps a fresh box. Install RVM, create the deploy user, upload keys."
@@ -28,10 +29,11 @@ module Capistrano::CapStrap
             bootstrap.add_known_hosts
             bootstrap.add_rvm_to_sudoers
             bootstrap.upload_deploy_key
+            bootstrap.install_specified_packages
           end
 
-          task :set_deploy_ownership do
-            sudo "chown -R #{deploy_user}:#{group} #{deploy_to}"
+          task :install_specified_packages do
+            install_packages(packages)
           end
 
           task :create_deploy_user do

data/spec/bootstrap_spec.rb

@@ -3,6 +3,36 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Capistrano::CapStrap::Bootstrap do
   load_capistrano_recipe(Capistrano::CapStrap::Bootstrap)
 
+  describe "tasks" do
+   it "has a default task" do
+    recipe.must_have_task "bootstrap:default"
+   end
+
+   it "has a create_deploy_user task" do
+      recipe.must_have_task "bootstrap:create_deploy_user"
+   end
+
+   it "has a upload authorized keys for deploy user task" do
+     recipe.must_have_task "bootstrap:upload_deploy_authorized_keys"
+   end
+
+   it "has a task for adding rvm group to sudoers" do
+      recipe.must_have_task "bootstrap:add_rvm_to_sudoers"
+   end
+
+   it "has one for uploading the deploy user's ssh key" do
+     recipe.must_have_task "bootstrap:upload_deploy_key"
+   end
+
+   it "has a task for installing rvm dependencies" do
+     recipe.must_have_task "bootstrap:install_rvm_dependencies"
+   end
+
+   it "has a task for installing any other specified packages" do
+     recipe.must_have_task "bootstrap:install_specified_packages"
+   end
+  end
+
   describe "default variables" do
     before do
       Capistrano::CLI.ui.stubs(:ask).returns('prompt')
@@ -23,6 +53,10 @@ describe Capistrano::CapStrap::Bootstrap do
     it "prompts for deploy key location if not set" do
       recipe.fetch(:deploy_key_file).must_equal 'prompt'
     end
+
+    it "packages is empty" do
+      recipe.fetch(:packages).must_be_empty
+    end
   end
 
   describe "variables set" do
@@ -32,11 +66,11 @@ describe Capistrano::CapStrap::Bootstrap do
       recipe.set(:known_hosts, "baz")
     end
 
-    it "doesn't prompted for a bootstrap user" do
+    it "doesn't prompt for a bootstrap user" do
       recipe.fetch(:user).must_equal "foo"
     end
 
-    it "doesn't prompted for a deploy user" do
+    it "doesn't prompt for a deploy user" do
       recipe.fetch(:deploy_user).must_equal "bar"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70195146425940 !ruby/object:Gem::Requirement
+  requirement: &70263018397900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *70195146425940
+  version_requirements: *70263018397900
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
-  requirement: &70195146424860 !ruby/object:Gem::Requirement
+  requirement: &70263018397020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *70195146424860
+  version_requirements: *70263018397020
 - !ruby/object:Gem::Dependency
   name: minitest-colorize
-  requirement: &70195146424260 !ruby/object:Gem::Requirement
+  requirement: &70263018412160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70195146424260
+  version_requirements: *70263018412160
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70195146423440 !ruby/object:Gem::Requirement
+  requirement: &70263018411640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70195146423440
+  version_requirements: *70263018411640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70195146461640 !ruby/object:Gem::Requirement
+  requirement: &70263018410980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.11.1
   type: :development
   prerelease: false
-  version_requirements: *70195146461640
+  version_requirements: *70263018410980
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70195146460720 !ruby/object:Gem::Requirement
+  requirement: &70263018410320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70195146460720
+  version_requirements: *70263018410320
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70195146459460 !ruby/object:Gem::Requirement
+  requirement: &70263018409160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70195146459460
+  version_requirements: *70263018409160
 description: Bootstrap a machine. Create a deploy user, upload authorized keys and
   deploy key. Uses RVM to install desired rubies, with patch support.
 email: