chatopsify 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad7c973ce861d481cbc1b15b008de15c5a489c84ed1410d61ec2bb834bed9be
-  data.tar.gz: a87c09f10af7611b2453756767b1b413f4a89bd504afa16e2e353ec79cc58bbe
+  metadata.gz: 14141a20c1a8a4cfda8993608f336919ef400ad96644ca994658fd215b494a8b
+  data.tar.gz: dbf4b8583120ec65a00d0e47fa82e469ed4fd80e27644d1d9def262c9e8849fb
 SHA512:
-  metadata.gz: 2a37716e4e9e248095a2ad2a2754eccd59315b1f684e1efcc5a2d14da788d37f71521e7d1b35344720e2095cbef4908e73336050c76bef40b8769c37a27ebb95
-  data.tar.gz: b8cb3e14161a00fea4ea68f58199e82ba75741a75dae5733655bb078d724966f819521ed23f8cb47f2d06ad0dfed83e0090487b26670892640c289eea3c9473b
+  metadata.gz: 690503d6828f98cd64ce2e90540c6adcdcaccfcc59093ad195f887ee5893c549b8ffd87f6a94e9f2985826cbd12bb8bc63ab6da54b52fdba8137c88ed49465c9
+  data.tar.gz: 29c67e0bed4b61b825c49a4e903fc1643516a9d14279bf12b0547e04a3a802b0de0fb80fccc2dce17af082fa0bb4e3675ec185aed0796761aee8f604c82065cb

data/.github/workflows/run_rubocop.yml

@@ -8,20 +8,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6 is
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 2.6.4
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
-    - uses: actions/cache@v1
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gems-
+        ruby-version: 2.6.4
+    # - uses: ruby/setup-ruby@v1
+    #   with:
+    #     bundler-cache: true
     - name: Run Rubocop linter
       run: |
-        gem install bundler
+        gem install bundler -v 2.4.22
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
         bundle exec rubocop

data/.github/workflows/run_tests.yml

@@ -8,20 +8,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6 is
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 2.6.4
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
-    - uses: actions/cache@v1
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gems-
+        ruby-version: 2.6.4
     - name: Run test suite
       run: |
-        gem install bundler
+        gem install bundler -v 2.4.22
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
         bundle exec rake test

data/.rubocop.yml

@@ -6,8 +6,14 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: single_quotes
 
+Metrics/AbcSize:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120
+Metrics/MethodLength:
+  Max: 120
+
 
 AllCops:
   NewCops: enable

data/Gemfile

@@ -5,8 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in Chatopsify.gemspec
 gemspec
 
-gem 'rake', '~> 13.0'
-
+gem 'bundler', '~> 2'
 gem 'minitest', '~> 5.0'
-
+gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.21'

data/README.md

@@ -1,9 +1,10 @@
 # Chatopsify
 
