frag 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.2 2012-08-11
+
+ * Gracefully exit if an invalid option is given.
+
 == 0.2.1 2012-08-11
 
  * Gracefully exit if file is not writable.

data/lib/frag/app.rb

@@ -12,7 +12,11 @@ module Frag
 
       @state = State.new('frag:', 'frag end', '#', '', nil, nil)
 
-      parser.parse!(args)
+      begin
+        parser.parse!(args)
+      rescue OptionParser::InvalidOption => e
+        return error e.message
+      end
       args.size > 0 || @version_printed or
         return error "no files given"
 
@@ -100,7 +104,7 @@ module Frag
           def parse_subconfig!(args)
             self.parsing_subconfig = true
             # OptionParser will error on an argument like like "-->".
-            if args.last =~ /\A--?(?:\W|\z)/
+            if args.last =~ /\A--?(?:[^0-9a-zA-Z]|\z)/
               last_arg = args.pop
               parse!(args)
               args << last_arg
@@ -164,7 +168,11 @@ module Frag
           output.puts line
         when /\A\s*(?:(\S+)\s*)?\$frag-config:\s*(.*)$/
           args = Shellwords.shellsplit($2)
-          parser.parse_subconfig!(args)
+          begin
+            parser.parse_subconfig!(args)
+          rescue OptionParser::InvalidOption => e
+            return error "#{input.lineno}: #{e.message}"
+          end
           args.size <= 1 or
             return error "#{input.lineno}: unexpected argument(s): #{args[0..-2].join(' ')}"
           @state.leader = $1 || ''

data/lib/frag/version.rb

@@ -1,5 +1,5 @@
 module Frag
-  VERSION = [0, 2, 1]
+  VERSION = [0, 2, 2]
 
   class << VERSION
     include Comparable

data/test/unit/test_app.rb

@@ -371,6 +371,7 @@ describe Frag::App do
         |# $frag-config: --leader %
       EOS
       frag('input').must_equal 0
+      output.string.must_equal ''
       error.string.must_equal "warning: -l / --leader is unnecessary in $frag-config line\n"
     end
 
@@ -379,6 +380,7 @@ describe Frag::App do
         |# $frag-config: --trailer %
       EOS
       frag('input').must_equal 0
+      output.string.must_equal ''
       error.string.must_equal "warning: -t / --trailer is unnecessary in $frag-config line\n"
     end
 
@@ -502,12 +504,22 @@ describe Frag::App do
       EOS
     end
 
+    it "errors if there is an invalid option" do
+      write_file 'input', <<-EOS.demargin
+        |# $frag-config: --invalid x
+      EOS
+      frag('input').must_equal 1
+      output.string.must_equal ''
+      error.string.must_match /invalid option: --invalid/
+    end
+
     it "errors if there are stray arguments" do
       write_file 'input', <<-EOS.demargin
         |# $frag-config: arg trailer
       EOS
       frag('input').must_equal 1
-      (output.string + error.string).must_match /unexpected argument/
+      output.string.must_equal ''
+      error.string.must_match /unexpected argument/
     end
   end
 
@@ -584,6 +596,12 @@ describe Frag::App do
     EOS
   end
 
+  it "prints an error if an invalid option is given" do
+    frag('--invalid').must_equal 1
+    output.string.must_equal ''
+    error.string.must_match /invalid option: --invalid/
+  end
+
   it "prints an error if an input file does not exist" do
     frag('input').must_equal 1
     output.string.must_equal ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frag
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -64,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3732901048616748446
+      hash: 2629403589841448314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3732901048616748446
+      hash: 2629403589841448314
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24