avalanche-cli 0.1.1 → 0.1.2

data/README.md

@@ -6,7 +6,7 @@ A small command line interface library for quickly building cli apps.
 
 Add this to your Gemfile:
 
-    gem 'cli', :git => 'git://github.com/avalanche123/cli.git'
+    gem 'avalanche-cli', :git => 'git://github.com/avalanche123/cli.git'
 
 Build a single command script:
 
@@ -15,9 +15,9 @@ Build a single command script:
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'cli'
+require 'avalanche/cli'
 
-cmd = CLI::Command.new('hello [options] NAME', {
+cmd = Avalanche::CLI::Command.new('hello [options] NAME', {
   :title => ['--title TITLE', String, 'Desired title']
 }, Proc.new do |opts, args|
   raise "NAME is required" if args.empty?
@@ -34,9 +34,9 @@ Build a cli application with many subcommands:
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'cli'
+require 'avalanche/cli'
 
-app = CLI::Application.new('app', '0.1.0')
+app = Avalanche::CLI::Application.new('app', '0.1.0')
 
 app.command('hello [options] NAME', "Says Hello", {
   :title => ['--title TITLE', String, 'Desired title']
@@ -57,4 +57,8 @@ Check it:
 
 ## License
 
-MIT
+MIT
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/avalanche123/cli/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/avalanche/cli/application.rb

@@ -52,7 +52,7 @@ module Avalanche
       rescue Interrupt
         exit 0
       rescue => e
-        @opts.abort(e.message)
+        @opts.abort("#{e.class.name}: #{e.message}")
       end
 
       def to_proc

data/lib/avalanche/cli/command.rb

@@ -48,7 +48,7 @@ module Avalanche
           puts ""
         end
 
-        @opts.abort(e.message)
+        @opts.abort("#{e.class.name}: #{e.message}")
       end
 
       def to_proc

data/lib/avalanche/cli/version.rb

@@ -1,5 +1,5 @@
 module Avalanche
   module CLI
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avalanche-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,9 +54,6 @@ files:
 - README.md
 - Rakefile
 - cli.gemspec
-- cli/application.rb
-- cli/command.rb
-- cli/version.rb
 - example/app
 - example/hello
 - lib/avalanche/cli.rb

data/cli/application.rb

@@ -1,73 +0,0 @@
-module CLI
-  class Application
-    def initialize(name, version)
-      @name         = name
-      @version      = version
-      @commands     = {}
-      @opts         = OptionParser.new
-
-      @opts.program_name = @name
-
-      @opts.banner = "Usage: #{@name} [--version] [--help] command [options] [args]"
-
-      @opts.top.append("", nil, nil)
-      @opts.top.append("Available #{@name} commands are:", nil, nil)
-
-      @opts.base.append("", nil, nil)
-      @opts.base.append("Common options:", nil, nil)
-
-      @opts.on_tail("-h", "--help",    "Show this message") { print_help    }
-      @opts.on_tail('-v', '--version', "Show version")      { print_version }
-    end
-
-    def command(usage, description, options, handler)
-      parts   = usage.split(" ")
-      command = parts.shift
-
-      @opts.separator(sprintf("  %-10.10s %s", command, description))
-
-      parts.unshift("#{@name}-#{command}")
-
-      @commands[command] = Command.new(parts.join(" "), options, handler)
-    end
-
-    def run(argv)
-      if argv.empty?
-        print_help
-      end
-
-      command = @commands[argv.first]
-
-      if command.nil?
-        @opts.permute!(argv)
-        print_help
-      else
-        argv.shift
-        command.run(argv)
-      end
-    rescue OptionParser::InvalidOption => e
-      @opts.warn(e.message)
-      print_help
-    rescue Interrupt
-      exit 0
-    rescue => e
-      @opts.abort(e.message)
-    end
-
-    def to_proc
-      proc { |opts, args| run(args) }
-    end
-
-    private
-
-    def print_help
-      puts @opts
-      exit 1
-    end
-
-    def print_version
-      puts "#{@name} #{@version}"
-      exit 0
-    end
-  end
-end

data/cli/command.rb

@@ -1,50 +0,0 @@
-module CLI
-  class Command
-    def initialize(usage, options, handler)
-      parts    = usage.split(/\s+/)
-      @name    = parts.shift
-      usage    = parts.join(" ")
-      @handler = handler.to_proc
-      @options = {}
-      @opts    = OptionParser.new
-
-      @opts.program_name = @name
-
-      @opts.banner = "Usage: #{@name} #{usage}"
-
-      options.each do |name, opts|
-        @opts.on(*opts) do |v|
-          @options[name] = v
-        end
-      end
-
-      @opts.base.append("", nil, nil)
-      @opts.base.append("Additional options:", nil, nil)
-
-      @opts.on_tail("-h", "--help", "Show this message") { print_help }
-    end
-
-    def run(argv)
-      $0 = "#{@name} #{argv.join(" ")}"
-      @handler.call(@options, @opts.permute!(argv))
-    rescue OptionParser::InvalidOption => e
-      @opts.warn(e.message)
-      print_help
-    rescue Interrupt
-      exit 0
-    rescue => e
-      @opts.abort(e.message)
-    end
-
-    def to_proc
-      proc { |opts, args| run(args) }
-    end
-
-    private
-
-    def print_help
-      puts @opts
-      exit 1
-    end
-  end
-end

data/cli/version.rb

@@ -1,3 +0,0 @@
-module CLI
-  VERSION = "0.1.0"
-end