-![Gem](https://img.shields.io/gem/v/chatopsify?color=%25234cc61f&label=Gem%20version&logo=ruby&logoColor=red)
-![Gem](https://img.shields.io/gem/dt/chatopsify?color=%2330c754&label=Downloads&logo=rubygems&logoColor=red)
-<!-- ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/rs-phunt/Chatopsify/Tests%20%F0%9F%A7%AA?label=Tests&logo=github)
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/rs-phunt/Chatopsify/Rubocop%20Lint?label=Rubocop&logo=github) -->
+![Gem](https://img.shields.io/gem/v/chatopsify?color=%25234cc61f&label=Gem%20version&logo=ruby&logoColor=red&link=https%3A%2F%2Frubygems.org%2Fgems%2Fchatopsify)
+![Gem](https://img.shields.io/gem/dt/chatopsify?color=%2330c754&label=Downloads&logo=rubygems&logoColor=red&link=https%3A%2F%2Frubygems.org%2Fgems%2Fchatopsify)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/papakvy/chatopsify/run_rubocop.yml?branch=main&logo=rubocop&logoColor=red&label=Rubocop%20Lint)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/papakvy/chatopsify/run_tests.yml?branch=main&logo=rubocop&logoColor=red&label=Tests%20%F0%9F%A7%AA)
+<!-- ![GitHub Repo stars](https://img.shields.io/github/stars/papakvy/chatopsify?logoColor=red) -->
 
 ## Installation
 

data/chatopsify.gemspec

@@ -12,15 +12,15 @@ Gem::Specification.new do |spec|
   spec.email         = ['phunt@runsystem.net']
 
   spec.summary       = 'Publish deployment notifications to ChatOps via the API'
-  spec.description   = 'Publish deployment notifications to ChatOps via the API'
+  spec.description   = 'chatopsify = ChatOps + Capistrano notifications via API'
   spec.homepage      = 'https://github.com/papakvy/chatopsify'
   spec.license       = 'MIT'
   spec.required_ruby_version = '>= 2.6'
 
   # spec.metadata['allowed_push_host'] = 'TODO: Set to your gem server 'https://example.com''
   spec.metadata['rubygems_mfa_required'] = 'true'
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/papakvy/chatopsify'
+  # spec.metadata['homepage_uri'] = spec.homepage
+  # spec.metadata['source_code_uri'] = 'https://github.com/papakvy/chatopsify'
   spec.metadata['changelog_uri'] = 'https://github.com/papakvy/chatopsify/blob/master/CHANGELOG.md'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -31,8 +31,6 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
 
   spec.add_dependency 'capistrano', '~> 3.2', '>= 3.2.0'
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'rake', '~> 1'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/capistrano/tasks/chatopsify.cap

@@ -4,7 +4,12 @@ namespace :chatops do
     set :chatops_time_started, Time.now
     run_locally do
       if fetch(:chatops_notify_events).include? :started
-        Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:starting))
+        info 'Notifying ChatOps of deploy started'
+        begin
+          Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:starting))
+        rescue StandardError => e
+          info "ERROR notify_started: #{e}"
+        end
       end
     end
   end
@@ -17,7 +22,11 @@ namespace :chatops do
     run_locally do
       if fetch(:chatops_notify_events).include? :finished
         info 'Notifying ChatOps of deploy finished'
-        Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:success))
+        begin
+          Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:success))
+        rescue StandardError => e
+          info "ERROR notify_finished: #{e}"
+        end
       end
     end
   end
@@ -30,7 +39,11 @@ namespace :chatops do
     run_locally do
       if fetch(:chatops_notify_events).include? :failed
         info 'Notifying ChatOps of deploy failed'
-        Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:failed))
+        begin
+          Chatopsify::Co.call.process(Chatopsify::CoLib.msg_fmt(:failed))
+        rescue StandardError => e
+          info "ERROR notify_failed: #{e}"
+        end
       end
     end
   end

data/lib/chatopsify/co.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'net/http'
 
 module Chatopsify
+  # ChatOps services
   class Co
     def initialize(api_key = nil)
       @api_key    = api_key || load_api_key
@@ -23,8 +24,8 @@ module Chatopsify
       puts e.message
     end
 
-    def call_get(id = nil)
-      send_get_request(id)
+    def call_delete(id = nil)
+      send_delete_request(id)
     rescue StandardError => e
       puts e.message
     end
@@ -65,11 +66,10 @@ module Chatopsify
       puts "Response: #{res.code} #{res.body}"
     end
 
-    def send_get_request(id = nil)
+    def send_delete_request(id = nil)
       uri = URI(@uri)
       uri.path += "/#{id}" if id
 
-      # req = Net::HTTP::Get.new(co_uri)
       req = Net::HTTP::Delete.new(uri)
       req['authorization'] = "Bearer #{o_api_key}"
       res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
@@ -95,20 +95,23 @@ module Chatopsify
         end
       end
 
