capistrano 3.0.0.pre14 → 3.0.0

data/spec/lib/capistrano/configuration_spec.rb

@@ -62,6 +62,17 @@ module Capistrano
       end
     end
 
+    describe 'deleting' do
+      before do
+        config.set(:key, :value)
+      end
+
+      it 'deletes the value' do
+        config.delete(:key)
+        expect(config.fetch(:key)).to be_nil
+      end
+    end
+
     describe 'asking' do
       let(:question) { stub }
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'capistrano/all'
 require 'rspec'
-require 'capistrano'
 require 'mocha/api'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -12,5 +12,4 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.mock_framework = :mocha
   config.order = 'random'
-  config.filter_run_excluding :slow
 end

data/spec/support/.gitignore

@@ -0,0 +1 @@
+.vagrant

data/spec/support/Vagrantfile

@@ -0,0 +1,13 @@
+Vagrant::Config.run do |config|
+
+  [:app].each_with_index do |role, i|
+    config.vm.define(role, primary: true) do |config|
+      config.vm.box = role
+      config.vm.box = 'precise64'
+      config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+      config.vm.forward_port 22, "222#{i}".to_i
+      config.vm.provision :shell, inline: 'yes | sudo apt-get install git-core'
+    end
+  end
+
+end

data/spec/support/tasks/database.cap

@@ -0,0 +1,11 @@
+namespace :deploy do
+  namespace :check do
+    task :linked_files => 'config/database.yml'
+  end
+end
+
+remote_file 'config/database.yml' => '/tmp/database.yml', roles: :all
+
+file '/tmp/database.yml' do |t|
+  sh "touch #{t.name}"
+end

data/spec/support/test_app.rb

@@ -1,10 +1,39 @@
 require 'fileutils'
 module TestApp
+  extend self
+
+  def install
+    install_test_app_with(default_config)
+  end
+
+  def default_config
+    %{
+      set :stage, :#{stage}
+      set :deploy_to, '#{deploy_to}'
+      set :repo_url, 'git://github.com/capistrano/capistrano.git'
+      set :branch, 'v3'
+      set :ssh_options, { keys: "\#{ENV['HOME']}/.vagrant.d/insecure_private_key" }
+      server 'vagrant@localhost:2220', roles: %w{web app}
+      set :linked_files, #{linked_files}
+      set :linked_dirs, #{linked_dirs}
+    }
+  end
+
+  def linked_files
+    %w{config/database.yml}
+  end
+
+  def linked_file
+    shared_path.join(linked_files.first)
+  end
+
+  def linked_dirs
+    %w{bin log public/system vendor/bundle}
+  end
+
   def create_test_app
-    [test_app_path, deploy_to].each do |path|
-      FileUtils.rm_rf(path)
-      FileUtils.mkdir(path)
-    end
+    FileUtils.rm_rf(test_app_path)
+    FileUtils.mkdir(test_app_path)
 
     File.open(gemfile, 'w+') do |file|
       file.write "gem 'capistrano', path: '#{path_to_cap}'"
@@ -56,7 +85,7 @@ module TestApp
   end
 
   def deploy_to
-    Pathname.new('/tmp/test_app/deploy_to')
+    Pathname.new('/home/vagrant/var/www/deploy')
   end
 
   def shared_path
@@ -72,7 +101,15 @@ module TestApp
   end
 
   def release_path
-    releases_path.join(Dir.entries(releases_path).last)
+    releases_path.join(timestamp)
+  end
+
+  def timestamp
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  end
+
+  def repo_path
+    deploy_to.join('repo')
   end
 
   def path_to_cap
@@ -83,7 +120,19 @@ module TestApp
     test_app_path.join('Gemfile')
   end
 
+  def capfile
+    test_app_path.join('Capfile')
+  end
+
   def current_user
     `whoami`.chomp
   end
+
+  def task_dir
+    test_app_path.join('lib/capistrano/tasks')
+  end
+
+  def copy_task_to_test_app(source)
+    FileUtils.cp(source, task_dir)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre14
+  version: 3.0.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -81,6 +81,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+- !ruby/object:Gem::Dependency
+  name: kuroko
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -102,14 +144,23 @@ files:
 - bin/capify
 - capistrano-public_cert.pem
 - capistrano.gemspec
+- features/deploy.feature
+- features/installation.feature
+- features/remote_file_task.feature
+- features/step_definitions/assertions.rb
+- features/step_definitions/cap_commands.rb
+- features/step_definitions/setup.rb
+- features/support/env.rb
+- features/support/remote_command_helpers.rb
 - lib/Capfile
 - lib/capistrano.rb
+- lib/capistrano/all.rb
 - lib/capistrano/application.rb
-- lib/capistrano/bundler.rb
 - lib/capistrano/configuration.rb
 - lib/capistrano/configuration/question.rb
 - lib/capistrano/configuration/server.rb
 - lib/capistrano/configuration/servers.rb
+- lib/capistrano/configuration/servers/role_filter.rb
 - lib/capistrano/console.rb
 - lib/capistrano/defaults.rb
 - lib/capistrano/deploy.rb
@@ -120,30 +171,27 @@ files:
 - lib/capistrano/dsl/stages.rb
 - lib/capistrano/dsl/task_enhancements.rb
 - lib/capistrano/git.rb
+- lib/capistrano/hg.rb
 - lib/capistrano/i18n.rb
 - lib/capistrano/install.rb
 - lib/capistrano/setup.rb
-- lib/capistrano/tasks/bundler.rake
 - lib/capistrano/tasks/console.rake
 - lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/framework.rake
 - lib/capistrano/tasks/git.rake
+- lib/capistrano/tasks/hg.rake
 - lib/capistrano/tasks/install.rake
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/deploy.rb.erb
 - lib/capistrano/templates/stage.rb.erb
 - lib/capistrano/version.rb
 - lib/capistrano/version_validator.rb
-- spec/integration/deploy_finalize_spec.rb
-- spec/integration/deploy_finished_spec.rb
-- spec/integration/deploy_started_spec.rb
-- spec/integration/deploy_update_spec.rb
 - spec/integration/dsl_spec.rb
-- spec/integration/installation_spec.rb
 - spec/integration_spec_helper.rb
 - spec/lib/capistrano/application_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
+- spec/lib/capistrano/configuration/servers/role_filter_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb
 - spec/lib/capistrano/dsl/env_spec.rb
@@ -152,7 +200,10 @@ files:
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
+- spec/support/.gitignore
+- spec/support/Vagrantfile
 - spec/support/matchers.rb
+- spec/support/tasks/database.cap
 - spec/support/test_app.rb
 homepage: ''
 licenses: []
@@ -169,9 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -179,16 +230,20 @@ signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
-- spec/integration/deploy_finalize_spec.rb
-- spec/integration/deploy_finished_spec.rb
-- spec/integration/deploy_started_spec.rb
-- spec/integration/deploy_update_spec.rb
+- features/deploy.feature
+- features/installation.feature
+- features/remote_file_task.feature
+- features/step_definitions/assertions.rb
+- features/step_definitions/cap_commands.rb
+- features/step_definitions/setup.rb
+- features/support/env.rb
+- features/support/remote_command_helpers.rb
 - spec/integration/dsl_spec.rb
-- spec/integration/installation_spec.rb
 - spec/integration_spec_helper.rb
 - spec/lib/capistrano/application_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
+- spec/lib/capistrano/configuration/servers/role_filter_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb
 - spec/lib/capistrano/dsl/env_spec.rb
@@ -197,5 +252,8 @@ test_files:
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
+- spec/support/.gitignore
+- spec/support/Vagrantfile
 - spec/support/matchers.rb
+- spec/support/tasks/database.cap
 - spec/support/test_app.rb

data/lib/capistrano/bundler.rb

@@ -1 +0,0 @@
-load File.expand_path("../tasks/bundler.rake", __FILE__)

data/lib/capistrano/tasks/bundler.rake

@@ -1,13 +0,0 @@
-namespace :deploy do
-
-  desc 'Bundle'
-  task :bundle do
-    on roles :all do
-      within release_path do
-        execute :bundle, "--gemfile #{release_path}/Gemfile --deployment --binstubs #{shared_path}/bin --path #{shared_path}/bundle --without development test cucumber"
-      end
-    end
-  end
-
-  before 'deploy:updated', 'deploy:bundle'
-end

