cap-strap 0.0.3 → 0.0.4

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.vagrant

data/Capfile

@@ -0,0 +1,4 @@
+load 'deploy' if respond_to?(:namespace) #cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+
+load 'config/deploy'

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :cli => "--color --fail-fast --drb", :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,19 +1,19 @@
-# CapStrap
+# cap-strap
 
-  CapStrap is a Capistrano Extension that bootstraps a machine for future capistrano tasks.
-It installs System-wide Rvm and specified rubies and gems. It will create a user for future capistrano
-deploy tasks.
+  cap-strap is a Capistrano Extension that bootstraps a machine for future capistrano tasks.
+It installs System-wide RVM and specified rubies and gems. It will create a deploy user, upload authorized_keys and
+deploy key.
 
 ## Notes
 
-Currently only Ubuntu 10.04 and 10.10 have been tested.
+Currently cap-strap has only been tested on Ubuntu 10.04 and 10.10.
 
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'cap-strap', :git => 'git@github.com:substantial/cap-strap.git'
+    gem 'cap-strap'
 
 And then execute:
 
@@ -22,9 +22,12 @@ And then execute:
 ## Usage
 
 You will be prompted for the name of the future deploy_user, location of authorized keys and
-the deploy_key. Deploy key isn't required, and you may skip.
+the deploy user's deploy_key. Deploy key isn't required, and you may skip.
+
+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:
+
 Note: Paths are relative to the root
 
 * `set :deploy_user, "<name of user for future deployes>"`
@@ -51,7 +54,23 @@ Note: Run from project root
  We're https://github.com/technicalpickles/capistrano-spec for testing the capistrano
 configuration.
 
-###TODO: Use Vagrant to test cap-strap.
+### Testing with Vagrant
+
+Vagrant will fetch a lucid-64 box and boot it up. Once started, it will run
+cap bootstrap on the vagrant box.
+
+To run: `bundle exec rake vagrant_test`
+
+To reload the box and run again: `bundle exec rake vagrant_test:restart`
+
+Vagrant Notes:
+
+* `vagrant ssh` - will ssh into the vagrant VM.
+* lucid64 root user and password is "vagrant"
+* vagrant box runs on port 2222
+* `vagrant destroy` - will destroy the current vagrant VM. It doesn't remove the large downloaded box.
+
+For more information regarding Vagrant: http://vagrantup.com/
 
 ## Contributing
 

data/Rakefile

@@ -3,6 +3,33 @@ require "rspec/core/rake_task"
 
 task :default => :spec
 
+desc "Test cap-strap on a local virtual machine, courtesy of vagrant."
+task :vagrant_test => ["vagrant_test:default"]
+
+namespace :vagrant_test do
+
+  task :default => [:up, :test]
+
+  task :test do
+    puts "Running cap bootstrap"
+    %x[bundle exec cap bootstrap]
+  end
+
+  task :restart => [:down, :up, :test]
+
+  task :down do
+    puts "Forcing vagrant shutdown"
+    %x[bundle exec vagrant destroy --force]
+  end
+
+  task :up do
+    puts "WARNING: This will take a while..."
+    puts "Starting up vagrant"
+    %x[bundle exec vagrant up]
+    puts "Vagrant is up."
+  end
+end
+
 Rspec::Core::RakeTask.new do |t|
   t.pattern = "./spec/*_spec.rb"
 end

data/Vagrantfile

@@ -0,0 +1,10 @@
+Vagrant::Config.run do |config|
+
+  config.vm.box = "lucid64"
+
+  config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
+
+  config.vm.forward_port 80, 8080
+  config.vm.forward_port 22, 2222
+  config.ssh.forward_agent = true
+end

data/cap-strap.gemspec

@@ -1,14 +1,13 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "cap-strap/version"
 
 Gem::Specification.new do |s|
   s.name        = "cap-strap"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
-  s.homepage    = ""
-  s.summary     = %q{Bootstrap a new machine for future Capistrano tasks.}
+  s.homepage    = "http://github.com/substantial/cap-strap"
+  s.summary     = %q{Bootstrap a new machine. Use with Capistrano to fully automate your provisioning.}
   s.description = %q{Bootstrap a machine. Create a deploy user, upload authorized keys and deploy key. Uses RVM to install desired rubies, with patch support.}
 
   s.rubyforge_project = "cap-strap"
@@ -18,9 +17,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "rake", "~> 0.9.2.2"
   s.add_development_dependency "capistrano", '>= 2.0.0'
-  s.add_development_dependency "capistrano-spec"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "capistrano-spec","~> 0.1.0"
+  s.add_development_dependency "rspec", "~> 2.9.0"
+  s.add_development_dependency "guard-rspec", "~> 0.7.0"
+  s.add_development_dependency "vagrant", "~> 1.0.2"
+
 
   s.add_runtime_dependency "capistrano", ">= 2.0.0"
 end

data/config/deploy.rb

