lazylead 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d2b34214d533e7ffe2c819c2655d5cc7b273e68b8791641b4462c655d14216
-  data.tar.gz: 86cf9712d1a6a1992c9414c4578b2c4e6ae7806f378f42e2c37e38508ad6448d
+  metadata.gz: fde968b00a6b6868ea644d731c54d23d08f365b133926fa2cf13699e982a0802
+  data.tar.gz: 3340adabd89a6699cf0ba2fdc723ccc9e372d505b8b14b81cd7eef6c816c7fdc
 SHA512:
-  metadata.gz: d0c5f522f77a818edc4bcd8b571ce359b9e10f45df809ef6a17a5154fdda8eccb4104ee08d2ce69049f93f76b5ee0506003fad3faffeea59a3df61ad93f77f9e
-  data.tar.gz: d3b52a77f6346e88b87dca54a6827c69557968b18770305578ff78d3436be5c6484176d531175ea1860b1460df1ad33933e8454e692c6544f3f018dc49881e44
+  metadata.gz: ecbf953aa53ae51b6ed4cc056794f3b8eb9e693d07cc3262070a95592546f9d45797f4ebdf4bbbacc650ad369033e9fd433e6d1975fd3f37688f5c7c3c321ee9
+  data.tar.gz: f2dae8c55b5b98ddca9fe769a007eb4ea40d6c2b52675fa47911bc924d9ad7b56453f1a4c3705275f2ba2840d9d662ffde58bd92c179ea2af5a2da5baf1b3156

data/.rubocop.yml

@@ -3,6 +3,7 @@ require:
   - rubocop-performance
 
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
   TargetRubyVersion: 2.6

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.8.1"
+  s.version = "0.8.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.8.1!
+  s.post_install_message = "Thanks for installing Lazylead v0.8.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
@@ -69,6 +69,7 @@ tasks instead of solving technical problems."
   s.add_runtime_dependency "openssl", "2.1.2"
   s.add_runtime_dependency "railties", "6.1.3"
   s.add_runtime_dependency "require_all", "3.0.0"
+  s.add_runtime_dependency "rubyzip", "2.3.0"
   s.add_runtime_dependency "rufus-scheduler", "3.7.0"
   s.add_runtime_dependency "slop", "4.8.2"
   s.add_runtime_dependency "sqlite3", "1.4.2"
@@ -89,12 +90,12 @@ tasks instead of solving technical problems."
   s.add_development_dependency "rake", "13.0.3"
   s.add_development_dependency "random-port", "0.5.1"
   s.add_development_dependency "rdoc", "6.3.0"
-  s.add_development_dependency "rubocop", "1.11.0"
-  s.add_development_dependency "rubocop-minitest", "0.10.3"
-  s.add_development_dependency "rubocop-performance", "1.10.1"
+  s.add_development_dependency "rubocop", "1.12.0"
+  s.add_development_dependency "rubocop-minitest", "0.11.0"
+  s.add_development_dependency "rubocop-performance", "1.10.2"
   s.add_development_dependency "rubocop-rake", "0.5.1"
   s.add_development_dependency "rubocop-rspec", "2.2.0"
-  s.add_development_dependency "sqlint", "0.1.10"
+  s.add_development_dependency "sqlint", "0.2.0"
   s.add_development_dependency "tempfile", "0.1.1"
   s.add_development_dependency "xcop", "0.6.2"
 end

data/lib/lazylead/cc.rb

@@ -80,13 +80,11 @@ module Lazylead
     end
 
     def cc
-      @cc ||= begin
-        if @text.include? ","
-          @text.split(",").map(&:strip).select { |e| e[@regxp] }
-        elsif @text[@regxp]
-          [@text.strip]
-        end
-      end
+      @cc ||= if @text.include? ","
+                @text.split(",").map(&:strip).select { |e| e[@regxp] }
+              elsif @text[@regxp]
+                [@text.strip]
+              end
     end
 
     def each(&block)
@@ -125,15 +123,13 @@ module Lazylead
     end
 
     def to_h
-      @to_h ||= begin
-        if @orig.is_a? Hash
-          @orig.each_with_object({}) do |i, o|
-            o[i.first] = Lazylead::PlainCC.new(i.last).cc
-          end
-        else
-          {}
-        end
-      end
+      @to_h ||= if @orig.is_a? Hash
+                  @orig.each_with_object({}) do |i, o|
+                    o[i.first] = Lazylead::PlainCC.new(i.last).cc
+                  end
+                else
+                  {}
+                end
     end
   end
 
@@ -151,12 +147,10 @@ module Lazylead
     end
 
     def to_h
-      @to_h ||= begin
-        components.each_with_object({}) do |c, h|
-          email = lead(c.attrs["id"])
-          next if email.nil? || email.blank?
-          h[c.attrs["name"]] = email
-        end
+      @to_h ||= components.each_with_object({}) do |c, h|
+        email = lead(c.attrs["id"])
+        next if email.nil? || email.blank?
+        h[c.attrs["name"]] = email
       end
     end
 

data/lib/lazylead/model.rb

@@ -135,13 +135,11 @@ module Lazylead
       end
 
       def props
-        @props ||= begin
-          if team.nil?
-            Opts.new(env(to_hash))
-          else
-            Opts.new(env(team.to_hash.merge(to_hash)))
-          end
-        end
+        @props ||= if team.nil?
+                     Opts.new(env(to_hash))
+                   else
+                     Opts.new(env(team.to_hash.merge(to_hash)))
+                   end
       end
 
       def postman

data/lib/lazylead/system/jira.rb

@@ -26,6 +26,7 @@ require "jira-ruby"
 require "forwardable"
 require_relative "../salt"
 require_relative "../opts"
+require_relative "../log"
 
 module Lazylead
   # Jira system for manipulation with issues.

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

@@ -118,13 +118,11 @@ module Lazylead
     end
 
     def colors
-      @colors ||= begin
-        JSON.parse(@opts["colors"])
-            .to_h
-            .to_a
-            .each { |e| e[0] = e[0].to_i }
-            .sort_by { |e| e[0] }
-      end
+      @colors ||= JSON.parse(@opts["colors"])
+                      .to_h
+                      .to_a
+                      .each { |e| e[0] = e[0].to_i }
+                      .sort_by { |e| e[0] }
     end
 
     # Calculate grade for accuracy

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

@@ -94,13 +94,11 @@ module Lazylead
 
     # Detect the percentage grid for tickets, by default its 0%, 10%, 20%, etc.
     def grid
-      @grid ||= begin
-        if @opts.key? "grid"
-          @opts.slice("grid", ",")
-        else
-          %w[0% 10% 20% 30% 40% 50% 60% 70% 80% 90% 100%]
-        end
-      end
+      @grid ||= if @opts.key? "grid"
+                  @opts.slice("grid", ",")
+                else
+                  %w[0% 10% 20% 30% 40% 50% 60% 70% 80% 90% 100%]
+                end
     end
 
     # Remove score labels from the ticket.

data/{Guardfile → lib/lazylead/task/accuracy/screenshots.rb}

@@ -22,12 +22,30 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 # OR OTHER DEALINGS IN THE SOFTWARE.
 
-# Guardfile for Lazylead
-guard :minitest, all_after_pass: false, all_on_start: false do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)/?test_(.*)\.rb$})
-  watch(%r{^test/test\.rb$}) { "test" }
-  watch(%r{^lib/lazylead/(.*/)?([^/]+)\.rb$}) do |m|
-    "test/#{m[1]}test_#{m[2]}.rb"
+require_relative "requirement"
+
+module Lazylead
+  #
+  # Check that ticket has screenshot(s).
+  # The screenshots should
+  #  1. present as attachments
+  #  2. mentioned in description with !<name>.<extension>|thumbnail! (read more https://bit.ly/3rusNgW)
+  #
+  class Screenshots < Lazylead::Requirement
+    # @param minimum The number of expected screenshots
+    def initialize(minimum: 2, score: 2, ext: %w[.jpg .jpeg .exif .tiff .tff .bmp .png .svg])
+      super "Screenshots", score, "Description,Attachments"
+      @minimum = minimum
+      @ext = ext
+    end
+
+    def passed(issue)
+      return false if issue.attachments.nil? || blank?(issue, "description")
+      regexps = issue.attachments
+                     .select { |a| @ext.include? File.extname(a.filename) }
+                     .map { |a| /!#{a.filename}\|thumbnail!/ }
+      return false if regexps.size < @minimum
+      regexps.all? { |r| issue.description.match? r }
+    end
   end
 end

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

@@ -22,6 +22,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 # OR OTHER DEALINGS IN THE SOFTWARE.
 
+require "zip"
 require "tempfile"
 require "nokogiri"
 require "backtrace"
@@ -58,19 +59,40 @@ module Lazylead
         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 opts.msg_body("template-attachment")
-              f.close
-              postman.send opts.merge(attachments: [f.path])
+              to_f(File.join(dir, name), opts)
+              postman.send opts.merge(attachments: [File.join(dir, name)])
             ensure
-              File.delete(f)
+              FileUtils.rm_rf("#{dir}/*")
             end
           rescue StandardError => e
             @log.error "ll-010: Can't send an email '#{opts['subject']}' to #{opts['to']} due to " \
                        "#{Backtrace.new(e)}'"
           end
         end
+
+        # Wrap attachment content to a *.zip file and archive.
+        #   to_f('my-content.html', opts)   => my-content.html.zip
+        #
+        # You may disable archiving option by passing option *no_archive*
+        #   to_f('my-content.html', "no_archive" => true)
+        def to_f(path, opts)
+          if opts.key? "no_archive"
+            f = File.open(path, "w")
+            body = opts.msg_body("template-attachment")
+          else
+            f = File.new("#{path}.zip", "wb")
+            bytes = Zip::OutputStream.write_buffer do |zio|
+              zio.put_next_entry(File.basename(path))
+              zio.write opts.msg_body("template-attachment")
+            end
+            bytes.rewind # reposition buffer pointer to the beginning
+            body = bytes.sysread
+          end
+          f.write body
+          f.close
+          f
+        end
       end
     end
   end

data/lib/lazylead/version.rb

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

data/test/lazylead/task/accuracy/screenshots_test.rb

@@ -0,0 +1,84 @@
+# 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_relative "../../../test"
+require_relative "../../../../lib/lazylead/task/accuracy/screenshots"
+require_relative "../../../../lib/lazylead/system/jira"
+
+module Lazylead
+  class ScreenshotsTest < Lazylead::Test
+    test "issue has two .png files with reference in description" do
+      assert Screenshots.new.passed(
+        OpenStruct.new(
+          description: "Hi,\n here are snapshots !img1.jpg|thumbnail!\n!img2.jpg|thumbnail!\n",
+          fields: {
+            "description" => "Hi,\n here are snapshots !img1.jpg|thumbnail!\n!img2.jpg|thumbnail!\n"
+          },
+          attachments: [
+            OpenStruct.new("filename" => "img1.jpg"),
+            OpenStruct.new("filename" => "img2.jpg")
+          ]
+        )
+      )
+    end
+
+    test "issue has several .png attachments mentioned using !xxx|thumbnail! option" do
+      assert Screenshots.new.passed(
+        NoAuthJira.new("https://jira.spring.io")
+                  .issues("key=SPR-15729", fields: %w[attachment description])
+                  .first
+      )
+    end
+
+    test "issue has only one .png file however minimum 2 are required" do
+      refute Screenshots.new.passed(
+        OpenStruct.new(
+          description: "Hi,\n here are snapshots !img1.jpg|thumbnail!\n",
+          fields: {
+            "description" => "Hi,\n here are snapshots !img1.jpg|thumbnail!\n"
+          },
+          attachments: [
+            OpenStruct.new("filename" => "img1.jpg"),
+            OpenStruct.new("filename" => "img2.jpg")
+          ]
+        )
+      )
+    end
+
+    test "issue has two .png files with reference in description but with extension mismatch" do
+      refute Screenshots.new.passed(
+        OpenStruct.new(
+          description: "Hi,\n here are snapshots !img1.jpg|thumbnail!\n!img2.jpg|thumbnail!\n",
+          fields: {
+            "description" => "Hi,\n here are snapshots !img1.jpg|thumbnail!\n!img2.jpg|thumbnail!\n"
+          },
+          attachments: [
+            OpenStruct.new("filename" => "img1.JPG"),
+            OpenStruct.new("filename" => "img2.jpg")
+          ]
+        )
+      )
+    end
+  end
+end

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

@@ -31,6 +31,10 @@ require_relative "../../../../lib/lazylead/task/svn/diff"
 
 module Lazylead
   class DiffTest < Lazylead::Test
+    # @todo #/DEV Right now its impossible to check that attachment is present in email as we
+    #  removing the directory with attachments once SVN::Diff is sent the email through the postman.
+    #  Think about how to test this case in automatically, because for now we are doing it manually
+    #  during the development.
     test "changes since revision" do
       skip "No svn credentials provided" unless env? "svn_log_user",
                                                      "svn_log_password"
@@ -53,8 +57,8 @@ module Lazylead
           "template-attachment" => "lib/messages/svn_diff_attachment.erb"
         )
       )
-      assert_email_line "[SVN] Changed since rev1",
-                        %w[r2 by dgroup at 2020-08-16]
+      assert_email_line "[SVN] Changed since rev1", %w[r2 by dgroup at 2020-08-16]
+      # assert_attachment "[SVN] Changed since rev1", /^.*svn-log-.*.html.zip$/
     end
 
     test "changes since revision with attachment" do
@@ -68,7 +72,7 @@ module Lazylead
                                                          "LL_SMTP_TO",
                                                          "LL_SMTP_FROM"
       Lazylead::Smtp.new(
-        Log.new,
+        Log.new.verbose,
         NoSalt.new,
         smtp_host: ENV["LL_SMTP_HOST"],
         smtp_port: ENV["LL_SMTP_PORT"],

data/test/test.rb

@@ -126,6 +126,18 @@ module Lazylead
              "Words '#{words.join(',')}' wasn't found in '#{mail.join('\n')}'"
     end
 
+    def assert_attachment(subject, regexp)
+      parts = Mail::TestMailer.deliveries
+                              .find { |m| m.subject.eql? subject }
+                              .body.parts.parts
+                              .select do |p|
+        p.header.fields.any? { |f| f.value.start_with? "attachment" }
+      end
+      refute_empty parts, "No attachments found within the email"
+      assert parts.first.header.fields.any? { |f| f.value.match regexp },
+             "No attachments found matches to '#{regexp}' in #{subject}"
+    end
+
     # Ping remote host
     #  https://github.com/eitoball/net-ping
     #  https://stackoverflow.com/a/35508446/6916890

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazylead
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Yurii Dubinka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,6 +206,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -492,42 +506,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -562,14 +576,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: tempfile
   requirement: !ruby/object:Gem::Requirement
@@ -648,7 +662,6 @@ files:
 - ".simplecov"
 - CNAME
 - Gemfile
-- Guardfile
 - Rakefile
 - appveyor.yml
 - bin/.ruby-version
@@ -683,6 +696,7 @@ files:
 - lib/lazylead/task/accuracy/onlyll.rb
 - lib/lazylead/task/accuracy/records.rb
 - lib/lazylead/task/accuracy/requirement.rb
+- lib/lazylead/task/accuracy/screenshots.rb
 - lib/lazylead/task/accuracy/servers.rb
 - lib/lazylead/task/accuracy/stacktrace.rb
 - lib/lazylead/task/accuracy/testcase.rb
@@ -738,6 +752,7 @@ files:
 - test/lazylead/task/accuracy/onlyll_test.rb
 - test/lazylead/task/accuracy/records_test.rb
 - test/lazylead/task/accuracy/score_test.rb
+- test/lazylead/task/accuracy/screenshots_test.rb
 - test/lazylead/task/accuracy/servers_test.rb
 - test/lazylead/task/accuracy/stacktrace_test.rb
 - test/lazylead/task/accuracy/testcase_test.rb
@@ -768,7 +783,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Lazylead v0.8.1!
+  Thanks for installing Lazylead v0.8.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
@@ -813,6 +828,7 @@ test_files:
 - test/lazylead/task/accuracy/onlyll_test.rb
 - test/lazylead/task/accuracy/records_test.rb
 - test/lazylead/task/accuracy/score_test.rb
+- test/lazylead/task/accuracy/screenshots_test.rb
 - test/lazylead/task/accuracy/servers_test.rb
 - test/lazylead/task/accuracy/stacktrace_test.rb
 - test/lazylead/task/accuracy/testcase_test.rb