hiiro 0.1.208 → 0.1.209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481e1331821875953629a6cac3c704b9867047f8d33cbc0d84c21037ec34ddc0
-  data.tar.gz: 9bb8ef3c6c1e1614a9c144e3ff299f824e0c3dc9804ca3c24b616dad35877f76
+  metadata.gz: 682986f0fe061c64a51e17710cc46a49e7227980af6765715a0db8e896cee7d2
+  data.tar.gz: 2bc5edffca82cb8f46e1cec99c5d0d3fefd49f5a6ec9ab7f46a8c810224acdbf
 SHA512:
-  metadata.gz: dc6339585ffc0a60610e279b0745dc3a9c74b5bb19df18025c20c92c2e1061aee36b9deac84fb4dba69b718b8eab0f9d036419baed3221d3fa45b4634315ee2d
-  data.tar.gz: '09ded021e3375c1a0414d75ca181d8f8310539f536dae6ab844941c4f0418bed522dff163768a10afa6c0e957ddfac55252d6f355f0e2e928a3487a2bf65b547'
+  metadata.gz: 8444324b5e67717a8533e1135bb54612b6ae85e0ae4e616692a6c87e715c22a6a92de79534468eb87de0c386b75fe202ad2b4f6df67c25662b7fac3229d207c3
+  data.tar.gz: 584c422ce992a137eea834db02bba83450ee8b90bb32d511057fdc55714c9a56a7edc67d6112318803e3d656cd25405306eb6a2190536fef22f795897036f074

data/lib/hiiro/config.rb

@@ -1,12 +1,17 @@
 class Hiiro
   class Config
     BASE_DIR = File.join(Dir.home, '.config/hiiro')
+    DATA_DIR = File.join(Dir.home, '.local/share/hiiro')
 
     class << self
       def path(relpath='')
         File.join(BASE_DIR, relpath)
       end
 
+      def data_path(relpath='')
+        File.join(DATA_DIR, relpath)
+      end
+
       def plugin_files
         user_files = Dir.glob(File.join(plugin_dir, '*.rb'))
         user_basenames = user_files.map { |f| File.basename(f) }

data/lib/hiiro/queue.rb

@@ -7,7 +7,7 @@ require 'tempfile'
 
 class Hiiro
   class Queue
-    DIR = File.join(Dir.home, '.config/hiiro/queue')
+    DIR = Hiiro::Config.data_path('queue')
     TMUX_SESSION = 'hq'
     STATUSES = %w[wip pending running done failed].freeze
 
@@ -289,6 +289,18 @@ class Hiiro
       text.downcase.gsub(/[^a-z0-9]+/, '-').gsub(/^-|-$/, '')[0, 60]
     end
 
+    # Returns [dest_path, unique_name] — appends -2, -3, etc. if a file
+    # with the same base_name already exists in dest_dir.
+    def unique_dest_path(dest_dir, base_name)
+      name = base_name
+      counter = 1
+      while File.exist?(File.join(dest_dir, "#{name}.md"))
+        counter += 1
+        name = "#{base_name}-#{counter}"
+      end
+      [File.join(dest_dir, "#{name}.md"), name]
+    end
+
     def add_with_frontmatter(content, task_info: nil)
       queue_dirs # ensure dirs exist
 
@@ -311,14 +323,7 @@ class Hiiro
         name += '-' + task_info[:task_name] if task_info&.key?(:task_name)
       end
 
-      base_name = name
-      counter = 1
-      while File.exist?(File.join(DIR, 'pending', "#{name}.md"))
-        counter += 1
-        name = "#{base_name}-#{counter}"
-      end
-
-      path = File.join(DIR, 'pending', "#{name}.md")
+      path, name = unique_dest_path(queue_dirs[:pending], name)
       File.write(path, content + "\n")
       { name: name, path: path }
     end
@@ -329,9 +334,17 @@ class Hiiro
       parent_hiiro.make_child do |h|
         h.add_subcmd(:watch) {
           q.queue_dirs
+          current_version = Gem.loaded_specs['hiiro']&.version&.to_s
           puts "Watching #{File.join(DIR, 'pending')} ..."
           puts "Press Ctrl-C to stop"
           loop do
+            if current_version
+              latest = Gem::Specification.find_by_name('hiiro')&.version&.to_s rescue nil
+              if latest && latest != current_version
+                puts "New hiiro version detected (#{latest}), restarting..."
+                exec('h', 'queue', 'watch')
+              end
+            end
             q.tasks_in(:pending).each { |name| q.launch_task(name) }
             sleep 2
           end
@@ -571,9 +584,13 @@ class Hiiro
             next
           end
 
-          dst = File.join(q.queue_dirs[:pending], "#{name}.md")
+          dst, dest_name = q.unique_dest_path(q.queue_dirs[:pending], name)
+          if dest_name != name
+            FileUtils.mv(src, File.join(q.queue_dirs[:wip], "#{dest_name}.md"))
+            src = File.join(q.queue_dirs[:wip], "#{dest_name}.md")
+          end
           FileUtils.mv(src, dst)
-          puts "Moved to pending: #{name}"
+          puts "Moved to pending: #{dest_name}"
         }
 
         h.add_subcmd(:kill) { |name = nil|
@@ -623,10 +640,11 @@ class Hiiro
 
           dirs = q.queue_dirs
           src_dir = dirs[found[:status].to_sym]
-          FileUtils.mv(File.join(src_dir, "#{name}.md"), File.join(dirs[:pending], "#{name}.md"))
+          dst, dest_name = q.unique_dest_path(dirs[:pending], name)
+          FileUtils.mv(File.join(src_dir, "#{name}.md"), dst)
           meta_path = File.join(src_dir, "#{name}.meta")
           FileUtils.rm_f(meta_path) if File.exist?(meta_path)
-          puts "Moved to pending: #{name}"
+          puts "Moved to pending: #{dest_name}"
         }
 
         h.add_subcmd(:clean) {
@@ -645,6 +663,31 @@ class Hiiro
           q.queue_dirs
           puts DIR
         }
+
+        h.add_subcmd(:migrate) {
+          old_dir = File.join(Dir.home, '.config/hiiro/queue')
+          new_dir = DIR
+
+          unless Dir.exist?(old_dir)
+            puts "Nothing to migrate: #{old_dir} does not exist"
+            next
+          end
+
+          if old_dir == new_dir
+            puts "Source and destination are the same: #{old_dir}"
+            next
+          end
+
+          if Dir.exist?(new_dir) && Dir.glob(File.join(new_dir, '**', '*')).any?
+            puts "Destination already has files: #{new_dir}"
+            puts "Remove it manually if you want to migrate from #{old_dir}"
+            next
+          end
+
+          FileUtils.mkdir_p(File.dirname(new_dir))
+          FileUtils.mv(old_dir, new_dir)
+          puts "Migrated: #{old_dir} -> #{new_dir}"
+        }
       end
     end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.208"
+  VERSION = "0.1.209"
 end

metadata

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