boson 0.4.0 → 1.0.0

data/test/scientist_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe "Scientist" do
   before_all {
-    Runner.in_shell = nil
+    Boson.in_shell = nil
     eval <<-EOF
     module Blah
       def blah(arg1, options={})
@@ -90,13 +90,6 @@ describe "Scientist" do
         }.should =~/invalid.*z/
       end
     end
-
-    it "print help with help option" do
-      all_commands.each do |cmd|
-        Boson.expects(:invoke).with(:usage, anything, anything)
-        send(cmd, '-h')
-      end
-    end
   end
 
   describe "command" do
@@ -130,11 +123,6 @@ describe "Scientist" do
         capture_stderr { command_with_args('a1 -l') }.should =~ /Error.*level/
       end
 
-      it "with unexpected error in render" do
-        Scientist.expects(:can_render?).raises("unexpected")
-        capture_stderr { command_with_args('a1') }.should =~ /Error.*unexpected/
-      end
-
       it "with no argument defined for options" do
         assert_error(OptionCommand::CommandArgumentError, '2 for 1') { command({:args=>1}, 'ok') }
       end
@@ -151,19 +139,10 @@ describe "Scientist" do
 
     it "with splat args does not raise error for too few or many args" do
       [[], [''], [1,2,3], ['1 2 3']].each do |args|
-        should.not.raise { command_with_splat_args *args }
+        should_not_raise { command_with_splat_args *args }
       end
     end
 
-    it "with debug option prints debug" do
-      capture_stdout { command_with_args("-v ok") }.should =~ /Arguments.*ok/
-    end
-
-    it "with pretend option prints arguments and returns early" do
-      Scientist.expects(:render_or_raw).never
-      capture_stdout { command_with_args("-p ok") }.should =~ /Arguments.*ok/
-    end
-
     it "with not enough args raises CommandArgumentError" do
       args = [OptionCommand::CommandArgumentError, '0 for 1']
       assert_error(*args) { command_with_args }
@@ -173,7 +152,9 @@ describe "Scientist" do
     end
 
     it "with too many args raises CommandArgumentError" do
-      args3 = [ArgumentError, '3 for 2']
+      args3 = RUBY_DESCRIPTION.include?('rubinius') ?
+        [ArgumentError, 'given 3, expected 2'] :
+        [ArgumentError, '3 for 2']
       args4 = [OptionCommand::CommandArgumentError, '4 for 2']
       assert_error(*args3) { command_with_args 1,2,3 }
       assert_error(*args4) { command_with_args '1 2 3' }
@@ -182,62 +163,6 @@ describe "Scientist" do
     end
   end
 
-  def command_with_render(*args)
-    basic_command({:render_options=>{:fields=>{:values=>['f1', 'f2']}} }, args)
-  end
-
-  def render_expected(options=nil)
-    View.expects(:render).with(anything, options || anything, false)
-  end
-
-  describe "render" do
-    it "called for command with render_options" do
-      render_expected
-      command_with_render('1')
-    end
-
-    it "called for command without render_options and --render" do
-      render_expected
-      command_with_args('--render 1')
-    end
-
-    it "not called for command with render_options and --render" do
-      Boson.expects(:invoke).never
-      command_with_render('--render 1')
-    end
-
-    it "not called for command without render_options" do
-      Boson.expects(:invoke).never
-      command_with_args('1')
-    end
-  end
-
-  describe "command renders" do
-    it "with basic render options" do
-      render_expected :fields => ['f1', 'f2']
-      command_with_render("--fields f1,f2 ab")
-    end
-
-    it "without non-render options" do
-      render_expected :fields=>['f1']
-      Scientist.expects(:can_render?).returns(true)
-      args = ["--render --fields f1 ab"]
-      basic_command({:render_options=>{:fields=>{:values=>['f1', 'f2']}} }, args)
-    end
-
-    it "with user-defined render options" do
-      render_expected :fields=>['f1'], :foo=>true
-      args = ["--foo --fields f1 ab"]
-      basic_command({:render_options=>{:foo=>:boolean, :fields=>{:values=>['f1', 'f2']}} }, args)
-    end
-
-    it "with non-hash user-defined render options" do
-      render_expected :fields=>['f1'], :foo=>true
-      args = ["--foo --fields f1 ab"]
-      basic_command({:render_options=>{:foo=>:boolean, :fields=>%w{f1 f2 f3}} }, args)
-    end
-  end
-
   describe "command with default option" do
     before_all { @cmd_attributes = {:name=>'default_option', :default_option=>'level', :args=>1} }
 
@@ -246,7 +171,7 @@ describe "Scientist" do
     end
 
     it "parses normally from cmdline" do
-      Runner.expects(:in_shell?).times(2).returns true
+      Boson.expects(:in_shell).times(2).returns true
       command(@cmd_attributes, ['--force', '--level=3']).should == {:level=>3, :force=>true}
     end
 
@@ -263,79 +188,16 @@ describe "Scientist" do
     end
 
     it "prepends correctly from cmdline" do
-      Runner.expects(:in_shell?).times(2).returns true
+      Boson.expects(:in_shell).times(2).returns true
       command(@cmd_attributes, ['3','-f']).should == {:level=>3, :force=>true}
     end
   end
 
-  it "optionless command renders" do
-    render_expected :fields=>['f1']
-    command({:args=>2, :options=>nil, :render_options=>{:fields=>:array}}, ["--fields f1 ab ok"])
-  end
-
   it "redefine_command prints error for command with nonexistant method" do
     capture_stderr {
       Scientist.redefine_command Object.new, Command.new(:name=>'blah', :lib=>'blah')
     }.should =~ /Error: No method.*'blah'/
   end
 
-  describe "global options:" do
-    def local_and_global(*args)
-      Scientist.stubs(:can_render?).returns(false) # turn off rendering caused by :render_options
-      @non_opts = basic_command(@command_options, args)
-      @non_opts.slice!(-1,1) << Scientist.global_options
-    end
-
-    before_all {
-      @command_options = {:options=>{:do=>:boolean, :foo=>:boolean},
-      :render_options=>{:dude=>:boolean}}
-      @expected_non_opts = [[], ['doh'], ['doh'], [:doh]]
-    }
-
-    it "local option overrides global one" do
-      ['-d', 'doh -d','-d doh', [:doh, '-d']].each_with_index do |args, i|
-        local_and_global(*args).should == [{:do=>true}, {}]
-        @non_opts.should == @expected_non_opts[i]
-      end
-    end
-
-    it "global option before local one is valid" do
-      args_arr = ['--dude -f', '--dude doh -f', '--dude -f doh', [:doh, '--dude -f']]
-      args_arr.each_with_index do |args, i|
-        local_and_global(*args).should == [{:foo=>true}, {:dude=>true}]
-        @non_opts.should == @expected_non_opts[i]
-      end
-    end
-
-    it "delete_options deletes global options" do
-      local_and_global('--delete_options=r,p -rp -f').should ==
-        [{:foo=>true}, {:delete_options=>["r", "p"]}]
-    end
-
-    it "global option after local one is invalid" do
-      args_arr = ['-f --dude', '-f doh --dude', '-f --dude doh', [:doh, '-f --dude'] ]
-      args_arr.each_with_index do |args, i|
-        capture_stderr {
-          local_and_global(*args).should == [{:foo=>true}, {}]
-          @non_opts.should == @expected_non_opts[i]
-        }.should =~ /invalid.*dude/
-      end
-    end
-
-    it "global option after local one and -" do
-      local_and_global("doh -r -f - --dude").should == [{:foo=>true}, {:dude=>true, :render=>true}]
-    end
-
-    it "conflicting global option after -" do
-      local_and_global('doh - -f=1,2').should == [{}, {:fields=>["1", "2"]}]
-    end
-
-    it "no options parsed after --" do
-      local_and_global('doh -f -- -r').should == [{:foo=>true}, {}]
-      local_and_global('doh -- -r -f').should == [{}, {}]
-      local_and_global('-- -r -f').should == [{}, {}]
-      local_and_global('doh -r -- -f').should == [{}, {:render=>true}]
-    end
-  end
-  after_all { Runner.in_shell = false }
-end
+  after_all { Boson.in_shell = false }
+end

data/test/test_helper.rb

@@ -1,18 +1,22 @@
-require 'bacon'
-require 'bacon/bits'
 require 'mocha'
-require 'mocha-on-bacon'
 require 'boson'
+require 'fileutils'
+require 'boson/runner'
+require 'bahia'
+
+ENV['RSPEC'] = '1' if $0[/rspec/]
+unless ENV['RSPEC']
+  require 'bacon'
+  require 'bacon/bits'
+  require 'mocha-on-bacon'
+end
+
 Object.send :remove_const, :OptionParser
 Boson.constants.each {|e| Object.const_set(e, Boson.const_get(e)) unless Object.const_defined?(e) }
+ENV['BOSONRC'] = File.dirname(__FILE__) + '/.bosonrc'
 
 module TestHelpers
