lazylead 0.8.2 → 0.9.3

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,14 +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(" ")}`
-          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.
@@ -60,8 +61,7 @@ module Lazylead
           Dir.mktmpdir do |dir|
             name = "svn-log-#{Date.today.strftime('%d-%b-%Y')}.html"
             begin
-              to_f(File.join(dir, name), opts)
-              postman.send opts.merge(attachments: [File.join(dir, name)])
+              postman.send opts.merge(attachments: [to_f(File.join(dir, name), opts)])
             ensure
               FileUtils.rm_rf("#{dir}/*")
             end
@@ -91,7 +91,7 @@ module Lazylead
           end
           f.write body
           f.close
-          f
+          f.path
         end
       end
     end

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
+        header[2]
+      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.8.2"
+  VERSION = "0.9.3"
 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/illegal_duedate_change.erb

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <style>
+    /* CSS styles taken from https://github.com/yegor256/tacit */
+    th {
+      font-weight: 600
+    }
+
+    table tr {
+      border-bottom-width: 2.16px
+    }
+
+    table tr th {
+      border-bottom-width: 2.16px
+    }
+
+    table tr td, table tr th {
+      overflow: hidden;
+      padding: 5.4px 3.6px
+    }
+
+    a {
+      color: #275a90;
+      text-decoration: none
+    }
+
+    a:hover {
+      text-decoration: underline
+    }
+
+    pre, code, kbd, samp, var, output {
+      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+      font-size: 13px
+    }
+
+    pre code {
+      background: none;
+      border: 0;
+      line-height: 29.7px;
+      padding: 0
+    }
+
+    code, kbd {
+      background: #daf1e0;
+      border-radius: 3.6px;
+      color: #2a6f3b;
+      display: inline-block;
+      line-height: 18px;
+      padding: 3.6px 6.3px 2.7px
+    }
+
+    * {
+      border: 0;
+      border-collapse: separate;
+      border-spacing: 0;
+      box-sizing: border-box;
+      margin: 0;
+      max-width: 100%;
+      padding: 0;
+      vertical-align: baseline;
+      font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 13px;
+      font-stretch: normal;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 29.7px
+    }
+
+    html, body {
+      width: 100%
+    }
+
+    html {
+      height: 100%
+    }
+
+    body {
+      background: #fff;
+      color: #1a1919;
+      padding: 36px
+    }
+  </style>
+  <title>Not authorized "Assignee" change</title>
+</head>
+<body>
+<p>Hi,</p>
+
+<p>The <span style='font-weight:bold'>'Duedate'</span> for the following
+  ticket(s) changed by not authorized person(s):</p>
+<table summary="ticket(s) where duedate changed">
+  <tr>
+    <th id="key">Key</th>
+    <th id="priority">Priority</th>
+    <th id="when">When</th>
+    <th id="who">Who</th>
+    <th id="to">To</th>
+    <th id="assignee">Assignee</th>
+    <th id="reporter">Reporter</th>
+    <th id="summary">Summary</th>
+  </tr>
+  <% dues.each do |d| %>
+    <tr>
+      <td><a href='<%= d.issue.url %>'><%= d.issue.key %></a></td>
+      <td><%= d.issue.priority %></td>
+      <td><%= d.when.to_date %></td>
+      <td><span style='color: red'><%= d.last.name %></span> (<%= d.last.id %>)</td>
+      <td><span style='color: red'><%= d.issue.duedate %></span></td>
+      <td><%= d.issue.assignee.name %></td>
+      <td><%= d.issue.reporter.name %></td>
+      <td><%= d.issue.summary %></td>
+    </tr>
+  <% end %>
+</table>
+
+<p>Authorized person(s) are: <code><%= allowed %></code>.</p>
+
+<p>Posted by
+  <a href="https://github.com/dgroup/lazylead">lazylead v<%= version %></a>.
+</p>
+</body>
+</html>

data/lib/messages/loading.erb

@@ -69,12 +69,11 @@
 <body>
 <table summary="tickets">
   <tr>
-    <th id="uid">ID</th>
     <th id="name">User</th>
     <th id="total">
-      <a href="https://jira.spring.io/issues/?jql=<%= CGI.escape(jql) %>">Assigned From</a>
+      <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? %>
@@ -83,17 +82,19 @@
       <tr>
     <% end %>
     <td>
-      <div class="auto"><a href="<%= user_link %>"><%= teammate %></a></div>
-    </td>
-    <td>
-      <div class="auto"><%= assignment.name %></div>
+      <div class="auto"><a href="<%= user_link %><%= teammate %>"><%= assignment.name %></a></div>
     </td>
     <td>
       <div class="auto">
         <% if assignment.free? %>
           <span style="color: red">0</span>
         <% else %>
-          <a href="https://jira.spring.io/issues/?jql=<%= CGI.escape("#{jql} and assignee=#{teammate}") %>"><%= assignment.size %></a>
+          <% assignment.sprints(defined?(sprint) ? sprint : "customfield_10480").each do |s| %>
+            <a href="<%= search_link %><%= CGI.escape("#{jql} and assignee=#{teammate}") %>">
+              <%= s.first.blank? ? "No sprint" : s.first %>: <%= s.last.size %>
+            </a>
+            <br/>
+          <% end %>
         <% end %>
       </div>
     </td>