capistrano-slackify 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2a846351630538a3d09f3d656904228de26405
-  data.tar.gz: 216e81c73f9c5569aac42ecba86a2795d1c5bdaa
+  metadata.gz: fe9d66451d1e3749363f4ee105e8e4d79bcddbda
+  data.tar.gz: 361a987c04fc365b388a5fb45d360adc6010b4ab
 SHA512:
-  metadata.gz: f5501205650457a9d25a20d8651bca094b798d401251b01697543458d27a8b5e55a310d36f29322ec63b36bfb88cd4c8688cbf41abb20d4d291ca8fc389163aa
-  data.tar.gz: effaac3d5fd3968727519a62a6eaeebe57c07f1f6f7ff0e26af58f4108d0d07ec1525ecd4dcea98bce19d3c5f69c0f5e930b8581a741a200e32929e69a8f6bea
+  metadata.gz: 98826d18cfe708a109498c45bf986938672c6d641255495d50af0458db3c7488022f272b5a7af27ddc330199b9ec227a51557667ab4475b38031430e1ecc95b7
+  data.tar.gz: f0dd5d1a4405a5890b566cf558c74a819258e43db365cc19e9cb7634c8743b2ed3500e5808b103c4eca69b0c3467c5978866ba0e5122b2a3c1d717138ae2d148

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 2.1.1
+  - 2
   - 2.1.0
   - 2.0.0
   - 1.9.3

data/README.md

@@ -1,4 +1,4 @@
-# Capistrano Slackify [![Build Status](https://travis-ci.org/onthebeach/capistrano-slackify.svg)](https://travis-ci.org/onthebeach/capistrano-slackify)
+# Capistrano Slackify [![Build Status](https://travis-ci.org/onthebeach/capistrano-slackify.svg)](https://travis-ci.org/onthebeach/capistrano-slackify) [![Code Climate](https://codeclimate.com/github/onthebeach/capistrano-slackify/badges/gpa.svg)](https://codeclimate.com/github/onthebeach/capistrano-slackify)
 
 Publish deploy notifications to [Slack](https://slack.com) - for [Capistrano v3](https://github.com/capistrano/capistrano).
 
@@ -24,19 +24,18 @@ Require the gem in your `Capfile`:
 
 And then set the required variables in `config/deploy.rb`:
 
-    set :slack_subdomain, 'my_slack_subdomain'
-    set :slack_token, 'my_slack_token'
+    set :slack_url, 'https://hooks.slack.com/services/your/webhook/url'
 
-Ensure that you have enabled the [incoming webhooks integration](https://api.slack.com/).
+Ensure that you have enabled the [incoming webhooks integration](https://api.slack.com/) -
+copy/paste the webhook url provided in the setup instructions.
 
 The task will run automatically on deploy. Alternatively, you can notify of a deploy starting manually by using:
 
-    `bundle exec cap production slack:notify_started`
-    
+    bundle exec cap production slack:notify_started
+
 Or to notify of a finished deploy:
 
-    `bundle exec cap production slack:notify_started`
-    
+    bundle exec cap production slack:notify_started
 
 By default, this will publish something along the lines of:
 
@@ -56,7 +55,7 @@ Any of the defaults can be over-ridden in `config/deploy.rb`:
       "#{fetch(:application)} deployed to #{fetch(:stage)} by #{fetch(:slack_user)} " \
       "in #{elapsed} seconds."
     }
-    set :slack_deploy_starting_text, -> {  
+    set :slack_deploy_starting_text, -> {
       "#{fetch(:stage)} deploy starting with revision/branch #{fetch(:current_revision, fetch(:branch))} for #{fetch(:application)}"
     }
 

data/capistrano-slackify.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-slackify'
-  spec.version       = '1.2.2'
+  spec.version       = '2.0.0'
   spec.authors       = ['seenmyfate']
   spec.email         = ['seenmyfate@gmail.com']
   spec.summary       = %q{Publish deployment notifications to Slack via the incoming webhooks integration}

data/lib/capistrano/tasks/slackify.cap

@@ -6,7 +6,7 @@ namespace :slack do
       info 'Notifying Slack of deploy starting'
       set :time_started, Time.now.to_i
       execute :curl, '-X POST',
-        '--data-urlencode', Slackify::Payload.build(:start),
+        '--data-urlencode', Slackify::Payload.build(self, :start),
         fetch(:slack_url)
     end
   end
@@ -19,7 +19,7 @@ namespace :slack do
       info 'Notifying Slack of deploy finished'
       set :time_finished, Time.now.to_i
       execute :curl, '-X POST',
-        '--data-urlencode', Slackify::Payload.build(:finish),
+        '--data-urlencode', Slackify::Payload.build(self, :finish),
         fetch(:slack_url)
     end
   end
@@ -33,14 +33,14 @@ namespace :load do
     set :slack_emoji, ':ghost:'
     set :slack_parse, 'default'
     set :slack_user, -> { local_user.strip }
-    set :slack_url, -> { Slackify::Configuration.instance.url }
+    set :slack_url, -> { fail ':slack_url is not set' }
     set :slack_text, lambda {
       time_elapsed = Integer(fetch(:time_finished) - fetch(:time_started))
       "Revision #{fetch(:current_revision, fetch(:branch))} of " \
       "#{fetch(:application)} deployed to #{fetch(:stage)} by #{fetch(:slack_user)} " \
-      "in #{time_elapsed} seconds." 
+      "in #{time_elapsed} seconds."
     }
-    set :slack_deploy_starting_text, -> {  
+    set :slack_deploy_starting_text, -> {
       "#{fetch(:stage)} deploy starting with revision/branch #{fetch(:current_revision, fetch(:branch))} for #{fetch(:application)}"
     }
   end

data/lib/slackify.rb

@@ -1,37 +1,17 @@
-require 'uri'
 require 'yajl/json_gem'
-require 'singleton'
 
 module Slackify
-  class URL
-    def initialize(subdomain, token)
-      @subdomain, @token = subdomain, token
-    end
-
-    def to_s
-      uri.to_s
-    end
-
-    private
-
-    def uri
-      @uri ||= URI(
-        "https://#{@subdomain}.slack.com/services/hooks/incoming-webhook?token=#{@token}"
-      )
-    end
-  end
-
   class Payload
 
     attr_reader :status
     protected :status
 
-    def self.build(status)
-      new(status).build
+    def initialize(context, status)
+      @context, @status = context, status
     end
 
-    def initialize(status)
-      @status = status
+    def self.build(context, status)
+      new(context, status).build
     end
 
     def build
@@ -56,23 +36,9 @@ module Slackify
       end
     end
 
-  end
-
-  class Configuration
-    include Singleton
-
-    def url
-      URL.new(subdomain, token).to_s
+    def fetch(*args, &block)
+      @context.fetch(*args, &block)
     end
 
-    private
-
-    def subdomain
-      fetch(:slack_subdomain) { fail ':slack_subdomain is not set' }
-    end
-
-    def token
-      fetch(:slack_token) { fail ':slack_token is not set' }
-    end
   end
 end

data/spec/lib/slackify_spec.rb

@@ -1,22 +1,40 @@
 require 'spec_helper'
 
 module Slackify
-  describe URL do
-    let(:url) { URL.new(subdomain, token) }
-    let(:subdomain) { 'me' }
-    let(:token) { 'abc123' }
+  describe Payload do
+    describe '.build' do
+      let(:context) {
+        {
+          slack_channel: '#general',
+          slack_username:'Capistrano',
+          slack_emoji: ':ghost:',
+          slack_parse: 'default',
+          slack_user: 'You',
+          slack_text: ':boom:',
+          slack_deploy_starting_text: 'duck!'
+        }
+      }
 
-    describe '.new' do
-      it 'takes a subdomain and a token' do
-        expect(url)
+      context 'when starting' do
+        let(:payload) {
+          %{'payload={"channel":"#general","username":"Capistrano","text":"duck!","icon_emoji":":ghost:","parse":"default"}'}
+        }
+
+        it 'returns the starting payload' do
+          expect(Payload.build(context, :start)).to eq payload
+        end
       end
-    end
 
-    describe '#to_s' do
-      it 'returns the url as a string' do
-        expect(url.to_s).
-          to eq 'https://me.slack.com/services/hooks/incoming-webhook?token=abc123'
+      context 'when finishing' do
+        let(:payload) {
+          %{'payload={"channel":"#general","username":"Capistrano","text":":boom:","icon_emoji":":ghost:","parse":"default"}'}
+        }
+
+        it 'returns the finishing payload' do
+          expect(Payload.build(context, :finish)).to eq payload
+        end
       end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 require 'slackify'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
   config.order = 'random'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-slackify
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - seenmyfate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Publish deployment notifications to Slack via the incoming webhooks integration