-  # make local so it doesn't pick up my real boson dir
-  Boson.repo.dir = File.dirname(__FILE__)
-  # prevent extra File.exists? calls which interfere with stubs for it
-  Boson.repo.config = {:libraries=>{}, :command_aliases=>{}, :console_defaults=>[]}
-  Boson.instance_variable_set "@repos", [Boson.repo]
-
+  ## Misc
   def assert_error(error, message=nil)
     yield
   rescue error=>e
@@ -22,6 +26,26 @@ module TestHelpers
     nil.should == error
   end
 
+  def remove_constant(name, mod=Object)
+    mod.send(:remove_const, name) if mod.const_defined?(name, false)
+  end
+
+  def with_config(options)
+    old_config = Boson.config
+    Boson.config = Boson.config.merge(options)
+    yield
+    Boson.config = old_config
+  end
+
+  def manager_load(lib, options={})
+    @stderr = capture_stderr { Manager.load(lib, options) }
+  end
+
+  def stderr
+    @stderr.chomp
+  end
+
+  ## Reset
   def reset
     reset_main_object
     reset_boson
@@ -29,8 +53,8 @@ module TestHelpers
 
   def reset_main_object
     Boson.send :remove_const, "Universe"
-    eval "module ::Boson::Universe; include ::Boson::Commands::Namespace; end"
-    Boson::Commands.send :remove_const, "Blah" rescue nil
+    eval "module ::Boson::Universe; end"
+    remove_constant "Blah", Boson::Commands
     Boson.main_object = Object.new
   end
 
@@ -43,10 +67,7 @@ module TestHelpers
     Boson.instance_eval("@libraries = nil")
   end
 
-  def command_exists?(name, bool=true)
-    (!!Command.find(name)).should == bool
-  end
-
+  ## Library
   def library_loaded?(name, bool=true)
     Manager.loaded?(name).should == bool
   end
@@ -55,33 +76,36 @@ module TestHelpers
     Boson.library(name)
   end
 
-  def library_has_module(lib, lib_module)
-    Manager.loaded?(lib).should == true
-    test_lib = library(lib)
-    (test_lib.module.is_a?(Module) && (test_lib.module.to_s == lib_module)).should == true
-  end
-
   def library_has_command(lib, command, bool=true)
     (lib = library(lib)) && lib.commands.include?(command).should == bool
   end
 
-  # mocks as a file library
-  def mock_library(lib, options={})
-    options = {:file_string=>'', :exists=>true}.merge!(options)
-    File.expects(:exists?).with(FileLibrary.library_file(lib.to_s, Boson.repo.dir)).
-      at_least(1).returns(options.delete(:exists))
-    File.expects(:read).returns(options.delete(:file_string))
+  ## Factories
+  def create_runner(*methods, &block)
+    options = methods[-1].is_a?(Hash) ? methods.pop : {}
+    library = options[:library] || :Blarg
+    remove_constant library
+
+    Object.const_set(library, Class.new(Boson::Runner)).tap do |klass|
+      if block
+        klass.module_eval(&block)
+      else
+        methods.each do |meth|
+          klass.send(:define_method, meth) { }
+        end
+      end
+    end
+  end
+
+  def create_library(hash)
+    Library.new(hash).tap {|lib| Manager.add_library lib }
   end
 
-  def load(lib, options={})
-    # prevent conflicts with existing File.read stubs
-    MethodInspector.stubs(:inspector_in_file?).returns(false)
-    mock_library(lib, options) unless options.delete(:no_mock)
-    result = Manager.load([lib], options)
-    FileLibrary.reset_file_cache
-    result
+  def create_command(hash)
+    Command.new(hash).tap {|cmd| Boson.commands << cmd }
   end
 
+  ## Capture
   def capture_stdout(&block)
     original_stdout = $stdout
     $stdout = fake = StringIO.new
@@ -93,13 +117,6 @@ module TestHelpers
     fake.string
   end
 
-  def with_config(options)
-    old_config = Boson.repo.config
-    Boson.repo.config = Boson.repo.config.merge(options)
-    yield
-    Boson.repo.config = old_config
-  end
-
   def capture_stderr(&block)
     original_stderr = $stderr
     $stderr = fake = StringIO.new
@@ -111,20 +128,38 @@ module TestHelpers
     fake.string
   end
 
