hiiro 0.1.169 → 0.1.170

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a90de4bbf5f17d90890078b14a3b5ce6eccd4aed9a7c4a7c7b5fc3b7da4f97
-  data.tar.gz: 43f9ef18fd88cfdc7a1535dad5c88c6df56c264ff2fcd659d79e0180730e52b7
+  metadata.gz: 72a0ad30e0ada0bea531d4a2d9f0724b1e82f2f3f785c44dda3fbad2d28abb61
+  data.tar.gz: 3f2e11e363408038c0910b1f66d5d7240c15510c85d04599fc973a2c4a9ae203
 SHA512:
-  metadata.gz: c69d5f1c2a0eacad95e7e8aefd985c31bcbf8ddc3ab29357806706d5da52dc207eeab9010535d1d8aa9191b485d6dc96a7bc81ac4af416e76d50150e5e9fd441
-  data.tar.gz: 0fb174d064742171d5592a79c554582856989b6bbfcba5631ddcf7f8526a8789bd26a1a5b1bffab01d53804cb082319935583a475b43661fc155c06bad60ed17
+  metadata.gz: d7da2d57be1be7c956e9221ed3f16e96cad9e6793eba5f7f2aadaffb097c2678c13f02f3346de33ac287daaff8436733328d4babe55fb566fda76133a961c28f
+  data.tar.gz: c5f99d312ed8baed31c2540182389b0cd59ff33cd0da0534473aa0e3d22a5ac6b3d06170f85f8523705e97fa0abdc6a5f9b4cbf144a719c771e49f83d69cfa3b

data/bin/h-misc

@@ -6,11 +6,10 @@ require 'awesome_print'
 Hiiro.run {
   add_subcmd(:symlink_destinations) do |*args|
     opts = Hiiro::Options.parse(args) do
-      option(:root, short: :r, desc: 'root path')
+      option(:root, short: :r, default: `git rev-parse --show-toplevel 2>/dev/null`.strip, desc: 'root path')
     end
 
-    repo_root = Pathname.new(opts.root || git.root)
-    pwd = Hiiro::Paths.new(Dir.pwd)
+    pwd = Hiiro::Paths.new(Dir.pwd, hiiro: this)
     outside = Hash.new { |h,k| h[k] = [] }
 
     opts.args.each_with_object(outside) do |basedir,h|
@@ -21,10 +20,9 @@ Hiiro.run {
 
     outside.each do |base, links|
       puts "# symlinks outside of => #{base}"
-      dest_width = links.map{|l| l.dest_relative_to(repo_root).to_s.length }.max
+      dest_width = links.map{|l| l.dest_from_root.to_s.length }.max
       links.each do |link|
-        rel_dest = link.dest_relative_to(repo_root)
-        printf("%-*s   # => %s\n", dest_width, rel_dest, link.path)
+        printf("%-*s   # => %s\n", dest_width, link.dest_from_root, link.path)
       end
     end
   end

data/lib/hiiro/git.rb

@@ -9,7 +9,7 @@ class Hiiro
   class Git
     attr_reader :hiiro, :pwd
 
-    def initialize(hiiro, pwd)
+    def initialize(hiiro, pwd=Dir.pwd)
       @hiiro = hiiro
       @pwd = pwd
     end

data/lib/hiiro/paths.rb

@@ -5,10 +5,11 @@ require "delegate"
 
 class Hiiro
   class Paths
-    attr_reader :base
+    attr_reader :base, :hiiro
 
-    def initialize(base=Dir.pwd)
+    def initialize(base=Dir.pwd, hiiro: nil)
       @base = Pathname.new base
+      @hiiro = hiiro
     end
 
     def from_base(file)
@@ -17,14 +18,21 @@ class Hiiro
     end
 
     def symlinks_in(path)
-      subdir = Pathname.new(path)
+      subdir = Pathname.new(path).expand_path
 
       subdir.find
         .select(&:symlink?)
-        .map { |link| Symlink.new(link) }
+        .map { |link| Symlink.new(link, hiiro) }
     end
 
     class Symlink < SimpleDelegator
+      attr_reader :hiiro
+
+      def initialize(path, hiiro=nil)
+        @hiiro = hiiro
+        super(path)
+      end
+
       def path
         @path ||= Pathname.new(__getobj__)
       end
@@ -33,9 +41,24 @@ class Hiiro
         path.readlink
       end
 
-      def dest_relative_to(root)
-        abs = (path.dirname + dest).cleanpath
-        abs.relative_path_from(Pathname.new(root))
+      def root
+        @root ||= hiiro&.git&.root || `git rev-parse --show-toplevel 2>/dev/null`.chomp
+      end
+
+      def root_path
+        Pathname.new root
+      end
+
+      def abs_dest
+        (path.dirname + dest).cleanpath
+      end
+
+      def dest_from_root
+        abs_dest.relative_path_from(root_path)
+      end
+
+      def dest_relative_to(base_dir)
+        abs_dest.relative_path_from(Pathname.new(base_dir))
       end
 
       def dest_dir

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.169"
+  VERSION = "0.1.170"
 end

metadata

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