run_tasks 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa8127bba38224f6ba4c779edae6b71f8f54a00
-  data.tar.gz: f279a93debf06b7085b0d95358e7f9f1fcb34780
+  metadata.gz: a8ca5b6161049b4ab439ac2f9138d50bcea418c8
+  data.tar.gz: '0929497d99ff80c07b4dcc434ca10322321653fb'
 SHA512:
-  metadata.gz: 86273c44aac9a5d1b447f75f5d606dcd0e14ca365455748adcf7b27a522953b0986fbfa68e768c2cd0d3b7f93f8a2d44bc6736bc1fd29933b0d317d4486870c0
-  data.tar.gz: f8638842342a3a39744d2ff6f24b6007138d97c9ce28929fabb47754fd2bd9124619209d370614e5e7d6770f28346b80c4bcc2f69d8e532176f859fbc5c32194
+  metadata.gz: 38b289ecbb3e0a0bb3cd0fa6fc0dc7872a6d9d2331bd9c3584f18a3eeaa220c5a3f9d2649b3ce0b1808c323b674329614e68342ecc5e12d3eb78cb142c883db2
+  data.tar.gz: a2aff1ef595a7e9e3d16417c25314a3bb9a452795f807f13e6dda09e5eb0b9baaa62ce45bdf0136d07787de1b4597ea992052baa6c429f0af302b3c54ca0116e

data/src/run.rb

@@ -33,24 +33,30 @@ HOMEPAGE = GEM&.homepage
 def task(name, help = nil, &block)
   if !name.is_a?(Symbol)
     puts
-    puts "First task parameter must be a symbol".red
+    puts "'name' parameter must be a symbol".red
     exit 6
   end
-  if !help.nil? && !help.is_a?(String)
-    puts
-    puts "Second task parameter must be a string".red
-    exit 6
-  end
-  if help.nil?
+  if !help.nil?
+    if !help.is_a?(String)
+      puts
+      puts "'help' parameter must be a string".red
+      exit 6
+    end
+  else
+    # Load comments directly above the task as help verbatim.
     caller = caller_locations[0]
-    line = File.readlines(caller.absolute_path)[caller.lineno - 2]
-    match = /^\s*#\s*(?<comment>.+?)\s*$/.match(line)
-    help = match[:comment] if !match.nil?
+    lines = File.readlines(caller.absolute_path)
+    help = (0..(caller.lineno - 2)).to_a.reverse.reduce([]) do |comments, lineno|
+      match = /^\s*#\s*(?<comment>.+?)\s*$/.match(lines[lineno])
+      break comments if match.nil?
+      comments << match[:comment]
+      comments
+    end.reverse
   end
   @tasks.store(
     name,
     {
-      :help => help.nil? ? "" : Markdown::Engine.new(help).to_ansi,
+      :help => help.is_a?(String) ? [help] : help,
       :block => block
     }
   )
@@ -149,7 +155,18 @@ if ARGV.size == 0 || (ARGV.size == 1 && ARGV[0] == "help")
   end
   # Display each task and their help.
   @tasks.sort.to_h.each do |name, task|
-    puts " #{name}".yellow + (" " * (max_size - name.size + 4)) + task[:help]
+    if task[:help].size == 0
+      puts " #{name}".yellow
+      next
+    end
+    task[:help].each_with_index do |help, index|
+      help = Markdown::Engine.new(help).to_ansi
+      if index == 0
+        puts " #{name}".yellow + (" " * (max_size - name.size + 4)) + help
+        next
+      end
+      puts (" " * (max_size + 5)) + help
+    end
   end
   exit
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_tasks
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Aurélien Delogu