hiiro 0.1.209 → 0.1.211

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682986f0fe061c64a51e17710cc46a49e7227980af6765715a0db8e896cee7d2
-  data.tar.gz: 2bc5edffca82cb8f46e1cec99c5d0d3fefd49f5a6ec9ab7f46a8c810224acdbf
+  metadata.gz: 93161b29e527a19a17c9e478558ab0d33a925e27ac04851151d4d86fd1f59f49
+  data.tar.gz: 775639bdc0be84af6ea30e8edf33251c5ed769614e51c59c12ab1c681be33ebc
 SHA512:
-  metadata.gz: 8444324b5e67717a8533e1135bb54612b6ae85e0ae4e616692a6c87e715c22a6a92de79534468eb87de0c386b75fe202ad2b4f6df67c25662b7fac3229d207c3
-  data.tar.gz: 584c422ce992a137eea834db02bba83450ee8b90bb32d511057fdc55714c9a56a7edc67d6112318803e3d656cd25405306eb6a2190536fef22f795897036f074
+  metadata.gz: 30c25c505dc5bfcc956a3be84245f3c3a680f6fe326963083a101f41781cb8a4437fa94d5655cb99fe40a9b0a051b9db73c3eeac3bf1fbbe4f42c2011f4dace2
+  data.tar.gz: e09c57d45a81c8c2334ab779d96da3ce024ad01904213895d874889697cc26ec6773d8f1589d43cc192a15a99d9da97d206215e725494af92ce6cbf4398bfb2b

data/lib/hiiro/paths.rb

@@ -25,6 +25,18 @@ class Hiiro
         .map { |link| Symlink.new(link, hiiro) }
     end
 
+    # Returns [full_path, unique_name] — appends -2, -3, etc. if a file
+    # with the same base_name already exists in dir.
+    def self.unique_path(dir, base_name, ext: '.md')
+      name = base_name
+      counter = 1
+      while File.exist?(File.join(dir, "#{name}#{ext}"))
+        counter += 1
+        name = "#{base_name}-#{counter}"
+      end
+      [File.join(dir, "#{name}#{ext}"), name]
+    end
+
     class Symlink < SimpleDelegator
       attr_reader :hiiro
 

data/lib/hiiro/queue.rb

@@ -289,18 +289,6 @@ 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
 
@@ -323,7 +311,7 @@ class Hiiro
         name += '-' + task_info[:task_name] if task_info&.key?(:task_name)
       end
 
-      path, name = unique_dest_path(queue_dirs[:pending], name)
+      path, name = Hiiro::Paths.unique_path(queue_dirs[:pending], name)
       File.write(path, content + "\n")
       { name: name, path: path }
     end
@@ -335,11 +323,18 @@ class Hiiro
         h.add_subcmd(:watch) {
           q.queue_dirs
           current_version = Gem.loaded_specs['hiiro']&.version&.to_s
+          puts current_version:;
           puts "Watching #{File.join(DIR, 'pending')} ..."
           puts "Press Ctrl-C to stop"
+          loops = 0
           loop do
+            loops += 1
             if current_version
               latest = Gem::Specification.find_by_name('hiiro')&.version&.to_s rescue nil
+              if loops % 50 == 0
+                puts current_version:, latest:;
+              end
+
               if latest && latest != current_version
                 puts "New hiiro version detected (#{latest}), restarting..."
                 exec('h', 'queue', 'watch')
@@ -584,7 +579,7 @@ class Hiiro
             next
           end
 
-          dst, dest_name = q.unique_dest_path(q.queue_dirs[:pending], name)
+          dst, dest_name = Hiiro::Paths.unique_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")
@@ -640,7 +635,7 @@ class Hiiro
 
           dirs = q.queue_dirs
           src_dir = dirs[found[:status].to_sym]
-          dst, dest_name = q.unique_dest_path(dirs[:pending], name)
+          dst, dest_name = Hiiro::Paths.unique_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)

data/lib/hiiro/version.rb

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

metadata

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