dirtravel 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,5 +1,7 @@
 = Version history
 
+[0.0.4] Fix for relative path conversion in Travel.filetree.
+
 [0.0.3] Entry#tip, Entry#relative?, Entry#rename methods added. New
         option for Travel.filetree, :inclusive. It uses one-up
         directory as root.

data/doc/DirTravel/DirEntry.html

@@ -242,6 +242,8 @@
       <pre class="lines">
 
 
+165
+166
 167
 168
 169
@@ -249,12 +251,10 @@
 171
 172
 173
-174
-175
-176</pre>
+174</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 167</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 165</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='id identifier rubyid_root'>root</span> <span class='op'>=</span> <span class='kw'>false</span> <span class='rparen'>)</span>
     <span class='kw'>super</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span> <span class='rparen'>)</span>
@@ -277,7 +277,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/DirTravel/DirTravelError.html

@@ -114,7 +114,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/DirTravel/Entry.html

@@ -592,9 +592,7 @@
 93
 94
 95
-96
-97
-98</pre>
+96</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 90</span>
@@ -602,8 +600,6 @@
 <span class='kw'>def</span> <span class='id identifier rubyid_abspath'>abspath</span>
     <span class='kw'>if</span> <span class='ivar'>@abspath</span>
         <span class='ivar'>@abspath</span>
-    <span class='kw'>elsif</span> <span class='kw'>self</span> <span class='op'>==</span> <span class='id identifier rubyid_root'>root</span>
-        <span class='const'>Dir</span><span class='period'>.</span><span class='id identifier rubyid_pwd'>pwd</span>
     <span class='kw'>else</span>
         <span class='id identifier rubyid_root'>root</span><span class='period'>.</span><span class='id identifier rubyid_abspath'>abspath</span> <span class='op'>+</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>/</span><span class='tstring_end'>'</span></span> <span class='op'>+</span> <span class='id identifier rubyid_subpath'>subpath</span>
     <span class='kw'>end</span>
@@ -679,12 +675,12 @@
       <pre class="lines">
 
 
-111
-112
-113</pre>
+109
+110
+111</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 111</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 109</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_dir'>dir</span><span class='lparen'>(</span> <span class='id identifier rubyid_basedir'>basedir</span> <span class='op'>=</span> <span class='kw'>self</span> <span class='rparen'>)</span>
     <span class='id identifier rubyid_parts'>parts</span><span class='lparen'>(</span> <span class='id identifier rubyid_basedir'>basedir</span><span class='period'>.</span><span class='id identifier rubyid_parent'>parent</span> <span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_join'>join</span><span class='lparen'>(</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>/</span><span class='tstring_end'>'</span></span> <span class='rparen'>)</span>
@@ -720,12 +716,12 @@
       <pre class="lines">
 
 
-127
-128
-129</pre>
+125
+126
+127</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 127</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 125</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_files'>files</span>
     <span class='id identifier rubyid_select'>select</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_i'>i</span><span class='op'>|</span> <span class='id identifier rubyid_i'>i</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>FileEntry</span> <span class='rparen'>)</span> <span class='kw'>end</span>
@@ -910,12 +906,12 @@
       <pre class="lines">
 
 
-138
-139
-140</pre>
+136
+137
+138</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 138</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 136</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_relative?'>relative?</span>
     <span class='ivar'>@name</span><span class='lbracket'>[</span><span class='int'>0</span><span class='rbracket'>]</span> <span class='op'>!=</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>/</span><span class='tstring_end'>'</span></span>
@@ -971,6 +967,8 @@
       <pre class="lines">
 
 
+144
+145
 146
 147
 148
@@ -978,12 +976,10 @@
 150
 151
 152
-153
-154
-155</pre>
+153</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 146</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 144</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_rename'>rename</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span> <span class='rparen'>)</span>
     <span class='ivar'>@name</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span>
@@ -1064,12 +1060,12 @@
       <pre class="lines">
 
 
-121
-122
-123</pre>
+119
+120
+121</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 121</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 119</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_select_level'>select_level</span><span class='lparen'>(</span> <span class='id identifier rubyid_level'>level</span> <span class='rparen'>)</span>
     <span class='id identifier rubyid_select'>select</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_i'>i</span><span class='op'>|</span> <span class='id identifier rubyid_i'>i</span><span class='period'>.</span><span class='id identifier rubyid_node_depth'>node_depth</span> <span class='op'>==</span> <span class='id identifier rubyid_level'>level</span><span class='semicolon'>;</span> <span class='kw'>end</span>
@@ -1105,12 +1101,12 @@
       <pre class="lines">
 
 
-133
-134
-135</pre>
+131
+132
+133</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 133</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 131</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_stat'>stat</span>
     <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_stat'>stat</span><span class='lparen'>(</span> <span class='id identifier rubyid_path'>path</span> <span class='rparen'>)</span>
@@ -1217,12 +1213,12 @@
       <pre class="lines">
 
 
-102
-103
-104</pre>
+100
+101
+102</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 102</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 100</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_tip'>tip</span>
     <span class='ivar'>@name</span><span class='period'>.</span><span class='id identifier rubyid_split'>split</span><span class='lparen'>(</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>/</span><span class='tstring_end'>&quot;</span></span> <span class='rparen'>)</span><span class='lbracket'>[</span><span class='op'>-</span><span class='int'>1</span><span class='rbracket'>]</span>
@@ -1237,7 +1233,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/DirTravel/FileEntry.html

@@ -267,14 +267,14 @@
       <pre class="lines">
 
 
+183
+184
 185
 186
-187
-188
-189</pre>
+187</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 185</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 183</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span> <span class='rparen'>)</span>
     <span class='kw'>super</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span> <span class='rparen'>)</span>
@@ -319,12 +319,12 @@
       <pre class="lines">
 
 
-183
-184
-185</pre>
+181
+182
+183</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 183</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 181</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_basename'>basename</span>
   <span class='ivar'>@basename</span>
@@ -362,12 +362,12 @@
       <pre class="lines">
 
 
-183
-184
-185</pre>
+181
+182
+183</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 183</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 181</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_suffix'>suffix</span>
   <span class='ivar'>@suffix</span>
@@ -383,7 +383,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/DirTravel/Travel.html

@@ -346,6 +346,8 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
+244
+245
 246
 247
 248
@@ -358,12 +360,10 @@ with suffix and modify tree building with options Hash (see below).</p>
 255
 256
 257
-258
-259
-260</pre>
+258</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 246</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 244</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span> <span class='id identifier rubyid_basedir'>basedir</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>.</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span> <span class='rparen'>)</span>
     <span class='ivar'>@basedir</span> <span class='op'>=</span> <span class='id identifier rubyid_basedir'>basedir</span>
@@ -418,12 +418,12 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
-220
-221
-222</pre>
+218
+219
+220</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 220</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 218</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_basedir'>basedir</span>
   <span class='ivar'>@basedir</span>
@@ -461,12 +461,12 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
-217
-218
-219</pre>
+215
+216
+217</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 217</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 215</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_defaults'>defaults</span>
   <span class='ivar'>@defaults</span>
@@ -504,12 +504,12 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
-214
-215
-216</pre>
+212
+213
+214</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 214</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 212</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_root'>root</span>
   <span class='ivar'>@root</span>
@@ -610,6 +610,8 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
+224
+225
 226
 227
 228
@@ -625,12 +627,10 @@ with suffix and modify tree building with options Hash (see below).</p>
 238
 239
 240
-241
-242
-243</pre>
+241</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 226</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 224</span>
 
 <span class='kw'>def</span> <span class='const'>Travel</span><span class='period'>.</span><span class='id identifier rubyid_filetree'>filetree</span><span class='lparen'>(</span> <span class='id identifier rubyid_basedir'>basedir</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>.</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span> <span class='rparen'>)</span>
 
@@ -687,12 +687,12 @@ with suffix and modify tree building with options Hash (see below).</p>
       <pre class="lines">
 
 
-265
-266
-267</pre>
+263
+264
+265</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 265</span>
+      <pre class="code"><span class="info file"># File 'lib/dirtravel.rb', line 263</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_travel'>travel</span><span class='lparen'>(</span> <span class='id identifier rubyid_suffix'>suffix</span> <span class='op'>=</span> <span class='ivar'>@defaults</span><span class='lbracket'>[</span> <span class='symbol'>:suffix</span> <span class='rbracket'>]</span> <span class='rparen'>)</span>
     <span class='id identifier rubyid_entriesIn'>entriesIn</span><span class='lparen'>(</span> <span class='ivar'>@basedir</span><span class='comma'>,</span> <span class='ivar'>@root</span><span class='comma'>,</span> <span class='id identifier rubyid_suffix'>suffix</span> <span class='rparen'>)</span>
@@ -707,7 +707,7 @@ with suffix and modify tree building with options Hash (see below).</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:33 2014 by
+  Generated on Thu Jan 23 17:38:45 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/DirTravel.html

@@ -149,7 +149,7 @@ directory hierachy.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/_index.html

@@ -163,7 +163,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/file.CHANGELOG.html

@@ -63,7 +63,10 @@
 
     <div id="content"><div id='filecontents'>
 <h1>Version history</h1>
-<dl class="rdoc-list"><dt>0.0.3</dt>
+<dl class="rdoc-list"><dt>0.0.4</dt>
+<dd>
+<p>Fix for relative path conversion in Travel.filetree.</p>
+</dd><dt>0.0.3</dt>
 <dd>
 <p>Entry#tip, Entry#relative?, Entry#rename methods added. New option for
 Travel.filetree, :inclusive. It uses one-up directory as root.</p>
@@ -77,7 +80,7 @@ Travel.filetree, :inclusive. It uses one-up directory as root.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/file.README.html

@@ -75,7 +75,7 @@ structure. This structure can be conveniently accessed in various ways.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/index.html

@@ -75,7 +75,7 @@ structure. This structure can be conveniently accessed in various ways.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 18 17:51:32 2014 by
+  Generated on Thu Jan 23 17:38:44 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-1.9.3).
 </div>

data/lib/dirtravel.rb

@@ -90,8 +90,6 @@ module DirTravel
         def abspath
             if @abspath
                 @abspath
-            elsif self == root
-                Dir.pwd
             else
                 root.abspath + '/' + subpath
             end
@@ -271,12 +269,11 @@ module DirTravel
 
         # Clean relative path head (remove dot etc).
         def clean( dir )
-            if dir[0..1] == './'
-                dir = dir[ 2..-1 ]
-            elsif dir[0] == '.'
-                dir = ""
+            if dir[0] == '/'
+                dir
+            else
+                File.basename( File.absolute_path( dir ) )
             end
-            dir
         end
 
 

data/test/test_dirtravel.rb

@@ -85,6 +85,35 @@ class DirTravelTest < Test::Unit::TestCase
         target = pwd + '/test_0'
         data = DirTravel::Travel.filetree( target, { :inclusive => true } )
         assert_equal( pwd, data.name )
+        assert_equal( Dir.pwd + '/' + pwd, data.abspath )
+        assert_equal( 'test', data.tip )
+        assert_equal( 1, data.children.length )
+        root = data.children[0]
+        assert_equal( 'test_0', root.name )
+        assert_equal( 'test_0', root.tip )
+        assert_equal( 'test/test_0', root.path )
+    end
+
+    def test_inclusive_rel2
+        pwd = 'test'
+        target = '../test/' + pwd + '/test_0'
+        data = DirTravel::Travel.filetree( target, { :inclusive => true } )
+        assert_equal( pwd, data.name )
+        assert_equal( Dir.pwd + '/' + pwd, data.abspath )
+        assert_equal( 'test', data.tip )
+        assert_equal( 1, data.children.length )
+        root = data.children[0]
+        assert_equal( 'test_0', root.name )
+        assert_equal( 'test_0', root.tip )
+        assert_equal( 'test/test_0', root.path )
+    end
+
+    def test_inclusive_rel3
+        pwd = 'test'
+        target = './' + pwd + '/test_0'
+        data = DirTravel::Travel.filetree( target, { :inclusive => true } )
+        assert_equal( pwd, data.name )
+        assert_equal( Dir.pwd + '/' + pwd, data.abspath )
         assert_equal( 'test', data.tip )
         assert_equal( 1, data.children.length )
         root = data.children[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dirtravel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree