tractive 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8e921094cb307df3ab46beb5ca61451f70dff070d002524d01311830fdfa2c
-  data.tar.gz: 3a41b37b4e9abdc7f54182023a5d8051bfa5cc0179e9a54a69f55acf64b140dc
+  metadata.gz: 5ebcddc1621be979b25f4041cc4eac2429e6a6a08b05611154c230d49d9de86c
+  data.tar.gz: f61bd5af4741266ae56d81c277c7aaec723a49358f81dcb6eebdc3dbaae2e37c
 SHA512:
-  metadata.gz: 9be506ff5ac3b8dd8613805202b10da56276fbe955415f395b11aef693367b95ed46dd19edc9e7ac3f22ff1eadb26a1be3deb68cb59a4ddbbb5c2fb06fdc754d
-  data.tar.gz: 427ac9b2b341dae9bad18073b310a716c6def1604ecd63b96b718eb73fe09b3c6688579b635403d008f36b75683c99709f7b38c57b5f60df6d1b4fd08eefeca0
+  metadata.gz: b29d97cc67c43cc4d9ee72d88563e01dc6d7cdc7b988ed3b987c73a3cbc9a2fc8746597c3d3b1e175ebca83073fd6e4b19f8b51f60c9792849893a6816483f5d
+  data.tar.gz: d07192c1b845a3a4ca266e881ead6a7583ba5575313d68372ffa9df6785c0f4e8856be09cafdf736bb279e5e651a4d3eb1e6f294b0754b0dd4c3a5dfded9ac03

data/.rubocop.yml

@@ -34,6 +34,9 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/ModuleLength:
+  Max: 150
+
 Security/Open:
   Enabled: false
 

data/README.adoc

@@ -682,6 +682,7 @@ The following options are allowed (at least one necessary):
 * `column-name`
 * `operator`
 * `column-value`
+* `include-null`
 
 | Boolean
 
@@ -697,6 +698,10 @@ The following options are allowed (at least one necessary):
 | Value of the column to filter.
 | String
 
+| `--include-null`
+| Include rows having null value in filtered column.
+| Boolean
+
 | `-h`, `help`
 | Display the Tractive help message, or you can provide a command to know more
   about a single command via `tractive help {command}`.

data/exe/tractive

@@ -30,6 +30,8 @@ class TractiveCommand < Thor
                             desc: "Operator for filter."
   method_option "columnvalue", type: :string, aliases: ["--column-value"],
                                desc: "Value of the column to filter."
+  method_option "includenull", type: :boolean, aliases: ["--include-null"],
+                               desc: "Flag for including null values in the filter result."
 
   method_option "importfromfile", type: :string, aliases: ["-I", "--import-from-file"],
                                   desc: "Import issues from a json file"

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

@@ -16,6 +16,7 @@ module Migrator
         @client               = GithubApi::Client.new(access_token: args[:cfg]["github"]["token"])
         @wiki_attachments_url = args[:cfg]["trac"]["wiki_attachments_url"]
         @revmap_file_path     = args[:opts][:revmapfile] || args[:cfg]["revmap_path"]
+        @attachment_options   = { hashed: args[:cfg].dig("attachments", "hashed") }
 
         load_milestone_map
         create_labels_on_github(@labels_cfg["severity"].values)
@@ -287,7 +288,7 @@ module Migrator
           name = meta[:filename]
           body = meta[:description]
           if @attachurl
-            url = @uri_parser.escape("#{@attachurl}/#{meta[:id]}/#{name}")
+            url = @uri_parser.escape("#{@attachurl}/#{attachment_path(meta[:id], name, @attachment_options)}")
             text += "[`#{name}`](#{url})"
             body += "\n![#{name}](#{url})" if [".png", ".jpg", ".gif"].include? File.extname(name).downcase
           else
@@ -339,6 +340,17 @@ module Migrator
 
         "[trac:#{ticket[:id]}](#{@tracticketbaseurl}/#{ticket[:id]})"
       end
+
+      def attachment_path(id, filename, options = {})
+        return "#{id}/#{filename}" unless options[:hashed]
+
+        folder_name = Digest::SHA1.hexdigest(id)
+        parent_folder_name = folder_name[0..2]
+        hashed_filename = Digest::SHA1.hexdigest(filename)
+        file_extension = File.extname(filename)
+
+        "#{parent_folder_name}/#{folder_name}/#{hashed_filename}#{file_extension}"
+      end
     end
   end
 end

data/lib/tractive/migrator/engine.rb

@@ -27,7 +27,7 @@ module Migrator
       input_file_name   = args[:opts][:importfromfile]
 
       @filter_applied   = args[:opts][:filter]
-      @filter_options   = { column_name: args[:opts][:columnname], operator: args[:opts][:operator], column_value: args[:opts][:columnvalue] }
+      @filter_options   = { column_name: args[:opts][:columnname], operator: args[:opts][:operator], column_value: args[:opts][:columnvalue], include_null: args[:opts][:includenull] }
 
       @trac  = Tractive::Trac.new(db)
       @repo  = github["repo"]

data/lib/tractive/models/ticket.rb

@@ -19,14 +19,18 @@ module Tractive
       def filter_column(options)
         return self if options.nil? || options.values.compact.empty?
 
-        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
+        query = case options[:operator].downcase
+                when "like"
+                  Sequel.like(options[:column_name].to_sym, options[:column_value])
+                when "not like"
+                  ~Sequel.like(options[:column_name].to_sym, options[:column_value])
+                else
+                  Sequel.lit("#{options[:column_name]} #{options[:operator]} '#{options[:column_value]}'")
+                end
+
+        query = Sequel.|(query, { options[:column_name].to_sym => nil }) if options[:include_null]
+
+        where { query }
       end
     end
 

data/lib/tractive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2