grinc 0.1.1 → 0.1.2

data/grinc.gemspec

@@ -3,13 +3,13 @@
 Gem::Specification.new do |s|
 
   s.name             = 'grinc'
-  s.version          = '0.1.1'
-  s.date             = '2011-03-26'
+  s.version          = '0.1.2'
+  s.date             = '2011-03-27'
   s.summary          = 'Command line include file preprocessor'
   s.authors          = ['Brian M. Clapper']
   s.license          = 'BSD'
   s.email            = 'bmc@clapper.org'
-  s.homepage         = 'http://software.clapper.org/grinc'
+  s.homepage         = 'http://software.clapper.org/grinc/'
 
   s.description      = <<-ENDDESC
 grinc runs an include file preprocessor on one or more files, writing the

data/lib/grizzled/grinc.rb

@@ -53,6 +53,7 @@ module Grizzled
 
     DEFAULT_MAX_NEST = 100
     PROGRAM_NAME = 'grinc'
+    THIS_GEM_PATH = 'grizzled/grinc'
 
     # -----------------------------------------------------------------------
     # Classes
@@ -62,9 +63,13 @@ module Grizzled
       attr_reader :output, :max_nesting, :input_paths
 
       def initialize(options_hash, argv)
-        @output = options_hash[:output]
-        @max_nesting = options_hash[:max_nesting] || DEFAULT_MAX_NEST
-        @input_paths = argv.length == 0 ? nil : argv
+        @options = options_hash
+        @options[:max_nesting] = options_hash[:max_nesting] || DEFAULT_MAX_NEST
+        @options[:input_paths] = argv.length == 0 ? nil : argv
+      end
+
+      def method_missing(m, *args, &block)
+        @options[m]
       end
 
       def to_s
@@ -81,14 +86,10 @@ module Grizzled
       def run
         begin
           params = parse_params
-          out = params.output.nil? ? $stderr : File.open(params.output, 'w')
-
-          if params.input_paths.nil?
-            process_include($stdin, out, params.max_nesting)
+          if params.show_version
+            show_version_only
           else
-            params.input_paths.each do |f|
-              process_include(File.open(f), out, params.max_nesting)
-            end
+            run_includer params
           end
 
         rescue UsageError
@@ -107,6 +108,30 @@ module Grizzled
         end
       end
 
+      private
+
+      def show_version_only
+        gem_spec = Gem.searcher.find(THIS_GEM_PATH)
+        if not gem_spec
+          raise StandardError.new("Can't find Gem specification for path \"" +
+                                  "#{THIS_GEM_PATH}\".")
+        end
+        puts("#{PROGRAM_NAME}, version #{gem_spec.version}. " +
+             "#{gem_spec.homepage}")
+      end
+
+      def run_includer(params)
+        out = params.output.nil? ? $stderr : File.open(params.output, 'w')
+
+        if params.input_paths.nil?
+          process_include($stdin, out, params.max_nesting)
+        else
+          params.input_paths.each do |f|
+            process_include(File.open(f), out, params.max_nesting)
+          end
+        end
+      end
+
       def parse_params
         options_hash = {}
         error = nil
@@ -127,6 +152,10 @@ module Grizzled
             end
             options_hash[:max_nesting] = n.to_i
           end
+
+          opts.on('-V', '--version', 'Display version number and exit.') do
+            options_hash[:show_version] = true
+          end
         end
 
         begin

data/man/man1/grinc.1

@@ -7,7 +7,7 @@
 \fBgrinc\fR \- Process includes on a text file
 .
 .SH "SYNOPSIS"
-\fBgrinc\fR [\-o output | \-\-output output] [\-n maxnest | \-\-maxnest maxnest] [files]
+\fBgrinc\fR [\-o output | \-\-output output] [\-n N | \-\-nesting N] [files]
 .
 .SH "DESCRIPTION"
 \fIgrinc\fR runs an include file preprocessor on one or more files, writing the result to an output file (or standard output)\.

data/src-man/grinc.1.md

@@ -3,7 +3,7 @@ grinc(1) -- Process includes on a text file
 
 ## SYNOPSIS
 
-`grinc` [-o output | --output output] [-n maxnest | --maxnest maxnest] [files]
+`grinc` [-o output | --output output] [-n N | --nesting N] [files]
 
 ## DESCRIPTION
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grinc
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Brian M. Clapper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -04:00
+date: 2011-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,16 +46,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README.md
 - CHANGELOG.md
 - Rakefile
-- README.md
 - grinc.gemspec
 - bin/grinc
 - lib/grizzled/grinc.rb
 - man/man1/grinc.1
 - src-man/grinc.1.md
 has_rdoc: true
-homepage: http://software.clapper.org/grinc
+homepage: http://software.clapper.org/grinc/
 licenses: 
 - BSD
 post_install_message: 
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command line include file preprocessor