lazylead 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50916d6916b46d8ea4c92fc6c4a02b75d6f9e35bbaad260057dd61bb0e25b650
-  data.tar.gz: d536e0d99c760a853d3a24f47d2b1a8fbece654790af65ec02fe7c3bf69af085
+  metadata.gz: 847a338ce12f9cd01529f1e6a66d810e68cde504e2a0873ecb41b869adcda7cc
+  data.tar.gz: 8ca65bb46faced2b89f07f1b65002b2890ecf2c78d4d53e74d017a712133d0f4
 SHA512:
-  metadata.gz: da6131b9e02115b3b61c70c3a38665f563f4ff7d37f20b0939073f11c05549c061403e9fa1711897b26917b88f324e89dd42c64128a27b72b6ebbf0b134e1d20
-  data.tar.gz: bcc6287781baced0f0c0e0d4506fc1fa18439c98ff66a9254704620b537e9eb448daabdef646aa145ddf2d744c2f07f805ef717612bba0e4b86901be8ef33a85
+  metadata.gz: f527721696b9f7215efc7628ea39c6cbf18c3145908d715ef5e698de57fcb5b6b28af8d0fe167b54b5418c9f15915071d0ff7ff2c7df3315f107f0d49c4c95d9
+  data.tar.gz: 1a71de8819ce9aa81fd0e11c4d0248e8b44d846d17f71adb0be18c6a74c9fe58d2ad257fd639f263c29546898cea0725dd6850dbdb417de6e03f541009fbebe0

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.0"
+  s.version = "0.6.1"
   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.0!
+  s.post_install_message = "Thanks for installing Lazylead v0.6.1!
   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
@@ -70,8 +70,8 @@ tasks instead of solving technical problems."
   s.add_runtime_dependency "rufus-scheduler", "3.6.0"
   s.add_runtime_dependency "slop", "4.4"
   s.add_runtime_dependency "sqlite3", "1.4.2"
+  s.add_runtime_dependency "tempfile", "0.1.0"
   s.add_runtime_dependency "tilt", "2.0.10"
-  s.add_runtime_dependency "tmpdir", "0.1.0"
   s.add_runtime_dependency "tzinfo", "1.1"
   s.add_runtime_dependency "tzinfo-data", "1.2019.3"
   s.add_runtime_dependency "vcs4sql", "0.1.0"

data/lib/lazylead/cli/app.rb

@@ -81,7 +81,12 @@ module Lazylead
           @log.warn "ll-001: No tasks found."
         else
           todo.find_each do |task|
-            @schedule.register task
+            if task.to_h?
+              @schedule.register task
+            else
+              @log.warn "ll-011: Scheduling skipped due to configuration " \
+                        "mistake in #{task}"
+            end
           end
           @schedule.join
         end

data/lib/lazylead/model.rb

@@ -80,6 +80,13 @@ module Lazylead
       JSON.parse(properties).to_h
     end
 
+    def to_h?
+      return true unless to_hash.nil?
+      false
+    rescue StandardError => _e
+      false
+    end
+
     def to_s
       attributes.map { |k, v| "#{k}='#{v}'" }.join(", ")
     end

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

@@ -38,10 +38,10 @@ module Lazylead
       return false if issue.description.nil?
       @tc = @ar = @er = -1
       issue.description.split("\n").reject(&:blank?).each_with_index do |l, i|
-        line = escape(l.downcase.gsub(/\s+/, ""))
-        detect_tc(line, i)
-        detect_ar(line, i)
-        detect_er(line, i)
+        line = escape l.downcase.gsub(/(\s+|\*)/, "")
+        detect_tc line, i
+        detect_ar line, i
+        detect_er line, i
         break if with_tc_ar_er?
       end
       with_tc_ar_er?
@@ -65,19 +65,20 @@ module Lazylead
     # Detect index of line with test case
     def detect_tc(line, index)
       return unless @tc.negative?
-      @tc = index if eql?(line, %w[testcase: tc: teststeps: teststeps steps:])
+      @tc = index if eql? line,
+                          %w[testcase: tc: teststeps: teststeps steps: tcsteps:]
     end
 
     # Detect index of line with actual result
     def detect_ar(line, index)
       return unless @ar.negative? && index > @tc
-      @ar = index if starts?(line, %w[ar: actualresult: ar= *ar*= *ar*:])
+      @ar = index if starts? line, %w[ar: actualresult: ar= [ar]]
     end
 
     # Detect index of line with expected result
     def detect_er(line, index)
       return unless @er.negative? && index > @tc
-      @er = index if starts?(line, %w[er: expectedresult: er= *er*= *er*:])
+      @er = index if starts? line, %w[er: expectedresult: er= [er]]
     end
 
     def starts?(line, text)

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

@@ -22,8 +22,9 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 # OR OTHER DEALINGS IN THE SOFTWARE.
 
-require "tmpdir"
+require "tempfile"
 require "nokogiri"
+require "backtrace"
 require "active_support/core_ext/hash/conversions"
 require_relative "../../salt"
 require_relative "../../opts"
