templater 0.4.0 → 0.4.1

data/lib/templater.rb

@@ -43,6 +43,6 @@ module Templater
   class MalformattedArgumentError < ArgumentError #:nodoc:
   end
   
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
   
 end

data/lib/templater/cli/generator.rb

@@ -45,7 +45,7 @@ module Templater
                   options[option.name] = s
                 end
               else
-                opts.on("--#{name} OPTION", option.options[:desc]) do |s|
+                opts.on("--#{name}=value", option.options[:desc]) do |s|
                   options[option.name] = s.gsub('-', '_').to_sym
                 end
               end

data/lib/templater/cli/parser.rb

@@ -42,11 +42,6 @@ module Templater
             options[:skip] = s
           end
         
-          # TODO: implement this
-          #opts.on("-a", "--ask", "Ask about each file before generating it.") do |s|
-          #  options[:ask] = s
-          #end
-        
           opts.on("-d", "--delete", "Delete files that have previously been generated with this generator.") do |s|
             options[:delete] = s
           end
@@ -55,15 +50,6 @@ module Templater
             options[:no_color] = true
           end
 
-          # these could be implemented in the future, but they are not used right now.
-          #opts.on("-q", "--quiet", "Suppress normal output.") do |q|
-          #  options[:quit] = q
-          #end
-          #
-          #opts.on("-v", "--verbose", "Run verbosely") do |v|
-          #  options[:verbose] = v
-          #end
-
           opts.on("-h", "--help", "Show this message") do
             options[:help] = true
           end
@@ -78,10 +64,20 @@ module Templater
       
         options[:opts] = opts
 
-        opts.parse!(args)
+        begin
+          opts.parse!(args)
+        rescue OptionParser::InvalidOption => e
+          puts
+          puts error_message(e)
+          puts
+        end
+
         options
       end
 
+      def self.error_message(e)
+        "One or more unknown options given: #{e.args.join(', ')}"
+      end
     end
   
   end

data/spec/options_parser_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require "tempfile"
+
+describe Templater::CLI::Parser do
+  describe "given unknown option" do    
+    it "outputs a meaninful error message instead of just blowing up" do
+      lambda do
+        Templater::CLI::Parser.parse(["--this-option-is-unknown", "--second-unknown-option"])
+      end.should_not raise_error
+    end
+    
+    it "lists unknown options" do
+      e = OptionParser::InvalidOption.new("--this-option-is-unknown", "--second-unknown-option")      
+      output = Templater::CLI::Parser.error_message(e)
+      
+      output.should =~ /--this-option-is-unknown/
+      output.should =~ /--second-unknown-option/
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: templater
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: templater
 bindir: bin
 cert_chain: []
 
-date: 2008-11-11 00:00:00 +02:00
+date: 2008-11-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - spec/generator/source_root_spec.rb
 - spec/generator/templates_spec.rb
 - spec/manifold_spec.rb
+- spec/options_parser_spec.rb
 - spec/results
 - spec/results/erb.rbs
 - spec/results/file.rbs
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: File generation system