hiiro 0.1.129 → 0.1.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9fef3df8af777d1973ef079667864c844647863d4d4e2f4a25936f7ec6e4398
-  data.tar.gz: 93d49ce15ec7ed31e42101d77bc88f8fa6d526d33d370cb5d49d7752186acac8
+  metadata.gz: 9ee15221ef5fd0d6dd334387e083049fc53cec41df755c270451f1329e63804a
+  data.tar.gz: 89df78fc18b86391dced6ec9e7f1dbb597f6f6549a3c627cc5b2898c2dd23b94
 SHA512:
-  metadata.gz: 60896c6b8783fd7b93d4c3a7fe8e82216cc03d6154cce5f4288867661accbae76b596e1833bb8d6141216aa72880a7f1def2dae2d2a69505e2fb5d2688224951
-  data.tar.gz: 530165f760d2e81f6bfa88eac2b9848e067484a02b05ee09876a79db06fe7714721925c2c2bc8f553e9748da8728b94ee5f11f690c75e2cde79e820effc0e3e3
+  metadata.gz: 6e043a980f853c53b429500047fc872092e21488a45ad9bfd1cdf64b4fab56d1513423cfe7af061988c468cb10272935cca9ceadad059d972c03c1ba51c152d0
+  data.tar.gz: 3abc9a1acfd9ff38060b6d8c01accae3efa5cea58113b8f0b1378b1270054b0e95543797400b9c89a5ed941c40679ab51299b447e86ccdf676189f561fb8dae6

data/bin/h-misc

@@ -9,24 +9,19 @@ Hiiro.run {
     end
 
     pwd = Hiiro::Paths.new(Dir.pwd)
-    outside_basedir = opts.args.inject({}) do |basedir,h|
-      real_base = pwd.child(basedir)
-      symlinks = pwd.symlinks_in(real_base)
+    outside_basedir = opts.args.inject({}) do |h,basedir|
+      symlinks = pwd.symlinks_in(basedir)
 
-      mapping = symlinks.each_with_object({}) do |link,h|
-        h[link] = pwd.symlink_dest(link)
-      end
-
-      outside = mapping.select{|link,dest|
-        pwd.outside_dir?(dest, real_base)
-      }
-
-      outside.each do |link,dest|
-        puts
-        puts "LINK: #{link}"
-        puts "DEST: #{dest}"
-        puts "is outside => #{real_base}"
-      end
+      outside_dir = symlinks
+        .reject{|l| l.dest_in_dir?(basedir) }
+        .tap do |outside|
+          outside.each do |link,dest|
+            puts
+            puts "LINK: #{link}"
+            puts "DEST: #{dest}"
+            puts "is outside => #{real_base}"
+          end
+        end
     end
   end
 }

data/lib/hiiro/paths.rb

@@ -1,37 +1,44 @@
 #!/usr/bin/env ruby
 
 require "hiiro"
+require "delegate"
 
 class Hiiro
   class Paths
     attr_reader :base
 
-    def initialize(base)
+    def initialize(base=Dir.pwd)
       @base = Pathname.new base
     end
 
-    def child(path)
-      if File.absolute_path?(path)
-        Pathname.new(path)
-      else
-        base.join path
-      end
+    def from_base(file)
+      path = Pathname.new(file)
+      path.relative_path_from(base)
     end
 
     def symlinks_in(path)
-      subdir = child(path)
+      subdir = Pathname.new(path)
 
-      subdir.find.select(&:symlink?)
+      subdir.find
+        .select(&:symlink?)
+        .map { |link| Symlink.new(link) }
     end
 
-    def symlink_dest(link)
-      link.readlink.expand_path(link.dirname)
-    end
+    class Symlink < SimpleDelegator
+      def path
+        @path ||= Pathname.new(__getobj__)
+      end
 
-    def outside_dir?(file, dir)
-      relative_path = file.relative_path_from(dir)
+      def dest
+        path.readlink
+      end
+
+      def dest_in_dir?(dir)
+        dir = Pathname.new(dir)
 
-      relative_path.descend.first == Pathname.new('..')
+        relpath = dest.relative_path_from(dir)
+        relpath.descend.first.to_s != '..'
+      end
     end
   end
 end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.129"
+  VERSION = "0.1.130"
 end

metadata

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