lazylead 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 847a338ce12f9cd01529f1e6a66d810e68cde504e2a0873ecb41b869adcda7cc
-  data.tar.gz: 8ca65bb46faced2b89f07f1b65002b2890ecf2c78d4d53e74d017a712133d0f4
+  metadata.gz: 669da4d2f993894e78fcd42508429667cb29afe9082012c8dadee88e77dc0518
+  data.tar.gz: '0976452e6d5aaf5e282f468f05620915e73ee5cb2566ff9e4441d094d4f3dc3f'
 SHA512:
-  metadata.gz: f527721696b9f7215efc7628ea39c6cbf18c3145908d715ef5e698de57fcb5b6b28af8d0fe167b54b5418c9f15915071d0ff7ff2c7df3315f107f0d49c4c95d9
-  data.tar.gz: 1a71de8819ce9aa81fd0e11c4d0248e8b44d846d17f71adb0be18c6a74c9fe58d2ad257fd639f263c29546898cea0725dd6850dbdb417de6e03f541009fbebe0
+  metadata.gz: ec9719d37253c81db0d59d6d3f216e8d677a8d3a4543776409782236c01428fe97a07e3c58e95150c031506d894a8188b2ce551a2ffa79c4b364edf60774ad8a
+  data.tar.gz: 57662e5ba79d877e4b7310f0ff20fa767e6b4246ba46f7ffd30afeee86215f311dffeb2e947a86c867b3554ac20b1711b1d69edbd493e971c01d170fccd85aed

data/lazylead.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.2"
   s.required_ruby_version = ">=2.6.5"
   s.name = "lazylead"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
   s.license = "MIT"
   s.summary = "Eliminate the annoying work within bug-trackers."
   s.description = "Ticketing systems (Github, Jira, etc.) are strongly
@@ -45,7 +45,7 @@ tasks instead of solving technical problems."
   s.authors = ["Yurii Dubinka"]
   s.email = "yurii.dubinka@gmail.com"
   s.homepage = "http://github.com/dgroup/lazylead"
-  s.post_install_message = "Thanks for installing Lazylead v0.6.1!
+  s.post_install_message = "Thanks for installing Lazylead v0.6.2!
   Read our blog posts: https://lazylead.org
   Stay in touch with the community in Telegram: https://t.me/lazylead
   Follow us on Twitter: https://twitter.com/lazylead

data/lib/lazylead/email.rb

@@ -25,26 +25,6 @@
 require "tilt"
 
 module Lazylead
-  # Email notifications utilities.
-  module Emailing
-    # Construct html document from template and binds.
-    def make_body(opts)
-      Email.new(
-        opts["template"],
-        opts.merge(version: Lazylead::VERSION)
-      ).render
-    end
-
-    # Split text with email addresses by ',' and trim all elements if needed.
-    def split(type, opts)
-      if opts[type].include? ","
-        opts[type].split(",").map(&:strip).reject(&:empty?)
-      else
-        [opts[type]]
-      end
-    end
-  end
-
   # An email regarding tickets based on file with markup.
   #
   # The 'tilt' gem was used as a template engine.

data/lib/lazylead/exchange.rb

@@ -39,8 +39,6 @@ module Lazylead
   # Copyright:: Copyright (c) 2019-2020 Yurii Dubinka
   # License:: MIT
   class Exchange
-    include Emailing
-
     def initialize(
       log = Log.new, salt = Salt.new("exchange_salt"), opts = ENV.to_h
     )
@@ -52,38 +50,28 @@ module Lazylead
     # Send an email.
     # :opts   :: the mail configuration like from, cc, subject, template.
     def send(opts)
-      to = opts["to"] || opts[:to]
-      to = [to] unless to.is_a? Array
-      if to.reject { |e| e.nil? || e.blank? }.empty?
-        @log.warn "Email can't be sent to '#{to}, more: '#{opts}'"
-        return
+      if opts.msg_to.empty?
+        @log.warn "ll-012: Email can't be sent to '#{opts.msg_to}," \
+                  " more: '#{opts}'"
+      else
+        msg = make_msg opts
+        cli.send_message msg
+        msg[:file_attachments].each(&:close) unless opts.msg_attachments.empty?
+        @log.debug "#{__FILE__} sent '#{opts['subject']}' to '#{opts.msg_to}'."
       end
