cap-strap 0.0.4 → 0.0.5

data/Guardfile

@@ -1,6 +1,5 @@
-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" }
+guard 'minitest' do
+  watch(%r|^spec/(.*)_spec\.rb|)
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})  { |m| "spec/#{m[2]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end
-

data/Rakefile

@@ -1,7 +1,13 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'rake/testtask'
 
-task :default => :spec
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['spec/*_spec.rb']
+  t.verbose = true
+end
+
+task :default => :test
 
 desc "Test cap-strap on a local virtual machine, courtesy of vagrant."
 task :vagrant_test => ["vagrant_test:default"]
@@ -29,7 +35,3 @@ namespace :vagrant_test do
     puts "Vagrant is up."
   end
 end
-
-Rspec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/*_spec.rb"
-end

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.4"
+  s.version     = "0.0.5"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/cap-strap"
@@ -17,13 +17,12 @@ 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","~> 0.1.0"
-  s.add_development_dependency "rspec", "~> 2.9.0"
-  s.add_development_dependency "guard-rspec", "~> 0.7.0"
+  s.add_development_dependency "minitest", "~> 2.12.0"
+  s.add_development_dependency "minitest-capistrano", "~> 0.0.8"
+  s.add_development_dependency "minitest-colorize", "~> 0.0.4"
+  s.add_development_dependency "guard-minitest", "~> 0.5.0"
+  s.add_development_dependency "mocha", "~> 0.11.1"
   s.add_development_dependency "vagrant", "~> 1.0.2"
 
-
-  s.add_runtime_dependency "capistrano", ">= 2.0.0"
+  s.add_dependency "capistrano", ">= 2.0.0"
 end

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

@@ -2,7 +2,7 @@ require 'cap-strap/helpers'
 require 'cap-strap/recipes/rvm'
 require 'capistrano/cli'
 
-module Capistrano
+module Capistrano::CapStrap
   module Bootstrap
     def self.load_into(configuration)
       configuration.load do
@@ -30,6 +30,10 @@ module Capistrano
             bootstrap.upload_deploy_key
           end
 
+          task :set_deploy_ownership do
+            sudo "chown -R #{deploy_user}:#{group} #{deploy_to}"
+          end
+
           task :create_deploy_user do
             create_user(deploy_user)
             add_user_to_group(deploy_user, "rvm")

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

@@ -1,6 +1,7 @@
 require 'cap-strap/helpers'
+require 'capistrano/cli'
 
-module Capistrano
+module Capistrano::CapStrap
   module RVM
     def self.load_into(configuration)
       configuration.load do

data/lib/cap-strap.rb

@@ -5,8 +5,8 @@ require "cap-strap/recipes/rvm"
 require "cap-strap/recipes/bootstrap"
 
 if instance = Capistrano::Configuration.instance
-  Capistrano::RVM.load_into(instance)
-  Capistrano::Bootstrap.load_into(instance)
+  Capistrano::CapStrap::RVM.load_into(instance)
+  Capistrano::CapStrap::Bootstrap.load_into(instance)
 
   instance.load do
     ssh_options[:forward_agent] = true

data/spec/bootstrap_spec.rb

@@ -1,49 +1,53 @@
-require 'spec_helper'
-
-describe Capistrano::Bootstrap do
-  let(:ui) { double("ui", :ask => 'prompt') }
-  before do
-    @configuration = Capistrano::Configuration.new
-    @configuration.extend(Capistrano::Spec::ConfigurationExtension)
-    Capistrano::Bootstrap.load_into(@configuration)
-    Capistrano::CLI.stub(:ui).and_return { ui }
-  end
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Capistrano::CapStrap::Bootstrap do
+  load_capistrano_recipe(Capistrano::CapStrap::Bootstrap)
 
   describe "default variables" do
+    before do
+      Capistrano::CLI.ui.stubs(:ask).returns('prompt')
+    end
+
     it "prompts for a bootstrap user" do
-      @configuration.fetch(:user).should == 'prompt'
+      recipe.fetch(:user).must_equal 'prompt'
     end
 
     it "prompts for a deploy user" do
-      @configuration.fetch(:deploy_user).should == 'prompt'
+      recipe.fetch(:deploy_user).must_equal 'prompt'
     end
 
     it 'prompts for authorized keys if no path set' do
-      @configuration.fetch(:authorized_keys_file).should == 'prompt'
+      recipe.fetch(:authorized_keys_file).must_equal 'prompt'
     end
 
     it "prompts for deploy key location if not set" do
-      @configuration.fetch(:deploy_key_file).should == 'prompt'
+      recipe.fetch(:deploy_key_file).must_equal 'prompt'
     end
   end
 
   describe "variables set" do
     before do
-      @configuration.set(:user, "foo")
-      @configuration.set(:deploy_user, "bar")
-      @configuration.set(:known_hosts, "baz")
+      recipe.set(:user, "foo")
+      recipe.set(:deploy_user, "bar")
+      recipe.set(:known_hosts, "baz")
     end
 
     it "doesn't prompted for a bootstrap user" do
-      @configuration.fetch(:user).should == "foo"
+      recipe.fetch(:user).must_equal "foo"
     end
 
     it "doesn't prompted for a deploy user" do
-      @configuration.fetch(:deploy_user).should == "bar"
+      recipe.fetch(:deploy_user).must_equal "bar"
     end
 
     it "replaces known_hosts with ones that are set" do
-      @configuration.fetch(:known_hosts).should == "baz"
+      recipe.fetch(:known_hosts).must_equal "baz"
+    end
+  end
+
+  describe "callbacks" do
+    it "installs rvm dependencies before installing system rvm" do
+      recipe.must_have_callback_before "rvm:install_system_wide_rvm", "bootstrap:install_rvm_dependencies"
     end
   end
 end

data/spec/rvm_spec.rb

@@ -1,38 +1,36 @@
-require 'spec_helper'
-
-describe Capistrano::RVM do
-  let(:ui) { double("ui", :ask => 'prompt') }
-  before do
-    @configuration = Capistrano::Configuration.new
-    @configuration.extend(Capistrano::Spec::ConfigurationExtension)
-    Capistrano::RVM.load_into(@configuration)
-    Capistrano::CLI.stub(:ui).and_return { ui }
-  end
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Capistrano::CapStrap::RVM do
+  load_capistrano_recipe(Capistrano::CapStrap::RVM)
 
   describe "default variables" do
+    let(:default_ruby) { "1.9.3-p125" }
+    before do
+      Capistrano::CLI.ui.stubs(:ask).returns('prompt')
+    end
+
     it "has a prompts for a bootstrap user" do
-      @configuration.fetch(:user).should == 'prompt'
+      recipe.fetch(:user).must_equal "prompt"
     end
 
     it "has a default ruby" do
-      @configuration.fetch(:default_ruby).should be
+      recipe.fetch(:default_ruby).must_equal default_ruby
     end
 
     it "has a default gemset" do
-      @configuration.fetch(:gemset).should be
+      recipe.fetch(:gemset).must_equal "global"
     end
 
     it "has a rubie ruby set" do
-      @configuration.fetch(:rubies).length.should be 1
+      recipe.fetch(:rubies).length.must_equal 1
     end
 
-    it "ruby is the default rubie" do
-      default_ruby = @configuration.fetch(:default_ruby)
-      @configuration.fetch(:rubies).first.should == default_ruby
+    it "default ruby is in rubies" do
+      recipe.fetch(:rubies).must_include default_ruby
     end
 
     it "has bundler in it's global gems" do
-      @configuration.fetch(:global_gems).include?("bundler").should == true
+      recipe.fetch(:global_gems).must_include 'bundler'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,26 @@
 require 'capistrano'
+
+require 'minitest/autorun'
+require 'minitest/capistrano'
+require 'minitest/colorize'
+require 'mocha'
+
 require 'cap-strap'
 
-require 'capistrano-spec'
 
-Rspec.configure do |config|
-  config.include Capistrano::Spec::Matchers
+def load_capistrano_recipe(recipe)
+  before do
+    @config = Capistrano::Configuration.new
+    @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+    @orig_config = Capistrano::Configuration.instance
+    Capistrano::Configuration.instance = @config
+    recipe.send(:load_into, @config)
+  end
+
+  after do
+    Capistrano::Configuration.instance = @orig_config
+  end
+
+  subject {@config}
+  let(:recipe) { @config }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,66 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70250544779080 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &70195146425940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *70250544779080
+  version_requirements: *70195146425940
 - !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: &70250544778420 !ruby/object:Gem::Requirement
+  name: minitest-capistrano
+  requirement: &70195146424860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *70250544778420
+  version_requirements: *70195146424860
 - !ruby/object:Gem::Dependency
-  name: capistrano-spec
-  requirement: &70250544777660 !ruby/object:Gem::Requirement
+  name: minitest-colorize
+  requirement: &70195146424260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70250544777660
+  version_requirements: *70195146424260
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70250544777100 !ruby/object:Gem::Requirement
+  name: guard-minitest
+  requirement: &70195146423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70250544777100
+  version_requirements: *70195146423440
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70250544776580 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &70195146461640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.11.1
   type: :development
   prerelease: false
-  version_requirements: *70250544776580
+  version_requirements: *70195146461640
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70250544776120 !ruby/object:Gem::Requirement
+  requirement: &70195146460720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70250544776120
+  version_requirements: *70195146460720
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70250544775660 !ruby/object:Gem::Requirement
+  requirement: &70195146459460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250544775660
+  version_requirements: *70195146459460
 description: Bootstrap a machine. Create a deploy user, upload authorized keys and
   deploy key. Uses RVM to install desired rubies, with patch support.
 email: