ci_slack 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e7fc82227bb4a7377109f371acd8b1dd65be275
-  data.tar.gz: 31424e4553462864c599eafd1f0f181e4aed2c72
+  metadata.gz: f99d5ee84a508ed11a15c05c2fb8c30c77f32de2
+  data.tar.gz: 96ea17fa76a7225bb45e6805ac24bfc4565a4c2b
 SHA512:
-  metadata.gz: 3cfa35a4ad6a9e5577b71b6ed8e4a4b1e9f42df7f5496275e3391e48e37a79771ff266db033054558d3ce94316ef3b1a2282824e9cc4b11fb7fcd360f9162332
-  data.tar.gz: 82a5de91f080ddd442b18ba0b9e4163122014e7d561f06c6864e148742a71996b621d01a1448a06ea9843d9d32cef19d394135eb24de57c92fbfa8e91359c77c
+  metadata.gz: b44f58c5152d8c7abaaf4c29a775c59275b134afa72121fd24f864140faf7051ffacdb5b7c318b1d7a802dea8218a2d2062f10fe0d37c26b9e40f947a997389e
+  data.tar.gz: bfa80b9d2aced0ea115596e59f6682aa3264ff6563ba85e3beed9da260dd2918debb607c6085f341101370d9013deeca9044a953bf50b58bc68a0ccd90ad2b45

data/lib/ci_slack/configuration.rb

@@ -3,7 +3,8 @@ module CiSlack
     attr_accessor :webhook, :channel, :ci_computer,
                   :bot_name, :project, :slack_names,
                   :failed_icon, :success_icon,
-                  :failed_title, :success_title
+                  :failed_title, :success_title,
+                  :skip_success_message
 
     def initialize
       @webhook = ''
@@ -17,6 +18,8 @@ module CiSlack
       @success_icon = 'successful'
       @failed_title = 'CI FAILED!'
       @success_title = 'SUCCESS'
+
+      @skip_success_message = []
     end
   end
 end

data/lib/ci_slack/messager.rb

@@ -8,18 +8,15 @@ module CiSlack
       return unless ENV[ci_computer.to_s]
 
       author, commit_message = last_git_log
-      slack_name = slack_names.select { |key, _| author.downcase =~ key }.values.first || author
 
-      text = "#{ project }. #{ send(status.to_s + '_title') }\n<@#{ slack_name }> : #{ commit_message }\n#{ message }"
-
-      client.post(text: text, icon_emoji: ":#{ send(status.to_s + '_icon') }:")
+      client.post(text: text(status, author, commit_message, message),
+                  icon_emoji: ":#{ send(status.to_s + '_icon') }:")
     end
 
     def method_missing(method, *args)
-      if %i[success_icon failed_icon
-            failed_title success_title
-            webhook channel ci_computer
-            bot_name project slack_names].include?(method)
+      if %i[success_icon failed_icon skip_success_message
+            failed_title success_title webhook channel
+            ci_computer bot_name project slack_names].include?(method)
         CiSlack.configuration.send(method)
       else
         super
@@ -28,6 +25,24 @@ module CiSlack
 
     private
 
+    def text(status, author, commit_message, message)
+      "#{ project }. #{ send(status.to_s + '_title') }\n#{ slack_name(author, status) } : #{ commit_message }\n#{ message }"
+    end
+
+    def slack_name(author, status)
+      slack_name = slack_names.select { |key, _| author.downcase =~ key }.values.first
+
+      unless slack_name.nil?
+        if skip_success_message.include?(slack_name) && status == :success 
+          slack_name
+        else
+          "<@#{ slack_name }>"
+        end
+      else
+        author
+      end
+    end
+
     def last_git_log
       `git log -1 --pretty='%an||%s'`.split('||').map(&:strip)
     end

data/lib/ci_slack/version.rb

@@ -1,3 +1,3 @@
 module CiSlack
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/ci_slack_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+RSpec.describe CiSlack do
+  it '.configure' do
+    CiSlack.configure do |config|
+      %i[failed_icon success_icon
+         success_title failed_title
+         webhook channel ci_computer
+         bot_name project slack_names
+         skip_success_message].each do |param|
+        config.send("#{ param }=", param)
+      end
+    end
+
+    %i[failed_icon success_icon
+         success_title failed_title
+         webhook channel ci_computer
+         bot_name project slack_names
+         skip_success_message].each do |param|
+      expect(CiSlack.configuration.send(param)).to eq(param)
+    end 
+  end
+end

data/spec/configuration_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe CiSlack::Configuration do
+  it 'default params' do
+    config = CiSlack::Configuration.new
+
+    expect(config.failed_icon).to eq('failed')
+    expect(config.failed_title).to eq('CI FAILED!')
+    expect(config.success_icon).to eq('successful')
+    expect(config.success_title).to eq('SUCCESS')
+    expect(config.channel).to eq('#ci')
+    expect(config.ci_computer).to eq('CI')
+    expect(config.project).to eq('')
+    expect(config.slack_names).to eq({})
+    expect(config.skip_success_message).to eq([])
+  end
+end

data/spec/messager_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require_relative '../lib/ci_slack/messager'
+
+RSpec.describe CiSlack::Messager do
+  before do
+    CiSlack.configure do |config|
+      %i[webhook channel ci_computer bot_name project slack_names success_title].each do |param|
+        if param == :webhook
+          config.send("#{ param }=", 'http://github.com')
+        elsif param == :slack_names
+          config.send("#{ param }=", {})
+        else
+          config.send("#{ param }=", param)
+        end
+      end
+    end
+  end
+
+  it "computer without ci: ENV['CI'] is absent" do
+    ENV['ci_computer'] = nil
+
+    messager = CiSlack::Messager.new
+
+    expect(messager.deliver('message')).to be_nil
+  end
+
+  it "computer with ci: ENV['CI'] is present" do
+    ENV['ci_computer'] = 'true'
+
+    messager = CiSlack::Messager.new
+
+    expect{messager.deliver('message')}.to raise_error(Slack::Notifier::APIError)
+  end
+
+  context 'configuration @skip_success_message' do
+    let(:messager) { CiSlack::Messager.new }
+
+    it 'present' do
+      CiSlack.configure do |config|
+        config.skip_success_message = ['author']
+        config.slack_names = { %r{author} => 'author' }
+      end
+
+      expect(messager.send(:text, :success, 'author', 'commit_message', 'message')).
+        to eq("project. success_title\nauthor : commit_message\nmessage")
+
+    end
+
+    it 'absent' do
+      CiSlack.configure do |config|
+        config.skip_success_message = []
+        config.slack_names = { %r{author} => 'author' }
+      end
+
+      expect(messager.send(:text, :success, 'author', 'commit_message', 'message')).
+        to eq("project. success_title\n<@author> : commit_message\nmessage")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,105 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'ci_slack'
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_slack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - skrinits
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: Send a message on failure of Continiues Integration to the specific channel
   with a link to the author of a last commit
 email:
@@ -33,17 +47,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- Rakefile
 - lib/ci_slack.rb
 - lib/ci_slack/configuration.rb
 - lib/ci_slack/messager.rb
 - lib/ci_slack/rspec/notifier.rb
 - lib/ci_slack/rspec/patch.rb
 - lib/ci_slack/version.rb
-- test/ci_slack_test.rb
-- test/configuration_test.rb
-- test/messager_test.rb
-- test/test_helper.rb
+- spec/ci_slack_spec.rb
+- spec/configuration_spec.rb
+- spec/messager_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/skrinits/ci_slack
 licenses:
 - MIT
@@ -69,7 +82,7 @@ signing_key:
 specification_version: 4
 summary: Slack report for Continiues Integration
 test_files:
-- test/messager_test.rb
-- test/ci_slack_test.rb
-- test/configuration_test.rb
-- test/test_helper.rb
+- spec/spec_helper.rb
+- spec/messager_spec.rb
+- spec/ci_slack_spec.rb
+- spec/configuration_spec.rb

data/Rakefile

@@ -1,29 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'CiSlack'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test

data/test/ci_slack_test.rb

@@ -1,15 +0,0 @@
-require 'test_helper'
-
-class CiSlackTest < ActiveSupport::TestCase
-  test 'configure' do
-    CiSlack.configure do |config|
-      %i[icon webhook channel ci_computer bot_name project slack_names].each do |param|
-        config.send("#{ param }=", param)
-      end
-    end
-
-    %i[icon webhook channel ci_computer bot_name project slack_names].each do |param|
-      assert_equal(CiSlack.configuration.send(param), param)
-    end
-  end
-end

data/test/configuration_test.rb

@@ -1,15 +0,0 @@
-require 'test_helper'
-
-class ConfigurationTest < ActiveSupport::TestCase
-  test 'default params' do
-    config = CiSlack::Configuration.new
-
-    assert_equal('failed', config.icon)
-    assert_equal('', config.webhook)
-    assert_equal('#ci', config.channel)
-    assert_equal('CI', config.ci_computer)
-    assert_equal('CI BOT', config.bot_name)
-    assert_equal('', config.project)
-    assert_equal({}, config.slack_names)
-  end
-end

data/test/messager_test.rb

@@ -1,36 +0,0 @@
-require 'test_helper'
-require_relative '../lib/ci_slack/messager'
-
-class MessagerTest < ActiveSupport::TestCase
-  setup do
-    CiSlack.configure do |config|
-      %i[icon webhook channel ci_computer bot_name project slack_names].each do |param|
-        if param == :webhook
-          config.send("#{ param }=", 'http://github.com')
-        elsif param == :slack_names
-          config.send("#{ param }=", {})
-        else
-          config.send("#{ param }=", param)
-        end
-      end
-    end
-  end
-
-  test "computer without ci: ENV['CI'] is absent" do
-    ENV['ci_computer'] = nil
-
-    messager = CiSlack::Messager.new
-
-    assert_nil(messager.deliver('message'))
-  end
-
-  test "computer with ci: ENV['CI'] is present" do
-    ENV['ci_computer'] = 'true'
-
-    messager = CiSlack::Messager.new
-
-    assert_raise Slack::Notifier::APIError do
-      messager.deliver('message')
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,20 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-require "rails/test_help"
-
-# Filter out Minitest backtrace while allowing backtrace from other libraries
-# to be shown.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-  ActiveSupport::TestCase.fixtures :all
-end