cruisecontrolrb-to-slack 0.0.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65a82491694a02f9af02772f49dab68ea23305ee
-  data.tar.gz: 57bb0f0857ab28738502cb72b448e6f1c5c39e55
+  metadata.gz: 09e6788b23cc2d349cb43f80d44ce77910973baf
+  data.tar.gz: 30cf3f748b51cb3dea72eb01ceb17a22f7ae0ede
 SHA512:
-  metadata.gz: 4445067d5ab28c6d39e9e43030971cab1b8e2e23c435b7cc67ae83eec365abf5b9bdfe86119fe5fbfaa57b9662d10326606350b43737a3f1d5fd2f298d6f6f50
-  data.tar.gz: b48076ff09375e02d7ec1b342008c23737108cef75befdddf7932453a9572e599ec99ccff5eca3f725fb4359eadf3016e82d4db2b4a8cfe12a495f8d7a0c392c
+  metadata.gz: e0909c8d54417f8fcf900a9abf7f7915905f2d7c1481363f083f94c5bc403e1d89acc8366cc88ad5326da7154480a38e525c9cc295069685a5f2c3186d675d2f
+  data.tar.gz: 605e4dee72e0ed40e8d85e3c1a6d46c3870cbc25bb8f283c41a725a03d2a42e8a79be18c67a83fa913a46ec0eba5485a0aba675e2bda53a4c146cf0a21e25cb4

data/.gitignore

@@ -0,0 +1 @@
+.idea

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.0
+Switch to webhook for slack
+
+## 0.1.0
+Initial Release

data/Gemfile.lock

@@ -1,30 +1,37 @@
 PATH
   remote: .
   specs:
-    cruisecontrolrb-to-slack (0.0.1)
+    cruisecontrolrb-to-slack (0.1.0)
       dante (~> 0.2.0)
       httparty (~> 0.13.1)
       nokogiri (~> 1.6.2)
       rufus-scheduler
-      slack-notifier (~> 0.6.0)
+      slack-notifier (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.0)
     dante (0.2.0)
-    httparty (0.13.1)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.1)
-    mini_portile (0.6.0)
-    minitest (4.7.5)
+    json (1.8.2)
+    method_source (0.8.2)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     multi_xml (0.5.5)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    rake (10.3.2)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
     rufus-scheduler (3.0.9)
       tzinfo
-    slack-notifier (0.6.0)
+    slack-notifier (1.0.0)
+    slop (3.6.0)
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -36,4 +43,5 @@ DEPENDENCIES
   bundler (~> 1.6)
   cruisecontrolrb-to-slack!
   minitest
+  pry
   rake

data/README.md

@@ -1,3 +1,5 @@
+Now supports the new Webhook method of interacting with Slack.
+
 This is a little app notifies Slack of any changes in the build status on your CruiseControl.rb install.
 It also support github as a source code repository to link to a commit. Other can easily be extended if needed
 
@@ -33,8 +35,7 @@ Make sure to define the following environment variable as they are required in e
 you `.profile` or `/etc/profile.d/cruisecontrolrc-to-slack.sh` (for all users)
 
 ```
-SLACK_TEAM=team                     # the team name (first part of the host in the incoming hook url)
-SLACK_HOOK_TOKEN=your_auth_token    # the incoming web_hook token
+SLACK_WEBHOOK_URL=webhook_url       # the webhook url you received from Slack
 CC_URL=your_cruise_control_url
 ```
 
@@ -76,4 +77,4 @@ cruisecontrolrb-to-slack -l /var/log/myapp.log
 cruisecontrolrb-to-slack -d -P /var/run/myapp.pid -l /var/log/myapp.log
 ```
 
-<img width="100px" src="http://1.bp.blogspot.com/-VYkLIx6dPTE/TapmnuECsJI/AAAAAAAAALY/L3c1FY4v--w/s1600/looney_tunes_thats_all_folks.jpg"  />
+<img width="100px" src="http://1.bp.blogspot.com/-VYkLIx6dPTE/TapmnuECsJI/AAAAAAAAALY/L3c1FY4v--w/s1600/looney_tunes_thats_all_folks.jpg"  />

data/bin/cruisecontrolrb-to-slack

@@ -4,19 +4,17 @@ require 'cruisecontrolrb-to-slack'
 
 Dante.run('myapp') do |opts|
   raise 'Missing required Cruisecontrol host: export CC_HOST=<your_cc_host>' unless  host = ENV["CC_HOST"]
-  raise 'Missing required Slack api token, export SLACK_HOOK_TOKEN=<token>' unless token = ENV["SLACK_HOOK_TOKEN"]
-  raise 'Missing required Slack api token, export SLACK_TEAM=<team>' unless team = ENV["SLACK_TEAM"]
-  user = ENV["SLACK_USERNAME"] 
+  raise 'Missing required Slack webhook url, export SLACK_WEBHOOK_URL=<webhook url>' unless webhook = ENV["SLACK_WEBHOOK_URL"]
+  user = ENV["SLACK_USERNAME"]
   channel = ENV["SLACK_CHANNEL"]
 
   options = {cc_host: host, 
              cc_username: ENV["CC_USERNAME"] || "", 
              cc_password: ENV["CC_PASSWORD"] || "",
-             slack_team: team,
-             slack_hook_token: token,
+             slack_webhook_url: webhook,
              slack_channel: channel ,
-             slack_user: user, 
+             slack_user: user,
              polling_interval: ENV["POLLING_INTERVAL"] || 5}
 
   CruisecontrolrbToSlack::Runner.run(options)
-end
+end

data/cruisecontrolrb-to-slack.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dante", "~> 0.2.0"
-  spec.add_dependency "slack-notifier", "~> 0.6.0"
+  spec.add_dependency "slack-notifier", "~> 1.0.0"
   spec.add_dependency "nokogiri", "~> 1.6.2"  
   spec.add_dependency "httparty", "~> 0.13.1"
   spec.add_dependency "rufus-scheduler"
@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "pry"
 
 end

data/lib/cruisecontrolrb-to-slack/slack_client.rb

@@ -2,11 +2,11 @@ module CruisecontrolrbToSlack
   class SlackClient
     attr_reader :client
 
-    def initialize(team, token, options = {})
+    def initialize(webhook, options = {})
       user = options[:user] || 'cruisecontrol'   
       channel = options[:channel] || '#general'
 
-      @client = Slack::Notifier.new team, token, channel: channel, username: user
+      @client = Slack::Notifier.new webhook, channel: channel, username: user
     end
 
     # 
@@ -17,4 +17,4 @@ module CruisecontrolrbToSlack
     end
 
   end
-end
+end

data/lib/cruisecontrolrb-to-slack/version.rb

@@ -1,3 +1,3 @@
 module CruisecontrolrbToSlack
-  VERSION = "0.0.2"
+  VERSION = "0.2.0"
 end

data/lib/cruisecontrolrb-to-slack.rb

@@ -36,7 +36,6 @@ module CruisecontrolrbToSlack
 
     def check_statuses
       statuses = cc_client.fetch_statuses
-
       unless statuses.empty?     
 
         statuses.each do |status_hash|   
@@ -98,7 +97,7 @@ module CruisecontrolrbToSlack
     end
 
     def slack_client
-      @slack_client ||= SlackClient.new(config[:slack_team], config[:slack_hook_token], 
+      @slack_client ||= SlackClient.new(config[:slack_webhook_url],
                                 channel: config[:slack_channel], user: config[:slack_user])
     end
 

data/test/slack_client_test.rb

@@ -1,19 +1,17 @@
 require 'test_helper'
+require 'pry'
 
 describe CruisecontrolrbToSlack::SlackClient do
-  subject{CruisecontrolrbToSlack::SlackClient.new('team', 'token')}
+  subject{CruisecontrolrbToSlack::SlackClient.new('http://url.to/webhook')}
 
   it 'should use the default  a new instance' do
     subject.client.must_be_kind_of Slack::Notifier
   end 
 
   it 'should set the team properly' do
-    subject.client.team.must_equal 'team'
+    subject.client.endpoint.to_s.must_equal 'http://url.to/webhook'
   end
 
-  it 'should set the token properly' do
-    subject.client.token.must_equal 'token'
-  end
 
   it 'should set the default channel to #general' do
     subject.client.channel.must_equal '#general'
@@ -24,12 +22,12 @@ describe CruisecontrolrbToSlack::SlackClient do
   end
 
   it 'should override the default channel ' do
-    slack_client = CruisecontrolrbToSlack::SlackClient.new('team', 'token', channel: 'channel')
+    slack_client = CruisecontrolrbToSlack::SlackClient.new('webhook', channel: 'channel')
     slack_client.client.channel.must_equal 'channel'
   end
 
   it 'should override the default user ' do
-    slack_client = CruisecontrolrbToSlack::SlackClient.new('team', 'token', user: 'user')
+    slack_client = CruisecontrolrbToSlack::SlackClient.new('webhook', user: 'user')
     slack_client.client.default_payload[:username].must_equal 'user'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cruisecontrolrb-to-slack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.2.0
 platform: ruby
 authors:
 - epinault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple daemon to report last build status of projects and activities
   from cruisecontrol into the awesome Slack (http://slack.com). It support multiple
   projects
@@ -132,6 +146,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt