capistrano 3.0.0.pre7 → 3.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117f494efdcee24c00ce4880240a374a8a8a82ee
-  data.tar.gz: e2eb9bee0c6d23634ba571f47e367584df04f112
+  metadata.gz: c435ab07209bb964ee9da9e5c134aa2265a9ed0d
+  data.tar.gz: a93041cc0f81586f08e4f32f528bc7c1ce87526b
 SHA512:
-  metadata.gz: 8abcc2ca0e5dd55d43d0e6e09ca13ec585b71b7fed96a9c1fd87a0d896c123257ddf49be61e7b4ea0c21edf4aa3397fc4b6938d1a10f653b0f5dceb682115ae0
-  data.tar.gz: 3412ab48b2ff5b8aeeec526113a7208955189bb933f5ba5b4cd9026cc47d2a2e6fb0b23c99c5d7d1e21cdc7aab472e2bc354a0ef6e20394565f40f940c30e97c
+  metadata.gz: 16860e60c8670911f0172c779cf573c49e7093dfb6c70ededee57894ec2f75d013b98794d4968a645d6f02dd721ffc0ba6d42b7aea75089f75757d079233ae56
+  data.tar.gz: 8e96b332b5a8f49517d343cb63f3587b26047397644bfb6f1638bee0af56fa4d3ff079f9c870596f20c9d61efbe106e76e86eb8d21644daa30125acd180d8053

data/.travis.yml

@@ -1,5 +1,7 @@
+language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
   - rbx-19mode
+script: "rake spec"

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 Reverse Chronological Order:
 
+## `3.0.0.pre10`
+
+ * Fixes pre9.
+
+## `3.0.0.pre9`
+
+ * Fixes a syntax error introduced with filtering (with tests) introduced in
+   `pre8`. (@leehambley)
+
+## `3.0.0.pre8`
+
+ * Fixed a syntax where `roles(:foo, :bar)` was being mistaken as a filter
+   (roles(:foo, :bar => nil). The correct syntax to use is: roles([:foo,:bar])
+   (@leehambley)
+
 ## `3.0.0.pre7`
 
  * Fix Git https authentication. (@leehambley)

data/lib/capistrano/configuration/servers.rb

@@ -41,7 +41,7 @@ module Capistrano
       end
 
       def fetch_roles(names, options)
-        if Array(names).map(&:to_sym).include?(:all)
+        if Array(names).flatten.map(&:to_sym).include?(:all)
           filter(servers, options)
         else
           role_servers = Array(names).flat_map { |name| fetch name }.uniq
@@ -70,7 +70,7 @@ module Capistrano
           if servers_with_filter.any?
             servers_with_filter
           else
-            fail I18n.t(:filter_removes_all_servers, scope: :capistrano, filter: key )
+            fail I18n.t(:filter_removes_all_servers, scope: :capistrano, filter: key || '(no filter)' )
           end
         end
 

data/lib/capistrano/i18n.rb

@@ -18,7 +18,7 @@ en = {
   mirror_exists:               "The repository mirror is at %{at}",
   revision_log_message:        'Branch %{branch} deployed as release %{release} by %{user}',
   rollback_log_message:        '%{user} rolled back to release %{release}',
-  filter_removes_all_servers:  'Your filter `:%{filter}` would remove all matching servers',
+  filter_removes_all_servers:  'Your filter `%{filter}` would remove all matching servers',
   console: {
     welcome:  'capistrano console - enter command to execute on %{stage}',
     bye:      'bye'

data/lib/capistrano/tasks/deploy.rake

@@ -59,7 +59,7 @@ namespace :deploy do
   namespace :symlink do
     desc 'Symlink release to current'
     task :release do
-      on roles :web, :app do
+      on roles :all do
         execute :rm, '-rf', current_path
         execute :ln, '-s', release_path, current_path
       end

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.0.0.pre7"
+  VERSION = "3.0.0.pre10"
 end

data/spec/integration/dsl_spec.rb

@@ -21,6 +21,13 @@ describe Capistrano::DSL do
         end
       end
 
+      describe 'fetching servers by multiple roles' do
+        it "does not confuse the last role with options" do
+          expect(dsl.roles(:app, :web).count).to eq 4
+          expect(dsl.roles(:app, :web, filter: :active).count).to eq 2
+        end
+      end
+
       describe 'fetching servers by role' do
         subject { dsl.roles(:app) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre7
+  version: 3.0.0.pre10
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit