gerrit2jiracomment 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ecbc2fa4fe6a2be30cd9a54c0c53f239ce6574a923684e0a963c2360c28c05
-  data.tar.gz: ce36adffff7b0e5f03c9f3d54585cc7bb2fde9ff189bdafe6b31cfb96034ee27
+  metadata.gz: 38f02540c309cdb94461866f9e3cbe2d9c771dd9087c0ec8f5afb924e4804e8f
+  data.tar.gz: ea95574a11ee24e72d7f7e539df37f976cc300edb165bb572218d26ed72059fc
 SHA512:
-  metadata.gz: b400a0f0f3235ac4a4eb99bc42868daaf98c1bd2cd2916ac80dfd0c2d4380f3f3548bdea2bcccbb037becc9879ba11312f1b5443e810d25d6b9c7fcfd04d28dd
-  data.tar.gz: 3e5c5e1c1403aa0b738294575cb3550d35626b0139ed68d3af38f3863e11f11fb119ed631cdd2f4152aa57ab1a9ebd5ac8097c53dc9d77bb7ff6f20172261331
+  metadata.gz: f44112e662f9129fe99ec0746f7287691d806547900762382a7607f2f8dfc2f05a23bc7433a5360ad892859820901bf57c8e41fef78dca94401668b272079337
+  data.tar.gz: 1600dfba6a24099cf90eea1551785d7b3ac6fdb2548419f38401f0d09dab4795eb18a509ab2dc7f211e5a0d5dd09f9585797434b2e55f0b6b6eccd098648f6eb

data/.rubocop.yml

@@ -2,3 +2,5 @@ AllCops:
   TargetRubyVersion: 2.5
 Metrics/BlockLength:
   ExcludedMethods: ['describe']
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.ruby-version

@@ -1,2 +1,2 @@
-2.5.0
+ruby-2.5.0
 

data/.travis.yml

@@ -3,16 +3,17 @@ rvm:
 - 2.5.0
 sudo: false
 before_install:
-  - gem install bundler -v 1.16.1
+- gem install bundler -v 1.16.1
 before_script:
-  - bundle install
+- bundle install
 script:
-  - bundle exec rake spec build
-  - find .
+- env
+- bundle exec rake spec build
+- find .
 deploy:
   provider: rubygems
   skip_cleanup: true
   api_key:
-    secure: 5gAc1r58UKCjXVNCHYse1GiWM3tPMo0IHuiOA6A/C1rGzVRmimu1i4Q1JQyeViwIrGj1XP4hK1iCBcoFWJe/wY3FVI9UThA4Y76o4aqRRqxbxzFwnK7iRXb50STllMA78UnDQggKWhm0k6EDtkLYl9wIfeTG7Wcx/rr6kGYiROTsiqXKPy+KVFGAF0NtJvehAXxJu4zrLN5bcEPGCFQijd7rEjgwShsRwPs2k8BHmOTnqDIKLqAnRdzcoX4sNR1P3gggvDnJ4+cAqOGv6v3EWHaAMJEI4DE1sDNeRf8lY2OSGS7LZaFtcth6+k3W3rCiDgiJ7CIcPXxWat/IGC8kwV89jhRB8dZ12G5pBWfoiM23Zm7EZ2JEz8fH2dpqbznIEJblo2HbArCZyY0K/cdMfxHNTDPh856Oh0dX2iOdCL+PhgCMjmWWPJDphR06zVmfCxDrDo3zHzzG1EOQDAIE8BNDp1JvkadpuoxCUTL5T0Hyq1E/VJiMJtCmIQWssXn2e0oNK3qeiplMsPmhLNp+fmcqY3kH3P8uYlEedeJaaBMkBRj/vWC0xrajupllbPsVhj0RVD3joP+VrUbjvweagRN6UYR6v8NDgAVxXuSn1FPxFR3g6rQOZRQF1fEx+SqEcbIzQFdDG6Lym/TWJqzVu2dVZfikjw5Df0YOLhXXgXA=
+    secure: ASJyDyynS5sc4I4dBQx3LrnYxl5331KAB0C0k/BzAfYsBiORpKdMRj1nPEvaTu1LNmIN1smJswdnwxIDd0r8Cdl2TFHu9oTlxF6wYi7r3Ix2Btmy1xAVMwfEmocQI9JIUvzLY6Dah/MOQG/A61XKpL6JBixz43sQW64fpN7y8wZMjbjm9/U3XhcL5zPDHjRebpgWYzBptuVCdCbvfnTETsYd4k/H5v9Ax6pCWkkK9Y2U9csWd7wcVl6Ja6qFM69wSgc0GmVzP/heqE4rG+fvauaHrtEp0qTvMkVgOTxOG3wa7MH3f4qmx+oRU8tV6JnjfuDt9Um0gzcQvAhmCvKl0Co4lkvdp3VpvWIedS0Z+aiw+FG+3n2xUxr4hKIHTTtQVMglXkKL5BBpKfPCkssmXnhZojBtfDUxdOaAXJuxqgKBdLOiDyf5kkxcp5iA3yAGDbW0WY95HpqXC0n3/8kM6QEYbjsnUeazn/XZD7HlzahZc72C3Ro+o5P8HybrHyuZCncmsikTyF91DJRdN3WxnNUj95UW80gw0xqbtvhWCHPQGFvvejhwGPGHe/cBP8imEBBrqnInM/TgCCMJyjyH2J448wJIL5Dx9Z4WArsKmBHOQLua3QCqpkd770+W1VP0Bd94aklQcBrh0nG2ltZEAhKGszcZnxz1CiVnQrdSj1c=
   on:
     tags: true

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/Gemfile.lock

