capistrano 3.4.1 → 3.5.0

data/lib/capistrano/tasks/hg.rake

@@ -3,14 +3,14 @@ namespace :hg do
     @strategy ||= Capistrano::Hg.new(self, fetch(:hg_strategy, Capistrano::Hg::DefaultStrategy))
   end
 
-  desc 'Check that the repo is reachable'
+  desc "Check that the repo is reachable"
   task :check do
     on release_roles :all do
       strategy.check
     end
   end
 
-  desc 'Clone the repo to the cache'
+  desc "Clone the repo to the cache"
   task :clone do
     on release_roles :all do
       if strategy.test
@@ -23,8 +23,8 @@ namespace :hg do
     end
   end
 
-  desc 'Pull changes from the remote repo'
-  task :update => :'hg:clone' do
+  desc "Pull changes from the remote repo"
+  task update: :'hg:clone' do
     on release_roles :all do
       within repo_path do
         strategy.update
@@ -32,8 +32,8 @@ namespace :hg do
     end
   end
 
-  desc 'Copy repo to releases'
-  task :create_release => :'hg:update' do
+  desc "Copy repo to releases"
+  task create_release: :'hg:update' do
     on release_roles :all do
       within repo_path do
         strategy.release
@@ -41,7 +41,7 @@ namespace :hg do
     end
   end
 
-  desc 'Determine the revision that will be deployed'
+  desc "Determine the revision that will be deployed"
   task :set_current_revision do
     on release_roles :all do
       within repo_path do

data/lib/capistrano/tasks/install.rake

@@ -1,12 +1,12 @@
-require 'erb'
-require 'pathname'
-desc 'Install Capistrano, cap install STAGES=staging,production'
+require "erb"
+require "pathname"
+desc "Install Capistrano, cap install STAGES=staging,production"
 task :install do
-  envs = ENV['STAGES'] || 'staging,production'
+  envs = ENV["STAGES"] || "staging,production"
 
-  tasks_dir = Pathname.new('lib/capistrano/tasks')
-  config_dir = Pathname.new('config')
-  deploy_dir = config_dir.join('deploy')
+  tasks_dir = Pathname.new("lib/capistrano/tasks")
+  config_dir = Pathname.new("config")
+  deploy_dir = config_dir.join("deploy")
 
   deploy_rb = File.expand_path("../../templates/deploy.rb.erb", __FILE__)
   stage_rb = File.expand_path("../../templates/stage.rb.erb", __FILE__)
@@ -14,14 +14,14 @@ task :install do
 
   mkdir_p deploy_dir
 
-  entries = [{template: deploy_rb, file: config_dir.join('deploy.rb')}]
-  entries += envs.split(',').map { |stage| {template: stage_rb, file: deploy_dir.join("#{stage}.rb")} }
+  entries = [{ template: deploy_rb, file: config_dir.join("deploy.rb") }]
+  entries += envs.split(",").map { |stage| { template: stage_rb, file: deploy_dir.join("#{stage}.rb") } }
 
   entries.each do |entry|
-    if File.exists?(entry[:file])
+    if File.exist?(entry[:file])
       warn "[skip] #{entry[:file]} already exists"
     else
-      File.open(entry[:file], 'w+') do |f|
+      File.open(entry[:file], "w+") do |f|
         f.write(ERB.new(File.read(entry[:template])).result(binding))
         puts I18n.t(:written_file, scope: :capistrano, file: entry[:file])
       end
@@ -30,13 +30,12 @@ task :install do
 
   mkdir_p tasks_dir
 
-  if File.exists?('Capfile')
+  if File.exist?("Capfile")
     warn "[skip] Capfile already exists"
   else
-    FileUtils.cp(capfile, 'Capfile')
-    puts I18n.t(:written_file, scope: :capistrano, file: 'Capfile')
+    FileUtils.cp(capfile, "Capfile")
+    puts I18n.t(:written_file, scope: :capistrano, file: "Capfile")
   end
 
-
   puts I18n.t :capified, scope: :capistrano
 end

data/lib/capistrano/tasks/svn.rake

@@ -3,14 +3,14 @@ namespace :svn do
     @strategy ||= Capistrano::Svn.new(self, fetch(:svn_strategy, Capistrano::Svn::DefaultStrategy))
   end
 
-  desc 'Check that the repo is reachable'
+  desc "Check that the repo is reachable"
   task :check do
     on release_roles :all do
       strategy.check
     end
   end
 