@@ -0,0 +1,24 @@
+require 'cap-strap'
+
+server "localhost", :test
+
+set :port, 2222
+
+set :user, "vagrant"
+set :password, "vagrant"
+
+set :gemset, "build-agent"
+set :rubies, [
+  "1.9.3-p125",
+  {
+    :version => "1.9.3-p125-perf",
+    :patch => "falcon,debug --force-autoconf -j 3"
+  }
+]
+
+set :default_ruby, "1.9.3-p125-perf"
+
+set :deploy_user, "deploy"
+set :group, "rvm"
+set :authorized_keys_file, "config/test-authorized-keys"
+set :deploy_key_file, "config/test-deploy-key"

data/config/test-authorized-keys

@@ -0,0 +1 @@
+Authorized Keys

data/config/test-deploy-key

@@ -0,0 +1 @@
+deploy_user's deploy key

data/lib/cap-strap/helpers.rb

@@ -43,15 +43,22 @@ def user_exists?(user)
 end
 
 def default_known_hosts
-  <<-TEXT
+<<TEXT
 github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-  TEXT
+TEXT
+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")
 end
 
 def install_ruby(ruby, patch = nil)
-  command = "rvm install #{ruby}"
-  command << " --patch #{patch}" if patch
-  sudo rvm_wrapper(command)
+  unless ruby_installed?(ruby)
+    command = "rvm install #{ruby}"
+    command << " --patch #{patch}" if patch
+    sudo rvm_wrapper(command)
+  end
 end
 
 def install_global_gem(ruby, gem)
@@ -59,7 +66,7 @@ def install_global_gem(ruby, gem)
 end
 
 def rvm_wrapper(command)
-  "bash -c '. /etc/profile.d/rvm.sh && #{command}'"
+  "bash -c \". /etc/profile.d/rvm.sh && #{command}\""
 end
 
 def gemrc

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

@@ -20,7 +20,7 @@ module Capistrano
         _cset(:known_hosts) { default_known_hosts }
 
         namespace :bootstrap do
-          desc "bootstraps a fresh box."
+          desc "Bootstraps a fresh box. Install RVM, create the deploy user, upload keys."
           task :default do
             rvm.default
             bootstrap.create_deploy_user
@@ -36,6 +36,8 @@ module Capistrano
             add_user_to_group(deploy_user, "admin")
           end
 
+          desc "Upload authorized keys for the deploy_user. Override by setting :authorized_keys_file. This
+          is the relative path from the project root"
           task :upload_deploy_authorized_keys do
             begin
               authorized_keys_path = File.join(File.expand_path(Dir.pwd), authorized_keys_file)

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

@@ -7,7 +7,7 @@ module Capistrano
 
         _cset :default_ruby , "1.9.3-p125"
         _cset :gemset, "global"
-        _cset :rubies, []
+        _cset :rubies, ["1.9.3-p125"]
         _cset(:user) { Capistrano::CLI.ui.ask("bootstrap root user: ") }
         _cset :global_gems, ["bundler"]
 
@@ -31,7 +31,6 @@ module Capistrano
           end
 
           task :install_rubies do
-            rubies << default_ruby
             rubies.each do |rubie|
               if rubie.is_a?(Hash)
                 ruby = rubie.fetch(:version)

data/spec/rvm_spec.rb

@@ -22,8 +22,13 @@ describe Capistrano::RVM do
       @configuration.fetch(:gemset).should be
     end
 
-    it "defaults to empty ruby set" do
-      @configuration.fetch(:rubies).length.should be 0
+    it "has a rubie ruby set" do
+      @configuration.fetch(:rubies).length.should be 1
+    end
+
+    it "ruby is the default rubie" do
+      default_ruby = @configuration.fetch(:default_ruby)
+      @configuration.fetch(:rubies).first.should == default_ruby
     end
 
     it "has bundler in it's global gems" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,59 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70250544779080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70250544779080
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &70250544778420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70250544778420
 - !ruby/object:Gem::Dependency
   name: capistrano-spec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70250544777660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70250544777660
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70250544777100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: *70250544777100
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &70250544776580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70250544776580
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: &70250544776120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: *70250544776120
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70250544775660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +87,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+  version_requirements: *70250544775660
 description: Bootstrap a machine. Create a deploy user, upload authorized keys and
   deploy key. Uses RVM to install desired rubies, with patch support.
 email:
@@ -84,10 +97,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Capfile
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
+- Vagrantfile
 - cap-strap.gemspec
+- config/deploy.rb
+- config/test-authorized-keys
+- config/test-deploy-key
 - lib/cap-strap.rb
 - lib/cap-strap/helpers.rb
 - lib/cap-strap/recipes/bootstrap.rb
@@ -95,7 +114,7 @@ files:
 - spec/bootstrap_spec.rb
 - spec/rvm_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://github.com/substantial/cap-strap
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -115,10 +134,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cap-strap
-rubygems_version: 1.8.22
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Bootstrap a new machine for future Capistrano tasks.
+summary: Bootstrap a new machine. Use with Capistrano to fully automate your provisioning.
 test_files:
 - spec/bootstrap_spec.rb
 - spec/rvm_spec.rb