-      msg = make_msg(to, opts)
-      msg.update(cc_recipients: opts["cc"]) if opts.key? "cc"
-      add_attachments(msg, opts)
-      cli.send_message msg
-      close_attachments msg
-      @log.debug "#{__FILE__} sent '#{opts['subject']}' to '#{to}'."
     end
 
-    def make_msg(to, opts)
-      {
+    def make_msg(opts)
+      msg = {
         subject: opts["subject"],
-        body: make_body(opts),
+        body: opts.msg_body,
         body_type: "HTML",
-        to_recipients: to
+        to_recipients: opts.msg_to
       }
-    end
-
-    def add_attachments(msg, opts)
-      return unless opts.key? "attachments"
-      files = split("attachments", opts).map { |f| File.open(f, "r") }
-      msg[:file_attachments] = files
-    end
-
-    def close_attachments(msg)
-      return if msg[:file_attachments].nil? || msg[:file_attachments].empty?
-      msg[:file_attachments].each(&:close)
+      files = opts.msg_attachments.map { |f| File.open(f, "r") }
+      msg[:file_attachments] = files unless files.empty?
+      msg[:cc_recipients] = opts["cc"] if opts.key? "cc"
+      msg
     end
 
     private

data/lib/lazylead/opts.rb

@@ -34,7 +34,8 @@ module Lazylead
   # License:: MIT
   class Opts
     extend Forwardable
-    def_delegators :@origin, :[], :[]=, :to_s, :key?, :fetch, :merge, :except
+    def_delegators :@origin, :[], :[]=, :to_s, :key?, :fetch, :except, :each,
+                   :each_pair, :sort_by
 
     def initialize(origin = {})
       @origin = origin
@@ -77,5 +78,51 @@ module Lazylead
       return Salt.new(sid).decrypt(text) if ENV.key? sid
       text
     end
+
+    def merge(args)
+      return self unless args.is_a? Hash
+      Opts.new @origin.merge(args)
+    end
+
+    # Construct html document from template and binds.
+    def msg_body(template = "template")
+      Email.new(
+        to_h[template],
+        to_h.merge(version: Lazylead::VERSION)
+      ).render
+    end
+
+    def msg_to(delim = ",")
+      sliced delim, :to, "to"
+    end
+
+    def msg_cc(delim = ",")
+      sliced delim, :cc, "cc"
+    end
+
+    def msg_from(delim = ",")
+      sliced delim, :from, "from"
+    end
+
+    def msg_attachments(delim = ",")
+      sliced(delim, :attachments, "attachments").select { |f| File.file? f }
+    end
+
+    #
+    # Find the option by key and split by delimiter
+    #   Opts.new("key" => "a,b").sliced(",", "key")     => [a, b]
+    #   Opts.new(key: "a,b").sliced(",", :key)          => [a, b]
+    #   Opts.new(key: "a,b").sliced(",", "key", :key)   => [a, b]
+    #   Opts.new(key: "").sliced ",", :key)             => []
+    #
+    def sliced(delim, *keys)
+      return [] if keys.empty?
+      key = keys.detect { |k| key? k }
+      val = to_h[key]
+      return [] if val.nil? || val.blank?
+      return val if val.is_a? Array
+      return [val] unless val.include? delim
+      slice key, delim
+    end
   end
 end

data/lib/lazylead/postman.rb

@@ -44,8 +44,6 @@ module Lazylead
   # Copyright:: Copyright (c) 2019-2020 Yurii Dubinka
   # License:: MIT
   class Postman
-    include Emailing
-
     def initialize(log = Log.new)
       @log = log
     end
@@ -53,32 +51,29 @@ module Lazylead
     # Send an email.
     # :opts   :: the mail configuration like to, from, cc, subject, template.
     def send(opts)
-      mail = make_email(opts)
-      mail.deliver
-      @log.debug "#{__FILE__} sent '#{mail.subject}' to '#{mail.to}'."
+      if opts.msg_to.empty?
+        @log.warn "ll-013: Email can't be sent to '#{opts.msg_to}," \
+                  " more: '#{opts}'"
+      else
+        mail = make_email(opts)
+        mail.deliver
+        @log.debug "#{__FILE__} sent '#{mail.subject}' to '#{mail.to}'."
+      end
     end
 
     # Construct an email based on input arguments
     def make_email(opts)
       mail = Mail.new
-      mail.to opts[:to] || opts["to"]
-      mail.from opts["from"]
-      mail.cc opts["cc"] if opts.key? "cc"
+      mail.to opts.msg_to
+      mail.from opts.msg_from
+      mail.cc opts.msg_cc if opts.key? "cc"
       mail.subject opts["subject"]
-      html = make_body(opts)
       mail.html_part do
         content_type "text/html; charset=UTF-8"
-        body html
+        body opts.msg_body
       end
-      add_attachments mail, opts
+      opts.msg_attachments.each { |f| mail.add_file f }
       mail
     end
-
-    def add_attachments(mail, opts)
-      return unless opts.key?("attachments") || opts.key?(:attachments)
-      attach = opts["attachments"] || opts[:attachments]
-      return if attach.nil?
-      attach.select { |a| File.file? a }.each { |a| mail.add_file a }
-    end
   end
 end

data/lib/lazylead/task/accuracy/logs.rb

@@ -36,7 +36,9 @@ module Lazylead
       name = attachment.attrs["filename"].downcase
       return false unless attachment.attrs["size"].to_i > 5120
       return true if File.extname(name).start_with?(".log", ".txt")
-      %w[.log.zip .log.gz .log.tar.gz].any? { |l| name.end_with? l }
+      %w[.log.zip .log.gz .log.tar.gz logs.7z log.7z].any? do |l|
+        name.end_with? l
+      end
     end
   end
 end

data/lib/lazylead/task/fix_version.rb

@@ -86,8 +86,10 @@ module Lazylead
         @issue.add_label("LL.IllegalChangeOfFixVersion") unless @silent
       end
 
-      def current
-        @issue.fields["fixVersions"].first["name"]
+      def to
+        versions = @issue.fields["fixVersions"]
+        return "" if versions.nil? || versions.empty?
+        versions.map { |x| x["name"] }.join(",")
       end
     end
   end

data/lib/lazylead/task/svn/diff.rb

@@ -49,36 +49,28 @@ module Lazylead
             "-r#{opts['since_rev']}:HEAD #{opts['svn_url']}"
           ]
           stdout = `#{cmd.join(" ")}`
-          send_email stdout, postman, opts unless stdout.blank?
+          send_email postman, opts.merge(stdout: stdout) unless stdout.blank?
         end
 
         # Send email with svn log as an attachment.
         # The attachment won't be stored locally and we'll be removed once
         #  mail sent.
-        def send_email(stdout, postman, opts)
+        def send_email(postman, opts)
           Dir.mktmpdir do |dir|
             name = "svn-log-#{Date.today.strftime('%d-%b-%Y')}.html"
             f = File.open(File.join(dir, name), "w")
             begin
-              f.write make_attachment(stdout, opts)
+              f.write opts.msg_body("template-attachment")
               f.close
-              postman.send opts.merge(stdout: stdout, attachments: [f.path])
+              postman.send opts.merge(attachments: [f.path])
             ensure
               File.delete(f)
             end
           rescue StandardError => e
             @log.error "ll-010: Can't send an email for #{opts} due to " \
-                       "#{Backtrace.new(e)}' based on #{stdout}'"
+                       "#{Backtrace.new(e)}'"
           end
         end
-
-        # Assemble HTML for attachment based on SVN output
-        def make_attachment(stdout, opts)
-          Email.new(
-            opts["template-attachment"],
-            opts.merge(stdout: stdout, version: Lazylead::VERSION)
-          ).render
-        end
       end
     end
   end