+      # rubocop:disable Lint/TripleQuotes, Style/StringLiterals, Layout/IndentationWidth
       def msg_fmt(status = nil)
 """#{text(status)}
 | TITLE | CONTENTS |
 |----------:|:-------------|
-| Stage | #{fetch(:stage).upcase!} |
-| Server | #{fetch(:ip_address) }|
+| Stage | #{fetch(:stage)&.upcase!} |
+| Server | #{fetch(:ip_address)}|
 | Branch | #{fetch(:branch)} |
 | Revision | #{fetch(:current_revision) || '<empty>'} |
-| Timestamp | #{Time.now.getlocal("+07:00") || Time.now} |
+| Timestamp | #{Time.now.getlocal('+07:00') || Time.now} |
 """
       end
+      # rubocop:enable Lint/TripleQuotes, Style/StringLiterals, Layout/IndentationWidth
     end
   end
 
+  # CoSecurity service
   class CoSecurity
     require 'openssl'
     require 'securerandom'
@@ -122,44 +125,40 @@ module Chatopsify
     end
 
     def encrypt_string
-      begin
-        cipher = OpenSSL::Cipher::AES256.new(:CBC)
-        cipher.encrypt
-        salt = SecureRandom.random_bytes(16)
-        key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(generate_pwd, salt, 2000, cipher.key_len + cipher.iv_len)
-        key = key_iv[0, cipher.key_len]
-        iv = key_iv[cipher.key_len, cipher.iv_len]
-
-        cipher.key = key
-        cipher.iv = iv
-
-        encrypted = cipher.update(@str) + cipher.final
-        (salt + encrypted).unpack1('H*')
-      rescue => e
-        false
-      end
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.encrypt
+      salt = SecureRandom.random_bytes(16)
+      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(generate_pwd, salt, 2000, cipher.key_len + cipher.iv_len)
+      key = key_iv[0, cipher.key_len]
+      iv = key_iv[cipher.key_len, cipher.iv_len]
+
+      cipher.key = key
+      cipher.iv = iv
+
+      encrypted = cipher.update(@str) + cipher.final
+      (salt + encrypted).unpack1('H*')
+    rescue StandardError => e
+      puts e.message
     end
 
     def decrypt_string
-      begin
-        encrypted = [@str].pack('H*')
-        cipher = OpenSSL::Cipher::AES256.new(:CBC)
-        cipher.decrypt
+      encrypted = [@str].pack('H*')
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.decrypt
 
-        salt = encrypted[0, 16]
-        encrypted_data = encrypted[16..-1]
+      salt = encrypted[0, 16]
+      encrypted_data = encrypted[16..]
 
-        key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(generate_pwd, salt, 2000, cipher.key_len + cipher.iv_len)
-        key = key_iv[0, cipher.key_len]
-        iv = key_iv[cipher.key_len, cipher.iv_len]
+      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(generate_pwd, salt, 2000, cipher.key_len + cipher.iv_len)
+      key = key_iv[0, cipher.key_len]
+      iv = key_iv[cipher.key_len, cipher.iv_len]
 
-        cipher.key = key
-        cipher.iv = iv
+      cipher.key = key
+      cipher.iv = iv
 
-        cipher.update(encrypted_data) + cipher.final
-      rescue => e
-        false
-      end
+      cipher.update(encrypted_data) + cipher.final
+    rescue StandardError => e
+      puts e.message
     end
 
     private

data/lib/chatopsify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Chatopsify
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
-require 'Chatopsify'
+require 'chatopsify'
 
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatopsify
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - phunt
@@ -30,35 +30,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-description: Publish deployment notifications to ChatOps via the API
+description: chatopsify = ChatOps + Capistrano notifications via API
 email:
 - phunt@runsystem.net
 executables: []
@@ -84,15 +56,13 @@ files:
 - lib/chatopsify/co.rb
 - lib/chatopsify/version.rb
 - lib/core_ext/custom_lib.rb
-- test/chatworkify_test.rb
+- test/chatopsify_test.rb
 - test/test_helper.rb
 homepage: https://github.com/papakvy/chatopsify
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  homepage_uri: https://github.com/papakvy/chatopsify
-  source_code_uri: https://github.com/papakvy/chatopsify
   changelog_uri: https://github.com/papakvy/chatopsify/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []