grizzled-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cdd00724c34a9ac32b4aa3a23f79c81b33f598
-  data.tar.gz: 9fea80c84a9dc79725b34b3d83dfef66d5ba7285
+  metadata.gz: 3a9bf6fb79b0bf8133f1066e3988904216fc35be
+  data.tar.gz: 60702eaa56fe5b5709c646f3a74218c1f5f807ee
 SHA512:
-  metadata.gz: f283fa8cb1d56de3f906c91ed2836d47701e572a341faa15cd522d531f64a73668cbaf4f42a4d16412e4fc370020e739f4f7bd94e2b5ef49851ce9910d65d7b5
-  data.tar.gz: 8d9a0bce9dbb1facb69f5690d8f54689b66a7e294b31a999dbe7c928f02df686ee70775f073875d1f760ef4337962c78193502684f4d5bdca17d4e476fb4d35d
+  metadata.gz: 9118e347acb11a7a2c1cf8cad109ab90418e7b60bc0c8b17a3cc0620a7d880b2a8bfe7704b629ed5a79310e75755232c636bc29039eb19d235fdf3ccf6d11661
+  data.tar.gz: 910898bd67fb2c3b1bbe99695e38e4c1336e3799b33ab7defdb5a21ce2b691948838a77e7d2c39177282c7d72d5107bac5afd139b0ea84484ca8a0fa8667ad41

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'zip'

data/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+    zip (2.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  zip

data/grizzled-ruby.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
 
   s.name             = 'grizzled-ruby'
-  s.version          = '0.1.7'
+  s.version          = '0.1.8'
   s.date             = '2015-09-08'
   s.summary          = 'Some general-purpose Ruby modules, classes, and tools'
   s.authors          = ['Brian M. Clapper']

data/lib/grizzled/fileutil/includer.rb

@@ -80,17 +80,20 @@ module Grizzled
     end
 
     # Internal fake URI
-    class FakeURI < URI::Generic
+    class FakeURI
+      attr_accessor :path
       def initialize(path)
-        super(scheme=nil,
-              userinfo=nil,
-              host=nil,
-              port=nil,
-              registry=nil,
-              path=path,
-              opaque=nil,
-              query=nil,
-              fragment=nil)
+        @fake_methods = [:scheme, :userinfo, :host, :port, :registry, :opaque,
+                         :query, :fragment]
+        @path = path
+      end
+
+      def method_missing(meth, *args, &block)
+        if @fake_methods.include? meth
+          nil
+        else
+          raise NoMethodError.new("Undefined method: #{meth.to_s}")
+        end
       end
     end
 
@@ -253,8 +256,11 @@ module Grizzled
           if not pathname.absolute?
             # Not an absolute path, and the including source has a path
             # (i.e., wasn't a string). Make this one relative to the path.
-            uri = cur_uri.clone
-            uri.path = File.join(::File.dirname(cur_uri.path), source)
+            parent_path = cur_uri.path
+            abs = File.absolute_path(
+              File.join(::File.dirname(cur_uri.path), source)
+            )
+            uri = FakeURI.new(abs)
           end
         end
 

data/test/fileutil/tc_includer.rb

@@ -66,28 +66,34 @@ EOF
   end
 
   def test_glob
-    temp1 = File.open("/tmp/foo1.txt", "w")
-    temp2 = File.open("/tmp/foo2.txt", "w")
-    main = Tempfile.new("inctest")
+    temps = ["/tmp/foo.txt", "/tmp/foo1.txt", "/tmp/foo2.txt"]
+    main = File.open(temps[0], "w")
+    temp1 = File.open(temps[1], "w")
+    temp2 = File.open(temps[2], "w")
+    begin
 
-    temp1.write <<EOF1
+      temp1.write <<EOF1
 one-1
 two-1
 EOF1
 
-    temp2.write <<EOF2
+      temp2.write <<EOF2
 one-2
 two-2
 EOF2
-    temp1.close
-    temp2.close
-    File.open(main, "w") do |f|
-      f.write('%include "/tmp/foo[0-9]*.txt"\n')
-    end
+      temp1.close
+      temp2.close
+      File.open(main, "w") do |f|
+        f.write('%include "./foo[0-9]*.txt"\n')
+      end
 
-    inc = Includer.new(main.path, allow_glob: true)
-    contents = inc.read
-    assert_equal("one-1\ntwo-1\none-2\ntwo-2\n", contents)
+      inc = Includer.new(main, allow_glob: true)
+      contents = inc.read
+      assert_equal("one-1\ntwo-1\none-2\ntwo-2\n", contents)
+    ensure
+      [main, temp1, temp2].each { |f| f.close unless f.closed? }
+      temps.each { |path| File.delete(path) }
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grizzled-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Brian M. Clapper
@@ -38,6 +38,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile