capistrano 3.2.1 → 3.3.3

data/spec/lib/capistrano/upload_task_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Capistrano::UploadTask do
+  let(:app) { Rake.application = Rake::Application.new }
+
+  subject(:upload_task) { described_class.define_task('path/file.yml') }
+
+  it { is_expected.to be_a(Rake::FileCreationTask) }
+  it { is_expected.to be_needed }
+
+  context 'inside namespace' do
+    let(:normal_task) { Rake::Task.define_task('path/other_file.yml') }
+
+    around { |ex| app.in_namespace('namespace', &ex) }
+
+    it { expect(upload_task.name).to eq('path/file.yml') }
+    it { expect(upload_task.scope.path).to eq('namespace') }
+  end
+end

data/spec/lib/capistrano/version_validator_spec.rb

@@ -24,7 +24,7 @@ module Capistrano
       context 'with exact version' do
         context 'valid' do
           let(:version) { '3.0.1' }
-          it { should be_true }
+          it { expect(subject).to be_truthy }
         end
 
         context 'invalid - lower' do
@@ -48,7 +48,7 @@ module Capistrano
       context 'with optimistic versioning' do
         context 'valid' do
           let(:version) { '>= 3.0.0' }
-          it { should be_true }
+          it { expect(subject).to be_truthy }
         end
 
         context 'invalid - lower' do
@@ -66,7 +66,7 @@ module Capistrano
         context '2 decimal places' do
           context 'valid' do
             let(:version) { '~> 3.0.0' }
-            it { should be_true }
+            it { expect(subject).to be_truthy }
           end
 
           context 'invalid' do
@@ -83,7 +83,7 @@ module Capistrano
 
           context 'valid' do
             let(:version) { '~> 3.1' }
-            it { should be_true }
+            it { expect(subject).to be_truthy }
           end
 
           context 'invalid' do

data/spec/spec_helper.rb

@@ -3,13 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'capistrano/all'
 require 'rspec'
 require 'mocha/api'
+require 'time'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir['#{File.dirname(__FILE__)}/support/**/*.rb'].each {|f| require f}
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+	config.raise_errors_for_deprecations!
   config.mock_framework = :mocha
   config.order = 'random'
 end

data/spec/support/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant::Config.run do |config|
       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'
+      config.vm.provision :shell, inline: 'sudo apt-get -y install git-core'
     end
   end
 

data/spec/support/test_app.rb

@@ -1,4 +1,6 @@
 require 'fileutils'
+require 'pathname'
+
 module TestApp
   extend self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Tom Clements
@@ -9,76 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: capistrano-stats
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: mocha
   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
@@ -92,8 +106,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -113,16 +127,16 @@ files:
 - features/step_definitions/setup.rb
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
+- features/support/vagrant_helpers.rb
 - lib/Capfile
 - lib/capistrano.rb
 - lib/capistrano/all.rb
 - lib/capistrano/application.rb
 - lib/capistrano/configuration.rb
+- lib/capistrano/configuration/filter.rb
 - lib/capistrano/configuration/question.rb
 - lib/capistrano/configuration/server.rb
 - lib/capistrano/configuration/servers.rb
-- lib/capistrano/configuration/servers/host_filter.rb
-- lib/capistrano/configuration/servers/role_filter.rb
 - lib/capistrano/console.rb
 - lib/capistrano/defaults.rb
 - lib/capistrano/deploy.rb
@@ -150,23 +164,25 @@ files:
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/deploy.rb.erb
 - lib/capistrano/templates/stage.rb.erb
+- lib/capistrano/upload_task.rb
 - lib/capistrano/version.rb
 - lib/capistrano/version_validator.rb
 - spec/integration/dsl_spec.rb
 - spec/integration_spec_helper.rb
 - spec/lib/capistrano/application_spec.rb
+- spec/lib/capistrano/configuration/filter_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
-- spec/lib/capistrano/configuration/servers/host_filter_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/paths_spec.rb
+- spec/lib/capistrano/dsl/task_enhancements_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
 - spec/lib/capistrano/git_spec.rb
 - spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/scm_spec.rb
 - spec/lib/capistrano/svn_spec.rb
+- spec/lib/capistrano/upload_task_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
@@ -182,25 +198,27 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |
-  Capistrano 3.1 has some breaking changes, like `deploy:restart` callback should be added manually to your deploy.rb. Please, check the CHANGELOG: http://goo.gl/SxB0lr
+  Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr
 
   If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB
+
+  The `deploy:restart` hook for passenger applications is now in a separate gem called capistrano-passenger.  Just add it to your Gemfile and require it in your Capfile.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -215,21 +233,23 @@ test_files:
 - features/step_definitions/setup.rb
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
+- features/support/vagrant_helpers.rb
 - spec/integration/dsl_spec.rb
 - spec/integration_spec_helper.rb
 - spec/lib/capistrano/application_spec.rb
+- spec/lib/capistrano/configuration/filter_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
-- spec/lib/capistrano/configuration/servers/host_filter_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/paths_spec.rb
+- spec/lib/capistrano/dsl/task_enhancements_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
 - spec/lib/capistrano/git_spec.rb
 - spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/scm_spec.rb
 - spec/lib/capistrano/svn_spec.rb
+- spec/lib/capistrano/upload_task_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
@@ -240,4 +260,3 @@ test_files:
 - spec/support/tasks/fail.rake
 - spec/support/tasks/failed.rake
 - spec/support/test_app.rb
-has_rdoc: 

data/lib/capistrano/configuration/servers/host_filter.rb

@@ -1,82 +0,0 @@
-module Capistrano
-  class Configuration
-    class Servers
-      class HostFilter
-
-        def initialize(available)
-          @available = available
-        end
-
-        def self.for(available)
-          new(available).hosts
-        end
-
-        def hosts
-          if host_filter.any?
-            @available.select { |server| host_filter.include? server.hostname }
-          else
-            @available
-          end
-        end
-
-        private
-
-        def filter
-          if host_filter.any?
-            host_filter
-          else
-            @available
-          end
-        end
-
-        def host_filter
-          env_filter | configuration_filter
-        end
-
-        def configuration_filter
-          ConfigurationFilter.new.hosts
-        end
-
-        def env_filter
-          EnvFilter.new.hosts
-        end
-
-        class ConfigurationFilter
-
-          def hosts
-            if filter
-              Array(filter.fetch(:hosts, []))
-            else
-              []
-            end
-          end
-
-          def config
-            Configuration.env
-          end
-
-          def filter
-            config.fetch(:filter) || config.fetch(:select)
-          end
-        end
-
-
-        class EnvFilter
-
-          def hosts
-            if filter
-              filter.split(',')
-            else
-              []
-            end
-          end
-
-          def filter
-            ENV['HOSTS']
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/capistrano/configuration/servers/role_filter.rb

@@ -1,86 +0,0 @@
-module Capistrano
-  class Configuration
-    class Servers
-      class RoleFilter
-
-        def initialize(required, available)
-          @required, @available = required, available
-        end
-
-        def self.for(required, available)
-          new(required, available).roles
-        end
-
-        def roles
-          if required.include?(:all)
-            available
-          else
-            required.select { |name| available.include? name }
-          end
-        end
-
-        private
-
-        def required
-          Array(@required).flat_map(&:to_sym)
-        end
-
-        def available
-          if role_filter.any?
-            role_filter
-          else
-            @available
-          end
-        end
-
-        def role_filter
-          env_filter | configuration_filter
-        end
-
-        def configuration_filter
-          ConfigurationFilter.new.roles
-        end
-
-        def env_filter
-          EnvFilter.new.roles
-        end
-
-        class ConfigurationFilter
-
-          def roles
-            if filter
-              Array(filter.fetch(:roles, [])).map(&:to_sym)
-            else
-              []
-            end
-          end
-
-          def config
-            Configuration.env
-          end
-
-          def filter
-            config.fetch(:filter) || config.fetch(:select)
-          end
-        end
-
-
-        class EnvFilter
-
-          def roles
-            if filter
-              filter.split(',').map(&:to_sym)
-            else
-              []
-            end
-          end
-
-          def filter
-            ENV['ROLES']
-          end
-        end
-
-      end
-    end
-  end
-end