-  desc 'Clone the repo to the cache'
+  desc "Clone the repo to the cache"
   task :clone do
     on release_roles :all do
       if strategy.test
@@ -23,8 +23,8 @@ namespace :svn do
     end
   end
 
-  desc 'Pull changes from the remote repo'
-  task :update => :'svn:clone' do
+  desc "Pull changes from the remote repo"
+  task update: :'svn:clone' do
     on release_roles :all do
       within repo_path do
         strategy.update
@@ -32,8 +32,8 @@ namespace :svn do
     end
   end
 
-  desc 'Copy repo to releases'
-  task :create_release => :'svn:update' do
+  desc "Copy repo to releases"
+  task create_release: :'svn:update' do
     on release_roles :all do
       within repo_path do
         strategy.release
@@ -41,7 +41,7 @@ namespace :svn do
     end
   end
 
-  desc 'Determine the revision that will be deployed'
+  desc "Determine the revision that will be deployed"
   task :set_current_revision do
     on release_roles :all do
       within repo_path do

data/lib/capistrano/templates/Capfile

@@ -1,8 +1,8 @@
 # Load DSL and set up stages
-require 'capistrano/setup'
+require "capistrano/setup"
 
 # Include default deployment tasks
-require 'capistrano/deploy'
+require "capistrano/deploy"
 
 # Include tasks from other gems included in your Gemfile
 #
@@ -24,4 +24,4 @@ require 'capistrano/deploy'
 # require 'capistrano/passenger'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
+Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

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

@@ -13,11 +13,12 @@ set :repo_url, 'git@example.com:me/my_repo.git'
 # Default value for :scm is :git
 # set :scm, :git
 
-# Default value for :format is :pretty
-# set :format, :pretty
+# Default value for :format is :airbrussh.
+# set :format, :airbrussh
 
-# Default value for :log_level is :debug
-# set :log_level, :debug
+# You can configure the Airbrussh format using :format_options.
+# These are the defaults.
+# set :format_options, command_output: true, log_file: 'log/capistrano.log', color: :auto, truncate: :auto
 
 # Default value for :pty is false
 # set :pty, true
@@ -26,7 +27,7 @@ set :repo_url, 'git@example.com:me/my_repo.git'
 # set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml')
 
 # Default value for linked_dirs is []
-# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'public/system')
+# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system')
 
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }

data/lib/capistrano/upload_task.rb

@@ -1,4 +1,4 @@
-require 'rake/file_creation_task'
+require "rake/file_creation_task"
 
 module Capistrano
   class UploadTask < Rake::FileCreationTask

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.4.1"
+  VERSION = "3.5.0".freeze
 end

data/lib/capistrano/version_validator.rb

@@ -1,6 +1,5 @@
 module Capistrano
   class VersionValidator
-
     def initialize(version)
       @version = version
     end
@@ -9,13 +8,13 @@ module Capistrano
       if match?
         self
       else
-        fail "Capfile locked at #{version}, but #{current_version} is loaded"
+        raise "Capfile locked at #{version}, but #{current_version} is loaded"
       end
     end
 
     private
-    attr_reader :version
 
+    attr_reader :version
 
     def match?
       available =~ requested
@@ -26,12 +25,11 @@ module Capistrano
     end
 
     def available
-      Gem::Dependency.new('cap', version)
+      Gem::Dependency.new("cap", version)
     end
 
     def requested
-      Gem::Dependency.new('cap', current_version)
+      Gem::Dependency.new("cap", current_version)
     end
-
   end
 end

data/spec/integration/dsl_spec.rb

@@ -1,148 +1,177 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Capistrano::DSL do
-
   let(:dsl) { Class.new.extend Capistrano::DSL }
 
   before do
     Capistrano::Configuration.reset!
   end
 
-  describe 'setting and fetching hosts' do
-    describe 'when defining a host using the `server` syntax' do
+  describe "setting and fetching hosts" do
+    describe "when defining a host using the `server` syntax" do
       before do
-        dsl.server 'example1.com', roles: %w{web}, active: true
-        dsl.server 'example2.com', roles: %w{web}
-        dsl.server 'example3.com', roles: %w{app web}, active: true
-        dsl.server 'example4.com', roles: %w{app}, primary: true
-        dsl.server 'example5.com', roles: %w{db}, no_release: true, active:true
+        dsl.server "example1.com", roles: %w{web}, active: true
+        dsl.server "example2.com", roles: %w{web}
+        dsl.server "example3.com", roles: %w{app web}, active: true
+        dsl.server "example4.com", roles: %w{app}, primary: true
+        dsl.server "example5.com", roles: %w{db}, no_release: true, active: true
       end
 