data/spec/integration/deploy_finalize_spec.rb

@@ -1,34 +0,0 @@
-require 'integration_spec_helper'
-
-describe 'cap deploy:finished', slow: true do
-  before do
-    install_test_app_with(config)
-  end
-
-  describe 'deploy' do
-    let(:config) {
-      %{
-        set :stage, :#{stage}
-        set :deploy_to, '#{deploy_to}'
-        set :repo_url, 'git://github.com/capistrano/capistrano.git'
-        set :branch, 'v3'
-        server 'localhost', roles: %w{web app}, user: '#{current_user}'
-        set :linked_files, %w{config/database.yml}
-        set :linked_dirs, %w{bin log public/system vendor/bundle}
-        }
-    }
-
-    describe 'log_revision' do
-      before do
-        cap 'deploy:started'
-        cap 'deploy:updating'
-        cap 'deploy:publishing'
-        cap 'deploy:finished'
-      end
-
-      it 'writes the log file' do
-        expect(deploy_to.join('revisions.log')).to be_a_file
-      end
-    end
-  end
-end

data/spec/integration/deploy_finished_spec.rb

@@ -1,36 +0,0 @@
-require 'integration_spec_helper'
-
-describe 'cap deploy:finished', slow: true do
-  before do
-    install_test_app_with(config)
-  end
-
-  describe 'deploy' do
-    let(:config) {
-      %{
-        set :stage, :#{stage}
-        set :deploy_to, '#{deploy_to}'
-        set :repo_url, 'git://github.com/capistrano/capistrano.git'
-        set :branch, 'v3'
-        server 'localhost', roles: %w{web app}, user: '#{current_user}'
-        set :linked_files, %w{config/database.yml}
-        set :linked_dirs, %w{bin log public/system vendor/bundle}
-        }
-    }
-
-    describe 'symlink' do
-      before do
-        cap 'deploy:started'
-        cap 'deploy:updating'
-        cap 'deploy:publishing'
-      end
-
-      describe 'release' do
-        it 'symlinks the release to `current`' do
-          expect(File.symlink?(current_path)).to be_true
-          expect(File.readlink(current_path)).to match /\/tmp\/test_app\/deploy_to\/releases\/\d{14}/
-        end
-      end
-    end
-  end
-end

data/spec/integration/deploy_started_spec.rb

@@ -1,74 +0,0 @@
-require 'integration_spec_helper'
-
-describe 'cap deploy:started', slow: true do
-  before do
-    install_test_app_with(config)
-  end
-
-  describe 'deploy:check' do
-    let(:config) {
-      %{
-        set :stage, :#{stage}
-        set :deploy_to, '#{deploy_to}'
-        set :repo_url, 'git://github.com/capistrano/capistrano.git'
-        set :branch, 'v3'
-        server 'localhost', roles: %w{web app}, user: '#{current_user}'
-        set :linked_files, %w{config/database.yml}
-        set :linked_dirs, %w{bin log public/system vendor/bundle}
-      }
-    }
-
-    describe 'directories' do
-      before do
-        cap 'deploy:check:directories'
-      end
-
-      it 'ensures the directory structure' do
-        expect(shared_path).to be_a_directory
-        expect(releases_path).to be_a_directory
-      end
-    end
-
-    describe 'linked_dirs' do
-      before do
-        cap 'deploy:check:linked_dirs'
-      end
-
-      it 'ensure directories to be linked in `shared`' do
-        [
-          shared_path.join('bin'),
-          shared_path.join('log'),
-          shared_path.join('public/system'),
-          shared_path.join('vendor/bundle'),
-        ].each do |dir|
-          expect(dir).to be_a_directory
-        end
-      end
-    end
-
-    describe 'linked_files' do
-
-      subject { cap 'deploy:check:linked_files' }
-
-      context 'file does not exist' do
-        it 'fails' do
-          expect(subject).to match 'config/database.yml does not exist'
-        end
-      end
-
-      context 'file exists' do
-        before do
-          create_shared_directory('config')
-          create_shared_file('config/database.yml')
-        end
-
-        it 'suceeds' do
-          expect(subject).not_to match 'config/database.yml does not exist'
-          expect(subject).to match 'successful'
-        end
-
-      end
-    end
-  end
-end
-