grizzled-ruby 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a9bf6fb79b0bf8133f1066e3988904216fc35be
-  data.tar.gz: 60702eaa56fe5b5709c646f3a74218c1f5f807ee
+  metadata.gz: d1d47485666a44d0c6b8f14c3372af933bfe142d
+  data.tar.gz: fdfab3b4ce6f7cadf7a7fc47764425789e157bfb
 SHA512:
-  metadata.gz: 9118e347acb11a7a2c1cf8cad109ab90418e7b60bc0c8b17a3cc0620a7d880b2a8bfe7704b629ed5a79310e75755232c636bc29039eb19d235fdf3ccf6d11661
-  data.tar.gz: 910898bd67fb2c3b1bbe99695e38e4c1336e3799b33ab7defdb5a21ce2b691948838a77e7d2c39177282c7d72d5107bac5afd139b0ea84484ca8a0fa8667ad41
+  metadata.gz: 14166d49fd3e5e93adbfd8a5e79ed282d9952561a536096686633a4b2cad858919144163d89633cbd670300efe4447c4001b915f7fe7d1c26aed594c9312c582
+  data.tar.gz: 65ad1894cdd9f6018807b7ee697d96e4807972c29332cc33dcdbc9b71d6c105261090b4fc5c31a1461d2a0c64f9e65e31e9c76e2e23142dcdaead31c8a65a739

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log for Grizzled Ruby
 
+Version 0.1.9 (28 September, 2015)
+
+- Updated `Grizzled::FileUtil::Includer` to sort globbed files, by default.
+
+Version 0.1.8 (8 September, 2015)
+
+- Updated `Grizzled::FileUtil::Includer` to handle glob paths.
+- Fixed various tests and tested against Ruby 2.
+
 Version 0.1.5 (...)
 
 - Added `WrapMany` class.

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rake'
 gem 'zip'
+gem 'test-unit'
+gem 'pry'

data/Gemfile.lock

@@ -1,12 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.0)
+    method_source (0.8.2)
+    power_assert (0.2.4)
+    pry (0.10.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.4.2)
+    slop (3.6.0)
+    test-unit (3.1.3)
+      power_assert
     zip (2.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry
   rake
+  test-unit
   zip
+
+BUNDLED WITH
+   1.10.6

data/grizzled-ruby.gemspec

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

data/grizzled-ruby.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

data/lib/grizzled/fileutil/includer.rb

@@ -174,11 +174,14 @@ module Grizzled
       #                    or URL. Default: ^%include\s"([^"]+)"
       # allow_glob::       For file names, allow and expand glob expressions.
       #                    Doesn't apply to URLs.
+      # sort_glob:         true to force a sort of the globbed expression
+      #                    (default), false not to sort.
       def initialize(source, options={})
         @max_nesting = options.fetch(:max_nesting, 100)
         inc_pattern = options.fetch(:include_pattern, '^%include\s"([^"]+)"')
         @include_re = /#{inc_pattern}/
         @allow_glob = options.fetch(:allow_glob, false)
+        @sort_glob = options.fetch(:sort_glob, true)
         includer_source = source_to_includer_source source
         @source_uri = includer_source.uri
         @temp = preprocess includer_source
@@ -203,9 +206,9 @@ module Grizzled
 
       def source_to_includer_source(source)
         if source.class == String
-          open_source(URI::parse(source))
+          open_source(URI::parse(source), source)
         elsif source.class == File
-          open_source(URI::parse(source.path))
+          open_source(URI::parse(source.path), source.path)
         elsif source.respond_to? :each_line
           IncludeSource.new(source, nil)
         else
@@ -261,16 +264,17 @@ module Grizzled
               File.join(::File.dirname(cur_uri.path), source)
             )
             uri = FakeURI.new(abs)
+            source = abs
           end
         end
 
-        open_source(uri)
+        open_source(uri, source)
       end
 
       # Open an input source, based on a parsed URI.
-      def open_source(uri)
+      def open_source(uri, source)
         case uri.scheme
-          when nil then     f = open_path(uri.path)  # assume file/path
+          when nil then     f = open_path(source)  # assume file/path
           when 'file' then  f = open(uri.path)  # open path directly
           when 'http' then  f = open(uri.to_s)  # open-uri will handle it
           when 'https' then f = open(uri.to_s)  # open-uri will handle it
@@ -284,7 +288,9 @@ module Grizzled
 
       def open_path(path)
         if @allow_glob
-          FileIterator.new(Dir.glob(path))
+          globs = Dir.glob(path)
+          globs.sort! if @sort_glob
+          FileIterator.new(globs)
         else
           File.open(path)
         end

data/test/fileutil/tc_includer.rb

@@ -65,8 +65,8 @@ EOF
     end
   end
 
-  def test_glob
-    temps = ["/tmp/foo.txt", "/tmp/foo1.txt", "/tmp/foo2.txt"]
+  def test_glob_unsorted
+    temps = ["/tmp/foo.txt", "/tmp/boo1.txt", "/tmp/foo2.txt"]
     main = File.open(temps[0], "w")
     temp1 = File.open(temps[1], "w")
     temp2 = File.open(temps[2], "w")
@@ -84,18 +84,44 @@ EOF2
       temp1.close
       temp2.close
       File.open(main, "w") do |f|
-        f.write('%include "./foo[0-9]*.txt"\n')
+        f.write('%include "./?oo[0-9]*.txt"' +  "\n")
       end
 
-      inc = Includer.new(main, allow_glob: true)
+      main = File.open(temps[0])
+      inc = Includer.new(main, allow_glob: true, sort_glob: false)
       contents = inc.read
-      assert_equal("one-1\ntwo-1\none-2\ntwo-2\n", contents)
+      assert_true(contents.include?("one-1\ntwo-1"))
     ensure
       [main, temp1, temp2].each { |f| f.close unless f.closed? }
       temps.each { |path| File.delete(path) }
     end
   end
 
+  def test_glob_sorted
+    temps = ['/tmp/glob_z.txt', '/tmp/glob_a.txt', '/tmp/glob_m.txt']
+    main = "/tmp/glob_main.txt"
+    begin
+      temps.each do |t|
+        File.open(t, "w") do |f|
+          f.write("In #{t}\n")
+        end
+      end
+      File.open(main, "w") do |f|
+        f.write('%include "/tmp/glob_?.txt"' + "\n")
+      end
+
+      contents = File.open(main) do |f|
+        Includer.new(f, allow_glob: true).read
+      end
+      expected = temps.sort.map { |s| "In #{s}\n" }.join('')
+      puts("contents=#{contents}")
+      puts("expected=#{expected}")
+      assert_equal(expected, contents)
+    ensure
+      (temps + [main]).each { |path| File.delete(path) }
+    end
+  end
+
   private
 
   def make_include_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grizzled-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Brian M. Clapper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -44,6 +44,7 @@ files:
 - README.md
 - Rakefile
 - grizzled-ruby.gemspec
+- grizzled-ruby.iml
 - lib/grizzled.rb
 - lib/grizzled/dir.rb
 - lib/grizzled/fileutil.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Some general-purpose Ruby modules, classes, and tools