dir_validator 0.13.2 → 0.14.0

data/CHANGELOG.rdoc

@@ -13,3 +13,7 @@
 == 0.13.2 (2012-08-02)
 
 * Added bin/validate-dir and a general scripting functionality.
+
+== 0.14.0 (2012-08-03)
+
+* Improved bin/validate-dir to allow passing directory on command line.

data/lib/dir_validator.rb

@@ -14,6 +14,8 @@ module DirValidator
   #   module DirValidator
   #     def initialize_validator
   #       # Should return the arguments to DirValidator.new().
+  #       # Alternatively, the user can supply those arguments on
+  #       # the command line; in that case, this method is unneeded.
   #     end
   #
   #     def run_validator(dv)
@@ -28,19 +30,37 @@ module DirValidator
   # wanting to offer the functionality of the dir_validator gem and
   # to receive the validation code as an input.
   def self.run_script(args)
+    # Usage message, and a copy of the args (typically from ARGV).
+    usage = lambda { abort "Usage: #{$PROGRAM_NAME} SCRIPT [DIRECTORY]" }
+    args = args.dup
     # Require the script, and add its functions to the module.
-    script = args.first
-    abort "Usage: #{$PROGRAM_NAME} SCRIPT" unless File.file?(script.to_s)
+    script = args.shift
+    usage.call unless File.file?(script.to_s)
     require File.expand_path(script)
     module_function(:initialize_validator, :run_validator)
-    # Create validator, run the validation code supplied by user.
-    dv = DirValidator.new(initialize_validator)
+    # Get the initialization parameters for the validator.
+    # If the user did not implement the initialize_validator() method,
+    # we will get the params from from args (the command line).
+    init_params = initialize_validator()
+    init_params = args unless init_params.first
+    usage.call unless File.directory?(init_params.first.to_s)
+    # Create validator and run the validation code supplied by user.
+    dv = DirValidator.new(*init_params)
     run_validator(dv)
     dv.validate()
     # Return the validator.
     return dv
   end
 
+  # Users depending on run_script() can implement this method if they
+  # prefer to pass arguments to the initializer in Ruby code
+  # rather than on the command line.
+  #
+  # @!visibility private
+  def initialize_validator
+    return []
+  end
+
 end
 
 require 'dir_validator/catalog'
@@ -48,3 +68,5 @@ require 'dir_validator/item'
 require 'dir_validator/quantity'
 require 'dir_validator/validator'
 require 'dir_validator/warning'
+
+require 'awesome_print'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dir_validator
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
-  - 2
-  version: 0.13.2
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Monty Hindman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-02 00:00:00 Z
+date: 2012-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement