tractive 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d01e25bb5de4180b95349f37e698b9717900155092fe35e43b293d9192bef63
-  data.tar.gz: 0a7fe333d0b26b440ddd5c0e9b2e6728a58da011080a33094ae0c7cf4e2254fe
+  metadata.gz: 73d210f072099b2362c1b39ebb5dfd7d6096fcb76b5096e9fc3db14dec34f14e
+  data.tar.gz: 39b0716034e7ddd0604bc7390f8a4332c2bb5c0664ba88834d7381761dd759aa
 SHA512:
-  metadata.gz: 1be7e6bf606c4482e7f04ae4b752ebaa483618a7831326e0862ddc70919c5480963860468691981a7a0c562569b18071c4c4b977b1ca2cdf83543ae898181aa1
-  data.tar.gz: 9afb81d65732dac50a9285823ab68305811e4a081af14119eb2f93fc9fb3554a0cef45d1342354decdb56a60d755caa97445030fbbe3545bced627ede70b9ae3
+  metadata.gz: c765fe77b184c12c4e161691df30181eea49b0ebd757893b28718b13cb8ccd89f25eec0e7037398bdabe1fa84e9a0df513706ddcc8cef21b27bc0c37812b9d62
+  data.tar.gz: 88eb6e7049f269feab229e39ab0de8ff9835648cf92f300b64ff07b94ad25e8274991bf9106f0c2050b75fceef430965b98d7ba493690965a7306b4e0932bc25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tractive (1.0.3)
+    tractive (1.0.4)
       mysql2
       ox
       rest-client

data/README.adoc

@@ -385,25 +385,55 @@ The pattern of a mapping is like:
 +
 [source,yaml]
 ----
-  blocker:  '#blocker'
-  critical: '#critical'
-  major:    '#major'
-  medium:   '#medium'
-  minor:    '#minor'
-  trivial:  '#easy'
-  waiting:  '#pending'
-  n/a:
+  trivial:
+    name: trivial
+    color: ff0000
+  major:
+    name: major
+    color: b44647
+  minor:
+    name: minor
+    color: f7347a
+  medium:
+    name: medium
+    color: f3c77c
 ----
 
 `priority:`::: Priority of the Trac ticket.
 +
 [source,yaml]
 ----
-  Low:  '@low'
-  High: '@high'
+  Low:
+    name: low
+    color: 22dd00
+  High:
+    name: high
+    color: ff0000
 ----
 
 
+`tracstate:`::: Status of the Trac ticket.
++
+[source,yaml]
+----
+  accepted:
+    name: accepted
+    color: 22dd00
+  assigned:
+    name: assigned
+    color: aadd88
+  closed:
+    name: closed
+    color: ee00aa
+  new:
+    name: new
+    color:
+----
+
+
+NOTE: As `severity`, `priority` and `tracstate` are converted into `labels` on github so there is an option to specify the `color` for those labels.
+
+
 ==== User mapping
 
 `users:`:: a one-to-one mapping between Trac usernames or email addresses to
@@ -412,7 +442,8 @@ GitHub usernames for users, in the following pattern:
 [source,yaml]
 ----
 users:
-  - email: {Trac email or username}
+  {Trac email or username}:
+    email: {Github email}
     name: {name of the person}
     username: {username on GitHub}
   ...
@@ -423,10 +454,12 @@ EXAMPLE:
 [source,yaml]
 ----
 users:
-  - email: matthew@example.org
+  matthew@gmail.org:
+    email: matthew@example.org
     name: Matthew
     username: example-matt
-  - email: valencia
+  valencia:
+    email: valencia
     name: Valencia
     username: example-vale
 ----
@@ -434,7 +467,8 @@ users:
 If you don't want to map a user, you can just leave the `username` empty like below:
 ----
 users:
-  - email: matthew@example.org
+  matthew@gmail.org:
+    email: matthew@example.org
     name: Matthew
     username:
 ----

data/config.example.yaml

@@ -54,14 +54,38 @@ labels:
 
   # less useful, but also possible:
   priority:
-    Low:                '@low'
-    High:               '@high'
+    Low:
+      name:             low
+      color:            22dd00
+    High:
+      name:             high
+      color:            ff0000
   severity:
-    blocker:            '#high'
-    critical:           '#critical'
-    major:              '#major'
-    minor:              '#minor'
-    trivial:            '#trivial'
+    trivial:
+      name:             trivial
+      color:            ff0000
+    major:
+      name:             major
+      color:            b44647
+    minor:
+      name:             minor
+      color:            f7347a
+    medium:
+      name:             medium
+      color:            f3c77c
+  tracstate:
+    accepted:
+      name:             accepted
+      color:            22dd00
+    assigned:
+      name:             assigned
+      color:            aadd88
+    closed:
+      name:             closed
+      color:            ee00aa
+    new:
+      name:             new
+      color:
   version:
     '1.3':              v1.3
     '1.4':              v1.4

data/lib/tractive/github_api/client/labels.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module GithubApi
+  class Client
+    module Labels
+      def list_labels(repo, params = {})
+        JSON.parse(
+          RestClient.get(
+            "https://api.github.com/repos/#{repo}/labels",
+            {
+              "Authorization" => "token #{@token}",
+              params: params
+            }
+          )
+        )
+      end
+      alias labels list_labels
+
+      def create_label(repo, params)
+        JSON.parse(
+          RestClient.post(
+            "https://api.github.com/repos/#{repo}/labels",
+            params.to_json,
+            {
+              "Authorization" => "token #{@token}",
+              "Accept" => "application/vnd.github.v3+json"
+            }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/tractive/github_api/client.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "client/issues"
+require_relative "client/labels"
 require_relative "client/milestones"
 
 # Service to perform github actions
 module GithubApi
   class Client
     include GithubApi::Client::Issues
+    include GithubApi::Client::Labels
     include GithubApi::Client::Milestones
 
     def initialize(options = {})

data/lib/tractive/info.rb

@@ -36,9 +36,9 @@ module Tractive
           "type" => Utilities.make_hash("type_", types),
           "component" => Utilities.make_hash("component_", components),
           "resolution" => Utilities.make_hash("resolution_", resolutions),
-          "severity" => Utilities.make_hash("severity", severity),
-          "priority" => Utilities.make_hash("priority_", priorities),
-          "tracstate" => Utilities.make_hash("tracstate_", tracstates)
+          "severity" => Utilities.make_each_hash(severity, %w[name color]),
+          "priority" => Utilities.make_each_hash(priorities, %w[name color]),
+          "tracstate" => Utilities.make_each_hash(tracstates, %w[name color])
         }
       }
     end

data/lib/tractive/main.rb

@@ -8,8 +8,6 @@ module Tractive
       @opts = opts
       @cfg  = YAML.load_file(@opts[:config])
 
-      @cfg["users"] = @cfg["users"].map { |user| [user["email"], user["username"]] }.to_h
-
       Tractive::Utilities.setup_logger(output_stream: @opts[:log_file] || $stderr, verbose: @opts[:verbose])
       @db = Tractive::Utilities.setup_db!(@cfg["trac"]["database"])
     rescue Sequel::DatabaseConnectionError, Sequel::AdapterNotFound, URI::InvalidURIError, Sequel::DatabaseError => e

data/lib/tractive/migrator/converter/trac_to_github.rb

@@ -17,6 +17,9 @@ module Migrator
         @wiki_attachments_url = args[:cfg]["trac"]["wiki_attachments_url"]
 
         load_milestone_map
+        create_labels_on_github(@labels_cfg["severity"].values)
+        create_labels_on_github(@labels_cfg["priority"].values)
+        create_labels_on_github(@labels_cfg["tracstate"].values)
 
         @uri_parser = URI::Parser.new
         @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(@tracticketbaseurl, @attachurl, @changeset_base_url, @wiki_attachments_url)
