mac_setup 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9223c0313ddec740c3975abd57e09bb52b3e3bab
-  data.tar.gz: 7b257be1fee8d0c7e72da35ce49102462a6e7881
+  metadata.gz: e97c8ad74f9d53a077daee438677c55e3f679670
+  data.tar.gz: bce55a00df2b902d8ef0fbac7d0365a06dc2de20
 SHA512:
-  metadata.gz: 611da27eed94132d5e9a1af2e7dd62e9c9039656a2203a57345d7fd9bfa80222c7766e7d8d0ba0243e5cf74591469c0993c83ad4e72a37d8b57cbc372fe65cb0
-  data.tar.gz: 09f30dc8cae280977c6b0e3ddf09d352d534bfcbf98b56a91903c420ea38fc15dda67581f30e53b0b4a8331ecf9b58dbd1994c21a531b0d5ca1fbf021d1ef391
+  metadata.gz: 27908ef58581729323760b78083afa07290522f09f1cb18cb854a0db379cc15013a12f15b313bcd6beab23c2aeeeb768a5cfc430b7a8deb611fc767ffc9b46e3
+  data.tar.gz: f186c539d81e369e13752a654ce458fbc514097ec5f9010e53f4106b80f560372a8da6d98c6afb0f244134df99271b81e53492906fa6b57c22098dca36d76bd4

data/lib/mac_setup/symlink_path_builder.rb

@@ -1,13 +1,13 @@
 module MacSetup
   class SymlinkPathBuilder
-    HOME = ENV.fetch("HOME").freeze
+    HOME = (ENV.fetch("HOME") + "/").freeze
 
     class << self
       def paths_for(root_dir)
         root = Pathname.new(root_dir)
 
         each_child(root) do |child|
-          yield [relative_path(child, HOME), relative_path(child, root, "~/.")]
+          yield [child.to_s, rewrite_path(child, root)]
         end
       end
 
@@ -25,8 +25,10 @@ module MacSetup
         end
       end
 
-      def relative_path(path, base, replacement = "~/")
-        path.to_s.sub(%r{^#{Regexp.escape(base.to_s)}\/}, replacement)
+      def rewrite_path(path, base)
+        first_part, rest = path.to_s.split(%r{^#{Regexp.escape(base.to_s)}/([^/]+)}).drop(1)
+        parts = Dir.exist?(HOME + first_part) ? [HOME, first_part, rest] : [HOME, ".", first_part, rest]
+        parts.join
       end
     end
   end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/mac_setup.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop", "~> 0.34.2"
   spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - matthew.wean@gmail.com