lazylead 0.9.2 → 0.10.2

data/lib/lazylead/task/fix_version.rb

@@ -39,15 +39,12 @@ module Lazylead
       def run(sys, postman, opts)
         allowed = opts.slice("allowed", ",")
         silent = opts.key? "silent"
-        issues = sys.issues(
-          opts["jql"], opts.jira_defaults.merge(expand: "changelog")
-        )
+        issues = sys.issues(opts["jql"], opts.jira_defaults.merge(expand: "changelog"))
+                    .map { |i| Version.new(i, allowed, silent) }
+                    .select(&:changed?)
+                    .each(&:add_label)
         return if issues.empty?
-        postman.send opts.merge(
-          versions: issues.map { |i| Version.new(i, allowed, silent) }
-                          .select(&:changed?)
-                          .each(&:add_label)
-        )
+        postman.send opts.merge(versions: issues)
       end
     end
 

data/lib/lazylead/task/loading.rb

@@ -72,8 +72,8 @@ module Lazylead
         "#{id} has #{total} tasks"
       end
 
-      def sprints(*label)
-        return @tasks.group_by(&:sprint).sort if label.empty? || label.nil?
+      def sprints(label)
+        return @tasks.group_by(&:sprint).sort if label.nil? || label.blank?
         @tasks.group_by { |t| t.sprint(label) }.sort
       end
     end

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

@@ -27,8 +27,10 @@ require "tempfile"
 require "nokogiri"
 require "backtrace"
 require "active_support/core_ext/hash/conversions"
+require_relative "../../os"
 require_relative "../../salt"
 require_relative "../../opts"
+require_relative "svn"
 
 module Lazylead
   module Task
@@ -43,15 +45,13 @@ module Lazylead
         end
 
         def run(_, postman, opts)
-          cmd = [
-            "svn log --diff --no-auth-cache",
-            "--username #{opts.decrypt('svn_user', 'svn_salt')}",
-            "--password #{opts.decrypt('svn_password', 'svn_salt')}",
-            "-r#{opts['since_rev']}:HEAD #{opts['svn_url']}"
-          ]
-          stdout = `#{cmd.join(" ")}`
-          stdout.scrub!
-          send_email postman, opts.merge(stdout: stdout) unless stdout.blank?
+          stdout = OS.new.run "svn log --diff --no-auth-cache",
+                              "--username #{opts.decrypt('svn_user', 'svn_salt')}",
+                              "--password #{opts.decrypt('svn_password', 'svn_salt')}",
+                              "-r#{opts['since_rev']}:HEAD #{opts['svn_url']}"
+          return if stdout.blank?
+          commits = Lazylead::Svn::Commits.new(stdout)
+          send_email postman, opts.merge(commits: commits) unless commits.empty?
         end
 
         # Send email with svn log as an attachment.

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

@@ -25,8 +25,10 @@
 require "tmpdir"
 require "nokogiri"
 require "active_support/core_ext/hash/conversions"
+require_relative "../../os"
 require_relative "../../salt"
 require_relative "../../opts"
+require_relative "svn"
 
 module Lazylead
   module Task
@@ -47,14 +49,12 @@ module Lazylead
 
         # Return all svn commits for particular date range in repo
         def svn_log(opts)
-          cmd = [
-            "svn log --diff --no-auth-cache",
-            "--username #{opts.decrypt('svn_user', 'svn_salt')}",
-            "--password #{opts.decrypt('svn_password', 'svn_salt')}",
-            "-r {#{from(opts)}}:{#{now(opts)}} #{opts['svn_url']}"
-          ]
-          stdout = `#{cmd.join(" ")}`
-          stdout.split("-" * 72).reject(&:blank?).reverse.map { |e| Entry.new(e) }
+          stdout = OS.new.run "svn log --diff --no-auth-cache",
+                              "--username #{opts.decrypt('svn_user', 'svn_salt')}",
+                              "--password #{opts.decrypt('svn_password', 'svn_salt')}",
+                              "-r {#{from(opts)}}:{#{now(opts)}} #{opts['svn_url']}"
+          return [] if stdout.blank?
+          Lazylead::Svn::Commits.new(stdout)
         end
 
         # The start date & time for search range
@@ -73,67 +73,4 @@ module Lazylead
       end
     end
   end
-
-  # Single SVN commit details
-  class Entry
-    def initialize(commit)
-      @commit = commit
-    end
-
-    def to_s
-      "#{rev} #{msg}"
-    end
-
-    def rev
-      header.first[1..]
-    end
-
-    def author
-      header[1]
-    end
-
-    def time
-      header[2]
-    end
-
-    def msg
-      lines[1]
-    end
-
-    # The modified lines contains expected text
-    def includes?(text)
-      text = [text] unless text.respond_to? :each
-      lines[4..].select { |l| l.start_with? "+" }
-                .any? { |l| text.any? { |t| l.include? t } }
-    end
-
-    def lines
-      @lines ||= @commit.split("\n").reject(&:blank?)
-    end
-
-    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..]
-      end
-    end
-  end
 end

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+# The MIT License
+#
+# Copyright (c) 2019-2021 Yurii Dubinka
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom
+# the Software is  furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+# OR OTHER DEALINGS IN THE SOFTWARE.
+
+require "forwardable"
+
+module Lazylead
+  module Svn
+    #
+    # SVN commit built from command-line stdout (OS#run).
+    #
+    class Commit
+      def initialize(raw)
+        @raw = raw
+      end
+
+      def to_s
+        "#{rev} #{msg}"
+      end
+
+      def rev
+        header.first[1..]
+      end
+
+      def author
+        header[1]
+      end
+
+      def time
+        DateTime.parse(header[2]).strftime("%d-%m-%Y %H:%M:%S")
+      end
+
+      def msg
+        lines[1]
+      end
+
+      def lines
+        @lines ||= @raw.split("\n").reject(&:blank?)
+      end
+
+      def header
+        @header ||= lines.first.split(" | ").reject(&:blank?)
+      end
+
+      # The modified lines contains expected text
+      def includes?(text)
+        text = [text] unless text.respond_to? :each
+        lines[4..].select { |l| l.start_with? "+" }.any? { |l| text.any? { |t| l.include? t } }
+      end
+
+      # Detect SVN diff lines with particular text
+      def diff(text)
+        @diff ||= begin
+          files = affected(text).uniq
+          @raw.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..]
+        end
+      end
+    end
+
+    #
+    # SVN commits built from command-line stdout (OS#run).
+    #
+    class Commits
+      extend Forwardable
+      def_delegators :@all, :each, :map, :select, :empty?
+
+      # @todo #/DEV Find a way how to avoid @all initialization directly in constructor.
+      #  There should be a way how to make lazy initialization of @all with 'forwardable'.
+      def initialize(stdout)
+        @all = stdout.split("-" * 72).reject(&:blank?).reverse.map { |e| Commit.new(e) }
+      end
+    end
+  end
+end

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

@@ -25,6 +25,7 @@
 require "tmpdir"
 require "nokogiri"
 require "active_support/core_ext/hash/conversions"
+require_relative "../../os"
 require_relative "../../salt"
 require_relative "../../opts"
 
@@ -64,13 +65,10 @@ module Lazylead
                   DateTime.now
                 end
           start = (now.to_time - opts["period"].to_i).to_datetime
-          cmd = [
-            "svn log --no-auth-cache",
-            "--username #{opts.decrypt('svn_user', 'svn_salt')}",
-            "--password #{opts.decrypt('svn_password', 'svn_salt')}",
-            "--xml -v -r {#{start}}:{#{now}} #{opts['svn_url']}"
-          ]
-          raw = `#{cmd.join(" ")}`
+          raw = OS.new.run "svn log --no-auth-cache",
+                           "--username #{opts.decrypt('svn_user', 'svn_salt')}",
+                           "--password #{opts.decrypt('svn_password', 'svn_salt')}",
+                           "--xml -v -r {#{start}}:{#{now}} #{opts['svn_url']}"
           Nokogiri.XML(raw, nil, "UTF-8")
         end
 

data/lib/lazylead/version.rb

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

data/lib/messages/illegal_assignee_change.erb

@@ -102,8 +102,7 @@
     <tr>
       <td><a href='<%= a.issue.url %>'><%= a.issue.key %></a></td>
       <td><%= a.issue.priority %></td>
-      <td><%= DateTime.parse(a.last["created"])
-                      .strftime('%d-%b-%Y %I:%M:%S %p') %></td>
+      <td><%= DateTime.parse(a.last["created"]).strftime('%d-%b') %></td>
       <td><span style='color: red'><%= a.last["author"]["displayName"] %></span>
         (<%= a.last["author"]["name"] %>)
       </td>

data/lib/messages/loading.erb

@@ -73,7 +73,7 @@
     <th id="total">
       <a href="<%= search_link %><%= CGI.escape(jql) %>">Assigned From</a>
     </th>
-    <th id="duedate">Next Due date</th>
+    <th id="duedate">Next due date</th>
   </tr>
   <% assignments.each do |teammate, assignment| %>
     <% if assignment.free? %>

data/lib/messages/svn_diff.erb

@@ -64,20 +64,13 @@
       padding: 36px
     }
 
-    .commit {
-      min-width: 100%;
-      border-radius: 3.5px;
-      overflow: hidden;
-      display: inline-block;
-      line-height: 15px;
-      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-      border: 1px solid #BCC6CC;
+    th, td {
+      padding-left: 3px;
+      padding-right: 3px;
     }
 
-    .commit * {
-      padding-left: 4px;
-      font-size: 8px;
-      line-height: 12px;
+    th {
+      font-weight: bold;
     }
   </style>
   <title>SVN log</title>
@@ -86,23 +79,30 @@
 <p>Hi,</p>
 <p>The following file(s) changed since <code><%= since_rev %></code> rev in
   <a href="<%= svn_url %>"><%= svn_url %></a>:</p>
-<% stdout.split("------------------------------------------------------------------------").reject(&:blank?).reverse.each do |commit| %>
-  <div class="commit">
-    <% commit.split("\n").reject(&:blank?).each_with_index do |line, index| %>
-      <p style="background: gainsboro;">
-        <% if index.zero? %>
-          <% details = line.split("|").map(&:strip).reject(&:blank?) %>
-          <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>
-        <% end %>
-        <% if index == 1 %>
-          <span style="padding-left: 4px"><%= line %></span>
-        <% end %>
-      </p>
-    <% end %>
-  </div>
-<% end %>
+<table summary="diff">
+  <tr>
+    <th id="rev">rev</th>
+    <th id="author">Author</th>
+    <th id="time">When</th>
+    <th id="msg">Message</th>
+  </tr>
+  <% commits.each do |commit| %>
+    <tr>
+      <td>
+        <div class="auto">
+          <a href="<%= commit_url %><%= commit.rev %>"><%= commit.rev %></a>
+        </div>
+      </td>
+      <td>
+        <div class="auto">
+          <a href="<%= user %><%= commit.author %>"><%= commit.author %></a>
+        </div>
+      </td>
+      <td><%= commit.time %></td>
+      <td><%= commit.lines[1] %></td>
+    </tr>
+  <% end %>
+</table>
 <p>Posted by
   <a href="https://github.com/dgroup/lazylead">lazylead v<%= version %></a>.
 </p>

data/lib/messages/svn_diff_attachment.erb

@@ -91,18 +91,16 @@
 <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>
+    <% commits.each do |commit| %>
+      <li><a href="#<%= commit.rev %>"><%= commit.rev %></a> by <%= commit.author %> at <%= commit.time %></li>
     <% end %>
   </ul>
 </div>
-<% stdout.split("------------------------------------------------------------------------").reject(&:blank?).reverse.each do |commit| %>
+<% commits.each do |commit| %>
   <div class="commit">
-    <% commit.split("\n").reject(&:blank?).each_with_index do |line, index| %>
+    <% commit.lines.each_with_index do |line, index| %>
       <% if index.zero? %>
-        <% details = line.split("|").map(&:strip).reject(&:blank?) %>
-        <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>
+        <p style="background: gainsboro;" id="<%= commit.rev %>"><a href="<%= commit_url %><%= commit.rev %>"><%= commit.rev %></a> by <a href="<%= user %><%= commit.author %>"><%= commit.author %></a> at <span style="color: #275a90;"><%= commit.time %></span>
           <a href="#table-of-contents">&#8593;</a>
         </p>
       <% else %>

data/lib/messages/svn_grep.erb

@@ -64,14 +64,8 @@
       padding: 36px
     }
 
-    .commit {
-      min-width: 100%;
-      border-radius: 3.5px;
-      overflow: hidden;
-      display: inline-block;
-      line-height: 15px;
-      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-      border: 1px solid #BCC6CC;
+    td {
+      padding: 2px;
     }
 
     .commit * {
@@ -86,29 +80,37 @@
 <p>Hi,</p>
 <p>The following file(s) contain text <code><%= text %></code> in
   <a href="<%= svn_url %>"><%= svn_url %></a>:</p>
-<% entries.each do |commit| %>
-  <div class="commit">
-    <p style="background: gainsboro;">
-      <a href="<%= commit_url %><%= commit.rev %>"><%= commit.msg %></a>
-      by <a href="<%= user %><%= commit.author %>"><%= commit.author %></a>
-      at <span style="color: #275a90;"><%= commit.time %></span>
-    </p>
-    <% 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 } %>
-        <p style="background: #F9F103;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
-      <% elsif line.start_with?("+") %>
-        <p style="<%= "background: darkseagreen;" %>"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
-      <% elsif line.start_with?("-") %>
-        <p style="<%= "background: lightsalmon;" %>"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
-      <% else %>
-        <p style="background: gainsboro;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
-      <% end %>
-    <% end %>
-  </div>
-<% end %>
-<p>Posted by<a href="https://github.com/dgroup/lazylead">lazylead
-  v<%= version %></a>.</p>
+<table summary="table with svn commits">
+  <tr>
+    <th id="rev">rev</th>
+    <th id="when">when</th>
+    <th id="author">author</th>
+    <th id="commit_msg" style="text-align: left">commit</th>
+  </tr>
+  <% entries.each do |commit| %>
+    <tr>
+      <td><a href="<%= commit_url %><%= commit.rev %>"><%= commit.rev %></a></td>
+      <td><%= commit.time %></td>
+      <td><a href="<%= user %><%= commit.author %>"><%= commit.author %></a></td>
+      <td>
+        <b><p><%= commit.msg %></p></b>
+        <% 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 } %>
+            <p style="background: #F9F103;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
+          <% elsif line.start_with?("+") %>
+            <p style="<%= "background: darkseagreen;" %>"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
+          <% elsif line.start_with?("-") %>
+            <p style="<%= "background: lightsalmon;" %>"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
+          <% else %>
+            <p style="background: gainsboro;"><%= line.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;') %></p>
+          <% end %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+<p>Posted by<a href="https://github.com/dgroup/lazylead">lazylead v<%= version %></a>.</p>
 </body>
 </html>