slackistrano 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95795f6130f67bf6c4845feace7deaa858fb042d
-  data.tar.gz: eb3cb8e5d6ecbf13633896090d9ab6831ff05b0b
+  metadata.gz: 7aee7cb384807fb00bce41d808dcf1c147673237
+  data.tar.gz: 6849e3a8506f73c0efc7002afc34c42ee2ae88fc
 SHA512:
-  metadata.gz: 84cb6025b635f7d6c30c47d6aaa698d3fc90707228f924e1e41fd4eddef13166743e92abb1f557710605ebe7d9a8444f0e6af95949df3321d848481cc8499ab9
-  data.tar.gz: f8c2d366313f7854f7f90e8a3b6c4ffd45ea1c6fef9558c9a2c7fa826a033a831e8e118b3754fca77c343613d8a285c17a810d662e3160590ff1347a92a106af
+  metadata.gz: c7b9457420f08b96541d278ce5ef92a57d178b49c321a4bf3036b478a4a2c8d63f177b155d5b75bc0fc646b73a20aea3cf4fdd1debbf23f57812ca5245ffc34b
+  data.tar.gz: 7a61dec6f4c406987ea4d797d1a1ed5447af0b070349b77fc2cd92d241baa1c00a9d875059ee7be8eee136c2be1ee639a69fcd8654ab04c3f8d13d311f1ea7c3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Slackistrano Change Log
 
+2.0.0
+-----
+
+- **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.
+
 1.1.0
 -----
 

data/README.md

@@ -8,6 +8,11 @@ Send notifications to [Slack](https://slack.com) about [Capistrano](http://www.c
 
 If you need Capistrano v2 support, check out [capistrano-slack](https://github.com/j-mcnally/capistrano-slack).
 
+## NOTE: Upgrading from 1.x? Not Getting Notifications?
+
+Version 2.0 has changed how Slackistrano must be loaded in your Gemfile and Capfile. See the *Installation* section
+below current install.
+
 ## Requirements
 
 - Capistrano >= 3.1.0
@@ -19,7 +24,7 @@ If you need Capistrano v2 support, check out [capistrano-slack](https://github.c
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'slackistrano', require: false
+gem 'slackistrano'
 ```
 
 And then execute:
@@ -40,7 +45,7 @@ In both case, you need to enable the integration inside Slack and get the token
 Require the library in your application's Capfile:
 
 ```ruby
-require 'slackistrano'
+require 'slackistrano/capistrano'
 ```
 
 If you post using *Incoming Webhooks* you need to set your webhook url in your application's config/deploy.rb:

data/lib/slackistrano.rb

@@ -2,50 +2,6 @@ require 'slackistrano/version'
 require 'net/http'
 require 'json'
 
-load File.expand_path("../slackistrano/tasks/slack.rake", __FILE__)
-
 module Slackistrano
 
-  #
-  #
-  #
-  def self.post(team: nil, token: nil, webhook: nil, via_slackbot: false, payload: {})
-    if via_slackbot
-      post_as_slackbot(team: team, token: token, webhook: webhook, payload: payload)
-    else
-      post_as_webhook(team: team, token: token, webhook: webhook, payload: payload)
-    end
-  rescue => e
-    error("[slackistrano] Error notifying Slack!")
-    error("[slackistrano]   Error: #{e.inspect}")
-  end
-
-  #
-  #
-  #
-  def self.post_as_slackbot(team: nil, token: nil, webhook: nil, payload: {})
-    uri = URI(URI.encode("https://#{team}.slack.com/services/hooks/slackbot?token=#{token}&channel=#{payload[:channel]}"))
-
-    text = payload[:attachments].collect { |a| a[:text] }.join("\n")
-
-    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-      http.request_post uri, text
-    end
-  end
-
-  #
-  #
-  #
-  def self.post_as_webhook(team: nil, token: nil, webhook: nil, payload: {})
-    params = {'payload' => payload.to_json}
-
-    if webhook.nil?
-      webhook = "https://#{team}.slack.com/services/hooks/incoming-webhook"
-      params.merge!('token' => token)
-    end
-
-    uri = URI(webhook)
-    Net::HTTP.post_form(uri, params)
-  end
-
 end

data/lib/slackistrano/capistrano.rb

@@ -0,0 +1,50 @@
+require 'net/http'
+require 'json'
+
+load File.expand_path("../tasks/slack.rake", __FILE__)
+
+module Slackistrano
+
+  #
+  #
+  #
+  def self.post(team: nil, token: nil, webhook: nil, via_slackbot: false, payload: {})
+    if via_slackbot
+      post_as_slackbot(team: team, token: token, webhook: webhook, payload: payload)
+    else
+      post_as_webhook(team: team, token: token, webhook: webhook, payload: payload)
+    end
+  rescue => e
+    error("[slackistrano] Error notifying Slack!")
+    error("[slackistrano]   Error: #{e.inspect}")
+  end
+
+  #
+  #
+  #
+  def self.post_as_slackbot(team: nil, token: nil, webhook: nil, payload: {})
+    uri = URI(URI.encode("https://#{team}.slack.com/services/hooks/slackbot?token=#{token}&channel=#{payload[:channel]}"))
+
+    text = payload[:attachments].collect { |a| a[:text] }.join("\n")
+
+    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+      http.request_post uri, text
+    end
+  end
+
+  #
+  #
+  #
+  def self.post_as_webhook(team: nil, token: nil, webhook: nil, payload: {})
+    params = {'payload' => payload.to_json}
+
+    if webhook.nil?
+      webhook = "https://#{team}.slack.com/services/hooks/incoming-webhook"
+      params.merge!('token' => token)
+    end
+
+    uri = URI(webhook)
+    Net::HTTP.post_form(uri, params)
+  end
+
+end

data/lib/slackistrano/version.rb

@@ -1,3 +1,3 @@
 module Slackistrano
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/slackistrano.gemspec

@@ -25,4 +25,20 @@ Gem::Specification.new do |gem|
   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'
+  }
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'capistrano/all'
 require 'capistrano/setup'
 load 'capistrano_deploy_stubs.rake'
 require 'slackistrano'
+require 'slackistrano/capistrano'
 require 'rspec'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -14,4 +15,5 @@ RSpec.configure do |config|
   config.order = 'random'
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
+  config.fail_fast = 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackistrano
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - examples/fomatting_with_fields.png
 - lib/slackistrano.rb
+- lib/slackistrano/capistrano.rb
 - lib/slackistrano/tasks/slack.rake
 - lib/slackistrano/version.rb
 - slackistrano.gemspec
@@ -106,7 +107,11 @@ homepage: https://github.com/phallstrom/slackistrano
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\n  BREAKING: You must now `require 'slackistrano/capistrano'`
+  in your Capfile.\n  Previously it was just `require 'slackistrano'`. It is also
+  no longer necessary\n  to add `require: false` in your Gemfile, but it won't hurt
+  to leave it.\n\n  Your files should now look like this:\n\n  Gemfile:\n\n    gem
+  'slackistrano'\n\n  Capfile:\n\n    require 'slackistrano/capistrano'\n  "
 rdoc_options: []
 require_paths:
 - lib