data/lib/lazylead/task/svn/grep.rb

@@ -107,5 +107,26 @@ module Lazylead
     def header
       @header ||= lines.first.split(" | ").reject(&:blank?)
     end
+
+    # Detect SVN diff lines with particular text
+    def diff(text)
+      @diff ||= begin
+                  files = affected(text).uniq
+                  @commit.split("Index: ")
+                         .select { |i| files.any? { |f| i.start_with? f } }
+                         .map { |i| i.split "\n" }
+                         .flatten
+                end
+    end
+
+    # Detect affected files with particular text
+    def affected(text)
+      occurrences = lines.each_index.select do |i|
+        lines[i].start_with?("+") && text.any? { |t| lines[i].include? t }
+      end
+      occurrences.map do |occ|
+        lines[2..occ].reverse.find { |l| l.start_with? "Index: " }[7..-1]
+      end
+    end
   end
 end

data/lib/lazylead/version.rb

@@ -23,5 +23,5 @@
 # OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Lazylead
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/messages/illegal_fixversion_change.erb

@@ -92,7 +92,8 @@
   <tr>
     <th id="key">Key</th>
     <th id="priority">Priority</th>
-    <th id="version">Fix Version</th>
+    <th id="from">From</th>
+    <th id="to">To</th>
     <th id="when">When</th>
     <th id="who">Who</th>
     <th id="reporter">Reporter</th>
@@ -102,7 +103,12 @@
     <tr>
       <td><a href='<%= v.issue.url %>'><%= v.issue.key %></a></td>
       <td><%= v.issue.priority %></td>
-      <td><%= v.current %></td>
+      <td><%= v.last["items"]
+               .select { |h| h["field"] == "Fix Version" }
+               .map { |h| h["fromString"] }
+               .reject(&:blank?)
+               .join(",") %></td>
+      <td><%= v.to %></td>
       <td><%= DateTime.parse(v.last["created"])
                       .strftime('%d-%b-%Y %I:%M:%S %p') %></td>
       <td><span style='color: red'><%= v.last["author"]["displayName"] %></span>

data/lib/messages/svn_diff_attachment.erb

@@ -64,7 +64,7 @@
       padding: 36px
     }
 
-    .commit {
+    .commit, .table-of-contents {
       min-width: 100%;
       border-radius: 3.5px;
       overflow: hidden;
@@ -74,26 +74,36 @@
       border: 1px solid #BCC6CC;
     }
 
-    .commit * {
+    .commit *, .table-of-contents * {
       padding-left: 4px;
       font-size: 8px;
       line-height: 15px;
     }
+
+    .table-of-contents {
+      border: none;
+    }
   </style>
   <title>SVN log</title>
 </head>
 <body>
 <p>Hi,</p>
-<p>The following file(s) changed since <code><%= since_rev %></code> rev in <a href="<%= svn_url %>"><%= svn_url %></a>:</p>
+<p>Commit(s) since <code><%= since_rev %></code> revision in <a href="<%= svn_url %>"><%= svn_url %></a>:</p>
+<div id="table-of-contents" class="table-of-contents">
+  <ul>
+    <% stdout.split("------------------------------------------------------------------------").reject(&:blank?).reverse.each do |commit| %>
+      <% details = commit.split("\n").reject(&:blank?).first.split("|").map(&:strip).reject(&:blank?) %>
+      <li><a href="#<%= details[0] %>"><%= details[0] %></a> by <%= details[1] %> at <%= details[2] %></li>
+    <% end %>
+  </ul>
+</div>
 <% stdout.split("------------------------------------------------------------------------").reject(&:blank?).reverse.each do |commit| %>
   <div class="commit">
     <% commit.split("\n").reject(&:blank?).each_with_index do |line, index| %>
       <% if index.zero? %>
         <% details = line.split("|").map(&:strip).reject(&:blank?) %>
-        <p style="background: gainsboro;">
-          <a href="<%= commit_url %><%= details[0][1 .. -1] %>"><%= details[0] %></a>
-          by <a href="<%= user %><%= details[1] %>"><%= details[1] %></a>
-          at <span style="color: #275a90;"><%= details[2] %></span>
+        <p style="background: gainsboro;" id="<%= details[0] %>"><a href="<%= commit_url %><%= details[0][1..-1] %>"><%= details[0] %></a> by <a href="<%= user %><%= details[1] %>"><%= details[1] %></a> at <span style="color: #275a90;"><%= details[2] %></span>
+          <a href="#table-of-contents">&#8593;</a>
         </p>
       <% else %>
         <% if line.start_with?("+++") || line.start_with?("---") %>
@@ -103,7 +113,7 @@
         <% elsif line.start_with?("-") %>
           <p style="<%= "background: lightsalmon;" %>"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
         <% else %>
-          <p style="background: gainsboro;"><%= line.gsub(/[<>]/,'<' => '&lt;', '>' => '&gt;') %></p>
+          <p style="background: gainsboro;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
         <% end %>
       <% end %>
     <% end %>

data/lib/messages/svn_grep.erb

@@ -93,7 +93,7 @@
       by <a href="<%= user %><%= commit.author %>"><%= commit.author %></a>
       at <span style="color: #275a90;"><%= commit.time %></span>
     </p>
-    <% commit.lines[2..-1].each do |line| %>
+    <% commit.diff(text.split(",")).each do |line| %>
       <% if line.start_with?("+++") || line.start_with?("---") %>
         <p style="background: gainsboro;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
       <% elsif text.split(",").any? { |t| line.include? t } %>

data/test/lazylead/opts_test.rb

@@ -66,5 +66,40 @@ module Lazylead
     test "except keys" do
       assert_equal 1, Opts.new("one" => "1", "two" => "2").except("one").size
     end
+
+    test "attachment is blank" do
+      assert_empty Opts.new("attachments" => "").msg_attachments
+    end
+
+    test "attachment is nil" do
+      assert_empty Opts.new("attachments" => nil).msg_attachments
+    end
+
+    test "attachment is absent" do
+      assert_empty Opts.new({}).msg_attachments
+    end
+
+    test "attachment is present" do
+      assert_equal %w[readme.md],
+                   Opts.new("attachments" => "readme.md").msg_attachments
+    end
+
+    test "attachments are present" do
+      assert_equal %w[readme.md license.txt],
+                   Opts.new("attachments" => "readme.md,license.txt")
+                       .msg_attachments
+    end
+
+    test "attachments are present as symbol" do
+      assert_equal %w[readme.md license.txt],
+                   Opts.new(attachments: " readme.md , license.txt ")
+                       .msg_attachments
+    end
+
+    test "attachments is present as array" do
+      assert_equal %w[readme.md license.txt],
+                   Opts.new(attachments: %w[readme.md license.txt])
+                       .msg_attachments
+    end
   end
 end

data/test/lazylead/postman_test.rb

@@ -24,6 +24,7 @@
 
 require_relative "../test"
 require_relative "../../lib/lazylead/log"
+require_relative "../../lib/lazylead/opts"
 require_relative "../../lib/lazylead/salt"
 require_relative "../../lib/lazylead/smtp"
 require_relative "../../lib/lazylead/postman"
@@ -46,11 +47,13 @@ module Lazylead
         smtp_pass: ENV["LL_SMTP_PASS"]
       ).enable
       Postman.new.send(
-        "to" => ENV["LL_SMTP_TO"],
-        "from" => ENV["LL_SMTP_FROM"],
-        "attachments" => ["readme.md"],
-        "subject" => "[LL] Attachments",
-        "template" => "lib/messages/savepoint.erb"
+        Opts.new(
+          "to" => ENV["LL_SMTP_TO"],
+          "from" => ENV["LL_SMTP_FROM"],
+          "attachments" => ["readme.md"],
+          "subject" => "[LL] Attachments",
+          "template" => "lib/messages/savepoint.erb"
+        )
       )
     end
   end

data/test/lazylead/task/fix_version_test.rb

@@ -42,6 +42,7 @@ module Lazylead
           "from" => "ll@company.com",
           "jql" => "key in ('DATAJDBC-480') and fixVersion is not empty",
           "allowed" => "tom,mike,bob",
+          "fields" => "description,reporter,priority,summary,created,fixVersions",
           "subject" => "FixVersion: How dare you?",
           "template" => "lib/messages/illegal_fixversion_change.erb"
         )