-  def create_library(libraries, attributes={})
-    libraries = [libraries] unless libraries.is_a?(Array)
-    libraries.map {|e|
-      lib = Library.new({:name=>e}.update(attributes))
-      Manager.add_library(lib); lib
+  if ENV['RSPEC']
+    def should_not_raise(&block)
+      block.should_not raise_error
+    end
+  else
+    # Since rspec doesn't allow should != or should.not
+    Object.send(:define_method, :should_not) {|*args, &block|
+      should.not(*args, &block)
     }
+    def should_not_raise(&block)
+      should.not.raise &block
+    end
   end
+end
 
-  def aborts_with(regex)
-    BinRunner.expects(:abort).with {|e| e[regex] }
-    yield
+if ENV['RSPEC']
+  module RspecBits
+    def before_all(&block)
+      before(:all, &block)
+    end
+
+    def after_all(&block)
+      after(:all, &block)
+    end
   end
-end
 
-class Bacon::Context
-  include TestHelpers
+  RSpec.configure {|c|
+    c.mock_with :mocha
+    c.extend RspecBits
+    c.include TestHelpers, Bahia
+  }
+else
+  Bacon::Context.send :include, Bahia
+  Bacon::Context.send :include, TestHelpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boson
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: &70363074549740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70363074549740
-- !ruby/object:Gem::Dependency
-  name: alias
-  requirement: &70363074548940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70363074548940
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70363074548340 !ruby/object:Gem::Requirement
+  requirement: &70219859552560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *70363074548340
+  version_requirements: *70219859552560
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70363074547880 !ruby/object:Gem::Requirement
+  requirement: &70219859552020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70363074547880
+  version_requirements: *70219859552020
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
-  requirement: &70363074547500 !ruby/object:Gem::Requirement
+  requirement: &70219859551540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363074547500
+  version_requirements: *70219859551540
 - !ruby/object:Gem::Dependency
   name: bacon-bits
-  requirement: &70363074547000 !ruby/object:Gem::Requirement
+  requirement: &70219859551080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,78 +54,56 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363074547000
+  version_requirements: *70219859551080
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70363074546540 !ruby/object:Gem::Requirement
+  name: bahia
+  requirement: &70219859550520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70363074546540
-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.
+  version_requirements: *70219859550520
+description: Boson is a modular command/task framework. Thanks to its rich set of
+  plugins, it differentiates itself from rake and thor by being usable from irb and
+  the commandline, having optional automated views generated by hirb and allowing
+  libraries to be written as plain ruby. Works with ruby >= 1.9.2
 email: gabriel.horner@gmail.com
 executables:
 - boson
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - LICENSE.txt
 files:
+- lib/boson/bare_runner.rb
+- lib/boson/bin_runner.rb
 - lib/boson/command.rb
-- lib/boson/commands/core.rb
-- lib/boson/commands/web_core.rb
-- lib/boson/commands.rb
-- lib/boson/index.rb
 - lib/boson/inspector.rb
-- lib/boson/inspectors/argument_inspector.rb
-- lib/boson/inspectors/comment_inspector.rb
-- lib/boson/inspectors/method_inspector.rb
-- lib/boson/libraries/file_library.rb
-- lib/boson/libraries/gem_library.rb
-- lib/boson/libraries/local_file_library.rb
-- lib/boson/libraries/module_library.rb
-- lib/boson/libraries/require_library.rb
 - lib/boson/library.rb
 - lib/boson/loader.rb
 - lib/boson/manager.rb
-- lib/boson/namespace.rb
+- lib/boson/method_inspector.rb
 - lib/boson/option_command.rb
 - lib/boson/option_parser.rb
 - lib/boson/options.rb
-- lib/boson/pipe.rb
-- lib/boson/pipes.rb
-- lib/boson/repo.rb
 - lib/boson/repo_index.rb
 - lib/boson/runner.rb
-- lib/boson/runners/bin_runner.rb
-- lib/boson/runners/console_runner.rb
+- lib/boson/runner_library.rb
 - lib/boson/scientist.rb
 - lib/boson/util.rb
 - lib/boson/version.rb
-- lib/boson/view.rb
 - lib/boson.rb
-- test/argument_inspector_test.rb
 - test/bin_runner_test.rb
 - test/command_test.rb
-- test/commands_test.rb
-- test/comment_inspector_test.rb
-- test/file_library_test.rb
 - test/loader_test.rb
 - test/manager_test.rb
 - test/method_inspector_test.rb
 - test/option_parser_test.rb
 - test/options_test.rb
-- test/pipes_test.rb
-- test/repo_index_test.rb
-- test/repo_test.rb
+- test/runner_library_test.rb
 - test/runner_test.rb
 - test/scientist_test.rb
 - test/test_helper.rb
@@ -156,11 +112,13 @@ files:
 - LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
-- deps.rip
+- README.md
+- Upgrading.md
 - test/deps.rip
 - Rakefile
 - .gemspec
 - .travis.yml
+- .rspec
 homepage: http://tagaholic.me/boson/
 licenses:
 - MIT
@@ -182,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A command/task framework similar to rake and thor that opens your ruby universe