[DRE-commits] [capistrano] 01/01: New upstream version 3.10.1

[Samuel Henrique]

This is an automated email from the git hooks/post-receive script.

samueloph-guest pushed a commit to annotated tag upstream/3.10.1
in repository capistrano.

commit c3ad5c23daeb8c11eef7ac83a01c38c1a2406b27
Author: Samuel Henrique <samueloph at gmail.com>
Date:   Mon Dec 11 23:33:34 2017 -0200

    New upstream version 3.10.1
---
 CHANGELOG.md                                          | 14 +++++++++++++-
 LICENSE.txt                                           |  2 +-
 lib/capistrano/configuration/host_filter.rb           |  2 +-
 lib/capistrano/version.rb                             |  2 +-
 spec/lib/capistrano/configuration/host_filter_spec.rb | 10 +++++-----
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d3e6a8..466dace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,10 +16,22 @@ gem "capistrano", :github => "capistrano/capistrano"
 
 ## [master]
 
-[master]: https://github.com/capistrano/capistrano/compare/v3.10.0...HEAD
+[master]: https://github.com/capistrano/capistrano/compare/v3.10.1...HEAD
 
 * Your contribution here!
 
+## [`3.10.1`] (2017-12-08)
+
+[`3.10.1`]: https://github.com/capistrano/capistrano/compare/v3.10.0...v3.10.1
+
+### Breaking changes:
+
+* None
+
+### Fixes:
+
+* [#1954](https://github.com/capistrano/capistrano/pull/1954): Fix Host filtering when multi-host strings contain `0`
+
 ## [`3.10.0`] (2017-10-23)
 
 [`3.10.0`]: https://github.com/capistrano/capistrano/compare/v3.9.1...v3.10.0
diff --git a/LICENSE.txt b/LICENSE.txt
index 24b6d22..5550233 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2012-2016 Tom Clements, Lee Hambley
+Copyright (c) 2012-2017 Tom Clements, Lee Hambley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/capistrano/configuration/host_filter.rb b/lib/capistrano/configuration/host_filter.rb
index 2fb205c..764b733 100644
--- a/lib/capistrano/configuration/host_filter.rb
+++ b/lib/capistrano/configuration/host_filter.rb
@@ -3,7 +3,7 @@ module Capistrano
     class HostFilter
       def initialize(values)
         av = Array(values).dup
-        av = av.flat_map { |v| v.is_a?(String) && v =~ /^(?<name>[-A-Za-z1-9.]+)(,\g<name>)*$/ ? v.split(",") : v }
+        av = av.flat_map { |v| v.is_a?(String) && v =~ /^(?<name>[-A-Za-z0-9.]+)(,\g<name>)*$/ ? v.split(",") : v }
         @rex = regex_matcher(av)
       end
 
diff --git a/lib/capistrano/version.rb b/lib/capistrano/version.rb
index 046bfde..441ad38 100644
--- a/lib/capistrano/version.rb
+++ b/lib/capistrano/version.rb
@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.10.0".freeze
+  VERSION = "3.10.1".freeze
 end
diff --git a/spec/lib/capistrano/configuration/host_filter_spec.rb b/spec/lib/capistrano/configuration/host_filter_spec.rb
index 1bf402a..9b3cb10 100644
--- a/spec/lib/capistrano/configuration/host_filter_spec.rb
+++ b/spec/lib/capistrano/configuration/host_filter_spec.rb
@@ -10,7 +10,7 @@ module Capistrano
          Server.new("server2"),
          Server.new("server3"),
          Server.new("server4"),
-         Server.new("server5")]
+         Server.new("server10")]
       end
 
       shared_examples "it filters hosts correctly" do |expected|
@@ -32,8 +32,8 @@ module Capistrano
         end
 
         context "with a comma separated string" do
-          let(:values) { "server1,server3" }
-          it_behaves_like "it filters hosts correctly", %w{server1 server3}
+          let(:values) { "server1,server10" }
+          it_behaves_like "it filters hosts correctly", %w{server1 server10}
         end
 
         context "with an array of strings" do
@@ -53,12 +53,12 @@ module Capistrano
 
         context "with a regexp with line boundaries" do
           let(:values) { "^server" }
-          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server5}
+          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server10}
         end
 
         context "with a regexp with a comma" do
           let(:values) { 'server\d{1,3}$' }
-          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server5}
+          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server10}
         end
 
         context "without number" do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/capistrano.git