data/test/lazylead/task/savepoint_test.rb

@@ -24,6 +24,7 @@
 
 require_relative "../../test"
 require_relative "../../../lib/lazylead/smtp"
+require_relative "../../../lib/lazylead/opts"
 require_relative "../../../lib/lazylead/postman"
 require_relative "../../../lib/lazylead/task/savepoint"
 
@@ -36,10 +37,12 @@ module Lazylead
       Task::Savepoint.new.run(
         [],
         Postman.new,
-        "from" => "fake@email.com",
-        "subject" => "[LL] Configuration backup",
-        "template" => "lib/messages/savepoint.erb",
-        "to" => "big.boss@example.com"
+        Opts.new(
+          "from" => "fake@email.com",
+          "subject" => "[LL] Configuration backup",
+          "template" => "lib/messages/savepoint.erb",
+          "to" => "big.boss@example.com"
+        )
       )
       assert_equal 'text/markdown; filename="readme.md"',
                    Mail::TestMailer.deliveries

data/test/lazylead/task/svn/grep_test.rb

@@ -41,7 +41,7 @@ module Lazylead
         Postman.new,
         Opts.new(
           "from" => "svnlog@test.com",
-          "text" => "ping,https://github.com/dgroup/lazylead",
+          "text" => "ping",
           "svn_url" => "https://svn.riouxsvn.com/touch4ll",
           "svn_user" => ENV["svn_log_user"],
           "svn_password" => ENV["svn_log_password"],
@@ -57,5 +57,47 @@ module Lazylead
       assert_email_line "[SVN] Changes with text",
                         %w[r2 by dgroup at 2020-08-16]
     end
+
+    test "test" do
+      diff = <<~MSG
+
+        r3 | dgroup | 2020-08-16 11:27:01 +0300 (Sun, 16 Aug 2020) | 1 line
+
+        Add description for 189 issue
+
+        Index: 189.md
+        ===================================================================
+        --- 189.md	(nonexistent)
+        +++ 189.md	(revision 3)
+        @@ -0,0 +1,9 @@
+        +*Issue 189*
+        +https://github.com/dgroup/lazylead/issues/189
+        +
+        +Find stable svn repo which can be used for stable test, for
+        +now only floating repo used for testing locally. Also, create a new
+        +method "ping" which can be used during tests like
+        +```ruby
+        +skip "No connection available to svn repo" unless ping("https://riouxsvn.com")
+        +```
+        
+        Index: readme.md
+        ===================================================================
+        --- readme.md	(revision 2)
+        +++ readme.md	(revision 3)
+        @@ -3,4 +3,5 @@
+         More
+          - https://github.com/dgroup/lazylead
+          - https://github.com/dgroup/lazylead/blob/master/lib/lazylead/task/touch.rb
+        - - https://github.com/dgroup/lazylead/blob/master/test/lazylead/task/touch_test.rb
+        
+        + - https://github.com/dgroup/lazylead/blob/master/test/lazylead/task/touch_test.rb
+        +
+        
+
+
+      MSG
+      assert_equal 15, Entry.new(diff).diff(%w[ping]).size,
+                   "There is one commit with 'ping' word where diff has 14 lines"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazylead
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yurii Dubinka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -698,7 +698,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Lazylead v0.6.1!
+  Thanks for installing Lazylead v0.6.2!
     Read our blog posts: https://lazylead.org
     Stay in touch with the community in Telegram: https://t.me/lazylead
     Follow us on Twitter: https://twitter.com/lazylead