hiiro 0.1.185 → 0.1.186

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c66d846296a1f1cfe12e3c29ea9f6979fefa936af7ccff85bee6eaa4b86b4a1
-  data.tar.gz: bd1d34ed26b65b8b6f6e30ab7c684fa17aa129ab88134ac661c84a7032be4770
+  metadata.gz: 953d7bc3db7d60c019e39a29356b95371ff6919c1542a4a02f5556176bd6a805
+  data.tar.gz: 1eb725bc5b2a9d3d1de8a8aba3e118eec99e49696e2402f4e437f1b4c491a674
 SHA512:
-  metadata.gz: a9e2553e2171684adf5044d910509f9f20a8349749941ba8dbdd07091e2993d19d88a9ca37fb111c01d2c6addeb37f452ed64b8d072905a8403ec5019fd53eaf
-  data.tar.gz: 66594ae31634f48641cbaba4b4ad5b81f91c647e516d15019ffbed51bc944cc00e52b6217281a8c3dd6decd573f8007c5cf88e5a76a0b147a3aaec6ae91f2cc7
+  metadata.gz: 9a4a3c3bf2238dc75ea1199303c52e63c821ea8c2685ac579ba55f2ad263fd96b54bb8f51751aa73dbb0642e4f2455cb081a28f90fd8ade5890212394072f7d9
+  data.tar.gz: 903c4d38edf20669cfe3645b425c91436333cfd0ea48d436aff419ad6125330855d61259bf2c846e902212cd1437b0a10c0b51a0f91eaea76ba19e8be7d2bd96

data/lib/hiiro/queue.rb

@@ -184,13 +184,35 @@ class Hiiro
       }
     end
 
-    def extract_task_flag(args)
-      idx = args.index('-t')
-      return [args, nil] unless idx
+    def select_task(hiiro)
+      env = Environment.current rescue nil
+      return nil unless env
+
+      tasks = env.all_tasks.sort_by(&:name)
+      return nil if tasks.empty?
+
+      mapping = tasks.each_with_object({}) do |task, h|
+        line = format("%-25s  tree: %-20s", task.name, task.tree_name || '(none)')
+        h[line] = task.name
+      end
+
+      hiiro.fuzzyfind_from_map(mapping)
+    end
+
+    def resolve_task_info(opts, hiiro, default_task_info)
+      task_name = if opts.choose
+        select_task(hiiro)
+      elsif opts.task
+        opts.task
+      else
+        nil
+      end
 
-      task_name = args[idx + 1]
-      remaining = args[0...idx] + args[(idx + 2)..]
-      [remaining, task_name]
+      if task_name
+        task_info_for(task_name)
+      else
+        default_task_info
+      end
     end
 
     def strip_frontmatter(text)
@@ -403,8 +425,12 @@ class Hiiro
 
         h.add_subcmd(:add) { |*args|
           q.queue_dirs
-          args, flag_task = q.extract_task_flag(args)
-          ti = flag_task ? q.task_info_for(flag_task) : task_info
+          opts = Hiiro::Options.parse(args) do
+            option(:task, short: :t, desc: 'Task name')
+            flag(:choose, short: :T, desc: 'Choose task interactively')
+          end
+          args = opts.args
+          ti = q.resolve_task_info(opts, h, task_info)
 
           tmpfile = Tempfile.new(['hq-', '.md'])
           prompt_file = tmpfile.path
@@ -446,8 +472,12 @@ class Hiiro
         h.add_subcmd(:wip) { |*args|
           q.queue_dirs
           editor = ENV['EDITOR'] || 'vim'
-          args, flag_task = q.extract_task_flag(args)
-          ti = flag_task ? q.task_info_for(flag_task) : task_info
+          opts = Hiiro::Options.parse(args) do
+            option(:task, short: :t, desc: 'Task name')
+            flag(:choose, short: :T, desc: 'Choose task interactively')
+          end
+          args = opts.args
+          ti = q.resolve_task_info(opts, h, task_info)
           name = args.first
 
           if name.nil?

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.185"
+  VERSION = "0.1.186"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.185
+  version: 0.1.186
 platform: ruby
 authors:
 - Joshua Toyota