@@ -1,68 +1,70 @@
 PATH
   remote: .
   specs:
-    gerrit2jiracomment (0.2.7)
+    gerrit2jiracomment (0.2.9)
       jira-ruby
       rx
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    ast (2.3.0)
+      zeitwerk (~> 2.2)
+    ast (2.4.0)
     atlassian-jwt (0.2.0)
       jwt (~> 2.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jira-ruby (1.7.1)
+    jaro_winkler (1.5.4)
+    jira-ruby (2.0.0)
       activesupport
       atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jwt (2.1.0)
-    minitest (5.12.2)
+    minitest (5.14.0)
     multipart-post (2.1.1)
     oauth (0.5.4)
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
+    parallel (1.19.1)
+    parser (2.7.1.0)
+      ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.52.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.81.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
     rx (0.0.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    zeitwerk (2.2.0)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 # as soon as the project is clean enough, enable this
-Rake::Task['build'].enhance(['rubocop:auto_correct'])
+Rake::Task["build"].enhance(["rubocop:auto_correct"])
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'gerrit2jiracomment'
+require "bundler/setup"
+require "gerrit2jiracomment"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'gerrit2jiracomment'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/exe/gerrit2jiracomment

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby --encoding utf-8
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'gerrit2jiracomment'
+require "bundler/setup"
+require "gerrit2jiracomment"
 
 Gerrit2jiracomment.run

data/gerrit2jiracomment.gemspec

@@ -1,33 +1,32 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gerrit2jiracomment/version'
+require "gerrit2jiracomment/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'gerrit2jiracomment'
+  spec.name          = "gerrit2jiracomment"
   spec.version       = Gerrit2jiracomment::VERSION
-  spec.authors       = ['Christian Koestlin']
-  spec.email         = ['info@esrlabs.com']
+  spec.authors       = ["Christian Koestlin"]
+  spec.email         = ["info@esrlabs.com"]
 
-  spec.summary       = 'Simple gem that listens on gerrit stream-events' \
-                       ' and puts comments to jira.'
-  spec.description   = 'Nothing more to add'
-  spec.homepage      = 'https://github.com/gizmomogwai/gerrit2jiracomment'
+  spec.summary       = "Simple gem that listens on gerrit stream-events" \
+                       " and puts comments to jira."
+  spec.description   = "Nothing more to add"
+  spec.homepage      = "https://github.com/gizmomogwai/gerrit2jiracomment"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'jira-ruby'
-  spec.add_dependency 'rx'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-mocks'
-  spec.add_development_dependency 'rubocop'
+  spec.add_dependency "jira-ruby"
+  spec.add_dependency "rx"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-mocks"
+  spec.add_development_dependency "rubocop"
 end

data/lib/gerrit2jiracomment.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'gerrit2jiracomment/version'
-require 'logger'
-require 'syslog/logger'
-require 'json'
-require 'open3'
-require 'ostruct'
-require 'jira-ruby'
-require 'yaml'
-require 'rx'
+require "gerrit2jiracomment/version"
+require "logger"
+require "syslog/logger"
+require "json"
+require "open3"
+require "ostruct"
+require "jira-ruby"
+require "yaml"
+require "rx"
 
 # Gerrit 2 jira sync module
 module Gerrit2jiracomment
@@ -32,8 +32,8 @@ module Gerrit2jiracomment
       @log.error("#{@tag}†#{message}: #{error_message}")
     end
 
-    def fail(c, message)
-      raise(c, "#{@tag}†#{message}")
+    def fail(exception, message)
+      raise(exception, "#{@tag}†#{message}")
     end
   end
 
@@ -111,7 +111,7 @@ module Gerrit2jiracomment
     end
 
     def change_merged(log, event, server)
-      log = LoggerWithTag.new(log, 'changeset')
+      log = LoggerWithTag.new(log, "changeset")
 
       log.debug("Send change merged to jira #{event}")
 
@@ -120,7 +120,8 @@ module Gerrit2jiracomment
 
       found = false
       message.scan(Gerrit2jiracomment.regexp).map(&:strip).each do |match|
-        found ||= handle_change_merged_issue_comment(match, log, event, server)
+        found = handle_change_merged_issue_comment(match, log, event, server) ||
+                found
       end
 
       found || log.fail(ProcessException, "No jira-issue found in #{event}")
@@ -133,7 +134,7 @@ module Gerrit2jiracomment
 
   def self.stdout_in_utf8(command)
     _stdin, stdout, _stderr = Open3.popen3(command)
-    stdout.set_encoding 'UTF-8:UTF-8'
+    stdout.set_encoding "UTF-8:UTF-8"
     stdout
   end
 
@@ -149,30 +150,30 @@ module Gerrit2jiracomment
     end
   end
 
-  def self.dispatch(log, e, sink)
-    logger = LoggerWithTag.new(log, 'events')
-    event = e.first
-    server = e[1]
-    return sink.send(event.type.tr('-', '_').to_sym, log, event, server)
+  def self.dispatch(log, event, sink)
+    logger = LoggerWithTag.new(log, "events")
+    event, server = event
+    logger.debug("#{event} from #{server}")
+    sink.send(event.type.tr("-", "_").to_sym, log, event, server)
   rescue NoMethodError => e
     logger.debug("Cannot handle event of type #{event.type} - #{e}")
     false
-  rescue StandardError => error
-    logger.error('Cannot process event', error)
+  rescue StandardError => e
+    logger.error("Cannot process event", e)
     false
   end
 
   def self.syslog_or_stdout_logger
-    Syslog::Logger.new 'g2jc'
+    Syslog::Logger.new "g2jc"
   rescue StandardError
     Logger.new(STDOUT)
   end
 
   def self.tag_and_message(msg)
-    tag, m = msg.split('†')
+    tag, m = msg.split("†")
     unless m
       m = tag
-      tag = 'gerrit2jiracomment'
+      tag = "gerrit2jiracomment"
     end
     [tag, m]
   end
@@ -181,7 +182,7 @@ module Gerrit2jiracomment
     logger = syslog_or_stdout_logger
     logger.formatter = proc do |severity, datetime, _progname, msg|
       tag, message = tag_and_message(msg)
-      format('%<year>04d-%<month>02d-%<day>02d %<hour>02d:%<min>02d:' \
+      format("%<year>04d-%<month>02d-%<day>02d %<hour>02d:%<min>02d:" \
              "%<sec>02d.000 7331 %<severity>s %<tag>s: %<message>s\n",
              year: datetime.year, month: datetime.month, day: datetime.day,
              hour: datetime.hour, min: datetime.min, sec: datetime.sec,
@@ -191,17 +192,17 @@ module Gerrit2jiracomment
   end
 
   def self.load_settings(logger)
-    logger.debug('lifecycle†loading settings from settings.yaml.gpg')
+    logger.debug("lifecycle†loading settings from settings.yaml.gpg")
     YAML.safe_load(`gpg --decrypt settings.yaml.gpg 2> /dev/null`)
   end
 
   def self.to_jira(logger, settings)
     ToJira.new(logger,
                JIRA::Client.new(
-                 username: settings['jira_user'],
-                 password: settings['jira_password'],
-                 site: 'https://esrlabs.atlassian.net/',
-                 context_path: '', auth_type: :basic,
+                 username: settings["jira_user"],
+                 password: settings["jira_password"],
+                 site: "https://esrlabs.atlassian.net/",
+                 context_path: "", auth_type: :basic,
                  use_ssl: true,
                  ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
                ))
@@ -211,13 +212,13 @@ module Gerrit2jiracomment
     subject.as_observable.subscribe(
       ->(e) { dispatch(logger, e, event_sink) },
       ->(_err) { logger.error(error) },
-      -> { logger.info('lifecycle†finished') }
+      -> { logger.info("lifecycle†finished") }
     )
   end
 
   def self.hosts
-    ['gerrit.int.esrlabs.com', 'git.esrlabs.com',
-     'hcp5-sources.int.esrlabs.com']
+    ["gerrit.int.esrlabs.com", "git.esrlabs.com",
+     "hcp5-sources.int.esrlabs.com"]
   end
 
   def self.run
@@ -232,6 +233,6 @@ module Gerrit2jiracomment
     hosts
       .map { |server| receive_events(logger, server, subject) }
       .each(&:join)
-    logger.info('lifecycle†exiting')
+    logger.info("lifecycle†exiting")
   end
 end

data/lib/gerrit2jiracomment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gerrit2jiracomment
-  VERSION = '0.2.7'
+  VERSION = "0.2.9"
 end

data/readme.org

@@ -4,8 +4,7 @@ Proof of concept implementation that listens on a gerrit stream and updated jira
 
 ** Installation
 
-first compile and install gerry 0.1.5.
-then compile and install gerrit2jiracomment.
+~gem install gerrit2jiracomment~
 
 ** Usage
 
@@ -17,4 +16,7 @@ encode your settings with gpg -e -r user@email.com settings.yaml
 To deploy a new gem version increment version.rb, run bundle install, make a commit and push this to origin.
 Travis will do the deployment to rubygems.org, if the build is allright.
 
+To deploy automatically to rubygems, one needs to add the api key of rubygems by running
+~travis encrypt --add deploy.api_key~
+
 ** Contributing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerrit2jiracomment
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Christian Koestlin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby