slackistrano 3.8.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae282d3041a490b906223784c2cd9689450f30cae5c045e4891112e6295d39d
-  data.tar.gz: a8a4a0b022efe867ccc259e36bce4916f101d20800cb2cb14c8f21f58b58a171
+  metadata.gz: 8f28f0c81b8d8772f9b77f26c0f3f069ea770630f94c63d91affc4724e397415
+  data.tar.gz: 49771347f5329cff33061b3fe4a83c2b785d7922dc57f420b766a0b9515798fc
 SHA512:
-  metadata.gz: 020d3c36889ef7696a5f5d1e2879bfb72c3084915da4724f6faa396498285581b6659468277317f392ca6ee812440636d8d6c0f5ce50abeffe85b221c6ab959c
-  data.tar.gz: 540bf2539b7ecac52f90260f2454e25cfcb7bcbc7d26409eb43765154e3ac6a22a02325513e1ff0a805dc82c8c9de4e8c2506ab290d0047785db710edb558bf9
+  metadata.gz: 578f583688d88ac3c0092d8f4da674bae4b562c58bb0c120d24cd4c77e38b744e8eb0310125a148d7bcf2c03beef70b8f2968051121a372db160b9c9c6ffb18c
+  data.tar.gz: 83f90a56bd3e2a067fd9437417e2fef5ef0853bf59d56fc87160982f482acd31022cb7a82d91018552396cc963836ea8e5a0f991e7533ea8321a53b7ee1651e8

data/.travis.yml

@@ -4,4 +4,3 @@ cache: bundler
 rvm:
   - 2.6
   - 2.5
-  - 2.3

data/CHANGELOG.md

@@ -1,14 +1,15 @@
 # Slackistrano Change Log
 
-3.8.4
+4.0.0
 -----
 
-- Fix improper boolean check when using not using slackbot and channels are empty [#90]
+- **BREAKING:** The Messaging::Deprecated has been removed. You must use
+  the new configuration options as specified in the README.
 
 3.8.3
 -----
 
-- Never released
+- Fix improper boolean check when using not using slackbot and channels are empty [#90]
 
 3.8.2
 -----

data/lib/slackistrano/capistrano.rb

@@ -17,21 +17,12 @@ module Slackistrano
     def initialize(env)
       @env = env
       config = fetch(:slackistrano, {})
-      @messaging = case config
-                   when false
-                     Messaging::Null.new
-                   when -> (o) { o.empty? }
-                     klass = Messaging::Deprecated.new(
-                       env: @env,
-                       team: fetch(:slack_team),
-                       channel: fetch(:slack_channel),
-                       token: fetch(:slack_token),
-                       webhook: fetch(:slack_webhook)
-                     )
-                   else
+      @messaging = if config
                      opts = config.dup.merge(env: @env)
                      klass = opts.delete(:klass) || Messaging::Default
                      klass.new(opts)
+                   else
+                     Messaging::Null.new
                    end
     end
 

data/lib/slackistrano/messaging/base.rb

@@ -72,5 +72,4 @@ module Slackistrano
 end
 
 require_relative 'default'
-require_relative 'deprecated'
 require_relative 'null'

data/lib/slackistrano/version.rb

@@ -1,3 +1,3 @@
 module Slackistrano
-  VERSION = '3.8.4'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackistrano
 version: !ruby/object:Gem::Version
-  version: 3.8.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -86,7 +86,6 @@ files:
 - lib/slackistrano/capistrano.rb
 - lib/slackistrano/messaging/base.rb
 - lib/slackistrano/messaging/default.rb
-- lib/slackistrano/messaging/deprecated.rb
 - lib/slackistrano/messaging/helpers.rb
 - lib/slackistrano/messaging/null.rb
 - lib/slackistrano/tasks/slack.rake
@@ -95,7 +94,6 @@ files:
 - spec/capistrano_deploy_stubs.rake
 - spec/disabling_posting_to_slack_spec.rb
 - spec/dry_run_spec.rb
-- spec/messaging/deprecated_spec.rb
 - spec/messaging/helpers_spec.rb
 - spec/messaging/null_spec.rb
 - spec/nil_payload_spec.rb
@@ -129,7 +127,6 @@ test_files:
 - spec/capistrano_deploy_stubs.rake
 - spec/disabling_posting_to_slack_spec.rb
 - spec/dry_run_spec.rb
-- spec/messaging/deprecated_spec.rb
 - spec/messaging/helpers_spec.rb
 - spec/messaging/null_spec.rb
 - spec/nil_payload_spec.rb

data/lib/slackistrano/messaging/deprecated.rb

@@ -1,75 +0,0 @@
-module Slackistrano
-  module Messaging
-    class Deprecated < Base
-
-      def initialize(env: nil, team: nil, channel: nil, token: nil, webhook: nil)
-        run_locally do
-          warn("[slackistrano] You are using an outdated configuration that will be removed soon.")
-          warn("[slackistrano] Please upgrade soon! <https://github.com/phallstrom/slackistrano>")
-        end
-
-        super
-      end
-
-      def icon_url
-        fetch("slack_icon_url".to_sym) || super
-      end
-
-      def icon_emoji
-        fetch("slack_icon_emoji".to_sym) || super
-      end
-
-      def username
-        fetch("slack_username".to_sym) || super
-      end
-
-      def deployer
-        fetch("slack_deploy_user".to_sym) || super
-      end
-
-      def channels_for(action)
-        fetch("slack_channel_#{action}".to_sym) || super
-      end
-
-      def payload_for_updating
-        make_message(__method__, super)
-      end
-
-      def payload_for_reverting
-        make_message(__method__, super)
-      end
-
-      def payload_for_updated
-        make_message(__method__, super.merge(color: 'good'))
-      end
-
-      def payload_for_reverted
-        make_message(__method__, super.merge(color: 'warning'))
-      end
-
-      def payload_for_failed
-        make_message(__method__, super.merge(color: 'danger'))
-      end
-
-      private ##################################################
-
-      def make_message(method, options={})
-        action = method.to_s.sub('payload_for_', '')
-
-        return nil unless fetch("slack_run".to_sym, true) && fetch("slack_run_#{action}".to_sym, true)
-
-        attachment = options.merge({
-          title:      fetch(:"slack_title_#{action}"),
-          pretext:    fetch(:"slack_pretext_#{action}"),
-          text:       fetch(:"slack_msg_#{action}", options[:text]),
-          fields:     fetch(:"slack_fields_#{action}", []),
-          fallback:   fetch(:"slack_fallback_#{action}"),
-          mrkdwn_in:  [:text, :pretext]
-        }).reject{|k, v| v.nil? }
-
-        {attachments: [attachment]}
-      end
-
-    end
-  end
-end

data/spec/messaging/deprecated_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-describe Slackistrano::Messaging::Deprecated do
-  before(:each) do
-    set :slackistrano, {}
-  end
-
-  %w[updating reverting updated reverted failed].each do |stage|
-    it "posts to slack on slack:deploy:#{stage}" do
-      set :slack_webhook, -> { "..." }
-      set :slack_run, ->{ true }
-      set "slack_run_#{stage}".to_sym, ->{ true }
-      expect_any_instance_of(Slackistrano::Capistrano).to receive(:post)
-      Rake::Task["slack:deploy:#{stage}"].execute
-    end
-
-    it "does not post to slack on slack:deploy:#{stage} when disabled" do
-      set :slack_webhook, -> { "..." }
-      set :slack_run, ->{ true }
-      set "slack_run_#{stage}".to_sym, ->{ false }
-      expect_any_instance_of(Slackistrano::Capistrano).not_to receive(:post)
-      Rake::Task["slack:deploy:#{stage}"].execute
-    end
-
-    it "does not post to slack on slack:deploy:#{stage} when disabled globally" do
-      set :slack_webhook, -> { "..." }
-      set :slack_run, ->{ false }
-      set "slack_run_#{stage}".to_sym, ->{ true }
-      expect_any_instance_of(Slackistrano::Capistrano).not_to receive(:post)
-      Rake::Task["slack:deploy:#{stage}"].execute
-    end
-  end
-
-  [ # stage, color, channel
-    ['updating', nil, nil],
-    ['reverting', nil, nil],
-    ['updated', 'good', nil],
-    ['reverted', 'warning', nil],
-    ['failed', 'danger', nil],
-    ['updating', nil, 'starting_channel'],
-    ['updated', 'good', 'finished_channel'],
-    ['reverted', 'warning', 'rollback_channel'],
-    ['failed', 'danger', 'failed_channel'],
-  ].each do |stage, color, channel_for_stage|
-
-    it "calls post_to_slack with the right arguments for stage=#{stage}, color=#{color}, channel_for_stage=#{channel_for_stage}" do
-      set :slack_run,            ->{ true }
-      set "slack_run_#{stage}".to_sym, -> { true }
-      set :slack_team,           -> { 'team' }
-      set :slack_token,          -> { 'token' }
-      set :slack_webhook,        -> { 'webhook' }
-      set :slack_channel,        -> { 'channel' }
-      set :slack_icon_url,       -> { 'http://icon.url' }
-      set :slack_icon_emoji,     -> { ':emoji:' }
-      set "slack_msg_#{stage}".to_sym, -> { 'text message' }
-
-      set "slack_channel_#{stage}".to_sym, -> { channel_for_stage }
-      expected_channel = channel_for_stage || 'channel'
-
-      attachment = {
-        text: 'text message',
-        color: color,
-        fields: [],
-        fallback: nil,
-        mrkdwn_in: [:text, :pretext]
-      }.reject{|k,v| v.nil?}
-
-      expect_any_instance_of(Slackistrano::Capistrano).to receive(:post_to_slack).with({
-          channel: expected_channel,
-          username: 'Slackistrano',
-          icon_url: 'http://icon.url',
-          icon_emoji: ':emoji:',
-          attachments: [attachment]
-      }).and_return(double(code: '200'))
-      Rake::Task["slack:deploy:#{stage}"].execute
-    end
-  end
-
-end