windirs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183259201b47253e89e37ed652ac9c93f2ea61b6
-  data.tar.gz: 16f92429bd66d44a9502cef35714273f08ae7216
+  metadata.gz: 2875a828eee836d39ddd080820de78e21a32cd95
+  data.tar.gz: 1f28a9a0e7ce8c4082be19e580cb8763dde8bbb4
 SHA512:
-  metadata.gz: 947cc7d0e965c84d86bccde760dc2ec2b989cbafcb455da0eb4e8b5597d2c82d6670784f8df4df74f2483dff383d0a311c65bcfdc14875eef5cdc19a33285438
-  data.tar.gz: 613f487282d70f420fcd8f2fe9ab36c6cd027cd7f7caae96424303a80d7e711e93796945453da0441cdbbce56c40a94fd057ffee2a0e1fe2cc812221a4c9b684
+  metadata.gz: 2f41e4abd2743320c1a43d63a707b96daa6be618b9a5aa534b633e0024ad56a466e707a7a89ea4ae20210523ab42191cf987ad026153890c6c9134711add1a5b
+  data.tar.gz: 2c2a39ef5cfa4e387c76014e9586723f81a6bc899317404456797c64484fbd9078832ef38f82d7386ca59f56e2b86cb7cfc61b8039b6bda721125c9c9d61431e

data/lib/windirs.rb

@@ -114,11 +114,58 @@ module Windirs
       fpath('\\'){       |drive| "#{@drive.upcase}:"}
     end
 
+    ##
+    # Return a new Windirs::Path with any Windows network mapped drives
+    # dereferenced to their UNC.
+    # Returns +self+ if not on Windows, or
+    # +self+ is not on a network mapped drive.
+    
+    def win_deref
+      return self unless ENV['OS'] == 'Windows_NT'
+
+      # FIXME try to get path to net if on Cygwin and can't see net
+      net_use = `net use #{@drive}:`
+      return self unless $?.exitstatus == 0
+      remote_line  = net_use.split("\r\n").select{|l| l =~ /^Remote name\s*/}
+      drive = @drive
+      drive = remote_line[0].sub(/^Remote name\s*/, '')
+      Path.new "#{drive}#{@dirs}"
+    end
+    
+#    #FIXME will need to stub or mock this to test properly?
+#    def cyg_deref
+#       
+##    C:/cygwin/bin on /usr/bin type ntfs (binary,auto)
+#      
+#      return self if ENV['OS'] != 'Windows_NT'
+#
+#      as_nix = self.nix
+#
+#      #FIXME use mount similarly, with similar caveats to net use
+#      mounts = `mount`.split("\n")
+#      mh = Hash.new
+#      mounts.map do |l| 
+#        l =~ /^(?<device>.*)\s+on\s+(?<mountpoint>.*)\s+type\s+.*$/
+#        m = Regexp.last_match
+#        mh[m[:device]] = m[:mountpoint]
+#      end
+#
+#
+#      sorted = mh.sort_by{|k,v| v.length}
+#
+#      sorted.each do |el|
+#        #if el[1] matches as_nix, replace that with el[0]
+#      end
+#
+#
+#    end
+#
+
     private
 
-    def fpath del='/', prefix=''
+    def fpath delim='/', prefix=''
       drive = @drive ? "#{prefix}#{yield(@drive)}" : nil
-      "#{drive}#{@dirs}".gsub(/[\/\\\\]/, del)
+      "#{drive}#{@dirs}".gsub(/[\/\\\\]/, delim)
     end
 
   end

data/spec/windirs_spec.rb

@@ -29,6 +29,7 @@ describe Windirs do
     @upaths = Hash.new
     @uncs.map{|k, v| @upaths[k] = Windirs::Path.new(v)}
 
+    @cygwin_home = Windirs::Path.new('/home')
   end
 
   describe Windirs::Path do
@@ -61,6 +62,16 @@ describe Windirs do
       end
     end
 
+    it 'dereferences cygwin mounts' do
+      pending
+      @cygwin_home.cyg_deref.windows.should eq 'C:/cygwin/home'
+    end
+
+    # FIXME This is not much of a test...
+    it 'dereferences windows network mounts' do
+      @dpaths[:windows].win_deref.windows.should eq @drives[:windows]
+    end
+
   end
 
 end

data/windirs.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'windirs'
-  s.version     = '0.0.1'
-  s.date        = '2014-03-21'
+  s.version     = '0.0.2'
+  s.date        = '2014-03-24'
   s.summary     = "translate between Cygwin, Windows, and Unix file paths"
   s.description = "Handy ways for dealing with directory paths when you are not
                    sure what platform your code will be running on, but you are

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windirs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Noah Birnel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Handy ways for dealing with directory paths when you are not