-      describe 'fetching all servers' do
+      describe "fetching all servers" do
         subject { dsl.roles(:all) }
 
-        it 'returns all servers' do
+        it "returns all servers" do
           expect(subject.map(&:hostname)).to eq %w{example1.com example2.com example3.com example4.com example5.com}
         end
       end
 
-      describe 'fetching all release servers' do
-
-        context 'with no additional options' do
+      describe "fetching all release servers" do
+        context "with no additional options" do
           subject { dsl.release_roles(:all) }
 
-          it 'returns all release servers' do
+          it "returns all release servers" do
             expect(subject.map(&:hostname)).to eq %w{example1.com example2.com example3.com example4.com}
           end
         end
 
-        context 'with property filter options' do
+        context "with property filter options" do
           subject { dsl.release_roles(:all, filter: :active) }
 
-          it 'returns all release servers that match the property filter' do
+          it "returns all release servers that match the property filter" do
             expect(subject.map(&:hostname)).to eq %w{example1.com example3.com}
           end
         end
       end
 
-      describe 'fetching servers by multiple roles' do
+      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
+      describe "fetching servers by role" do
         subject { dsl.roles(:app) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com example4.com}
         end
       end
 
-      describe 'fetching servers by an array of roles' do
+      describe "fetching servers by an array of roles" do
         subject { dsl.roles([:app]) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com example4.com}
         end
       end
 
-      describe 'fetching filtered servers by role' do
+      describe "fetching filtered servers by role" do
         subject { dsl.roles(:app, filter: :active) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com}
         end
       end
 
-      describe 'fetching selected servers by role' do
+      describe "fetching selected servers by role" do
         subject { dsl.roles(:app, select: :active) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com}
         end
       end
 
-      describe 'fetching the primary server by role' do
-        context 'when inferring primary status based on order' do
+      describe "fetching the primary server by role" do
+        context "when inferring primary status based on order" do
           subject { dsl.primary(:web) }
-          it 'returns the servers' do
-            expect(subject.hostname).to eq 'example1.com'
+          it "returns the servers" do
+            expect(subject.hostname).to eq "example1.com"
           end
         end
 
-        context 'when the attribute `primary` is explicitly set' do
+        context "when the attribute `primary` is explicitly set" do
           subject { dsl.primary(:app) }
-          it 'returns the servers' do
-            expect(subject.hostname).to eq 'example4.com'
+          it "returns the servers" do
+            expect(subject.hostname).to eq "example4.com"
           end
         end
       end
 
-      describe 'setting an internal host filter' do
+      describe "setting an internal host filter" do
         subject { dsl.roles(:app) }
-        it 'is ignored' do
-          dsl.set :filter, { host: 'example3.com' }
-          expect(subject.map(&:hostname)).to eq(['example3.com', 'example4.com'])
+        it "is ignored" do
+          dsl.set :filter, host: "example3.com"
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
         end
       end
 
-      describe 'setting an internal role filter' do
+      describe "setting an internal role filter" do
         subject { dsl.roles(:app) }
-        it 'ignores it' do
-          dsl.set :filter, { role: :web }
-          expect(subject.map(&:hostname)).to eq(['example3.com','example4.com'])
+        it "ignores it" do
+          dsl.set :filter, role: :web
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
         end
       end
 
-      describe 'setting an internal host and role filter' do
+      describe "setting an internal host and role filter" do
         subject { dsl.roles(:app) }
-        it 'ignores it' do
-          dsl.set :filter, { role: :web, host: 'example1.com' }
-          expect(subject.map(&:hostname)).to eq(['example3.com','example4.com'])
+        it "ignores it" do
+          dsl.set :filter, role: :web, host: "example1.com"
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
         end
       end
 
-      describe 'setting an internal regexp host filter' do
+      describe "setting an internal regexp host filter" do
         subject { dsl.roles(:all) }
-        it 'is ignored' do
-          dsl.set :filter, { host: /1/ }
+        it "is ignored" do
+          dsl.set :filter, host: /1/
           expect(subject.map(&:hostname)).to eq(%w{example1.com example2.com example3.com example4.com example5.com})
         end
       end
 
+      describe "setting an internal hosts filter" do
+        subject { dsl.roles(:app) }
+        it "is ignored" do
+          dsl.set :filter, hosts: "example3.com"
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
+        end
+      end
+
+      describe "setting an internal roles filter" do
+        subject { dsl.roles(:app) }
+        it "ignores it" do
+          dsl.set :filter, roles: :web
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
+        end
+      end
+
+      describe "setting an internal hosts and roles filter" do
+        subject { dsl.roles(:app) }
+        it "ignores it" do
+          dsl.set :filter, roles: :web, hosts: "example1.com"
+          expect(subject.map(&:hostname)).to eq(["example3.com", "example4.com"])
+        end
+      end
+
+      describe "setting an internal regexp hosts filter" do
+        subject { dsl.roles(:all) }
+        it "is ignored" do
+          dsl.set :filter, hosts: /1/
+          expect(subject.map(&:hostname)).to eq(%w{example1.com example2.com example3.com example4.com example5.com})
+        end
+      end
     end
 
-    describe 'when defining role with reserved name' do
-      it 'fails with ArgumentError' do
-        expect {
+    describe "when defining role with reserved name" do
+      it "fails with ArgumentError" do
+        expect do
           dsl.role :all, %w{example1.com}
-        }.to raise_error(ArgumentError, "all reserved name for role. Please choose another name")
+        end.to raise_error(ArgumentError, "all reserved name for role. Please choose another name")
       end
     end
 
-    describe 'when defining hosts using the `role` syntax' do
+    describe "when defining hosts using the `role` syntax" do
       before do
         dsl.role :web, %w{example1.com example2.com example3.com}
         dsl.role :web, %w{example1.com}, active: true
@@ -152,243 +181,237 @@ describe Capistrano::DSL do
         dsl.role :db, %w{example5.com}, no_release: true
       end
 
-      describe 'fetching all servers' do
+      describe "fetching all servers" do
         subject { dsl.roles(:all) }
 
-        it 'returns all servers' do
+        it "returns all servers" do
           expect(subject.map(&:hostname)).to eq %w{example1.com example2.com example3.com example4.com example5.com}
         end
       end
 
-      describe 'fetching all release servers' do
-
-        context 'with no additional options' do
+      describe "fetching all release servers" do
+        context "with no additional options" do
           subject { dsl.release_roles(:all) }
 
-          it 'returns all release servers' do
+          it "returns all release servers" do
             expect(subject.map(&:hostname)).to eq %w{example1.com example2.com example3.com example4.com}
           end
         end
 
-        context 'with filter options' do
+        context "with filter options" do
           subject { dsl.release_roles(:all, filter: :active) }
 
-          it 'returns all release servers that match the filter' do
+          it "returns all release servers that match the filter" do
             expect(subject.map(&:hostname)).to eq %w{example1.com example3.com}
           end
         end
       end
 
-
-      describe 'fetching servers by role' do
+      describe "fetching servers by role" do
         subject { dsl.roles(:app) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com example4.com}
         end
       end
 
-      describe 'fetching servers by an array of roles' do
+      describe "fetching servers by an array of roles" do
         subject { dsl.roles([:app]) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com example4.com}
         end
       end
 
-      describe 'fetching filtered servers by role' do
+      describe "fetching filtered servers by role" do
         subject { dsl.roles(:app, filter: :active) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com}
         end
       end
 
-      describe 'fetching selected servers by role' do
+      describe "fetching selected servers by role" do
         subject { dsl.roles(:app, select: :active) }
 
-        it 'returns the servers' do
+        it "returns the servers" do
           expect(subject.map(&:hostname)).to eq %w{example3.com}
         end
       end
 
-      describe 'fetching the primary server by role' do
-        context 'when inferring primary status based on order' do
+      describe "fetching the primary server by role" do
+        context "when inferring primary status based on order" do
           subject { dsl.primary(:web) }
-          it 'returns the servers' do
-            expect(subject.hostname).to eq 'example1.com'
+          it "returns the servers" do
+            expect(subject.hostname).to eq "example1.com"
           end
         end
 
-        context 'when the attribute `primary` is explicity set' do
+        context "when the attribute `primary` is explicity set" do
           subject { dsl.primary(:app) }
-          it 'returns the servers' do
-            expect(subject.hostname).to eq 'example4.com'
+          it "returns the servers" do
+            expect(subject.hostname).to eq "example4.com"
           end
         end
       end
-
     end
 
-    describe 'when defining a host using a combination of the `server` and `role` syntax' do
-
+    describe "when defining a host using a combination of the `server` and `role` syntax" do
       before do
-        dsl.server 'db@example1.com:1234', roles: %w{db}, active: true
-        dsl.server 'root@example1.com:1234', roles: %w{web}, active: true
-        dsl.server 'example1.com:5678', roles: %w{web}, active: true
+        dsl.server "db@example1.com:1234", roles: %w{db}, active: true
+        dsl.server "root@example1.com:1234", roles: %w{web}, active: true
+        dsl.server "example1.com:5678", roles: %w{web}, active: true
         dsl.role :app, %w{deployer@example1.com:1234}
         dsl.role :app, %w{example1.com:5678}
       end
 
-      describe 'fetching all servers' do
-        it 'creates one server per hostname, ignoring user and port combinations' do
-          expect(dsl.roles(:all).size).to eq(1)
+      describe "fetching all servers" do
+        it "creates one server per hostname, ignoring user combinations" do
+          expect(dsl.roles(:all).size).to eq(2)
         end
       end
 
-      describe 'fetching servers for a role' do
-        it 'roles defined using the `server` syntax are included' do
+      describe "fetching servers for a role" do
+        it "roles defined using the `server` syntax are included" do
           as = dsl.roles(:web).map { |server| "#{server.user}@#{server.hostname}:#{server.port}" }
-          expect(as.size).to eq(1)
-          expect(as[0]).to eq("deployer@example1.com:5678")
+          expect(as.size).to eq(2)
+          expect(as[0]).to eq("deployer@example1.com:1234")
+          expect(as[1]).to eq("@example1.com:5678")
         end
 
-        it 'roles defined using the `role` syntax are included' do
+        it "roles defined using the `role` syntax are included" do
           as = dsl.roles(:app).map { |server| "#{server.user}@#{server.hostname}:#{server.port}" }
-          expect(as.size).to eq(1)
-          expect(as[0]).to eq("deployer@example1.com:5678")
+          expect(as.size).to eq(2)
+          expect(as[0]).to eq("deployer@example1.com:1234")
+          expect(as[1]).to eq("@example1.com:5678")
         end
       end
-
     end
 
-    describe 'when setting user and port' do
+    describe "when setting user and port" do
       subject { dsl.roles(:all).map { |server| "#{server.user}@#{server.hostname}:#{server.port}" }.first }
 
       describe "using the :user property" do
         it "takes precedence over in the host string" do
-          dsl.server 'db@example1.com:1234', roles: %w{db}, active: true, user: 'brian'
+          dsl.server "db@example1.com:1234", roles: %w{db}, active: true, user: "brian"
           expect(subject).to eq("brian@example1.com:1234")
         end
       end
 
       describe "using the :port property" do
         it "takes precedence over in the host string" do
-          dsl.server 'db@example1.com:9090', roles: %w{db}, active: true, port: 1234
+          dsl.server "db@example1.com:9090", roles: %w{db}, active: true, port: 1234
           expect(subject).to eq("db@example1.com:1234")
         end
       end
     end
-
   end
 
-  describe 'setting and fetching variables' do
-
+  describe "setting and fetching variables" do
     before do
       dsl.set :scm, :git
     end
 
-    context 'without a default' do
-      context 'when the variables is defined' do
-        it 'returns the variable' do
+    context "without a default" do
+      context "when the variables is defined" do
+        it "returns the variable" do
           expect(dsl.fetch(:scm)).to eq :git
         end
       end
 
-      context 'when the variables is undefined' do
-        it 'returns nil' do
+      context "when the variables is undefined" do
+        it "returns nil" do
           expect(dsl.fetch(:source_control)).to be_nil
         end
       end
     end
 
-    context 'with a default' do
-      context 'when the variables is defined' do
-        it 'returns the variable' do
+    context "with a default" do
+      context "when the variables is defined" do
+        it "returns the variable" do
           expect(dsl.fetch(:scm, :svn)).to eq :git
         end
       end
 
-      context 'when the variables is undefined' do
-        it 'returns the default' do
+      context "when the variables is undefined" do
+        it "returns the default" do
           expect(dsl.fetch(:source_control, :svn)).to eq :svn
         end
       end
     end
 
-    context 'with a block' do
-      context 'when the variables is defined' do
-        it 'returns the variable' do
+    context "with a block" do
+      context "when the variables is defined" do
+        it "returns the variable" do
           expect(dsl.fetch(:scm) { :svn }).to eq :git
         end
       end
 
-      context 'when the variables is undefined' do
-        it 'calls the block' do
+      context "when the variables is undefined" do
+        it "calls the block" do
           expect(dsl.fetch(:source_control) { :svn }).to eq :svn
         end
       end
     end
-
   end
 
-  describe 'asking for a variable' do
+  describe "asking for a variable" do
     before do
       dsl.ask(:scm, :svn)
       $stdout.stubs(:print)
     end
 
-    context 'variable is provided' do
+    context "variable is provided" do
       before do
-        $stdin.expects(:gets).returns('git')
+        $stdin.expects(:gets).returns("git")
       end
 
-      it 'sets the input as the variable' do
-        expect(dsl.fetch(:scm)).to eq 'git'
+      it "sets the input as the variable" do
+        expect(dsl.fetch(:scm)).to eq "git"
       end
     end
 
-    context 'variable is not provided' do
+    context "variable is not provided" do
       before do
-        $stdin.expects(:gets).returns('')
+        $stdin.expects(:gets).returns("")
       end
 
-      it 'sets the variable as the default' do
+      it "sets the variable as the default" do
         expect(dsl.fetch(:scm)).to eq :svn
       end
     end
   end
 
-  describe 'checking for presence' do
+  describe "checking for presence" do
     subject { dsl.any? :linked_files }
 
     before do
       dsl.set(:linked_files, linked_files)
     end
 
-    context 'variable is an non-empty array' do
+    context "variable is an non-empty array" do
       let(:linked_files) { %w{1} }
 
       it { expect(subject).to be_truthy }
     end
 
-    context 'variable is an empty array' do
+    context "variable is an empty array" do
       let(:linked_files) { [] }
       it { expect(subject).to be_falsey }
     end
 
-    context 'variable exists, is not an array' do
+    context "variable exists, is not an array" do
       let(:linked_files) { stub }
       it { expect(subject).to be_truthy }
     end
 
-    context 'variable is nil' do
+    context "variable is nil" do
       let(:linked_files) { nil }
       it { expect(subject).to be_falsey }
     end
   end
 
-  describe 'configuration SSHKit' do
+  describe "configuration SSHKit" do
     let(:config) { SSHKit.config }
     let(:backend) { SSHKit.config.backend.config }
     let(:default_env) { { rails_env: :production } }
@@ -399,185 +422,209 @@ describe Capistrano::DSL do
       dsl.set(:default_env, default_env)
       dsl.set(:pty, true)
       dsl.set(:connection_timeout, 10)
-      dsl.set(:ssh_options, {
-        keys: %w(/home/user/.ssh/id_rsa),
-        forward_agent: false,
-        auth_methods: %w(publickey password)
-      })
+      dsl.set(:ssh_options, keys: %w(/home/user/.ssh/id_rsa),
+                            forward_agent: false,
+                            auth_methods: %w(publickey password))
       dsl.configure_backend
     end
 
-    it 'sets the output' do
+    it "sets the output" do
       expect(config.output).to be_a SSHKit::Formatter::Dot
     end
 
-    it 'sets the output verbosity' do
+    it "sets the output verbosity" do
       expect(config.output_verbosity).to eq 0
     end
 
-    it 'sets the default env' do
+    it "sets the default env" do
       expect(config.default_env).to eq default_env
     end
 
-    it 'sets the backend pty' do
+    it "sets the backend pty" do
       expect(backend.pty).to be_truthy
     end
 
-    it 'sets the backend connection timeout' do
+    it "sets the backend connection timeout" do
       expect(backend.connection_timeout).to eq 10
     end
 
-    it 'sets the backend ssh_options' do
+    it "sets the backend ssh_options" do
       expect(backend.ssh_options[:keys]).to eq %w(/home/user/.ssh/id_rsa)
       expect(backend.ssh_options[:forward_agent]).to eq false
       expect(backend.ssh_options[:auth_methods]).to eq %w(publickey password)
     end
-
   end
 
-  describe 'local_user' do
-    before do
-      dsl.set :local_user, -> { Etc.getlogin }
-    end
-
-    describe 'fetching local_user' do
-      subject { dsl.local_user }
+  describe "on()" do
+    describe "when passed server objects" do
+      before do
+        dsl.server "example1.com", roles: %w{web}, active: true
+        dsl.server "example2.com", roles: %w{web}
+        dsl.server "example3.com", roles: %w{app web}, active: true
+        dsl.server "example4.com", roles: %w{app}, primary: true
+        dsl.server "example5.com", roles: %w{db}, no_release: true
+        @coordinator = mock("coordinator")
+        @coordinator.expects(:each).returns(nil)
+        ENV.delete "ROLES"
+        ENV.delete "HOSTS"
+      end
 
-      context 'where a local_user is not set' do
-        before do
-          Etc.expects(:getlogin).returns('login')
-        end
+      it "filters by role from the :filter variable" do
+        hosts = dsl.roles(:web)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        dsl.set :filter, role: "web"
+        dsl.on(all)
+      end
 
-        it 'returns the login name' do
-          expect(subject.to_s).to eq 'login'
-        end
+      it "filters by host and role from the :filter variable" do
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.set :filter, role: "db", host: "example3.com"
+        dsl.on(all)
       end
 
-      context 'where a local_user is set' do
-        before do
-          dsl.set(:local_user, -> { 'custom login' })
-        end
+      it "filters by roles from the :filter variable" do
+        hosts = dsl.roles(:web)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        dsl.set :filter, roles: "web"
+        dsl.on(all)
+      end
 
-        it 'returns the custom name' do
-          expect(subject.to_s).to eq 'custom login'
-        end
+      it "filters by hosts and roles from the :filter variable" do
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.set :filter, roles: "db", hosts: "example3.com"
+        dsl.on(all)
       end
-    end
-  end
 
-  describe 'on()' do
+      it "filters from ENV[ROLES]" do
+        hosts = dsl.roles(:db)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        ENV["ROLES"] = "db"
+        dsl.on(all)
+      end
 
-    before do
-      dsl.server 'example1.com', roles: %w{web}, active: true
-      dsl.server 'example2.com', roles: %w{web}
-      dsl.server 'example3.com', roles: %w{app web}, active: true
-      dsl.server 'example4.com', roles: %w{app}, primary: true
-      dsl.server 'example5.com', roles: %w{db}, no_release: true
-      @coordinator = mock('coordinator')
-      @coordinator.expects(:each).returns(nil)
-      ENV.delete 'ROLES'
-      ENV.delete 'HOSTS'
+      it "filters from ENV[HOSTS]" do
+        hosts = dsl.roles(:db)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        ENV["HOSTS"] = "example5.com"
+        dsl.on(all)
+      end
 
+      it "filters by ENV[HOSTS] && ENV[ROLES]" do
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        ENV["HOSTS"] = "example5.com"
+        ENV["ROLES"] = "web"
+        dsl.on(all)
+      end
     end
 
-    it 'filters by role from the :filter variable' do
-      hosts = dsl.roles(:web)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      dsl.set :filter, { role: 'web' }
-      dsl.on(all)
-    end
+    describe "when passed server literal names" do
+      before do
+        ENV.delete "ROLES"
+        ENV.delete "HOSTS"
+        @coordinator = mock("coordinator")
+        @coordinator.expects(:each).returns(nil)
+      end
 
-    it 'filters by host and role from the :filter variable' do
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
-      dsl.set :filter, { role: 'db', host: 'example3.com' }
-      dsl.on(all)
-    end
+      it "selects nothing when a role filter is present" do
+        dsl.set :filter, role: "web"
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on("my.server")
+      end
 
-    it 'filters from ENV[ROLES]' do
-      hosts = dsl.roles(:db)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      ENV['ROLES'] = 'db'
-      dsl.on(all)
-    end
+      it "selects using the string when a host filter is present" do
+        dsl.set :filter, host: "server.local"
+        SSHKit::Coordinator.expects(:new).with(["server.local"]).returns(@coordinator)
+        dsl.on("server.local")
+      end
 
-    it 'filters from ENV[HOSTS]' do
-      hosts = dsl.roles(:db)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      ENV['HOSTS'] = 'example5.com'
-      dsl.on(all)
-    end
+      it "doesn't select when a host filter is present that doesn't match" do
+        dsl.set :filter, host: "ruby.local"
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on("server.local")
+      end
 
-    it 'filters by ENV[HOSTS] && ENV[ROLES]' do
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
-      ENV['HOSTS'] = 'example5.com'
-      ENV['ROLES'] = 'web'
-      dsl.on(all)
-    end
+      it "selects nothing when a roles filter is present" do
+        dsl.set :filter, roles: "web"
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on("my.server")
+      end
 
