patches 2.4.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a726ce30a4830757598e3c8e1a418ae177496782f61b2863709389be96c4d086
-  data.tar.gz: 83c927ddd30bf534d0925c9962faea4a1b8ae384ed0f726997eb0c595a0f8312
+  metadata.gz: 0c64a7680b2e1f703e7b66026113aa41a1c8a4eb6150eddf41d57fe3dc73cc3a
+  data.tar.gz: 1857e2c1a65df0e1df26dff96b65db37380f1f8887d855d906ca7791be410e03
 SHA512:
-  metadata.gz: 5ca1c096b455735c6ac1dd2b2bd246126fb1fc45d0d253d099234b3fd4bc3f22f13dec67d1c2708efea16afdbe7d25d4b57c61743540803c9bb7097122e7d8f4
-  data.tar.gz: e6495c336cc87c106e7943ec7fbd2798aaa8010bda3a024357f7bbf4b4fcac1b5c703db81e166fc3451bac96e699614118eda1027306dfb4462b97540700d21c
+  metadata.gz: 2ba176d20d1b4212da9c5f6170a8e9aaca2060074d908ad0bf1638b100ba7acd7089a90db000ad33eb81a5297dda2a4f54eee0801de0bc73e1a0e1292a060cd1
+  data.tar.gz: dca92ff447b236a9e47b28f5b1ce31739d7eb8a40f5325d53f977263655929a727a2f0089842b2fe7fccfb9b4fe4390ccfd0beaf629764d403bbd1c4bf0686d9

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.0.1] - 2018-11-19
+### Added
+- Set icon_emoji of posted slack message to :dog:
+
+## [3.0.0] - 2018-11-19
+### Removed
+- Hipchat is no longer supported
+
 ## [2.4.1] - 2018-09-19
 ### Changed
 - Corrected gem ownership and authors.

data/docs/usage.md

@@ -23,21 +23,13 @@ bundle exec rake db:migrate
 ## Configuration
 
 If you would like to run the patches asynchronously, or would like them to notify
-your hipchat room or Slack channel when they fail or succeed, you need to set up
+your Slack channel when they fail or succeed, you need to set up
 an initializer to set those options.
 
 ```Ruby
 Patches::Config.configure do |config|
   config.use_sidekiq = true
 
-  config.use_hipchat = true
-  config.hipchat_options = {
-    api_token: ENV['HIPCHAT_TOKEN'],
-    room: ENV['HIPCHAT_ROOM'],
-    user: ENV['HIPCHAT_USERNAME'], # maximum of 15 characters
-    api_version: 'v1', # optional
-  }
-
   config.use_slack = true
   config.slack_options = {
     webhook_url: ENV['SLACK_WEBHOOK_URL'],

data/lib/patches/config.rb

@@ -14,8 +14,8 @@ module Patches
       end
 
       class Configuration
-        attr_accessor :use_sidekiq, :sidekiq_queue, :sidekiq_options, :use_hipchat,
-          :hipchat_options, :sidekiq_parallel, :use_slack, :slack_options
+        attr_accessor :use_sidekiq, :sidekiq_queue, :sidekiq_options,
+          :sidekiq_parallel, :use_slack, :slack_options
 
         def initialize
           @sidekiq_queue = 'default'
@@ -25,22 +25,6 @@ module Patches
           @sidekiq_options ||= { retry: false, queue: sidekiq_queue }
         end
 
-        def hipchat_api_token
-          hipchat_options[:api_token]
-        end
-
-        def hipchat_init_options
-          hipchat_options.except(:api_token, :room, :user)
-        end
-
-        def hipchat_room
-          hipchat_options[:room]
-        end
-
-        def hipchat_user
-          hipchat_options[:user]
-        end
-
         def slack_channel
           slack_options[:channel]
         end

data/lib/patches/notifier.rb

@@ -3,12 +3,10 @@ require 'slack-notifier'
 class Patches::Notifier
   class << self
     def notify_success(patches)
-      send_hipchat_message(success_message(patches), color: 'green')
       send_slack_message(success_message(patches), 'good')
     end
 
     def notify_failure(patch_path, error)
-      send_hipchat_message(failure_message(patch_path, error), color: 'red')
       send_slack_message(failure_message(patch_path, error), 'danger')
     end
 
@@ -32,14 +30,6 @@ class Patches::Notifier
       message
     end
 
-    def send_hipchat_message(message, options)
-      return unless defined?(HipChat) && config.use_hipchat
-
-      client = HipChat::Client.new(config.hipchat_api_token, config.hipchat_init_options)
-      room = client[config.hipchat_room]
-      room.send(config.hipchat_user, message, options)
-    end
-
     def send_slack_message(message, color)
       return unless defined?(Slack) && config.use_slack
 
@@ -48,7 +38,7 @@ class Patches::Notifier
         channel: config.slack_channel,
         username: config.slack_username)
 
-      payload = { attachments: [{ color: color, text: message }] }
+      payload = { icon_emoji: ":dog:", attachments: [{ color: color, text: message }] }
 
       notifier.post payload
     end

data/lib/patches/tenant_run_concern.rb

@@ -1,8 +1,9 @@
 module Patches
   module TenantRunConcern
     def run(tenant_name, path = nil)
-      Apartment::Tenant.switch(tenant_name)
-      Patches::Runner.new(path).perform
+      Apartment::Tenant.switch(tenant_name) do
+        Patches::Runner.new(path).perform
+      end
     end
   end
 end

data/lib/patches/version.rb

@@ -1,3 +1,6 @@
 module Patches
-  VERSION = "2.4.1"
+  MAJOR = 3
+  MINOR = 1
+  PATCH = 0
+  VERSION = [MAJOR, MINOR, PATCH].compact.join(".").freeze
 end

data/patches.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner", "~> 1.3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sidekiq", "~> 3.4.1"
-  spec.add_development_dependency "hipchat"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patches
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.1.0
 platform: ruby
 authors:
 - JobReady
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
-- !ruby/object:Gem::Dependency
-  name: hipchat
-  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'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +277,6 @@ files:
 - lib/patches/worker.rb
 - lib/tasks/patches.rake
 - patches.gemspec
-- script/buildkite.sh
 homepage: http://github.com/jobready/patches
 licenses:
 - MIT
@@ -311,8 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple gem for one off tasks

data/script/buildkite.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -e
-
-echo '--- setting ruby version'
-cd /var/lib/buildkite-agent/.rbenv/plugins/ruby-build && git pull && cd -
-rbenv install 2.3.7 -s
-rbenv local 2.3.7
-
-echo '--- setting up env'
-REVISION=https://github.com/$BUILDBOX_PROJECT_SLUG/commit/$BUILDBOX_COMMIT
-
-echo '--- bundling'
-bundle install -j $(nproc) --without production --quiet
-
-echo '--- running specs'
-if bundle exec rspec; then
-  echo "[Successful] $BUILDBOX_PROJECT_SLUG - Build - $BUILDBOX_BUILD_URL - Commit - $REVISION" | hipchat_room_message -t $HIPCHAT_TOKEN -r $HIPCHAT_ROOM -f "Buildbox" -c "green"
-else
-  echo "[Failed] Build $BUILDBOX_PROJECT_SLUG - Build - $BUILDBOX_BUILD_URL - Commit - $REVISION" | hipchat_room_message -t $HIPCHAT_TOKEN -r $HIPCHAT_ROOM -f "Buildbox" -c "red"
-  exit 1;
-fi