pushpop-slack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c1e8c6d65e28ab5b56fbffbaab716765a5a65c
-  data.tar.gz: b71d5f05bd60072218c44bd0b1e0f90877c7e5e4
+  metadata.gz: 88e7bfe71d848db00fcea152b73da9cd401e7463
+  data.tar.gz: 58dcb70eb30b0829c005765e39083138a29eaef9
 SHA512:
-  metadata.gz: 6cc87d58208b7f74dc9a62c756622d50b9bd7acfd58744fbc6dcf3ff95290673ac47b45197359e4df23652066f194b5bc88bd38798e442924f40969137156afb
-  data.tar.gz: b027d47c17a68810e2b4d4a94ee257cdedaae9b04b2f1440644be313c0fb455718ff8dda0f3ed177a00bf0e85c357314f24aa8861f8e973f6cf2c5051dccd2e0
+  metadata.gz: a6316f2ba699f0e903e70e08542d42778b51e2cf4366b6b9ddc7a2209e5979cfe3b579f82ad1ad721ad7d555550b4a6087eb5976d2db0bc3896d93425de46b1e
+  data.tar.gz: e1e60d5482a8853fe9b9053d7d4a0d859b63bfaf4e4bb1dcc57d83b8e299bd2c2bc228fa09b3b477c8f4246a390f9360b0df230066b81bfc4c22809fbcf262e2

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'pushpop'
+gem 'pushpop', :git => 'git@github.com:pushpop-project/pushpop.git'
 gem 'slack-notifier'
 
 group :development, :test do

data/lib/pushpop-slack/version.rb

@@ -1,5 +1,5 @@
 module Pushpop
   class Slack
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/pushpop-slack.rb

@@ -14,6 +14,10 @@ module Pushpop
     attr_accessor :_channel
     attr_accessor :_username
     attr_accessor :_message
+    attr_accessor :_icon
+    attr_accessor :_icon_type
+    attr_accessor :_attachments
+    attr_accessor :_unfurl
 
     def run(last_response=nil, step_responses=nil)
 
@@ -48,6 +52,18 @@ module Pushpop
         opts['username'] = _username
       end
 
+      if _icon && _icon_type
+        opts["icon_#{_icon_type}"] = _icon
+      end
+
+      if _attachments
+        opts['attachments'] = _attachments
+      end
+
+      if _unfurl
+        opts['unfurl_links'] = true
+      end
+
       return opts
     end
 
@@ -60,7 +76,38 @@ module Pushpop
     end
 
     def message(message)
-      self._message = message
+      self._message = ::Slack::Notifier::LinkFormatter.format(message)
+    end
+
+    def attachment(attachment)
+      self._attachments = [] unless self._attachments
+
+      self._attachments.push(attachment)
+    end
+
+    def icon(icon)
+      if icon[0..3] == 'http'
+        self._icon_type = 'url'
+        self._icon = icon
+      else
+        self._icon_type = 'emoji'
+        self._icon = icon
+
+        # Make sure the emoji is wrapped in colons
+        if self._icon[0] != ':'
+          self._icon = ":#{self._icon}"
+        end
+
+        if self._icon[self._icon.length - 1] != ':'
+          self._icon = "#{self._icon}:"
+        end
+      end
+
+      self._icon
+    end
+
+    def unfurl(should = true)
+      self._unfurl = should
     end
 
     def configure(last_response=nil, step_responses=nil)

data/pushpop-slack.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = "pushpop-slack allows you to send messages to your slack channel inside of a Pushpop job"
 
   s.add_dependency "pushpop"
+  s.add_dependency "slack-notifier"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/pushpop-slack_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Pushpop::Slack do
   it 'should make sure there is a message' do
     step = Pushpop::Slack.new do
-      message 'test'
     end 
 
     expect{step.run}.to raise_error
@@ -11,17 +10,118 @@ describe Pushpop::Slack do
 
   it 'should prepend a # to the channel if its not there' do
     step = Pushpop::Slack.new do
+      message 'nothing'
       channel 'test'
     end
 
-    step.options['channel'].should eq('#test')
+    step.configure
+
+    expect(step.options['channel']).to eq('#test')
   end
 
   it 'should not prepend a # to the channel if its already there' do
     step = Pushpop::Slack.new do
+      message 'nothing'
       channel '#test'
     end
 
-    step.options['channel'].should eq('#test')
+    step.configure
+
+    expect(step.options['channel']).to eq('#test')
+  end
+
+  it 'should set URL icons' do
+      step = Pushpop::Slack.new do
+        message 'nothing'
+        icon 'https://keen.io/file.png'
+      end
+
+      step.configure
+
+      expect(step.options["icon_url"]).to eq("https://keen.io/file.png")
+  end
+
+  it 'should set emoji icons' do
+    step = Pushpop::Slack.new do
+      message 'nothing'
+      icon ':ghost:'
+    end
+
+    step.configure
+
+    expect(step.options['icon_emoji']).to eq(':ghost:')
+  end
+
+  it 'should set add colons to emoji icons' do
+    step = Pushpop::Slack.new do
+      message 'nothing'
+      icon 'ghost'
+    end
+
+    step.configure
+
+    expect(step.options['icon_emoji']).to eq(':ghost:')
+  end
+
+  it 'should format links in the message' do
+    step = Pushpop::Slack.new do
+      message 'Check out [this link](https://keen.io) to Keen!'
+    end
+
+    step.configure
+
+    expect(step._message).to include('<https://keen.io|this link>')
+  end
+
+  it 'sets attachments' do
+    step = Pushpop::Slack.new do
+      first_a = {
+        fallback: 'tester',
+        text: 'heyo',
+        color: 'good'
+      }
+
+      message 'nothing'
+      attachment first_a
+    end 
+
+    step.configure
+
+    expect(step.options['attachments'].size).to eq(1)
+  end
+
+  it 'sets multiple' do
+    step = Pushpop::Slack.new do
+      first_a = {
+        fallback: 'tester',
+        text: 'heyo',
+        color: 'good'
+      }
+
+      second_a = {
+        fallback: 'tester 2',
+        text: 'sup',
+        color: 'bad'
+      }
+
+      message 'nothing'
+      attachment first_a
+      attachment second_a
+    end 
+
+    step.configure
+
+    expect(step.options['attachments'].size).to eq(2)
+  end
+
+  it 'unfurls links' do
+    step = Pushpop::Slack.new do
+      message 'nothing'
+      unfurl
+    end
+
+    step.configure
+
+    expect(step.options['unfurl_links']).to eq(true)
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $: << File.join(File.dirname(__FILE__), '../lib')
 
 require 'pushpop'
-require 'pushpop-plugin'
+require 'pushpop-slack'
 
 RSpec.configure do |config|
   config.before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushpop-slack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Wegner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pushpop
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slack-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: pushpop-slack allows you to send messages to your slack channel inside
   of a Pushpop job
 email: joe@keen.io