capistrano 3.7.0.beta1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e931dfadef610b41da34b4f62e12a7a27c811cd0
-  data.tar.gz: f50c1a957e6a56af182eefe19025021ec94b8e62
+  metadata.gz: ce22b5f5826e88b5fd92b3369c02344f20e2191e
+  data.tar.gz: 491397aab719879777bec4153c3125575f86e62a
 SHA512:
-  metadata.gz: f5d746ae4fb0ef00e20856e805587be8d1215f692cbb23d10a24a5df90e078a7f1d901909085824d27e9eafb03b5ce85ccf6099ff540d001dc2aac958761fe79
-  data.tar.gz: 491a552e20243bb82c77274d95d726cb0be2e37e6cccb866473b7621cc5549087b3a45cec370957f237c259d6439df77fc0834d71dc7e3fd586639b080dc9fd4
+  metadata.gz: 37864d78dd2d14478f0e9edcb316ac5e68fe5dc83b02bfd4017b1790350b26d1c929f6b94890fe351101fd05257f4bf8ce427fb8f5be0d1758e36e48fcc70fd5
+  data.tar.gz: 6eec3f49c1e4867137d3d266d533c44bcba2bc076d1e8d003e51bcc8735a14f613ef8c49a86f69417cd40deca95b2827115885289113e490ea8bf0940639c50b

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
   - 2.2
   - 2.1
   - 2.0
@@ -13,6 +13,10 @@ matrix:
   include:
     - rvm: rbx-2
       script: bundle exec rake spec
+    # Run Danger only once, on 2.3.1
+    - rvm: 2.3.1
+      before_script: bundle exec danger
+
 script: bundle exec rake spec rubocop
 install: bundle install --jobs=1
 cache: bundler

data/CHANGELOG.md

@@ -4,10 +4,36 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/capistrano/capistrano/compare/v3.7.0.beta1...HEAD
+https://github.com/capistrano/capistrano/compare/v3.7.0...HEAD
 
 * Your contribution here!
 
+## `3.7.0` (2016-12-10)
+
+https://github.com/capistrano/capistrano/compare/v3.6.1...v3.7.0
+
+*Note: These release notes include all changes since 3.6.1, including the changes that were first published in 3.7.0.beta1.*
+
+### Deprecations:
+
+* The `set :scm, ...` mechanism is now deprecated in favor of a new SCM plugin system. See the [UPGRADING-3.7](UPGRADING-3.7.md) document for details
+
+### Potentially breaking changes:
+
+* The `:git_strategy`, `:hg_strategy`, and `:svn_strategy` settings have been removed with no replacement. If you have been using these to customize Capistrano's SCM behavior, you will need to rewrite your customization using the [new plugin system](http://capistranorb.com/documentation/advanced-features/custom-scm/)
+* `remote_file` feature has been removed and is no longer available to use @SaiVardhan
+
+### New features:
+
+* The `tar` used by the Git SCM now honors the SSHKit command map, allowing an alternative tar binary to be used (e.g. gtar) #1787 (@caius)
+* Add support for custom on-filters [#1776](https://github.com/capistrano/capistrano/issues/1776)
+
+### Fixes:
+
+* Fix test suite to work with Mocha 1.2.0 (@caius)
+* Fix bug where host_filter and role_filter were overly greedy [#1766](https://github.com/capistrano/capistrano/issues/1766) (@cseeger-epages)
+* Fix the removal of old releases `deploy:cleanup`. Logic is changed because of unreliable modification times on folders. Removal of directories is now decided by sorting on folder names (name is generated from current datetime format YmdHis). Cleanup is skipped, and a warning is given when a folder name is in a different format
+
 ## `3.7.0.beta1` (2016-11-02)
 
 https://github.com/capistrano/capistrano/compare/v3.6.1...v3.7.0.beta1

data/Dangerfile

@@ -0,0 +1,54 @@
+# Adapted from https://github.com/ruby-grape/danger/blob/master/Dangerfile
+# Q: What is a Dangerfile, anyway? A: See http://danger.systems/
+
+# ------------------------------------------------------------------------------
+# Additional pull request data
+# ------------------------------------------------------------------------------
+project_name = github.pr_json["base"]["repo"]["name"]
+pr_number = github.pr_json["number"]
+pr_url = github.pr_json["_links"]["html"]["href"]
+
+# ------------------------------------------------------------------------------
+# What changed?
+# ------------------------------------------------------------------------------
+has_lib_changes = !git.modified_files.grep(/^lib/).empty?
+has_test_changes = !git.modified_files.grep(/^(features|spec)/).empty?
+has_changelog_changes = git.modified_files.include?("CHANGELOG.md")
+
+# ------------------------------------------------------------------------------
+# You've made changes to lib, but didn't write any tests?
+# ------------------------------------------------------------------------------
+if has_lib_changes && !has_test_changes
+  warn("There are code changes, but no corresponding tests. "\
+       "Please include tests if this PR introduces any modifications in "\
+       "#{project_name}'s behavior.",
+       :sticky => false)
+end
+
+# ------------------------------------------------------------------------------
+# Have you updated CHANGELOG.md?
+# ------------------------------------------------------------------------------
+if !has_changelog_changes && has_lib_changes
+  markdown <<-MARKDOWN
+Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
+
+```markdown
+* [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
+```
+MARKDOWN
+  warn("Please update CHANGELOG.md with a description of your changes. "\
+       "If this PR is not a user-facing change (e.g. just refactoring), "\
+       "you can disregard this.", :sticky => false)
+end
+
+# ------------------------------------------------------------------------------
+# Did you remove the CHANGELOG's "Your contribution here!" line?
+# ------------------------------------------------------------------------------
+if has_changelog_changes
+  unless IO.read("CHANGELOG.md") =~ /^\* Your contribution here/i
+    fail(
+      "Please put the `* Your contribution here!` line back into CHANGELOG.md.",
+      :sticky => false
+    )
+  end
+end

data/README.md

@@ -103,7 +103,7 @@ Add Capistrano to your project's Gemfile:
 
 ``` ruby
 group :development do
-  gem "capistrano", "~> 3.6"
+  gem "capistrano", "~> 3.7"
 end
 ```
 

data/capistrano.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "sshkit", ">= 1.9.0"
   gem.add_dependency "capistrano-harrow"
 
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "danger"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "rubocop"
 end

data/lib/capistrano/configuration.rb

@@ -110,8 +110,25 @@ module Capistrano
       @timestamp ||= Time.now.utc
     end
 
+    def add_filter(filter=nil, &block)
+      if block
+        raise ArgumentError, "Both a block and an object were given" if filter
+
+        filter = Object.new
+        def filter.filter(servers)
+          block.call(servers)
+        end
+      elsif !filter.respond_to? :filter
+        raise TypeError, "Provided custom filter <#{filter.inspect}> does " \
+                         "not have a public 'filter' method"
+      end
+      @custom_filters ||= []
+      @custom_filters << filter
+    end
+
     def setup_filters
-      @filters = cmdline_filters.clone
+      @filters = cmdline_filters
+      @filters += @custom_filters if @custom_filters
       @filters << Filter.new(:role, ENV["ROLES"]) if ENV["ROLES"]
       @filters << Filter.new(:host, ENV["HOSTS"]) if ENV["HOSTS"]
       fh = fetch_for(:filter, {}) || {}

data/lib/capistrano/i18n.rb

@@ -12,6 +12,7 @@ en = {
   written_file: "create %{file}",
   question: "Please enter %{key} (%{default_value}): ",
   keeping_releases: "Keeping %{keep_releases} of %{releases} deployed releases on %{host}",
+  skip_cleanup: "Skipping cleanup of old releases on %{host}; unexpected foldername found (should be timestamp)",
   no_old_releases: "No old releases (keeping newest %{keep_releases}) on %{host}",
   linked_file_does_not_exist: "linked file %{file} does not exist on %{host}",
   cannot_rollback: "There are no older releases to rollback to",

data/lib/capistrano/tasks/deploy.rake

@@ -148,8 +148,10 @@ namespace :deploy do
   desc "Clean up old releases"
   task :cleanup do
     on release_roles :all do |host|
-      releases = capture(:ls, "-xtr", releases_path).split
-      if releases.count >= fetch(:keep_releases)
+      releases = capture(:ls, "-x", releases_path).split
+      if !(releases.all? { |e| /^\d{14}$/ =~ e })
+        warn t(:skip_cleanup, host: host.to_s)
+      elsif releases.count >= fetch(:keep_releases)
         info t(:keeping_releases, host: host.to_s, keep_releases: fetch(:keep_releases), releases: releases.count)
         directories = (releases - releases.last(fetch(:keep_releases)))
         if directories.any?

data/lib/capistrano/templates/stage.rb.erb

@@ -13,7 +13,7 @@
 # ==================
 
 # Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
+# group is considered to be the first unless any hosts have the primary
 # property set. Specify the username and a domain or IP for the server.
 # Don't use `:all`, it's a meta role.
 

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.7.0.beta1".freeze
+  VERSION = "3.7.0".freeze
 end

data/spec/lib/capistrano/configuration_spec.rb

@@ -304,5 +304,54 @@ module Capistrano
         expect(config.dry_run?).to eq(true)
       end
     end
+
+    describe "custom filtering" do
+      it "accepts a custom filter object" do
+        filter = Object.new
+        def filter.filter(servers)
+          servers
+        end
+        config.add_filter(filter)
+      end
+
+      it "accepts a custom filter as a block" do
+        config.add_filter { |servers| servers }
+      end
+
+      it "raises an error if passed a block and an object" do
+        filter = Object.new
+        def filter.filter(servers)
+          servers
+        end
+
+        expect { config.add_filter(filter) { |servers| servers } }.to raise_error(ArgumentError)
+      end
+
+      it "raises an error if the filter lacks a filter method" do
+        filter = Object.new
+        expect { config.add_filter(filter) }.to raise_error(TypeError)
+      end
+
+      it "calls the filter method of a custom filter" do
+        ENV.delete "ROLES"
+        ENV.delete "HOSTS"
+
+        servers = Configuration::Servers.new
+
+        servers.add_host("test1")
+        servers.add_host("test2")
+        servers.add_host("test3")
+
+        filtered_servers = servers.take(2)
+
+        filter = mock("custom filter")
+        filter.expects(:filter)
+              .with { |subset| subset.is_a? Configuration::Servers }
+              .returns(filtered_servers)
+
+        config.add_filter(filter)
+        expect(config.filter(servers)).to eq(filtered_servers)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.7.0.beta1
+  version: 3.7.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: danger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +156,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
+- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -277,12 +292,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.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.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH