grizzled-ruby 0.1.4 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a0cdd00724c34a9ac32b4aa3a23f79c81b33f598
+  data.tar.gz: 9fea80c84a9dc79725b34b3d83dfef66d5ba7285
+SHA512:
+  metadata.gz: f283fa8cb1d56de3f906c91ed2836d47701e572a341faa15cd522d531f64a73668cbaf4f42a4d16412e4fc370020e739f4f7bd94e2b5ef49851ce9910d65d7b5
+  data.tar.gz: 8d9a0bce9dbb1facb69f5690d8f54689b66a7e294b31a999dbe7c928f02df686ee70775f073875d1f760ef4337962c78193502684f4d5bdca17d4e476fb4d35d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log for Grizzled Ruby
 
+Version 0.1.5 (...)
+
+- Added `WrapMany` class.
+
 Version 0.1.4 (25 March, 2011)
 
 - Fixed some gem issues.

data/Rakefile

@@ -1,9 +1,10 @@
-#                                                                  -*- ruby -*-
+#
 #
 # NOTE: Man pages use the 'ronn' gem. http://rtomayko.github.com/ronn/
 
 require 'rake/clean'
 require 'pathname'
+require 'fileutils'
 
 PACKAGE = 'grizzled-ruby'
 GEMSPEC = "#{PACKAGE}.gemspec"
@@ -19,7 +20,8 @@ end
 
 def gem_name(spec)
   gem = load_gem(spec)
-  "#{PACKAGE}-#{gem.version.to_s}.gem"
+  version = gem.version.to_s
+  "#{PACKAGE}-#{version}.gem"
 end
 
 GEM = gem_name(GEMSPEC)
@@ -45,13 +47,8 @@ desc "Build the gem (#{GEM})"
 task :gem => GEM
 
 file GEM => RUBY_FILES + ['Rakefile', GEMSPEC] do |t|
-  require 'rubygems/builder'
-  if !defined? Gem
-    raise StandardError.new("Gem package not defined.")
-  end
-  spec = eval File.new(GEMSPEC).read
-  Gem::Builder.new(spec).build
-end  
+  sh "gem build #{GEMSPEC}"
+end
 
 desc "Build the documentation, locally"
 task :doc => :rdoc
@@ -66,10 +63,9 @@ file 'rdoc' => RUBY_FILES do |t|
 end
 
 desc "Install the gem"
-task :install => :gem do |t|
-  require 'rubygems/installer'
+task :install => [:build, :gem] do |t|
   puts("Installing from #{GEM}")
-  Gem::Installer.new(GEM).install
+  sh "gem install #{GEM}"
 end
 
 desc "Publish the gem"

data/grizzled-ruby.gemspec

@@ -3,14 +3,13 @@
 Gem::Specification.new do |s|
 
   s.name             = 'grizzled-ruby'
-  s.version          = '0.1.4'
-  s.date             = '2011-03-25'
+  s.version          = '0.1.7'
+  s.date             = '2015-09-08'
   s.summary          = 'Some general-purpose Ruby modules, classes, and tools'
   s.authors          = ['Brian M. Clapper']
   s.license          = 'BSD'
   s.email            = 'bmc@clapper.org'
   s.homepage         = 'http://software.clapper.org/grizzled-ruby'
-  s.has_rdoc         = true
 
   s.description      = <<-ENDDESC
 Grizzled Ruby is a general purpose library of Ruby modules, classes and tools.
@@ -18,6 +17,8 @@ ENDDESC
 
   s.require_paths    = ['lib']
 
+  s.add_runtime_dependency 'zip', '~> 2.0', '>= 2.0.2'
+
   # = MANIFEST =
   s.files            = Dir.glob('[A-Z]*')
   s.files           += Dir.glob('*.gemspec')
@@ -26,7 +27,7 @@ ENDDESC
 
 
   # = MANIFEST =
-  s.test_files       = FileList['test/**/tc_*.rb'].to_a
+  s.test_files       = Dir.glob('test/**/tc_*.rb')
 end
 
 

data/lib/grizzled/fileutil.rb

@@ -122,10 +122,14 @@ module Grizzled
             make_directory_tree(entry, contents)
 
           elsif contents.kind_of? Enumerable
-            f = File.open(File.join(entry), 'w')
-            contents.each {|thing| f.write(thing.to_s)}
-            f.close
+            File.open(File.join(entry), 'w') do |f|
+              contents.each {|thing| f.write(thing.to_s)}
+            end
 
+          elsif contents.kind_of? String
+            File.open(entry, "w") do |f|
+              f.write(contents)
+            end
           else
             raise BadDirectoryTreeValue.new(entry, contents)
           end

data/lib/grizzled/fileutil/includer.rb

@@ -61,6 +61,39 @@ module Grizzled
       end
     end
 
+    # Internal wrapper for multiple files
+    class FileIterator
+      def initialize(paths)
+        @files = paths
+      end
+
+      def each_line(&block)
+        @files.each do |path|
+          File.open path do |f|
+            f.each_line do |line|
+              block.call(line)
+            end
+          end
+        end
+        nil
+      end
+    end
+
+    # Internal fake URI
+    class FakeURI < URI::Generic
+      def initialize(path)
+        super(scheme=nil,
+              userinfo=nil,
+              host=nil,
+              port=nil,
+              registry=nil,
+              path=path,
+              opaque=nil,
+              query=nil,
+              fragment=nil)
+      end
+    end
+
     # == Introduction
     #
     # An +Includer+ object preprocesses a text file, resolve _include_
@@ -136,10 +169,13 @@ module Grizzled
       # include_pattern::  String regex pattern to match include directives.
       #                    Must have a single regex group for the file name
       #                    or URL. Default: ^%include\s"([^"]+)"
+      # allow_glob::       For file names, allow and expand glob expressions.
+      #                    Doesn't apply to URLs.
       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)
         includer_source = source_to_includer_source source
         @source_uri = includer_source.uri
         @temp = preprocess includer_source
@@ -206,14 +242,18 @@ module Grizzled
       # Handle an include reference.
       def process_include(source, parent_input)
         cur_uri = parent_input.uri
-        uri = URI::parse(source)
+        begin
+          uri = URI::parse(source)
+        rescue URI::InvalidURIError
+          uri = FakeURI.new(source)
+        end
         if (cur_uri != nil) and (uri.scheme == nil)
           # Could be a relative path. Should be relative to the parent input.
           pathname = Pathname.new(source)
           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 = cur_uri.clone
             uri.path = File.join(::File.dirname(cur_uri.path), source)
           end
         end
@@ -224,7 +264,7 @@ module Grizzled
       # Open an input source, based on a parsed URI.
       def open_source(uri)
         case uri.scheme
-          when nil then     f = open(uri.path)  # assume file/path
+          when nil then     f = open_path(uri.path)  # 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
@@ -235,6 +275,14 @@ module Grizzled
 
         IncludeSource.new(f, uri)
       end
+
+      def open_path(path)
+        if @allow_glob
+          FileIterator.new(Dir.glob(path))
+        else
+          File.open(path)
+        end
+      end
     end # class Includer
 
   end # module File

data/lib/grizzled/wrapmany.rb

@@ -0,0 +1,86 @@
+require 'ostruct'
+
+# Adapted from https://gist.github.com/1120383
+#
+# Wraps multiple objects in a single object. Method calls are resolved by
+# cycling through all wrapped objects, in the order they were specified on
+# the constructor, looking for the appropriate named method. Useful for
+# temporarily adding methods to an instance, without monkeypatching the
+# class.
+#
+# WrapMany has special-case logic for OpenStruct objects, Hash objects and
+# object fields. Hash keys, OpenStruct fields, and public instance
+# variables will be resolved, but only for calls made with no parameters.
+#
+# Example 1: Add an "age" value to a User object using an OpenStruct
+#
+#     require 'ostruct'
+#     require 'grizzled/wrapmany'
+#
+#     age_holder = OpenStruct.new(:age => 43)
+#     u = User.find(...)
+#     user_with_age = WrapMany.new(u, age_holder)
+#
+# Example 2: Add an "age" value to a User object using a hash
+#
+#     require 'grizzled/wrapmany'
+#
+#     u = User.find(...)
+#     user_with_age = WrapMany.new(u, {:age => 43})
+#
+# Example 3: Add an "age" value to a User object using another class
+#
+#     require 'grizzled/wrapmany'
+#
+#     class AgeHolder
+#         def initialize(age)
+#             @age = age
+#         end
+#     end
+#
+#     u = User.find(...)
+#     user_with_age = WrapMany.new(u, AgeHolder.new(43))
+class WrapMany
+  def initialize(*args)
+    # Map any OpenStruct objects in the arguments to hashes, and add the
+    # current object (in case someone subclasses this class)
+    @objects = args.to_a.map {
+      |a| a.is_a?(OpenStruct) ? a.instance_variable_get("@table") : a
+    } + [self]
+  end
+
+  def method_missing(meth, *args, &block)
+    method_name = meth.to_s
+
+    # Loop through all objects, looking for something that satisfies the
+    # method name.
+    @objects.each do |o|
+
+      # First determine if the method exists as a public instance method.
+      # If so, call it.
+      if o.class.public_instance_methods.include? method_name.to_sym
+        return o.send(method_name, *args, &block)
+      end
+
+      # Otherwise, if there are no arguments, then check for fields and
+      # hash keys
+      if args.length == 0
+        if o.instance_variables.include? ":@#{method_name}"
+          return o.instance_variable_get method_name
+        end
+
+        # Special case for hash
+        if o.is_a? Hash
+          if o.has_key? meth
+            return o[meth]
+          elsif o.has_key? method_name
+            return o[method_name]
+          end
+        end
+      end
+
+    end
+
+    raise NoMethodError.new("Undefined method: '#{method_name}'", meth)
+  end
+end

data/test/fileutil/tc_includer.rb

@@ -64,7 +64,32 @@ EOF
       assert_equal(contents, bytes)
     end
   end
-    
+
+  def test_glob
+    temp1 = File.open("/tmp/foo1.txt", "w")
+    temp2 = File.open("/tmp/foo2.txt", "w")
+    main = Tempfile.new("inctest")
+
+    temp1.write <<EOF1
+one-1
+two-1
+EOF1
+
+    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
+
+    inc = Includer.new(main.path, allow_glob: true)
+    contents = inc.read
+    assert_equal("one-1\ntwo-1\none-2\ntwo-2\n", contents)
+  end
+
   private
 
   def make_include_file

data/test/fileutil/tc_zip.rb

@@ -65,7 +65,7 @@ class ZipMixinTestDriver < Test::Unit::TestCase
   end
 
   def test_non_recursive
-    expected_files = ['foo.txt', 'bar.txt']
+    expected_files = ['foo.txt', 'bar.txt'].sort
     Dir.mktmpdir 'ziptest' do |tmpdir|
       FileUtils.cd tmpdir do
 
@@ -85,7 +85,7 @@ class ZipMixinTestDriver < Test::Unit::TestCase
       with_tempfile('ziptest', '.zip') do |t|
         zip t.path, tmpdir, :dir_at_top => false, :recursive => false
 
-        assert_equal expected_files, zip_file_entries(t.path).to_a
+        assert_equal expected_files, zip_file_entries(t.path).to_a.sort
       end
     end
   end

data/test/tc_forwarder.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require './test_helper'
 require 'test/unit'
 require 'tempfile'
 require 'grizzled/forwarder'

data/test/tc_stack.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require './test_helper'
 require 'test/unit'
 require 'grizzled/stack'
 

metadata

@@ -1,93 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: grizzled-ruby
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - Brian M. Clapper
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-25 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2015-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: |
   Grizzled Ruby is a general purpose library of Ruby modules, classes and tools.
-
 email: bmc@clapper.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- README.md
-- LICENSE.md
+files:
 - CHANGELOG.md
+- LICENSE.md
+- README.md
 - Rakefile
 - grizzled-ruby.gemspec
+- lib/grizzled.rb
+- lib/grizzled/dir.rb
 - lib/grizzled/fileutil.rb
-- lib/grizzled/stack.rb
 - lib/grizzled/fileutil/includer.rb
 - lib/grizzled/fileutil/ziputil.rb
-- lib/grizzled/dir.rb
 - lib/grizzled/forwarder.rb
+- lib/grizzled/stack.rb
 - lib/grizzled/string/template.rb
 - lib/grizzled/unix.rb
-- lib/grizzled.rb
-- test/tc_stack.rb
-- test/tc_forwarder.rb
-- test/fileutil/tc_zip.rb
+- lib/grizzled/wrapmany.rb
 - test/fileutil/tc_includer.rb
 - test/fileutil/tc_make_dir_tree.rb
+- test/fileutil/tc_zip.rb
 - test/string/tc_template.rb
-has_rdoc: true
+- test/tc_forwarder.rb
+- test/tc_stack.rb
 homepage: http://software.clapper.org/grizzled-ruby
-licenses: 
+licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Some general-purpose Ruby modules, classes, and tools
-test_files: 
-- test/tc_stack.rb
-- test/tc_forwarder.rb
-- test/fileutil/tc_zip.rb
+test_files:
 - test/fileutil/tc_includer.rb
 - test/fileutil/tc_make_dir_tree.rb
+- test/fileutil/tc_zip.rb
 - test/string/tc_template.rb
+- test/tc_forwarder.rb
+- test/tc_stack.rb