Skip to content

Commit

Permalink
Merge branch 'mvoto-fix_capistrano_dry_run_call'
Browse files Browse the repository at this point in the history
  • Loading branch information
phallstrom committed May 26, 2017
2 parents f979cba + ca73dae commit 4ccd297
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Slackistrano Change Log

3.8.1
-----

- Changes to support capistrano 3.8.1 (hence the massive version bump) [#70, #71]

3.1.1
-----

Expand Down
6 changes: 1 addition & 5 deletions lib/slackistrano/capistrano.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,7 @@ def post_to_slack_as_webhook(payload = {})
end

def dry_run?
if ::Capistrano::Configuration.respond_to?(:dry_run?)
::Capistrano::Configuration.dry_run?
else
::Capistrano::Configuration.env.send(:config)[:sshkit_backend] == SSHKit::Backend::Printer
end
::Capistrano::Configuration.env.dry_run?
end

def post_dry_run(payload)
Expand Down
2 changes: 1 addition & 1 deletion lib/slackistrano/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Slackistrano
VERSION = '3.1.1'
VERSION = '3.8.1'
end
19 changes: 3 additions & 16 deletions slackistrano.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,11 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]

gem.add_dependency 'capistrano', '>= 3.5.0'
gem.add_dependency 'capistrano', '>= 3.8.1'
gem.add_development_dependency 'rake'
gem.add_development_dependency 'rspec'
gem.add_development_dependency 'pry'

gem.post_install_message = %Q{
BREAKING: You must now `require 'slackistrano/capistrano'` in your Capfile.
Previously it was just `require 'slackistrano'`. It is also no longer necessary
to add `require: false` in your Gemfile, but it won't hurt to leave it.
Your files should now look like this:
Gemfile:
gem 'slackistrano'
Capfile:
require 'slackistrano/capistrano'
}
# gem.post_install_message = %Q{
# }
end

0 comments on commit 4ccd297

Please sign in to comment.