@@ -58,18 +59,26 @@ module Lazylead
           Dir.mktmpdir do |dir|
             name = "svn-log-#{Date.today.strftime('%d-%b-%Y')}.html"
             f = File.open(File.join(dir, name), "w")
-            f.write(
-              Email.new(
-                opts["template-attachment"],
-                opts.merge(stdout: stdout, version: Lazylead::VERSION)
-              ).render
-            )
-            postman.send opts.merge(stdout: stdout, attachments: [f.path])
+            begin
+              f.write make_attachment(stdout, opts)
+              f.close
+              postman.send opts.merge(stdout: stdout, attachments: [f.path])
+            ensure
+              File.delete(f)
+            end
           rescue StandardError => e
-            @log.error "ll-010: Can't send an email for #{opts} based on "\
-                     "'#{stdout}'", e
+            @log.error "ll-010: Can't send an email for #{opts} due to " \
+                       "#{Backtrace.new(e)}' based on #{stdout}'"
           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/version.rb

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

data/lib/messages/svn_diff.erb

@@ -77,7 +77,7 @@
     .commit * {
       padding-left: 4px;
       font-size: 8px;
-      line-height: 15px;
+      line-height: 12px;
     }
   </style>
   <title>SVN log</title>
@@ -89,17 +89,17 @@
 <% 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;">
+      <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>
-        </p>
-      <% end %>
-      <% if index == 1 %>
-        <p style="background: gainsboro;"><%= line %></p>
-      <% end %>
+        <% end %>
+        <% if index == 1 %>
+          <span style="padding-left: 4px"><%= line %></span>
+        <% end %>
+      </p>
     <% end %>
   </div>
 <% end %>

data/lib/messages/svn_diff_attachment.erb

@@ -108,7 +108,7 @@
       <% end %>
     <% end %>
   </div>
-  <br/><br/><br/>
+  <br/>
 <% end %>
 <p>Posted by
   <a href="https://github.com/dgroup/lazylead">lazylead v<%= version %></a>.

data/test/lazylead/model_test.rb

@@ -72,5 +72,15 @@ module Lazylead
       )
       assert_equal "value", ORM::Task.find(171).props["envkey"]
     end
+
+    test "task properties are parsed despite on wrong config" do
+      CLI::App.new(Log.new, NoSchedule.new).run(
+        home: ".",
+        sqlite: "test/resources/#{no_ext(__FILE__)}.#{__method__}.db",
+        vcs4sql: "upgrades/sqlite",
+        testdata: true
+      )
+      refute ORM::Task.find(260).to_h?
+    end
   end
 end

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

@@ -217,6 +217,35 @@ module Lazylead
                         *{color:#DE10AA}AR{color}* = YYYY"
     end
 
+    test "tc with ar er in brackets" do
+      assert testcase? "*TC Steps:*
+                         # Step 1
+                         # Step ..
+                         # Step N
+                        *[ER]* = XXXX
+                        *[AR]* = YYYY"
+    end
+
+    test "tc with ar er in noformat" do
+      assert testcase? "*TC Steps:*
+                         # Step 1
+                         # Step ..
+                         # Step N
+                        {noformat}
+                        *[ER]* = XXXX
+                        *[AR]* = YYYY
+                        {noformat}"
+    end
+
+    test "tc with colored ar er in brackets" do
+      assert testcase? "*TC Steps:*
+                         # Step 1
+                         # Step ..
+                         # Step N
+                        *{color:#00673A}[ER]{color}* = XXXX
+                        *{color:#DE10AA}[AR]{color}* = YYYY"
+    end
+
     # ensure that issue description has a test case, AR and ER
     def testcase?(desc)
       Testcase.new.passed(OpenStruct.new(description: desc))

data/upgrades/sqlite/999.testdata.sql

@@ -37,4 +37,5 @@ values ('echo', 'cron:* * * * *', 'false', 1, 1, 1, 'Lazylead::Task::Echo', '{}'
        ('task with complex cc', '', 'false', 165, 1, 1, 'Lazylead::Task::Echo','{"cc":{"type":"Lazylead::PredefinedCC","opts": {"jvm":"tom@fake.com","jdbc":"mike@fake.com"}}}'),
        ('issue 171', '', 'false', 171, 1, 1, 'Lazylead::Task::Echo', '{"envkey":"${key171}"}'),
        ('issue 195', '', 'false', 195, 1, 1, 'Lazylead::Task::Accuracy', '{"key":"value"}'),
-       ('issue 130', 'in:0.001s', 'true', 130, 1, 1, 'Lazylead::Task::EchoIO', '{}');
+       ('issue 130', 'in:0.001s', 'true', 130, 1, 1, 'Lazylead::Task::EchoIO', '{}'),
+       ('issue 260', 'cron:* * * * *', 'false', 260, 1, 1, 'Lazylead::Task::EchoIO', '{abc}');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazylead
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yurii Dubinka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -221,33 +221,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: tempfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: tmpdir
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -698,7 +698,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Lazylead v0.6.0!
+  Thanks for installing Lazylead v0.6.1!
     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