-  end
+      it "selects using the string when a hosts filter is present" do
+        dsl.set :filter, hosts: "server.local"
+        SSHKit::Coordinator.expects(:new).with(["server.local"]).returns(@coordinator)
+        dsl.on("server.local")
+      end
 
-  describe 'role_properties()' do
+      it "doesn't select when a hosts filter is present that doesn't match" do
+        dsl.set :filter, hosts: "ruby.local"
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on("server.local")
+      end
+    end
+  end
 
+  describe "role_properties()" do
     before do
       dsl.role :redis, %w[example1.com example2.com], redis: { port: 6379, type: :slave }
-      dsl.server 'example1.com', roles: %w{web}, active: true, web: { port: 80 }
-      dsl.server 'example2.com', roles: %w{web redis}, web: { port: 81 }, redis: { type: :master }
-      dsl.server 'example3.com', roles: %w{app}, primary: true
+      dsl.server "example1.com", roles: %w{web}, active: true, web: { port: 80 }
+      dsl.server "example2.com", roles: %w{web redis}, web: { port: 81 }, redis: { type: :master }
+      dsl.server "example3.com", roles: %w{app}, primary: true
     end
 
-    it 'retrieves properties for a single role as a set' do
+    it "retrieves properties for a single role as a set" do
       rps = dsl.role_properties(:app)
-      expect(rps).to eq(Set[{ hostname: 'example3.com', role: :app}])
+      expect(rps).to eq(Set[{ hostname: "example3.com", role: :app }])
     end
 
-    it 'retrieves properties for multiple roles as a set' do
+    it "retrieves properties for multiple roles as a set" do
       rps = dsl.role_properties(:app, :web)
-      expect(rps).to eq(Set[{ hostname: 'example3.com', role: :app},{ hostname: 'example1.com', role: :web, port: 80},{ hostname: 'example2.com', role: :web, port: 81}])
+      expect(rps).to eq(Set[{ hostname: "example3.com", role: :app }, { hostname: "example1.com", role: :web, port: 80 }, { hostname: "example2.com", role: :web, port: 81 }])
     end
 
-    it 'yields the properties for a single role' do
-      recipient = mock('recipient')
-      recipient.expects(:doit).with('example1.com', :redis, { port: 6379, type: :slave})
-      recipient.expects(:doit).with('example2.com', :redis, { port: 6379, type: :master})
+    it "yields the properties for a single role" do
+      recipient = mock("recipient")
+      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
+      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
       dsl.role_properties(:redis) do |host, role, props|
         recipient.doit(host, role, props)
       end
     end
 
-    it 'yields the properties for multiple roles' do
-      recipient = mock('recipient')
-      recipient.expects(:doit).with('example1.com', :redis, { port: 6379, type: :slave})
-      recipient.expects(:doit).with('example2.com', :redis, { port: 6379, type: :master})
-      recipient.expects(:doit).with('example3.com', :app, nil)
+    it "yields the properties for multiple roles" do
+      recipient = mock("recipient")
+      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
+      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
+      recipient.expects(:doit).with("example3.com", :app, nil)
       dsl.role_properties(:redis, :app) do |host, role, props|
         recipient.doit(host, role, props)
       end
     end
 
-    it 'yields the merged properties for multiple roles' do
-      recipient = mock('recipient')
-      recipient.expects(:doit).with('example1.com', :redis, { port: 6379, type: :slave})
-      recipient.expects(:doit).with('example2.com', :redis, { port: 6379, type: :master})
-      recipient.expects(:doit).with('example1.com', :web, { port: 80 })
-      recipient.expects(:doit).with('example2.com', :web, { port: 81 })
+    it "yields the merged properties for multiple roles" do
+      recipient = mock("recipient")
+      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
+      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
+      recipient.expects(:doit).with("example1.com", :web, port: 80)
+      recipient.expects(:doit).with("example2.com", :web, port: 81)
       dsl.role_properties(:redis, :web) do |host, role, props|
         recipient.doit(host, role, props)
       end
     end
 
-    it 'honours a property filter before yielding' do
-      recipient = mock('recipient')
-      recipient.expects(:doit).with('example1.com', :redis, { port: 6379, type: :slave})
-      recipient.expects(:doit).with('example1.com', :web, { port: 80 })
+    it "honours a property filter before yielding" do
+      recipient = mock("recipient")
+      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
+      recipient.expects(:doit).with("example1.com", :web, port: 80)
       dsl.role_properties(:redis, :web, select: :active) do |host, role, props|
         recipient.doit(host, role, props)
       end
     end
   end
-
 end