hiiro 0.1.201 → 0.1.202

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0161eeaf4f0cbe1052c13d9373ab9ed268394d1895f498fd5b964ba363b017d9
-  data.tar.gz: 559024c602f5667a1ae23b3d9d917295fe676194c17e24489d3047f16cb1b50d
+  metadata.gz: cb51c411e28d0ce3d0b7d9374b8de629de59442a34baa0428b1eec6198f3a661
+  data.tar.gz: 815b50958a7f9d12fa80523ff234a548ace880e722d6c34f5e5461877e2a0e11
 SHA512:
-  metadata.gz: 85941f5cf69ef053cc6ae8a08ef2b1036313ee8b60413243009cbd85311c2fcb8823b52c11780dd7b4fdf2785027440a86373146673dbb76e9ab2b3de819d773
-  data.tar.gz: 8cba796136692b6cd26cc372a42d429d422a7a141414939cc383212f4fa9a491b1a94a05cb0383fc2db27d503c4d63ad00be87bd49c63e08b52b5e4458acc3a6
+  metadata.gz: 995d28e52ef80c890d3356112236b53eb4a0ee2a0cf7a09a560573fa45c1c8ba970d75d4405309c00542a4412b7eaf3b5d21d4c8603781ee87acd478c8b5e935
+  data.tar.gz: 5c41177b7ccb01d40f4cd56e7a7b2319be8993f89e54fe0d11e10a707e671c1ecb76f4e60844d39d1d5786152f882d5ac0cfc29615397e778b78cedd8f78825c

data/lib/hiiro/queue.rb

@@ -40,6 +40,50 @@ class Hiiro
       Dir.glob(File.join(dir, '*.md')).sort.map { |f| File.basename(f, '.md') }
     end
 
+    def tasks_in_sorted(status)
+      dir = queue_dirs[status]
+      Dir.glob(File.join(dir, '*.md')).map { |f|
+        { name: File.basename(f, '.md'), mtime: File.mtime(f) }
+      }.sort_by { |t| -t[:mtime].to_i }
+    end
+
+    def format_mtime(mtime)
+      now = Time.now
+      mtime.year == now.year ? mtime.strftime("%m-%d %H:%M") : mtime.strftime("%Y-%m-%d %H:%M")
+    end
+
+    def list_lines(all: false)
+      lines = []
+      STATUSES.each do |status|
+        tasks = tasks_in_sorted(status.to_sym)
+        next if tasks.empty?
+
+        display = all ? tasks : tasks.first(10)
+        display.each do |t|
+          ts = format_mtime(t[:mtime])
+          line = "%-10s %-12s %s" % [status, ts, t[:name]]
+          meta = meta_for(t[:name], status.to_sym)
+          if meta && status == 'running'
+            started = meta['started_at']
+            if started
+              elapsed = Time.now - Time.parse(started)
+              mins = (elapsed / 60).to_i
+              line += "  (#{mins}m)"
+            end
+            line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+          end
+          preview = task_preview(t[:name], status.to_sym)
+          line += "  #{preview}" if preview
+          lines << line
+        end
+
+        if !all && tasks.size > 10
+          lines << "  ... and #{tasks.size - 10} more"
+        end
+      end
+      lines
+    end
+
     def all_tasks
       STATUSES.flat_map do |status|
         tasks_in(status.to_sym).map { |name| { name: name, status: status } }
@@ -315,54 +359,30 @@ class Hiiro
           end
         }
 
-        h.add_subcmd(:ls) {
-          tasks = q.all_tasks
-          if tasks.empty?
-            puts "No tasks"
-            next
-          end
-          tasks.each do |t|
-            line = "%-10s %s" % [t[:status], t[:name]]
-            meta = q.meta_for(t[:name], t[:status].to_sym)
-            if meta && t[:status] == 'running'
-              started = meta['started_at']
-              if started
-                elapsed = Time.now - Time.parse(started)
-                mins = (elapsed / 60).to_i
-                line += "  (#{mins}m)"
-              end
-              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
-            end
-            preview = q.task_preview(t[:name], t[:status].to_sym)
-            line += "  #{preview}" if preview
-            puts line
+        list_cmd = proc { |*args|
+          opts = Hiiro::Options.parse(args) do
+            flag(:all, short: :a, desc: 'Show all tasks without limit; use pager if output exceeds terminal height')
           end
-        }
-
-        h.add_subcmd(:list) {
-          tasks = q.all_tasks
-          if tasks.empty?
+          lines = q.list_lines(all: opts.all)
+          if lines.empty?
             puts "No tasks"
             next
           end
-          tasks.each do |t|
-            line = "%-10s %s" % [t[:status], t[:name]]
-            meta = q.meta_for(t[:name], t[:status].to_sym)
-            if meta && t[:status] == 'running'
-              started = meta['started_at']
-              if started
-                elapsed = Time.now - Time.parse(started)
-                mins = (elapsed / 60).to_i
-                line += "  (#{mins}m)"
-              end
-              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+          if opts.all
+            terminal_lines = ENV['LINES']&.to_i || 24
+            if lines.size > terminal_lines
+              IO.popen(ENV['PAGER'] || 'less', 'w') { |io| io.puts lines }
+            else
+              puts lines
             end
-            preview = q.task_preview(t[:name], t[:status].to_sym)
-            line += "  #{preview}" if preview
-            puts line
+          else
+            puts lines
           end
         }
 
+        h.add_subcmd(:ls, &list_cmd)
+        h.add_subcmd(:list, &list_cmd)
+
         h.add_subcmd(:status) {
           tasks = q.all_tasks
           if tasks.empty?

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.201"
+  VERSION = "0.1.202"
 end

metadata

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