whiteout 0.1.0 → 0.2.0

data/lib/whiteout/version.rb

@@ -1,3 +1,3 @@
 module Whiteout
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/whiteout.rb

@@ -1,49 +1,69 @@
 require "whiteout/version"
 require "optparse"
 
-# TODO handle directories more appropriately
-# TODO add man page
-
 module Whiteout
   def self.execute(*args)
+    recurse = false
+
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: whiteout file1 [...]"
 
-      opts.on('-h', '--help', 'Display this screen' ) do
+      opts.on('-h', '--help', 'Display this screen') do
         puts opts
         exit
       end
+
+      opts.on('-r', '--recursive', 'Clean all files under each directory, recursively') do
+        recurse = true
+      end
     end
 
     begin
-      opts.parse!
-
-      if !$stdin.tty? || args[0] == '-'
-        puts self.clean($stdin.read)
-      else
-        if args.empty?
-          puts opts
-          exit
-        end
+      opts.parse!(args)
+    rescue OptionParser::InvalidOption => e
+      abort "#{e}\n#{opts}"
+    end
 
-        args.each do |file|
-          abort "Can't find #{file}" unless File.exists?(file)
+    if !$stdin.tty? || args[0] == '-'
+      puts self.clean($stdin.read)
+    else
+      abort opts.to_s if args.empty?
 
-          contents = File.read(file)
+      self.input_list(args, recurse).each do |file|
+        contents = File.read(file)
 
-          # TODO consider writing to a temporary file and moving into place
-          File.open(file, 'w') do |f|
-            f.write(self.clean(contents))
-          end
+        # TODO consider writing to a temporary file and moving into place
+        File.open(file, 'w') do |f|
+          f.write(self.clean(contents))
         end
       end
-    rescue OptionParser::InvalidOption => e
-      warn e
-      puts opts
     end
   end
 
   def self.clean(str)
     str.gsub(/[ \t]+$/, '')
   end
+
+  def self.input_list(file_args, recurse)
+    to_process = file_args
+    ret = []
+
+    to_process.each do |file|
+      abort "Can't find #{file}" unless File.exists?(file)
+
+      if File.directory?(file)
+        if recurse
+          Dir[file + "/**/*"].each do |subfile|
+            to_process << subfile
+          end
+        else
+          abort "#{file} is a directory; not processing without -r option"
+        end
+      else
+        ret << file
+      end
+    end
+
+    ret
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whiteout
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201719750680 !ruby/object:Gem::Requirement
+  requirement: &70307420752320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201719750680
+  version_requirements: *70307420752320
 description: ! '  Removes trailing whitespace from standard input or from named files.
 
 '