boson 0.2.5 → 0.3.0

data/{gemspec → .gemspec}

@@ -9,12 +9,17 @@ Gem::Specification.new do |s|
   s.email       = "gabriel.horner@gmail.com"
   s.homepage    = "http://tagaholic.me/boson/"
   s.summary = "A command/task framework similar to rake and thor that opens your ruby universe to the commandline and irb."
-  s.description =  "Boson provides users with the power to turn any ruby method into a full-fledged commandline tool. Boson achieves this with powerful options (borrowed from thor) and views (thanks to hirb). Some other unique features that differentiate it from rake and thor include being accessible from irb and the commandline, being able to write boson commands in non-dsl ruby and toggling a pretty view of a command's output without additional view code."
+  s.description =  "Boson is a command/task framework with the power to turn any ruby method into a full-fledged executable with options.  Some unique features that differentiate it from rake and thor include being usable from irb and the commandline, optional automated views generated by hirb and allowing libraries to be written as plain ruby. For my libraries that use this, see irbfiles.  Works with all major ruby versions."
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = 'tagaholic'
   s.executables = ['boson']
   s.add_dependency 'hirb', '>= 0.3.2'
-  s.add_dependency 'alias', '>= 0.2.1'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile gemspec}
+  s.add_dependency 'alias', '>= 0.2.2'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'bacon', '>= 1.1.0'
+  s.add_development_dependency 'mocha-on-bacon'
+  s.add_development_dependency 'bacon-bits'
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
+  s.license = 'MIT'
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 0.3.0
+* Added --debug to executable with multiple debug hooks
+* Added --ruby_debug and -I to executable to change $LOAD_PATH and $DEBUG
+* Added @option method attribute as a more readable complement to @options
+* Added proper exit code for failed commands (#12)
+* Added friendlier errors for libraries with SyntaxError or LoaderError
+* Added validation to method attributes
+* Improved RequireLibrary to more robustly handle gems like httparty
+* Fixed 1.9.2-rc2 bugs including #14
+* Fixed finding commands with same names
+* Fixed --console for ruby >= 1.8.7
+* Fixed --help for namespaced commands
+
 == 0.2.5
 * Fixed critical gemspec error
 

data/README.rdoc

@@ -1,9 +1,11 @@
 To read a linkable version of this README, {see here}[http://tagaholic.me/boson/doc/].
 
 == Description
-A command/task framework similar to rake and thor that opens your ruby universe to the commandline
-and irb. For my libraries that use this, see {irbfiles}[http://github.com/cldwalker/irbfiles].
-Works with all major ruby versions.
+Boson is a command/task framework with the power to turn any ruby method into a full-fledged
+executable with options.  Some unique features that differentiate it from rake and thor include
+being usable from irb and the commandline, optional automated views generated by hirb and allowing
+libraries to be written as plain ruby. For my libraries that use this, see
+{irbfiles}[http://github.com/cldwalker/irbfiles].  Works with all major ruby versions.
 
 == Features
 * Simple organization: Commands are just methods on an object (default is main) and command libraries are just modules.
@@ -159,10 +161,10 @@ My {tagging obsession}[http://github.com/cldwalker/tag-tree] from the ruby conso
 * http://tagaholic.me/2009/10/15/boson-and-hirb-interactions.html
 * http://tagaholic.me/2009/10/19/how-boson-enhances-your-irb-experience.html
 
-== Acknowledgements
+== Credits
 Boson stands on the shoulders of these people and their ideas:
 * Yehuda Katz for inspiring me with Thor and its awesome option parser (Boson::OptionParser).
 * Daniel Berger for his original work on thor's awesome option parser.
 * Dave Thomas for scraping a method's comments (Boson::CommentInspector)
 * Mauricio Fernandez for scraping a method's arguments (Boson::ArgumentInspector)
-* Chris Wanstrath for inspiring Boson's libraries with Rip's packages.
+* Chris Wanstrath for inspiring Boson's libraries with Rip's packages.

data/Rakefile

@@ -2,12 +2,12 @@ require 'rake'
 require 'fileutils'
 
 def gemspec
-  @gemspec ||= eval(File.read('gemspec'), binding, 'gemspec')
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
 end
 
 desc "Build the gem"
 task :gem=>:gemspec do
-  sh "gem build gemspec"
+  sh "gem build .gemspec"
   FileUtils.mkdir_p 'pkg'
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
 end
@@ -32,4 +32,4 @@ task :test do |t|
   sh 'bacon -q -Ilib -I. test/*_test.rb'
 end
 
-task :default => :test
+task :default => :test

data/deps.rip

@@ -0,0 +1,2 @@
+hirb >=0.3.2
+alias >=0.2.2

data/lib/boson/command.rb

@@ -20,13 +20,20 @@ module Boson
     # Finds a command, namespaced or not and aliased or not. If found returns the
     # command object, otherwise returns nil.
     def self.find(command, commands=Boson.commands)
-      command, subcommand = command.to_s.split(NAMESPACE, 2)
-      is_namespace_command = lambda {|current_command|
-        [current_command.name, current_command.alias].include?(subcommand) &&
-        current_command.library && (current_command.library.namespace == command)
-      }
-      find_lambda = subcommand ? is_namespace_command : lambda {|e| [e.name, e.alias].include?(command)}
-      commands.find(&find_lambda)
+      if command.to_s.include?(NAMESPACE)
+        command, subcommand = command.to_s.split(NAMESPACE, 2)
+        commands.find {|current_command|
+          [current_command.name, current_command.alias].include?(subcommand) &&
+          current_command.library && (current_command.library.namespace == command)
+        }
+      else
+        commands.find {|e| [e.name, e.alias].include?(command) && !e.namespace}
+      end
+    end
+
+    # One line usage for a command if it exists
+    def self.usage(command)
+      (cmd = find(command)) ? "#{command} #{cmd.usage}" : "Command '#{command}' not found"
     end
 
     ATTRIBUTES = [:name, :lib, :alias, :desc, :options, :args, :config]

data/lib/boson/commands/core.rb

@@ -61,17 +61,17 @@ module Boson::Commands::Core #:nodoc:
   end
 
   def usage(command, options={})
-    msg = (cmd = Boson::Command.find(command)) ? "#{command} #{cmd.usage}" : "Command '#{command}' not found"
-    puts msg
-    return if options[:one_line] || !cmd
+    puts Boson::Command.usage(command)
 
-    if cmd.options && !cmd.options.empty?
-      puts "\nLOCAL OPTIONS"
-      cmd.option_parser.print_usage_table options[:render_options].dup.merge(:local=>true)
-    end
-    if options[:verbose] && cmd.render_option_parser
-      puts "\nGLOBAL OPTIONS"
-      cmd.render_option_parser.print_usage_table options[:render_options].dup
+    if (cmd = Boson::Command.find(command))
+      if cmd.options && !cmd.options.empty?
+        puts "\nLOCAL OPTIONS"
+        cmd.option_parser.print_usage_table options[:render_options].dup.merge(:local=>true)
+      end
+      if options[:verbose] && cmd.render_option_parser
+        puts "\nGLOBAL OPTIONS"
+        cmd.render_option_parser.print_usage_table options[:render_options].dup
+      end
     end
   end
 end

data/lib/boson/inspector.rb

@@ -9,16 +9,19 @@ module Boson
   #      # @render_options :fields=>%w{one two}
   #      # @config :alias=>'so'
   #      options :verbose=>:boolean
+  #      option :count, :numeric
   #      # Something descriptive perhaps
   #      def some_method(opts)
   #        # ...
   #      end
   #   end
   #
-  # Method attributes serve as configuration for a method's command. Available method attributes:
+  # Method attributes serve as configuration for a method's command. All attributes should only be called once per
+  #   method except for option. Available method attributes:
   # * config: Hash to define any command attributes (see Command.new).
   # * desc: String to define a command's description for a command. Defaults to first commented line above a method.
   # * options: Hash to define an OptionParser object for a command's options.
+  # * option: Option name and value to be merged in with options. See OptionParser for what an option value can be.
   # * render_options: Hash to define an OptionParser object for a command's local/global render options (see View).
   #
   # When deciding whether to use commented or normal Module methods, remember that commented Module methods allow
@@ -31,9 +34,9 @@ module Boson
     # loading its methods.
     def enable
       @enabled = true
-      body = MethodInspector::METHODS.map {|e|
-        %[def #{e}(val)
-            Boson::MethodInspector.#{e}(self, val)
+      body = MethodInspector::ALL_METHODS.map {|e|
+        %[def #{e}(*args)
+            Boson::MethodInspector.#{e}(self, *args)
           end]
       }.join("\n") +
       %[
@@ -50,7 +53,7 @@ module Boson
     # Disable scraping method data.
     def disable
       ::Module.module_eval %[
-        Boson::MethodInspector::METHODS.each {|e| remove_method e }
+        Boson::MethodInspector::ALL_METHODS.each {|e| remove_method e }
         alias_method :method_added, :_old_method_added
       ]
       @enabled = false
@@ -71,7 +74,17 @@ module Boson
       (MethodInspector::METHODS + [:args]).each do |key|
         (@store[key] || []).each do |cmd, val|
           @commands_hash[cmd] ||= {}
-          add_scraped_data_to_config(key, val, cmd)
+          add_valid_data_to_config(key, val, cmd)
+        end
+      end
+    end
+
+    def add_valid_data_to_config(key, value, cmd)
+      if valid_attr_value?(key, value)
+        add_scraped_data_to_config(key, value, cmd)
+      else
+        if Runner.debug
+          warn "DEBUG: Command '#{cmd}' has #{key.inspect} attribute with invalid value '#{value.inspect}'"
         end
       end
     end
@@ -88,12 +101,17 @@ module Boson
       end
     end
 
+    def valid_attr_value?(key, value)
+      return true if (klass = MethodInspector::METHOD_CLASSES[key]).nil?
+      value.is_a?(klass) || value.nil?
+    end
+
     def add_comment_scraped_data
       (@store[:method_locations] || []).select {|k,(f,l)| f == @library_file }.each do |cmd, (file, lineno)|
         scraped = CommentInspector.scrape(FileLibrary.read_library_file(file), lineno, MethodInspector.current_module)
         @commands_hash[cmd] ||= {}
         MethodInspector::METHODS.each do |e|
-          add_scraped_data_to_config(e, scraped[e], cmd)
+          add_valid_data_to_config(e, scraped[e], cmd)
         end
       end
     end

data/lib/boson/inspectors/argument_inspector.rb

@@ -26,11 +26,15 @@ module Boson::ArgumentInspector
     return if local_variables == params # nothing new found
     format_arguments(params, values, arity, num_args)
     rescue Exception
-      # puts "#{klass}.#{meth}: #{$!.message}"
+      print_debug_message(klass, meth) if Boson::Runner.debug
     ensure
       set_trace_func(nil)
   end
 
+  def print_debug_message(klass, meth) #:nodoc:
+    warn "DEBUG: Error while scraping arguments from #{klass.to_s[/\w+$/]}##{meth}: #{$!.message}"
+  end
+
   # process params + values to return array of argument arrays
   def format_arguments(params, values, arity, num_args) #:nodoc:
     params ||= []
@@ -55,10 +59,11 @@ module Boson::ArgumentInspector
       begin
         if event[/call/] && classname == klass && id == meth
           params = eval("local_variables", binding)
-          values = eval("local_variables.map{|x| eval(x)}", binding)
+          values = eval("local_variables.map{|x| eval(x.to_s)}", binding)
           throw :done
         end
       rescue Exception
+        print_debug_message(klass, meth) if Boson::Runner.debug
       end
     }
     if arity >= 0
@@ -70,7 +75,7 @@ module Boson::ArgumentInspector
       MAX_ARGS.downto(arity.abs - 1) do |i|
         catch(:done) do 
           begin
-            object.send(meth, *(0...i)) 
+            object.send(meth, *(0...i))
           rescue Exception
           end
         end

data/lib/boson/inspectors/comment_inspector.rb

@@ -10,7 +10,8 @@ module Boson
   # * If no @desc is found in the comment block, then the first comment line directly above the method
   #   is assumed to be the value for @desc. This means that no multi-line attribute definitions can occur
   #   without a description since the last line is assumed to be a description.
-  # * options, config and render_options attributes can take any valid ruby since they're evaled in their module's context.
+  # * options, option, config and render_options attributes can take any valid ruby since they're evaled in
+  #   their module's context.
   # * desc attribute is not evaled and is simply text to be set as a string.
   #
   # This module was inspired by
@@ -23,16 +24,35 @@ module Boson
     # of attributes defined for that method.
     def scrape(file_string, line, mod, attribute=nil)
       hash = scrape_file(file_string, line) || {}
+      options = (arr = hash.delete(:option)) ? parse_option_comments(arr, mod) : {}
       hash.select {|k,v| v && (attribute.nil? || attribute == k) }.each do |k,v|
-        hash[k] = EVAL_ATTRIBUTES.include?(k) ? eval_comment(v.join(' '), mod) : v.join(' ')
+        hash[k] = EVAL_ATTRIBUTES.include?(k) ? eval_comment(v.join(' '), mod, k) : v.join(' ')
       end
+      (hash[:options] ||= {}).merge!(options) if !options.empty?
       attribute ? hash[attribute] : hash
     end
 
     #:stopdoc:
-    def eval_comment(value, mod)
+    def parse_option_comments(arr, mod)
+      arr.inject({}) {|t,e|
+        key, val = e.join(' ').split(/\s*,\s*/, 2)
+        if val
+          key = key.sub(/^\s*:/, '').to_sym
+          t[key] = eval_comment(val, mod, 'option')
+        end
+        t
+      }
+    end
+
+    def eval_comment(value, mod, mattr)
       value = "{#{value}}" if !value[/^\s*\{/] && value[/=>/]
-      begin mod.module_eval(value); rescue(Exception); nil end
+      mod.module_eval(value)
+    rescue Exception
+      if Runner.debug
+        warn "DEBUG: Error while evaluating @#{mattr} in module #{mod.to_s[/\w+$/]}:\n  " +
+          $!.message.gsub(/\n/, "\n  ")
+      end
+      nil
     end
 
     # Scrapes a given string for commented @keywords, starting with the line above the given line
@@ -58,6 +78,7 @@ module Boson
         lines << last_line unless hash[:desc]
       end
 
+      option = []
       while i < lines.size
         while lines[i] =~ /^\s*#\s*@(\w+)\s*(.*)/
           key = $1.to_sym
@@ -67,9 +88,11 @@ module Boson
             hash[key] << $1
             i+= 1
           end
+          option << hash.delete(:option) if key == :option
         end
         i += 1
       end
+      hash[:option] = option if !option.empty?
       hash
     end
     #:startdoc:

data/lib/boson/inspectors/method_inspector.rb

@@ -8,6 +8,8 @@ module Boson
     attr_reader :mod_store
     @mod_store ||= {}
     METHODS = [:config, :desc, :options, :render_options]
+    METHOD_CLASSES = {:config=>Hash, :desc=>String, :options=>Hash, :render_options=>Hash}
+    ALL_METHODS = METHODS + [:option]
 
     # The method_added used while scraping method attributes.
     def new_method_added(mod, meth)
@@ -17,8 +19,9 @@ module Boson
       METHODS.each do |e|
         store[e][meth.to_s] = store[:temp][e] if store[:temp][e]
       end
+      (store[:options][meth.to_s] ||= {}).merge! store[:temp][:option] if store[:temp][:option]
 
-      if store[:temp].size < METHODS.size
+      if store[:temp].size < ALL_METHODS.size
         store[:method_locations] ||= {}
         if (result = find_method_locations(caller))
           store[:method_locations][meth.to_s] = result
@@ -35,6 +38,12 @@ module Boson
       end
     end
 
+    def option(mod, name, value)
+      (@mod_store[mod] ||= {})[:options] ||= {}
+      (store(mod)[:temp] ||= {})[:option] ||= {}
+      (store(mod)[:temp] ||= {})[:option][name] = value
+    end
+
     # Scrapes a method's arguments using ArgumentInspector.
     def scrape_arguments(meth)
       store[:args] ||= {}

data/lib/boson/libraries/require_library.rb

@@ -9,11 +9,11 @@
 #   >> Dir.pwd
 #   >> '/home'
 class Boson::RequireLibrary < Boson::GemLibrary
+  EXTENSIONS = ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar']
   handles {|source|
-    begin
-      Kernel.load("#{source}.rb", true)
-    rescue LoadError
-      false
-    end
+    extensions_glob = "{#{EXTENSIONS.join(',')}}"
+    $LOAD_PATH.any? {|dir|
+      Dir["#{File.expand_path source.to_s, dir}#{extensions_glob}"].size > 0
+    }
   }
 end

data/lib/boson/manager.rb

@@ -40,15 +40,20 @@ module Boson
       def rescue_load_action(library, load_method)
         yield
       rescue AppendFeaturesFalseError
+        warn "DEBUG: Library #{library} didn't load due to append_features" if Runner.debug
       rescue LoaderError=>e
         FileLibrary.reset_file_cache(library.to_s)
         failed_libraries << library
         $stderr.puts "Unable to #{load_method} library #{library}. Reason: #{e.message}"
-      rescue StandardError=>e
+      rescue StandardError, SyntaxError, LoadError =>e
         FileLibrary.reset_file_cache(library.to_s)
         failed_libraries << library
         message = "Unable to #{load_method} library #{library}. Reason: #{$!}"
-        message += "\n" + e.backtrace.slice(0,3).map {|e| "  " + e }.join("\n") if @options[:verbose]
+        if Runner.debug
+          message += "\n" + e.backtrace.map {|e| "  " + e }.join("\n")
+        elsif @options[:verbose]
+          message += "\n" + e.backtrace.slice(0,3).map {|e| "  " + e }.join("\n")
+        end
         $stderr.puts message
       ensure
         Inspector.disable if Inspector.enabled
@@ -143,7 +148,7 @@ module Boson
       end
 
       def create_class_aliases(mod, class_commands)
-        class_commands.each {|k,v|
+        class_commands.dup.each {|k,v|
           if v.is_a?(Array)
             class_commands.delete(k).each {|e| class_commands[e] = "#{k}.#{e}"}
           end

data/lib/boson/pipes.rb

@@ -43,7 +43,11 @@ module Boson
     def sort_pipe(object, sort)
       sort_lambda = lambda {}
       if object[0].is_a?(Hash)
-        sort = sort.to_i if sort.to_s[/^\d+$/]
+        if sort.to_s[/^\d+$/]
+          sort = sort.to_i
+        elsif object[0].keys.all? {|e| e.is_a?(Symbol) }
+          sort = sort.to_sym
+        end
         sort_lambda = untouched_sort?(object.map {|e| e[sort] }) ? lambda {|e| e[sort] } : lambda {|e| e[sort].to_s }
       else
         sort_lambda = untouched_sort?(object.map {|e| e.send(sort) }) ? lambda {|e| e.send(sort) || ''} :

data/lib/boson/runner.rb

@@ -2,6 +2,8 @@ module Boson
   # Base class for runners.
   class Runner
     class<<self
+      attr_accessor :debug
+
       # Enables view, adds local load path and loads default_libraries
       def init
         View.enable

data/lib/boson/runners/bin_runner.rb

@@ -45,7 +45,10 @@ module Boson
       :unload=>{:type=>:string, :desc=>"Acts as a regular expression to unload default libraries"},
       :render=>{:type=>:boolean, :desc=>"Renders a Hirb view from result of command without options"},
       :pager_toggle=>{:type=>:boolean, :desc=>"Toggles Hirb's pager"},
-      :option_commands=>{:type=>:boolean, :desc=>"Toggles on all commands to be defined as option commands" }
+      :option_commands=>{:type=>:boolean, :desc=>"Toggles on all commands to be defined as option commands" },
+      :ruby_debug=>{:type=>:boolean, :desc=>"Sets $DEBUG", :alias=>'D'},
+      :debug=>{:type=>:boolean, :desc=>"Prints debug info for boson"},
+      :load_path=>{:type=>:string, :desc=>"Add to front of $LOAD_PATH", :alias=>'I'}
     } #:nodoc:
 
     PIPE = '+'
@@ -58,7 +61,10 @@ module Boson
         @command, @options, @args = parse_args(args)
         return puts("boson #{Boson::VERSION}") if @options[:version]
         return print_usage if args.empty? || (@command.nil? && !@options[:console] && !@options[:execute])
+        $:.unshift(*options[:load_path].split(":")) if options[:load_path]
+        Runner.debug = true if @options[:debug]
         return ConsoleRunner.bin_start(@options[:console], @options[:load]) if @options[:console]
+        $DEBUG = true if options[:ruby_debug]
         init
 
         if @options[:help]
@@ -71,9 +77,9 @@ module Boson
           execute_command
         end
       rescue NoMethodError
-        print_error_message no_method_error_message
+        abort_with no_method_error_message
       rescue
-        print_error_message default_error_message
+        abort_with default_error_message
       end
 
       def no_method_error_message #:nodoc:
@@ -114,10 +120,11 @@ module Boson
       def commands
         @commands ||= @all_args.map {|e| e[0]}
       end
+
       #:stopdoc:
-      def print_error_message(message)
+      def abort_with(message)
         message += "\nOriginal error: #{$!}\n" + $!.backtrace.slice(0,10).map {|e| "  " + e }.join("\n") if options[:verbose]
-        $stderr.puts message
+        abort message
       end
 
       def default_error_message
@@ -149,9 +156,7 @@ module Boson
           rescue ArgumentError
             if $!.class == OptionCommand::CommandArgumentError || ($!.message[/wrong number of arguments/] &&
               (cmd_obj = Command.find(cmd)) && cmd_obj.arg_size != args.size)
-              print_error_message "'#{cmd}' was called incorrectly."
-              Boson.invoke(:usage, cmd, :one_line=>true)
-              return
+              abort_with "'#{cmd}' was called incorrectly.\n" + Command.usage(cmd)
             else
               raise
             end

data/lib/boson/runners/console_runner.rb

@@ -24,10 +24,16 @@ module Boson
         repl = Boson.repo.config[:console] if Boson.repo.config[:console]
         repl = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb' unless repl.is_a?(String)
         unless repl.index('/') == 0 || (repl = Util.which(repl))
-          $stderr.puts "Console not found. Please specify full path in config[:console]."
-          return
+          abort "Console not found. Please specify full path in config[:console]."
+        else
+          load_repl(repl)
         end
+      end
+
+      def load_repl(repl) #:nodoc:
         ARGV.replace ['-f']
+        $progname = $0
+        alias $0 $progname
         Kernel.load $0 = repl
       end
 

data/lib/boson/scientist.rb

@@ -147,7 +147,7 @@ module Boson
     def run_help_option
       opts = @global_options[:verbose] ? ['--verbose'] : []
       opts << "--render_options=#{@global_options[:usage_options]}" if @global_options[:usage_options]
-      Boson.invoke :usage, @command.name + " " + opts.join(' ')
+      Boson.invoke :usage, @command.full_name + " " + opts.join(' ')
     end
 
     def run_pretend_option(args)

data/lib/boson/version.rb

@@ -1,3 +1,3 @@
 module Boson
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

data/test/bin_runner_test.rb

@@ -19,7 +19,7 @@ describe "BinRunner" do
     end
 
     it "invalid option value prints error" do
-      capture_stderr { start("-l") }.should =~ /Error:/
+      aborts_with(/Error: no value/) { start("-l") }
     end
 
     it "help option but no arguments prints usage" do
@@ -36,17 +36,18 @@ describe "BinRunner" do
       start('-l', 'blah', 'libraries')
     end
 
-    # it "console option starts irb" do
-    #   ConsoleRunner.expects(:start)
-    #   Util.expects(:which).returns("/usr/bin/irb")
-    #   Kernel.expects(:load).with("/usr/bin/irb")
-    #   start("--console")
-    # end
+    it "console option starts irb" do
+      ConsoleRunner.expects(:start)
+      Util.expects(:which).returns("/usr/bin/irb")
+      ConsoleRunner.expects(:load_repl).with("/usr/bin/irb")
+      start("--console")
+    end
 
     it "console option but no irb found prints error" do
       ConsoleRunner.expects(:start)
       Util.expects(:which).returns(nil)
-      capture_stderr { start("--console") }.should =~ /Console not found/
+      ConsoleRunner.expects(:abort).with {|arg| arg[/Console not found/] }
+      start '--console'
     end
 
     it "execute option executes string" do
@@ -59,34 +60,48 @@ describe "BinRunner" do
       start('commands', '-f', 'f1, f2')
     end
 
+    it "debug option sets Runner.debug" do
+      View.expects(:render)
+      start('-d', 'commands')
+      Runner.debug.should == true
+      Runner.debug = nil
+    end
+
+    it "ruby_debug option sets $DEBUG" do
+      View.expects(:render)
+      start('-D', 'commands')
+      $DEBUG.should == true
+      $DEBUG = nil
+    end
+
     it "execute option errors are caught" do
-      capture_stderr { start("-e", "raise 'blah'") }.should =~ /^Error:/
+      aborts_with(/^Error:/) { start("-e", "raise 'blah'") }
     end
 
     it "option command and too many arguments prints error" do
       capture_stdout {
-        capture_stderr { start('commands','1','2','3') }.should =~ /'commands'.*incorrect/
+        aborts_with(/'commands'.*incorrect/) { start('commands','1','2','3') }
       }
     end
 
     it "normal command and too many arguments prints error" do
       capture_stdout {
-        capture_stderr { start('render') }.should =~ /'render'.*incorrect/
+        aborts_with(/'render'.*incorrect/) { start('render') }
       }
     end
 
     it "failed subcommand prints error and not command not found" do
       BinRunner.expects(:execute_command).raises("bling")
-      capture_stderr { start("commands.to_s") }.should =~ /Error: bling/
+      aborts_with(/Error: bling/) { start("commands.to_s") }
     end
 
     it "nonexistant subcommand prints command not found" do
-      capture_stderr { start("to_s.bling") }.should =~ /'to_s.bling' not found/
+      aborts_with(/'to_s.bling' not found/) { start("to_s.bling") }
     end
 
     it "undiscovered command prints error" do
-       BinRunner.expects(:autoload_command).returns(false)
-      capture_stderr { start('blah') }.should =~ /Error.*not found/
+      BinRunner.expects(:autoload_command).returns(false)
+      aborts_with(/Error.*not found/) { start 'blah' }
     end
 
     it "basic command executes" do
@@ -108,7 +123,7 @@ describe "BinRunner" do
       defaults = Runner.default_libraries + ['yo']
       with_config(:bin_defaults=>['yo']) do
         Manager.expects(:load).with {|*args| args[0] == defaults }
-        capture_stderr { start 'blah' }
+        aborts_with(/blah/) { start 'blah' }
       end
     end
   end
@@ -151,7 +166,7 @@ describe "BinRunner" do
       Index.expects(:find_library).returns(nil, 'sweet_lib')
       Manager.expects(:load).with {|*args| args[0].is_a?(String) ? args[0] == 'sweet_lib' : true}.at_least(1)
       Index.indexes[0].expects(:update).returns(true)
-      capture_stderr { start("sweet") }.should =~ /sweet/
+      aborts_with(/sweet/) { start 'sweet' }
     end
   end
 

data/test/command_test.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe "Command" do
+  describe ".find" do
+    before_all {
+      reset_boson
+      Boson.libraries << Library.new(:name=>'bling', :namespace=>true)
+      @namespace_command = Command.new(:name=>'blah', :lib=>'bling', :namespace=>'bling')
+      @top_level_command = Command.new(:name=>'blah', :lib=>'bling')
+      Boson.commands << @namespace_command
+      Boson.commands << @top_level_command
+    }
+
+    it 'finds correct command when a subcommand of the same name exists' do
+      Command.find('blah').should == @top_level_command
+    end
+
+    it 'finds correct command when a top level command of the same name exists' do
+      Command.find('bling.blah').should == @namespace_command
+    end
+  end
+end

data/test/comment_inspector_test.rb

@@ -47,39 +47,67 @@ describe "CommentInspector" do
     }
     def options(opts={})
       @lines[1] = opts[:value] if opts[:value]
-      args = [@lines.join("\n"), 3, Optional]
+      args = [@lines.join("\n"), opts[:line] || 3, Optional]
       CommentInspector.scrape(*args)[:options]
     end
 
-    it "that are basic return options" do
+    it "that are basic" do
       options.should == {:a=>true}
     end
 
-    it "that are hash-like returns hashified options" do
+    it "that are hash-like" do
       options(:value=>'#@options :a => 2').should == {:a=>2}
     end
 
-    it "that are whitespaced return options" do
+    it "that are whitespaced" do
       options(:value=>"\t"+ '#    @options {:a=>1}').should == {:a=>1}
     end
 
-    it "that have a local value return options" do
+    it "that have a local value" do
       options(:value=>'#@options bling').should == {:a=>'bling'}
     end
 
-    it "that are multi-line return options" do
+    it "that are multi-line" do
       @lines.delete_at(1)
       @lines.insert(1, '#@options {:a =>', " # 1}", "# some comments")
-      CommentInspector.scrape(@lines.join("\n"), 5, Optional)[:options].should == {:a=>1}
+      options(:line=>5).should == {:a=>1}
     end
 
-    it "with failed eval return nil" do
+    it "with failed eval and returns nil" do
       options(:value=>'#@options !--').should == nil
     end
 
-    it "that are empty return nil" do
+    it "that are empty and returns nil" do
       options(:value=>"# nada").should == nil
     end
+
+    it "when @option overwrites @options" do
+      @lines.insert(1, '  #@option :a, :boolean')
+      options(:line=>4).should == {:a=>:boolean}
+    end
+
+    it "when set by @option and @options" do
+      @lines.insert(1, '  #@option :b, :boolean')
+      options(:line=>4).should == {:b=>:boolean, :a=>true}
+    end
+
+    it "when set by @option" do
+      @lines.delete_at(1)
+      @lines.insert(1, ' #@option :b, :string', '  #@option :a, 4')
+      options(:line=>4).should == {:b=>:string, :a=>4}
+    end
+
+    it "when set by multi-line @option" do
+      @lines.delete_at(1)
+      @lines.insert(1, ' #@option :b, :type=>:string,', '  # :values=>%w{one two}', '# some comments')
+      options(:line=>5).should == {:b=>{:type=>:string, :values=>%w{one two}}}
+    end
+
+    it "and ignores invalid @option's" do
+      @lines.delete_at(1)
+      @lines.insert(1, '  #@option :b=>:string', '  #@option :a, :string')
+      options(:line=>4).should == {:a=>:string}
+    end
   end
 
   it "scrapes all comment types with implicit desc" do

data/test/deps.rip

@@ -0,0 +1,4 @@
+mocha >=0
+bacon >=1.1.0
+mocha-on-bacon >=0
+bacon-bits >=0

data/test/file_library_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe "file library" do
   before { reset; FileLibrary.reset_file_cache }
-  before { Gem.stubs(:loaded_specs).returns({}) } if RUBY_VERSION >= '1.9.2'
+  before { Gem.stubs(:loaded_specs).returns({}) } if RUBY_VERSION >= '1.9.2' && defined? Gem
 
   it "loads" do
     load :blah, :file_string=>"module Blah; def blah; end; end"

data/test/loader_test.rb

@@ -5,7 +5,7 @@ describe "Loader" do
     Manager.load([Boson::Commands::Namespace])
   end
 
-  before { Gem.stubs(:loaded_specs).returns({}) } if RUBY_VERSION >= '1.9.2'
+  before { Gem.stubs(:loaded_specs).returns({}) } if RUBY_VERSION >= '1.9.2' && defined? Gem
   describe "config" do
     before { reset }
     it "from callback overridden by user's config" do

data/test/manager_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe "Manager" do
-  describe "after_load" do
+  describe ".after_load" do
     def load_library(hash)
       new_attributes = {:name=>hash[:name], :commands=>[], :created_dependencies=>[], :loaded=>true}
       [:module, :commands].each {|e| new_attributes[e] = hash.delete(e) if hash[e] }
@@ -23,6 +23,20 @@ describe "Manager" do
       command_exists?('meatwad')
     end
 
+    it "prints error for library with SyntaxError" do
+      Manager.expects(:loader_create).raises(SyntaxError)
+      capture_stderr {
+        Manager.load 'blah'
+      }.should =~ /Unable to load library blah. Reason: SyntaxError/
+    end
+
+    it "prints error for library with LoadError" do
+      Manager.expects(:loader_create).raises(LoadError)
+      capture_stderr {
+        Manager.load 'blah'
+      }.should =~ /Unable to load library blah. Reason: LoadError/
+    end
+
     describe "command aliases" do
       before { eval %[module ::Aquateen; def frylock; end; end] }
       after { Object.send(:remove_const, "Aquateen") }
@@ -84,7 +98,7 @@ describe "Manager" do
     end
   end
 
-  describe "loaded" do
+  describe ".loaded?" do
     before { reset_libraries }
 
     it "returns false when library isn't loaded" do

data/test/method_inspector_test.rb

@@ -31,6 +31,21 @@ describe "MethodInspector" do
       parse("options :z=>'b'; def zee; end")[:options].should == {"zee"=>{:z=>'b'}}
     end
 
+    it "option sets options" do
+      parse("option :z, 'b'; option :y, :boolean; def zee; end")[:options].should ==
+        {"zee"=>{:z=>'b', :y=>:boolean}}
+    end
+
+    it "option(s) sets options" do
+      parse("options :z=>'b'; option :y, :string; def zee; end")[:options].should ==
+        {"zee"=>{:z=>'b', :y=>:string}}
+    end
+
+    it "option(s) option overrides options" do
+      parse("options :z=>'b'; option :z, :string; def zee; end")[:options].should ==
+        {"zee"=>{:z=>:string}}
+    end
+
     it "render_options sets render_options" do
       parse("render_options :z=>true; def zee; end")[:render_options].should == {"zee"=>{:z=>true}}
     end
@@ -42,7 +57,7 @@ describe "MethodInspector" do
     it "not all method attributes set causes method_locations to be set" do
       MethodInspector.stubs(:find_method_locations).returns(["/some/path", 10])
       parsed = parse "desc 'yo'; def yo; end; options :yep=>1; def yep; end; " +
-        "render_options :a=>1; config :a=>1; desc 'z'; options :a=>1; def az; end"
+        "option :b, :boolean; render_options :a=>1; config :a=>1; desc 'z'; options :a=>1; def az; end"
       parsed[:method_locations].key?('yo').should == true
       parsed[:method_locations].key?('yep').should == true
       parsed[:method_locations].key?('az').should == false

data/test/pipes_test.rb

@@ -49,6 +49,15 @@ describe "Pipes" do
       Pipes.sort_pipe(hashes, :a).should == hashes.reverse
     end
 
+    it "sorts numeric hash keys by string" do
+      hashes = [{2=>'thing'}, {2=>'some'}]
+      Pipes.sort_pipe(hashes, '2').should == hashes.reverse
+    end
+
+    it "sorts numeric hash keys by string" do
+      Pipes.sort_pipe(@hashes, 'a').should == @hashes.reverse
+    end
+
     it "prints error for invalid sort field" do
       capture_stderr { Pipes.sort_pipe(@objects, :blah)}.should =~ /failed.*'blah'/
     end

data/test/test_helper.rb

@@ -1,6 +1,5 @@
-require 'mocha'
 require 'bacon'
-require File.dirname(__FILE__)+'/bacon_extensions'
+require 'bacon/bits'
 require 'mocha'
 require 'mocha-on-bacon'
 require 'boson'
@@ -119,9 +118,13 @@ module TestHelpers
       Manager.add_library(lib); lib
     }
   end
+
+  def aborts_with(regex)
+    BinRunner.expects(:abort).with {|e| e[regex] }
+    yield
+  end
 end
 
 class Bacon::Context
   include TestHelpers
-  include BaconExtensions
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boson
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 3
@@ -40,14 +42,73 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id002
-description: Boson provides users with the power to turn any ruby method into a full-fledged commandline tool. Boson achieves this with powerful options (borrowed from thor) and views (thanks to hirb). Some other unique features that differentiate it from rake and thor include being accessible from irb and the commandline, being able to write boson commands in non-dsl ruby and toggling a pretty view of a command's output without additional view code.
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha-on-bacon
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bacon-bits
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: Boson is a command/task framework with the power to turn any ruby method into a full-fledged executable with options.  Some unique features that differentiate it from rake and thor include being usable from irb and the commandline, optional automated views generated by hirb and allowing libraries to be written as plain ruby. For my libraries that use this, see irbfiles.  Works with all major ruby versions.
 email: gabriel.horner@gmail.com
 executables: 
 - boson
@@ -91,8 +152,8 @@ files:
 - lib/boson/view.rb
 - lib/boson.rb
 - test/argument_inspector_test.rb
-- test/bacon_extensions.rb
 - test/bin_runner_test.rb
+- test/command_test.rb
 - test/comment_inspector_test.rb
 - test/file_library_test.rb
 - test/loader_test.rb
@@ -111,12 +172,14 @@ files:
 - LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
+- deps.rip
+- test/deps.rip
 - Rakefile
-- gemspec
+- .gemspec
 has_rdoc: true
 homepage: http://tagaholic.me/boson/
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -127,6 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -135,6 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3

data/test/bacon_extensions.rb

@@ -1,26 +0,0 @@
-module BaconExtensions
-  def self.included(mod)
-    mod.module_eval do
-      # nested context methods automatically inherit methods from parent contexts
-      def describe(*args, &block)
-        context = Bacon::Context.new(args.join(' '), &block)
-        (parent_context = self).methods(false).each {|e|
-          class<<context; self end.send(:define_method, e) {|*args| parent_context.send(e, *args)}
-        }
-        @before.each { |b| context.before(&b) }
-        @after.each { |b| context.after(&b) }
-        context.run
-      end
-    end
-  end
-
-  def xit(*args); end
-  def xdescribe(*args); end
-  def before_all; yield; end
-  def after_all; yield; end
-  def assert(description, &block)
-    it(description) do
-      block.call.should == true
-    end
-  end
-end