comrad 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c6919f9e828f044c58110f1f249c397bf8b30f
-  data.tar.gz: bfe6cea60a7b4284a42f4cfff6e46684da3520ff
+  metadata.gz: f8a7c8c56e6699348b75573ab291f298b1b40267
+  data.tar.gz: 4f27ebddb71d6bad85cc9ea6ec947bc1b1f524b5
 SHA512:
-  metadata.gz: 8a3c112332856871089428d59ea4ad98f0ba0f8c5b7e155552c8854961e74b62849a3d66f0e59f88c207b1083565f6252c989854b2d5f91bbc230b9d039dd715
-  data.tar.gz: 2b8c623f22b0d0ea2fd7ac9611a5c2625bb6f7612d1cb8632d0320006fc68d9937f4ea3c93a8bb2aafedb79cac9d908f7dbe250ac0d62f23e5b204ec43bd0d36
+  metadata.gz: 7807998016b768f385925a846ad053eb41be367dadb1400936ae5a7eb1746d79f1ecbc129ddf98696071f5a7fc63ccd18b05c6510065a4b25558a240ac576daf
+  data.tar.gz: a90d91f1dd5542dbd01c964a87305b87949ae2d277dd60500ce778df73a33a2b315d7d7a0518ecb58e5f04799d859ce449308d89e9bb3af1bbca37e390005f0e

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
+cache:
+  - bundler
+install:
+  - bundle install
 rvm:
-- 2.1.5
-- 2.2.0
+- 2.1.6
+- 2.2.2
 script:
   - bundle exec rake test
 

data/Gemfile

@@ -1,10 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'chef', '>= 11.0'
-gem 'ridley', '~> 4.1'
-gem 'rest-client', '~> 1.7.0'
-
-group :test do
-  gem 'rubocop', '~> 0.30.0'
-  gem 'rake', '~> 10.4'
-end
+gemspec

data/README.md

@@ -1,2 +1,6 @@
-# Comrad
+Comrad
+======
+[![Build Status](https://travis-ci.org/tas50/Comrad.svg)](https://travis-ci.org/tas50/Comrad)
+
 Application to sync changes from git to Chef Server via Jenkins
+

data/bin/comrad

@@ -20,6 +20,6 @@
 # load the libs
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'application'
+require 'comrad'
 
-Comrad::Application.new.run
+Comrad.run

data/comrad.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'comrad'
-  s.version     = '0.0.3'
+  s.version     = '0.1.0'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']
@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'rest-client', '~> 1.7.0'
   s.add_dependency 'chef', '>= 11.0'
-  s.add_dependency 'ridley', '~> 4.0'
+  s.add_dependency 'slack-post', '~> 0.3'
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rubocop', '~> 0.30.0'
 
   s.files         = `git ls-files -z`.split("\x0")
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.executables   = s.name
   s.require_paths = ['lib']
   s.extra_rdoc_files = ['README.md']
-  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'reagan', '--main', 'README.md']
+  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'comrad', '--main', 'README.md']
 end

data/comrad.yml.EXAMPLE

@@ -1,5 +1,6 @@
 slack:
   webhook_url: 1234abcde1234abcde
+  channel: '#general'
 jenkins:
   workspace_dir: '/home/jenkins/workspace/chef-repo/'
 chef:

data/lib/comrad.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+require 'pp'
+
+require 'core_ext/string'
+
+require 'comrad/config'
+require 'comrad/changeset'
+require 'comrad/chef'
+require 'comrad/notifier'
+
+# Your rad comrade - Sync changes from git to Chef Server via Jenkins
+module Comrad
+  module_function
+
+  # Evaluate the current build for chef object changes,
+  # use knife to upload changed objects to the Chef server,
+  # send a notification to slack.
+  def self::run
+    if Config.config['flags']['print_config']
+      'Current config file / CLI flag values'.marquee
+      Config.print
+      exit
+    end
+
+    if Changeset.empty?
+      'No objects to test. Exiting'.to_green
+      exit
+    end
+
+    'The following chef objects will be changed'.marquee
+    pp Changeset.changes
+
+    'Making Chef Changes'.marquee
+    Chef.process_changes
+
+    Notifier.notify_changes
+  end
+end

data/lib/{change.rb → comrad/changeset.rb}

@@ -16,82 +16,72 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-begin
-  require 'json'
-  require 'rest_client'
-  require 'uri'
-rescue LoadError => e
-  raise "Missing gem or lib #{e}"
-end
+require 'json'
+require 'rest_client'
 
 module Comrad
   # interacts with jenkins API to determine changes files
   # parses changed files to determine relevant files that will
   # need to be uploaded to chef server
-  class Change < Application
-    attr_accessor :changes
-    def initialize(config)
-      @config = config
-      @protocol = URI(@config['jenkins']['url']).scheme
-      @jenkins_host = URI(@config['jenkins']['url']).host
-      @username = @config['jenkins']['username']
-      @password = @config['jenkins']['password']
-      @job_name = @config['jenkins']['job_name']
-      @jenkins_workspace_path = @config['jenkins']['workspace_dir']
-      @build_num = ENV['BUILD_NUMBER']
+  class Changeset
+    # Return a hash of all changed objects
+    def self::changes
+      @changes ||= create_change_hash(changed_files_array)
+    end
 
-      @build_data = query_build_data
-      @changes = create_change_hash(changed_files_array)
+    # True if there are no changed objects
+    def self::empty?
+      changes == empty_chef_object_hash
+    end
+
+    # Return a hash of all Jenkins details for this build
+    def self::build_data
+      @build_data ||= fetch_build_data
     end
 
     # fetch build data using Jenkins API
-    def query_build_data
-      conn = RestClient::Resource.new("#{@protocol}://#{@jenkins_host}/job/#{@job_name}/#{@build_num}/api/json?", @username, @password)
+    def self::fetch_build_data
+      j = Config.config['jenkins']
+      url = j['url'] + '/job/' + j['job_name'] + '/' + ENV['BUILD_NUMBER'] + '/api/json?'
+      conn = RestClient::Resource.new(url, j['username'], j['password'])
       JSON.parse(conn.get)
     end
 
     # parse jenkins build data to determine unique list of all files that have changed accross multiple commits
-    def changed_files_array
+    def self::changed_files_array
       changed_files = []
-
-      @build_data['changeSet']['items'].each do |change|
+      build_data['changeSet']['items'].each do |change|
         changed_files.concat(change['affectedPaths'])
       end
-
       changed_files.uniq
     end
 
-    # create the empty hash that stores the changed objects
-    def empty_chef_object_hash
-      objects = {}
-      objects['environments'] = {}
-      objects['roles'] = {}
-      objects['data_bags'] = {}
-      objects['cookbooks'] = {}
-
-      objects
+    def self::empty_chef_object_hash
+      {
+        'environments' => {},
+        'roles' => {},
+        'data_bags' => {},
+        'cookbooks' => {}
+      }
     end
 
     # return an action based on the status of the object in the workspace
-    def action(file)
-      ::File.exist?(::File.join(@jenkins_workspace_path, file)) ? 'update' : 'delete'
-    end
-
-    def print
+    def self::action(file)
+      ::File.exist?(::File.join(Config.config['jenkins']['workspace_dir'], file)) ? 'update' : 'delete'
     end
 
     # takes an array of files that have changes and returns hash of chef objects and an action to take on the object
-    def create_change_hash(files_array)
+    def self::create_change_hash(files_array)
       objects = empty_chef_object_hash
       files_array.each do |file|
+        split_file = file.split('/')
         case
         when file.match(/^[cookbook|roles|environments]/)
-          split_file = file.split('/')
+          # "cookbooks"=>{"some-cookbook"=>"update"}
           objects[split_file[0]][split_file[1]] = action(split_file[0..1].join('/'))
         when file.match(/^data_bags/)
-          split_file = file.split('/')
-          objects[split_file[0]][split_file[1]] = {} unless objects[split_file[0]].key?(split_file[1])
-          objects[split_file[0]][split_file[1]][split_file[2]] = action(split_file[0..2].join('/'))
+          # "data_bags"=>{"some_dbag/some_item.json"=>"update"}
+          objects[split_file[0]][split_file[1..2].join('/')] = action(split_file[0..2].join('/'))
         end
       end
       objects

data/lib/comrad/chef.rb

@@ -0,0 +1,64 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Comrad
+  # uploads / removes objects that changed from the chef server
+  class Chef
+    # Given an +item+ of +item_class+, return a knife command that performs +action+
+    def self::knife_command(item_class, item, action)
+      item_path = {
+        cookbooks: item,
+        data_bags: "data_bags/#{item}",
+        environments: "environments/#{item}",
+        roles: "roles/#{item}"
+      }
+      # Special case: if we're deleting a data_bag, we want
+      # "bag_name item_name" without the '.json' rather than the path to the item.
+      item_path[:data_bags] = item.split('/').join(' ').chomp('.json') if action == 'delete'
+
+      knife_action = { delete: 'delete', update: 'from file' }
+      # Special case: we call 'upload' instead of 'from file' for updated cookbooks
+      knife_action[:update] = 'upload' if item_class == 'cookbooks'
+
+      'knife %s %s %s' % [ # rubocop:disable FormatString
+        item_class.chomp('s'), # cookbook, data_bag, environment, role
+        knife_action[action.to_sym], # 'upload', 'delete' or 'from file'
+        item_path[item_class.to_sym] # cookbookname, environments/foo.json, 'dbag bagitem', etc.
+      ]
+    end
+
+    # run the provided knife command
+    def self::excute_knife_cmd(cmd)
+      if Config.config['flags']['dryrun']
+        puts "I would be running '#{cmd}'"
+      else
+        puts "Live mode is not implemented. Not performing '#{cmd}'"
+      end
+    end
+
+    # perform the appropriate knife action for each item in the +changeset+
+    def self::process_changes
+      Changeset.changes.each_pair do |item_class, action_pairs|
+        next if action_pairs.empty?
+        action_pairs.each_pair do |item, action|
+          excute_knife_cmd(knife_command(item_class, item, action))
+        end
+      end
+    end
+  end # Chef class
+end # Comrad Module

data/lib/{config.rb → comrad/config.rb}

@@ -16,25 +16,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-begin
-  require 'yaml'
-  require 'optparse'
-rescue LoadError => e
-  raise "Missing gem or lib #{e}"
-end
+require 'yaml'
+require 'optparse'
 
 module Comrad
   # builds a single config from passed flags, yaml config, and knife.rb
   class Config
-    attr_accessor :settings
-    def initialize
-      @flags = parse_flags
-      @config_file = load_file
-      @settings = merge_configs
+    # return the fully-evaluated configuration hash
+    def self::config
+      @flags ||= parse_flags
+      @config ||= merge_configs(load_file(@flags[:config]), @flags)
+    end
+
+    # pretty print the config hash
+    def self::print(hash = config, spaces = 0)
+      hash.each do |k, v|
+        spaces.times { print ' ' }
+        print k.to_s + ': '
+        if v.class == Hash
+          print "\n"
+          print_config(v, spaces + 2)
+        else
+          puts v
+        end
+      end
     end
 
     # make sure the BUILD_NUMBER Jenkins variable exists.  If not force help
-    def check_jenkins_env_variable
+    def self::check_jenkins_env_variable
       if ENV['BUILD_NUMBER'].nil?
         puts "Jenkins set BUILD_NUMBER environmental variable not set. Cannot continue.\n\n"
         ARGV[0] = '-h'
@@ -42,14 +51,14 @@ module Comrad
     end
 
     # grabs the flags passed in via command line
-    def parse_flags
+    def self::parse_flags
       check_jenkins_env_variable
 
       flags = { config: '/etc/comrad.yml', print_config: false, quiet: false }
       OptionParser.new do |opts|
         opts.banner = 'Usage: comrad [options]'
 
-        opts.on('-p', '--print', 'Print the config options that will be used') do |config|
+        opts.on('-p', '--print', 'Print the config options that would be used, and then exit') do |config|
           flags[:print_config] = config
         end
 
@@ -79,42 +88,27 @@ module Comrad
     end
 
     # loads the comrad.yml config file from /etc/comrad.yml or the passed location
-    def load_file
-      config = YAML.load_file(@flags[:config])
+    def self::load_file(file_path)
+      config = YAML.load_file(file_path)
       if config == false
         puts "ERROR: Comrad config at #{@flags[:config]} does not contain any configuration data"
         exit 1
       end
       config
     rescue Errno::ENOENT
-      puts "ERROR: Cannot load Comrad config file at #{@flags[:config]}"
+      puts "ERROR: Cannot load Comrad config file at #{file_path}"
       exit 1
     rescue Psych::SyntaxError
-      puts "ERROR: Syntax error in Comrad config file at #{@flags[:config]}"
+      puts "ERROR: Syntax error in Comrad config file at #{file_path}"
       exit 1
     end
 
     # join the config file with the passed flags into a single object
-    def merge_configs
-      config = @config_file
+    def self::merge_configs(file_config, flags_config)
+      config = file_config.dup
       config['flags'] = {}
-      @flags.each { |k, v| config['flags'][k.to_s] = v }
+      flags_config.each { |k, v| config['flags'][k.to_s] = v }
       config
     end
-
-    # pretty print the config hash
-    def print(hash = nil, spaces = 0)
-      hash = @settings if hash.nil?
-      hash.each do |k, v|
-        spaces.times { print ' ' }
-        print k.to_s + ': '
-        if v.class == Hash
-          print "\n"
-          print_config(v, spaces + 2)
-        else
-          puts v
-        end
-      end
-    end
   end
 end

data/lib/comrad/notifier.rb

@@ -0,0 +1,62 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'slack/post'
+
+module Comrad
+  # send notifications to slack
+  class Notifier
+    def self::configure
+      Slack::Post.configure(
+        webhook_url: Config.config['slack']['webhook_url'],
+        username: 'comrad',
+        channel: Config.config['slack']['channel']
+      )
+      @configured = true
+    end
+
+    # Post a Slack notification containing details of the changes
+    def self::notify_changes
+      unless Config.config['flags']['quiet']
+        configure unless @configured
+        Slack::Post.post_with_attachments(
+          'Comrad action for chef repo <%s|Build #%s>' % [ # rubocop:disable FormatString
+            Changeset.build_data['url'],
+            Changeset.build_data['number']],
+          changeset_attachment)
+      end
+    end
+
+    # Generate a Slack message attachment that contains changeset details
+    def self::changeset_attachment
+      attach = { fallback: '', color: '#36a64f', fields: [] }
+
+      Changeset.changes.each_pair do |item_class, action_pairs|
+        next if action_pairs.empty?
+        text = ''
+        action_pairs.each_pair do |item, action|
+          text << "#{action} #{item}\n"
+        end
+        attach[:fallback] << "#{item_class}:\n#{text}"
+        attach[:fields] << { title: item_class, value: text, short: false }
+      end
+
+      [attach]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comrad
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: ridley
+  name: slack-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,12 +98,12 @@ files:
 - bin/comrad
 - comrad.gemspec
 - comrad.yml.EXAMPLE
-- lib/application.rb
-- lib/change.rb
-- lib/chef.rb
-- lib/config.rb
-- lib/slack.rb
-- lib/string.rb
+- lib/comrad.rb
+- lib/comrad/changeset.rb
+- lib/comrad/chef.rb
+- lib/comrad/config.rb
+- lib/comrad/notifier.rb
+- lib/core_ext/string.rb
 homepage: http://www.github.com/tas50/Comrad
 licenses:
 - Apache-2.0
@@ -113,7 +113,7 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- reagan
+- comrad
 - --main
 - README.md
 require_paths:

data/lib/application.rb

@@ -1,66 +0,0 @@
-# encoding: UTF-8
-#
-# Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014-2015 Tim Smith
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Comrad
-  # the main class for the comrad app.  gets called by the comrad bin
-  class Application
-    require 'config'
-    require 'change'
-    require 'chef'
-    require 'string'
-    require 'slack'
-
-    def initialize
-      @config_obj = Comrad::Config.new
-      @config = @config_obj.settings
-      @changes = Comrad::Change.new(@config).changes
-    end
-
-    # exit with a friendly message if nothing we test has been changed
-    def check_empty_update
-      objects_updated = false
-      %w(cookbooks roles environments data_bags).each do |object|
-        objects_updated = true unless @changes[object].empty?
-      end
-
-      ('No objects to test. Exiting'.to_green && exit) unless objects_updated
-    end
-
-    # check and see if the -p flag was passed and if so print the config hash
-    def check_print_config
-      if @config['flags']['print_config']
-        'Current config file / CLI flag values'.marquee
-        @config_obj.print
-        exit
-      end
-    end
-
-    # run tests on each changed cookbook
-    def run
-      check_print_config
-      ('No objects updated by this commit.  Exiting'.to_green && exit) if check_empty_update
-
-      # print objects that will be uploaded
-      'The following chef objects will be changed'.marquee
-      puts @changes
-
-      'Making Chef Changes'.marquee
-      Comrad::Chef.new(@config, @changes).run
-    end
-  end
-end

data/lib/chef.rb

@@ -1,94 +0,0 @@
-# encoding: UTF-8
-#
-# Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014-2015 Tim Smith
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-begin
-  require 'ridley'
-rescue LoadError => e
-  raise "Missing gem or lib #{e}"
-end
-
-module Comrad
-  # uploads / removes objects that changed from the chef server
-  class Chef < Application
-    def initialize(config, changes)
-      @config = config
-      @changes = changes
-      @slack = Comrad::Slack.new(config)
-    end
-
-    # builds a string of what the action is / would be depending on dry run or not
-    def action_string(action, trailing_text)
-      string = @config['flags']['dryrun'] ? " - I would #{action} " : " - #{action.capitalize.chomp('e')}ing "
-      string + trailing_text
-    end
-
-    # a really horrible method to build knife commands based on item / action / item type (cookbook/role/environment/data_bag)
-    def build_knife_cmd(type, action, item1, item2 = nil)
-      if type == 'data_bags'
-        action == 'delete' ? "knife data bag delete #{item1} #{item2}" : "knife data bag from file #{item1} data_bags/#{item1}/#{item2}"
-      elsif action == 'delete'
-        "knife #{type.chomp('s')} delete #{item1} #{item2}"
-      elsif type == 'cookbooks'
-        "knife cookbook #{action == 'update' ? 'upload' : 'delete'} #{item1}"
-      else
-        "knife #{type.chomp('s')} from file #{type}/#{item1}"
-      end
-    end
-
-    # run the provided knife command
-    def excute_knife_cmd(cmd)
-      if @config['flags']['dryrun']
-        @slack.slack_put("    - I would be running #{cmd}")
-      else
-        @slack.slack_put('    - Non-dry mode is not implemented.  Doing nothing')
-      end
-    end
-
-    # main method of the class.  Iterates over the changes passed in and kicks off actions / slack messaging
-    def take_actions
-      @changes.each_pair do |type, name|
-        next if name.empty?
-        case
-        when type.match(/^['environments|roles']/)
-          name.each_pair do |item, action|
-            @slack.slack_put(action_string(action, "#{item}"))
-            excute_knife_cmd(build_knife_cmd(type, action, item))
-          end
-        when type == 'cookbooks'
-          name.each_pair do |item, action|
-            @slack.slack_put(action_string(action, "#{item}"))
-            excute_knife_cmd(build_knife_cmd(type, action, item))
-          end
-        when type == 'data_bags'
-          name.each_pair do |bag, item|
-            item.each_pair do |bag_item_name, action|
-              @slack.slack_put(action_string(action, "#{bag}::#{bag_item_name} data bag item"))
-              excute_knife_cmd(build_knife_cmd(type, action, bag, bag_item_name))
-            end
-          end
-        end
-      end
-    end
-
-    # called by application to perform actions
-    def run
-      @slack.slack_put("Comrad action for chef repo build # #{ENV['BUILD_NUMBER']}:")
-      take_actions
-    end
-  end # Chef class
-end # Comrad Module

data/lib/slack.rb

@@ -1,46 +0,0 @@
-# encoding: UTF-8
-#
-# Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014-2015 Tim Smith
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'rest-client'
-require 'json'
-
-# base module
-module Comrad
-  # send notifications to slack
-  class Slack
-    def initialize(config)
-      @config = config
-      @url = config['slack']['webhook_url']
-    end
-
-    def slack_put(text)
-      puts text
-      post(text) unless @config['flags']['quiet']
-    end
-
-    def post(text)
-      RestClient.post @url, create_message(text).to_json
-    end
-
-    def create_message(text)
-      message = {}
-      message['text'] = text
-      message
-    end
-  end
-end