@@ -116,7 +119,8 @@ module Migrator
         # compose body
         body = [badgetable, body, footer].join("\n\n___\n")
 
-        labels.add("owner:#{github_assignee}")
+        labels.add("name" => "owner:#{github_assignee}") unless github_assignee.nil? || github_assignee.empty?
+        labels = labels.map { |label| label["name"] }
 
         issue = {
           "title" => ticket[:summary],
@@ -129,7 +133,7 @@ module Migrator
 
         if @users.key?(ticket[:owner])
           owner = trac_mail(ticket[:owner])
-          github_owner = @users[owner]
+          github_owner = @users[owner]["username"]
           $logger.debug("..owner in trac: #{owner}")
           $logger.debug("..assignee in GitHub: #{github_owner}")
           issue["assignee"] = github_owner
@@ -155,11 +159,11 @@ module Migrator
       private
 
       def map_user(user)
-        @users[user] || user
+        @users.fetch(user, {})["email"] || user
       end
 
       def map_assignee(user)
-        @users[user]
+        @users.fetch(user, {})["email"]
       end
 
       def load_milestone_map
@@ -168,9 +172,9 @@ module Migrator
         newmilestonekeys = @milestonesfromtrac.keys - @milestonemap.keys
 
         newmilestonekeys.each do |milestonelabel|
-          milestone           = {
+          milestone = {
             "title" => milestonelabel.to_s,
-            "state" => @milestonesfromtrac[milestonelabel][:completed].nil? ? "open" : "closed",
+            "state" => @milestonesfromtrac[milestonelabel][:completed].to_i.zero? ? "open" : "closed",
             "description" => @milestonesfromtrac[milestonelabel][:description] || "no description in trac",
             "due_on" => "2012-10-09T23:39:01Z"
           }
@@ -194,6 +198,21 @@ module Migrator
         nil
       end
 
+      def create_labels_on_github(labels)
+        return if labels.nil? || labels.empty?
+
+        existing_labels = @client.labels(@repo).map { |label| label["name"] }
+        new_labels = labels.reject { |label| existing_labels.include?(label["name"]) }
+
+        new_labels.each do |label|
+          params = { name: label["name"] }
+          params["color"] = label["color"] unless label["color"].nil?
+
+          @client.create_label(@repo, params)
+          $logger.info("Created label: #{label["name"]}")
+        end
+      end
+
       def ticket_change(append, meta)
         # kind
         kind = if meta[:ticket]

data/lib/tractive/models/ticket.rb

@@ -19,8 +19,11 @@ module Tractive
       def filter_column(options)
         return self if options.nil? || options.values.compact.empty?
 
-        if options[:operator].downcase == "like"
+        case options[:operator].downcase
+        when "like"
           where { Sequel.like(options[:column_name].to_sym, options[:column_value]) }
+        when "not like"
+          where { ~Sequel.like(options[:column_name].to_sym, options[:column_value]) }
         else
           where { Sequel.lit("#{options[:column_name]} #{options[:operator]} '#{options[:column_value]}'") }
         end

data/lib/tractive/utilities.rb

@@ -10,8 +10,8 @@ module Tractive
       def make_each_hash(values, keys)
         values.map do |value|
           value = [value] unless value.is_a?(Array)
-          keys.zip(value).to_h
-        end
+          [value[0], keys.zip(value).to_h]
+        end.to_h
       end
 
       def setup_db!(db_url)

data/lib/tractive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tractive
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -140,6 +140,7 @@ files:
 - lib/tractive/github_api.rb
 - lib/tractive/github_api/client.rb
 - lib/tractive/github_api/client/issues.rb
+- lib/tractive/github_api/client/labels.rb
 - lib/tractive/github_api/client/milestones.rb
 - lib/tractive/graceful_quit.rb
 - lib/tractive/info.rb