bacon 0.9.0 → 1.0.0

data/RDOX

@@ -32,4 +32,29 @@ shared/behaves_like
 - gets called where it is included
 - can access data
 
-28 specifications (288 requirements), 0 failures, 0 errors
+describe arguments
+- should work with stringstring
+
+
+- should work with symbolsbehaviour
+
+
+- should work with modulesBacon
+
+
+- should work with namespaced modulesBacon::Context
+
+
+- should work with multiple argumentsBacon::Context empty
+
+
+
+#should shortcut for #it('should')
+- should be called
+- should save some characters by typing should
+- should save characters even on failure
+- should work nested
+- should add new specifications
+- should have been called
+
+39 specifications (359 requirements), 0 failures, 0 errors

data/README

@@ -3,7 +3,7 @@
    "Truth will sooner come out from error than from confusion."
                                                ---Francis Bacon
 
-Bacon is a small RSpec clone weighing less than 300 LoC but
+Bacon is a small RSpec clone weighing less than 350 LoC but
 nevertheless providing all essential features.
 
 == Whirl-wind tour
@@ -196,9 +196,40 @@ demonstrations, quick checks and doctest tests.
     => false
 
 
+== Bacon with autotest
+
+Since version 1.0, there is autotest support.  You need to tag your
+test directories (test/ or spec/) by creating an .bacon file there.
+Autotest then will find it.  bin/bacon needs to be in PATH or RUBYPATH.
+
+
+== Converting specs
+
+spec-converter is a simple tool to convert test-unit or dust style
+tests to test/spec specs.
+
+It can be found at http://opensource.thinkrelevance.com/wiki/spec_converter.
+
+
 == Thanks to
 
 * Michael Fellinger, for fixing Bacon for 1.9 and various improvements.
+* Gabriele Renzi, for implementing Context#should.
+* James Tucker, for the autotest support
+* everyone contributing bug fixes.
+
+
+== History
+
+* January 7, 2008: First public release 0.9.
+
+* July 6th, 2008: Second public release 1.0.
+  * Add Context#should as a shortcut for Context#it('should ' + _).
+  * describe now supports multiple arguments for better organization.
+  * Empty specifications are now erroneous.
+  * after-blocks run in the case of exceptions too.
+  * Autotest support.
+  * Bug fixes.
 
 
 == Contact

data/Rakefile

@@ -92,7 +92,7 @@ else
     s.summary         = "a small RSpec clone"
 
     s.description = <<-EOF
-Bacon is a small RSpec clone weighing less than 300 LoC but
+Bacon is a small RSpec clone weighing less than 350 LoC but
 nevertheless providing all essential features.
 
 http://chneukirchen.org/repos/bacon

data/bin/bacon

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'optparse'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/')
 module Bacon; end
 
 automatic = false
@@ -89,9 +90,9 @@ opts = OptionParser.new("", 24, '  ') { |opts|
 files = ARGV
 
 if automatic
-  files.concat Dir["test/test_*.rb"]
-  files.concat Dir["test/spec_*.rb"]
-  files.concat Dir["spec/spec_*.rb"]
+  files.concat Dir["test/**/test_*.rb"]
+  files.concat Dir["test/**/spec_*.rb"]
+  files.concat Dir["spec/**/spec_*.rb"]
 end
 
 if files.empty?

data/lib/autotest/bacon.rb

@@ -0,0 +1,36 @@
+Autotest.add_hook :initialize do |att|
+  att.clear_mappings
+
+  att.add_mapping(%r%^(test|spec)/.*\.rb$%) do |filename, _|
+    filename
+  end
+
+  att.add_mapping(%r%^lib/(.*)\.rb$%) do |filename, m|
+    lib_path = m[1]
+    spec = File.basename(lib_path)
+    path = File.dirname(lib_path)
+    [
+      "test/#{path}/test_#{spec}.rb",
+      "test/#{path}/spec_#{spec}.rb",
+      "spec/#{path}/spec_#{spec}.rb",
+      # TODO : decide if the follow 'rspec style' name should be allowed?
+      # "spec/#{path}/#{spec}_spec.rb"
+    ]
+  end
+
+  false
+end
+
+class Autotest::Bacon < Autotest
+  def initialize
+    super
+    self.libs = %w[. lib test spec].join(File::PATH_SEPARATOR)
+  end
+
+  def make_test_cmd(files_to_test)
+    args = files_to_test.keys.flatten.join(' ')
+    args = '-a' if args.empty?
+    # TODO : make regex to pass to -n using values
+    "#{ruby} -S bacon -o TestUnit #{args}"
+  end
+end

data/lib/autotest/discover.rb

@@ -0,0 +1,9 @@
+Autotest.add_discovery do
+  if File.exist?('spec/.bacon') || File.exist?('test/.bacon')
+    class Autotest
+      @@discoveries.delete_if { |d| d.inspect =~ /rspec/ }
+      warn 'Removing rspec from autotest!'
+    end
+    'bacon'
+  end
+end

data/lib/bacon.rb

@@ -8,7 +8,7 @@
 # See COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 module Bacon
-  VERSION = "0.9"
+  VERSION = "1.0"
 
   Counter = Hash.new(0)
   ErrorLog = ""
@@ -122,17 +122,42 @@ module Bacon
 
     def it(description, &block)
       return  unless description =~ RestrictName
+      block ||= lambda { should.flunk "not implemented" }
       Counter[:specifications] += 1
       run_requirement description, block
     end
+    
+    def should(*args, &block)
+      if Counter[:depth]==0
+        it('should '+args.first,&block)
+      else
+        super(*args,&block)
+      end
+    end
 
     def run_requirement(description, spec)
       Bacon.handle_requirement description do
         begin
           Counter[:depth] += 1
-          @before.each { |block| instance_eval(&block) }
-          instance_eval(&spec)
-          @after.each { |block| instance_eval(&block) }
+          rescued = false
+          begin
+            @before.each { |block| instance_eval(&block) }
+            prev_req = Counter[:requirements]
+            instance_eval(&spec)
+          rescue Object => e
+            rescued = true
+            raise e
+          ensure
+            if Counter[:requirements] == prev_req and not rescued
+              raise Error.new(:missing,
+                              "empty specification: #{@name} #{description}")
+            end
+            begin
+              @after.each { |block| instance_eval(&block) }
+            rescue Object => e
+              raise e  unless rescued
+            end
+          end
         rescue Object => e
           ErrorLog << "#{e.class}: #{e.message}\n"
           e.backtrace.find_all { |line| line !~ /bin\/bacon|\/bacon\.rb:\d+/ }.
@@ -178,7 +203,7 @@ end
 
 class Proc
   def raise?(*exceptions)
-    exceptions << RuntimeError if exceptions.empty?
+    exceptions = [RuntimeError]  if exceptions.empty?
     call
 
   # Only to work in 1.9.0, rescue with splat doesn't work there right now
@@ -217,23 +242,20 @@ end
 
 
 class Object
-  def should(*args, &block)   Should.new(self).be(*args, &block)  end
+  def should(*args, &block)    Should.new(self).be(*args, &block)         end
 end
 
 module Kernel
   private
-
-  def describe(name, &block)  Bacon::Context.new(name, &block) end
-  def shared(name, &block)    Bacon::Shared[name] = block      end
+  def describe(*args, &block)  Bacon::Context.new(args.join(' '), &block) end
+  def shared(name, &block)     Bacon::Shared[name] = block                end
 end
 
 
 class Should
   # Kills ==, ===, =~, eql?, equal?, frozen?, instance_of?, is_a?,
   # kind_of?, nil?, respond_to?, tainted?
-  instance_methods.each { |method|
-    undef_method method  if method =~ /\?|^\W+$/
-  }
+  instance_methods.each { |name| undef_method name  if name =~ /\?|^\W+$/ }
 
   def initialize(object)
     @object = object
@@ -271,8 +293,8 @@ class Should
 
     r = yield(@object, *args)
     if Bacon::Counter[:depth] > 0
-      raise Bacon::Error.new(:failed, description)  unless @negated ^ r
       Bacon::Counter[:requirements] += 1
+      raise Bacon::Error.new(:failed, description)  unless @negated ^ r
     end
     @negated ^ r ? r : false
   end

data/test/spec_bacon.rb

@@ -1,5 +1,6 @@
-$: << File.dirname(__FILE__) + '/../lib/'
-require 'bacon'
+$-w,w = nil, $-w
+require File.join(File.dirname(__FILE__), '../lib/bacon')
+$-w = w
 
 # Hooray for meta-testing.
 module MetaTests
@@ -308,3 +309,32 @@ describe "shared/behaves_like" do
   }
   behaves_like "another shared context"
 end
+
+describe 'describe arguments' do
+
+  def check(ctx,name)
+    ctx.should.be.an.instance_of Bacon::Context
+    ctx.instance_variable_get('@name').should == name
+  end
+
+  it 'should work with string' do
+    check(describe('string') {},'string')
+  end
+
+  it 'should work with symbols' do
+    check(describe(:behaviour) {},'behaviour')
+  end
+   
+  it 'should work with modules' do
+    check(describe(Bacon) {},'Bacon')
+  end
+
+  it 'should work with namespaced modules' do
+    check(describe(Bacon::Context) {},'Bacon::Context')
+  end
+
+  it 'should work with multiple arguments' do
+    check(describe(Bacon::Context, :empty) {},'Bacon::Context empty')
+  end
+
+end

data/test/spec_should.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '../lib/bacon')
+
+describe "#should shortcut for #it('should')" do
+  
+  should "be called" do
+    @called = true
+    @called.should.be == true
+  end
+  
+  should "save some characters by typing should" do
+    lambda { should.satisfy { 1 == 1 } }.should.not.raise
+  end
+
+  should "save characters even on failure" do
+    lambda { should.satisfy { 1 == 2 } }.should.raise Bacon::Error
+  end
+
+  should "work nested" do
+    should.satisfy {1==1}
+  end
+  
+  count = Bacon::Counter[:specifications]
+  should "add new specifications" do
+    # XXX this should +=1 but it's +=2
+    (count+1).should == Bacon::Counter[:specifications]
+  end
+
+  should "have been called" do
+    @called.should.be == true
+  end
+
+end

metadata

@@ -1,53 +1,63 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: bacon
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2008-01-07 00:00:00 +01:00
-summary: a small RSpec clone
-require_paths: 
-- lib
-email: chneukirchen@gmail.com
-homepage: http://chneukirchen.org/repos/bacon
-rubyforge_project: 
-description: Bacon is a small RSpec clone weighing less than 300 LoC but nevertheless providing all essential features.  http://chneukirchen.org/repos/bacon
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Christian Neukirchen
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-07-06 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: Bacon is a small RSpec clone weighing less than 350 LoC but nevertheless providing all essential features.  http://chneukirchen.org/repos/bacon
+email: chneukirchen@gmail.com
+executables: 
+- bacon
+extensions: []
+
+extra_rdoc_files: 
+- README
+- RDOX
 files: 
 - bin/bacon
 - COPYING
+- lib/autotest/bacon.rb
+- lib/autotest/discover.rb
 - lib/bacon.rb
 - Rakefile
 - README
 - test/spec_bacon.rb
+- test/spec_should.rb
 - RDOX
-test_files: []
-
+has_rdoc: true
+homepage: http://chneukirchen.org/repos/bacon
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- RDOX
-executables: 
-- bacon
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: a small RSpec clone
+test_files: []