taco_it 1.5.0 → 1.5.1

data/bin/taco

@@ -9,10 +9,10 @@ rescue TacoRc::ParseError => e
   exit 1
 end
 
-require 'commander/import'
+require 'taco/commander/import'
 
 program :name, 'taco'
-program :version, '1.5.0'
+program :version, '1.5.1'
 program :description, 'simple command line issue tracking'
 
 command :init do |c|
@@ -20,14 +20,7 @@ command :init do |c|
   c.summary = 'initialize a taco repo in the current directory'
   c.description = 'Initialize a taco Issue repository in the current working directory'
   c.action do |args, options|
-    begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") unless args.size == 0
-      puts cli.init!
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.init!
   end
 end
 
@@ -40,17 +33,10 @@ command :list do |c|
   
   c.example 'Sort Issues by Priority, Owner, and Kind', 'taco list --sort priority,owner,kind'
   
+  c.arguments lambda { |args| args.all? { |arg| arg =~ /\w+:\w+/ } }
+  
   c.action do |args, options|
-    begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      unless args.all? { |arg| arg =~ /\w+:\w+/ }
-        raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}")
-      end
-      puts cli.list args, :sort => options.sort
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.list args, :sort => options.sort
   end
 end
   
@@ -63,19 +49,13 @@ command :new do |c|
   
   c.option '--retry', nil, 'retry a failed Issue creation'
   
+  c.arguments lambda { |args| args.size <= 1 }
+  
   c.action do |args, options|
     begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") if args.size > 1
-      
-      begin
-        puts cli.new! args, { :retry => options.retry }
-      rescue Issue::Invalid => e
-        raise Issue::Invalid.new("#{e.to_s}.\nYou can use the --retry option to correct this error.")      
-      end
-    rescue Exception => e
-      puts "Error: #{e}"        
-      exit 1
+      puts cli.new! args, { :retry => options.retry }
+    rescue Issue::Invalid => e
+      raise Issue::Invalid.new("#{e.to_s}.\nYou can use the --retry option to correct this error.")      
     end
   end  
 end
@@ -94,13 +74,10 @@ command :show do |c|
   c.option '--changelog', nil, 'shows the changelog'
   c.option '--all', nil, 'show all Issues'
   
+  c.arguments lambda { |args| true } # argument validation (matching arguments to issues) will be done inside cli.show
+  
   c.action do |args, options|
-    begin
-      puts cli.show args, { :changelog => options.changelog, :all => options.all }
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.show args, { :changelog => options.changelog, :all => options.all }
   end  
 end
 
@@ -111,20 +88,14 @@ command :edit do |c|
   
   c.option '--retry', nil, 'retry a failed Issue edit'
   
+  c.arguments lambda { |args| args.size == 1 }
+  
   c.action do |args, options|
     begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") unless args.size == 1
-      
-      begin
-        puts cli.edit! args, { :retry => options.retry }
-      rescue Issue::Invalid => e
-        raise Issue::Invalid.new("#{e.to_s}.\nYou can use the --retry option to correct this error.")      
-      end        
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+      puts cli.edit! args, { :retry => options.retry }
+    rescue Issue::Invalid => e
+      raise Issue::Invalid.new("#{e.to_s}.\nYou can use the --retry option to correct this error.")      
+    end        
   end  
 end
 
@@ -136,15 +107,7 @@ command :template do |c|
   c.option '--defaults', nil, 'Print the Issue template with default values'
   
   c.action do |args, options|
-    begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") unless args.size == 0
-      
-      puts cli.template({ :defaults => options.defaults })
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.template({ :defaults => options.defaults })
   end  
 end
 
@@ -154,15 +117,7 @@ command :html do |c|
   c.description = 'Generate an HTML buglist from index.html.erb'
   
   c.action do |args, options|
-    begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") unless args.size == 0
-      
-      puts cli.html
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.html
   end  
 end
 
@@ -174,14 +129,6 @@ command :push do |c|
   c.option '--message STRING', String, 'Override the default commit message.'
   
   c.action do |args, options|
-    begin
-      # FIXME: merge this kind of thing into commander: tell it how many arguments we expect.
-      raise ArgumentError.new("Unexpected arguments: #{args.join(', ')}") unless args.size == 0
-      
-      puts cli.push({ :message => options.message })
-    rescue Exception => e
-      puts "Error: #{e}"
-      exit 1
-    end
+    puts cli.push({ :message => options.message })
   end  
 end

data/lib/taco/commander.rb

@@ -0,0 +1,31 @@
+#--
+# Copyright (c) 2008-2009 TJ Holowaychuk <tj@vision-media.ca>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'highline/import'
+require 'taco/commander/version'
+require 'taco/commander/blank'
+require 'taco/commander/core_ext'
+require 'taco/commander/runner'
+require 'taco/commander/command'
+require 'taco/commander/help_formatters'
+require 'taco/commander/platform'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taco_it
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -38,6 +38,7 @@ files:
 - lib/taco.rb
 - lib/taco/change.rb
 - lib/taco/cli.rb
+- lib/taco/commander.rb
 - lib/taco/issue.rb
 - lib/taco/schema.rb
 - lib/taco/taco.rb