bacon 1.1.0 → 1.2.0

data/.travis.yml

@@ -0,0 +1,12 @@
+script: bin/bacon -Ilib --automatic --quiet
+rvm:
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- rbx-18mode
+- rbx-19mode
+- jruby-18mode
+- jruby-19mode
+notifications:
+  recipients:
+  - gabriel.horner@gmail.com

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
+Copyright (c) 2007, 2008, 2012 Christian Neukirchen <purl.org/net/chneukirchen>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/ChangeLog

@@ -1,3 +1,131 @@
+Fri Dec 21 11:49:56 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Update README
+
+Fri Dec 21 11:45:44 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Replace ChangeLog generator
+
+Fri Dec 21 11:45:31 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Update copyright years
+
+Fri Dec 21 11:42:19 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Rename README README.rdoc
+
+Wed Mar 21 04:27:31 2012 -0700  Christian Neukirchen <chneukirchen@gmail.com>
+  * Merge pull request #11 from cldwalker/fix_change_tests
+
+    Fix change tests for jruby and sometimes 1.8.7
+Tue Mar 20 18:19:29 2012 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * all tests green - remove allowed_failures for travis
+
+Tue Mar 20 18:02:51 2012 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * fix should.change tests failing intermittently on jruby + 1.8.7
+
+    see http://travis-ci.org/#!/cldwalker/bacon/builds/910141 tests were
+    running so fast that Time.now remains the same
+
+Fri Mar 16 19:30:08 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Update README
+
+Fri Mar 16 11:42:46 2012 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * Add travis to see tests pass on supported rubies
+
+Fri Mar 16 19:14:14 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Push version to 1.2
+
+Fri Mar 16 19:11:20 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Add tests for should.==
+
+    Proposed by Gabriel Horner <gabriel.horner@gmail.com>.
+
+Fri Mar 16 19:05:34 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Remove passing arguments in #satisfy, simplify argument parsing
+
+    This feature was never used and triggers a JRuby bug: 
+    http://jira.codehaus.org/browse/JRUBY-6550
+
+    Proposed by Gabriel Horner <gabriel.horner@gmail.com>.
+
+Fri Mar 16 19:03:58 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Whitespace cleanup
+
+Sun Feb 26 17:50:46 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Add specs for change?
+
+Sun Feb 26 17:48:57 2012 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Fix Context#change?
+
+Wed Dec 28 12:23:29 2011 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Merge remote-tracking branch 'jeffkreeftmeijer/master'
+
+Wed Dec 28 03:17:12 2011 -0800  Christian Neukirchen <chneukirchen@gmail.com>
+  * Merge pull request #6 from manveru/master
+
+    Two minor fixes
+Wed Dec 28 03:54:58 2011 +0100  Michael Fellinger <m.fellinger@gmail.com>
+  * Avoid warning about unused variable
+
+Wed Dec 28 03:54:19 2011 +0100  Michael Fellinger <m.fellinger@gmail.com>
+  * Update deprecated calls in rakefile
+
+Sun Jan 16 14:38:05 2011 +0100  Jeff Kreeftmeijer <jeff@kreeftmeijer.nl>
+  * Move the Gem::Specification to bacon.gemspec
+
+    So the gem can be built and released using gem build and gem push and to
+    allow tools like Bundler to install Bacon from git or from the local
+    filesystem.
+
+Wed Apr 14 05:40:31 2010 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * Indent nested contexts for SpecDoxOutput Based on similar patch from
+    http://github.com/wvl/bacon/commit/af940dbeb789f5eef2d998e227e5425d
+
+Mon Mar 29 14:06:47 2010 +0200  Christian Neukirchen <chneukirchen@gmail.com>
+  * Merge remote branch 'cldwalker/timer'
+
+Sun Mar 28 23:16:49 2010 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * give TestUnitOutput the same timer that Test::Unit has
+
+Sat Mar 20 04:19:18 2010 -0400  Gabriel Horner <gabriel.horner@gmail.com>
+  * methods in a context should serve as behavior that is inherited by sibling
+    contexts
+
+Sun Jan 17 12:17:42 2010 -0800  Eoin Hennessy <eoin@randomrules.org>
+  * Add support for finding specs with RSpec style naming.
+
+Tue Sep 22 21:17:55 2009 +0200  Christian Neukirchen <chneukirchen@gmail.com>
+  * Add ChangeLog as gem dependency reported by lian
+
+Mon Aug 31 23:36:56 2009 +0200  Eloy Duran <eloy.de.enige@gmail.com>
+  * Revert old change that was made because 1.9.0 couldn't rescue a splatted
+    array of Exception classes. MacRuby currently can't use when with the same
+    array and 1.9.2dev does.
+
+    Also some other minor changes which didn't work currently on 1.9.2dev,
+    but are nicer anyway imo.
+
+Thu Jan 22 06:07:53 2009 +0000  Anna Gabutero <amdg@lavabit.com>
+  * Add libs to include path when invoking Test::Unit
+
+Sun Jan 11 14:41:01 2009 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Update homepage
+
+Sat Jan 10 14:01:30 2009 -0800  Christian Neukirchen <chneukirchen@gmail.com>
+  * Allow negated nontrue values outside specs
+
+Sat Jan 10 13:44:14 2009 -0800  Ian Dees <undees@gmail.com>
+  * Added test for nontrue values outside specs
+
+Sun Nov 30 11:14:31 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Push VERSION to 1.1
+
+Sun Nov 30 11:13:33 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Last fixes
+
+Sun Nov 30 11:06:09 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Update README
+
+Sun Nov 30 11:00:28 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
+  * Add Knock output
+
 Sat Oct 25 12:30:00 2008 +0200  Christian Neukirchen <chneukirchen@gmail.com>
   * De-metaprogram and document nested before/after
 
@@ -15,10 +143,10 @@ Fri Oct 24 17:06:18 2008 -0500  Yossef Mendelssohn <ymendel@pobox.com>
 
 Fri Oct 24 17:01:51 2008 -0500  Yossef Mendelssohn <ymendel@pobox.com>
   * Letting before blocks be run from higher levels in nested context
-    
-    Split up Context#initialize to let running be a separate step.
-    Added attr_reader for Context name and block to let the running step have access
-    to them without resorting to instance variables.
+
+    Split up Context#initialize to let running be a separate step. Added
+    attr_reader for Context name and block to let the running step have
+    access to them without resorting to instance variables.
 
 Sat Oct 4 13:38:23 2008 +0200  Christian Neukirchen <chneukirchen@gmail.com>
   * Move to git
@@ -31,8 +159,9 @@ Sun Aug 17 12:48:29 2008 +0200  Christian Neukirchen <chneukirchen@gmail.com>
 
 Fri Aug 1 12:01:28 2008 +0200  jftucker <jftucker@gmail.com>
   * pols-for-at-exit
-    
-    Added an alias for summary_on_exit to summary_at_exit to save on POLS for some people (me!).
+
+    Added an alias for summary_on_exit to summary_at_exit to save on POLS
+    for some people (me!).
 
 Sun Jul 6 18:47:42 2008 +0200  Christian Neukirchen <chneukirchen@gmail.com>
   * Add bacon_rspec.rb to avoid errors when .bacon doesn't exist
@@ -60,19 +189,19 @@ Wed Jun 25 13:20:29 2008 +0200  jftucker <jftucker@gmail.com>
 
 Wed Jun 25 00:27:08 2008 +0200  jftucker <jftucker@gmail.com>
   * adding autotest support
-    
-    The autotest auto discovery uses bacons test/unit output.
-    It does not currently call specific examples (TODO).
-    It currently attempts to fix the rspec auto discovery by removing it if it
-    finds a .bacon under test/ or spec/. In fact, these are the only conditions
-    under which the bacon autotest will load.
+
+    The autotest auto discovery uses bacons test/unit output. It does not
+    currently call specific examples (TODO). It currently attempts to fix
+    the rspec auto discovery by removing it if it finds a .bacon under test/
+    or spec/. In fact, these are the only conditions under which the bacon
+    autotest will load.
 
 Thu Mar 13 04:00:42 2008 +0100  Michael Fellinger m.fellinger@gmail.com <chneukirchen@gmail.com>
   * Show exception instead of missing error if a spec is empty because of it.
 
 Sun Mar 2 11:52:38 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
   * Call after-blocks even if before-blocks or spec raise exceptions
-    
+
     Based on a patch by Keita Yamaguchi
 
 Sun Mar 2 11:52:09 2008 +0100  Christian Neukirchen <chneukirchen@gmail.com>
@@ -88,11 +217,12 @@ Sun Feb 10 14:49:58 2008 +0100  Michael Fellinger <m.fellinger@gmail.com>
   * Improve require for lib/bacon
 
 Wed Jan 23 23:59:40 2008 +0100  rff.rff <rff.rff@gmail.com>
-  * allows multiple arguments to #describe to allow specialized behaviours such as
-    
+  * allows multiple arguments to #describe to allow specialized behaviours such
+    as
+
      describe Queue,'empty'
-     describe Queue,'full'
-    
+    describe Queue,'full'
+
     Some tests for this and manveru's latest patch are included
 
 Sat Jan 19 23:07:25 2008 +0100  Michael Fellinger <m.fellinger@gmail.com>

data/RDOX

@@ -1,69 +1,73 @@
-Bacon
-- should have should.satisfy
-- should have should.equal
-- should have should.raise
-- should have should.raise with a block
-- should have a should.raise should return the exception
-- should have should.be.an.instance_of
-- should have should.be.nil
-- should have should.include
-- should have should.be.a.kind_of
-- should have should.match
-- should have should.not.raise
-- should have should.throw
-- should have should.not.satisfy
-- should have should.not.equal
-- should have should.not.match
-- should have should.be.identical_to/same_as
-- should have should.respond_to
-- should have should.be.close
-- should support multiple negation
-- should have should.<predicate>
-- should have should <operator> (>, >=, <, <=, ===)
-- should allow for custom shoulds
-- should have should.flunk
+#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
 
-before/after
-- should run in the right order
-when nested
-- should run from higher level
-- should run at the nested level
-- should run in the right order
+A non-true value
+  - should pass negated tests inside specs
+  - should pass negated tests outside specs
 
-- should not run from lower level
-when nested at a sibling level
-- should not run from sibling level
+Bacon
+  - should have should.satisfy
+  - should have should.==
+  - should have should.equal
+  - should have should.raise
+  - should have should.change
+  - should have should.raise with a block
+  - should have a should.raise should return the exception
+  - should have should.be.an.instance_of
+  - should have should.be.nil
+  - should have should.include
+  - should have should.be.a.kind_of
+  - should have should.match
+  - should have should.not.raise
+  - should have should.throw
+  - should have should.not.satisfy
+  - should have should.not.equal
+  - should have should.not.match
+  - should have should.be.identical_to/same_as
+  - should have should.respond_to
+  - should have should.be.close
+  - should support multiple negation
+  - should have should.<predicate>
+  - should have should <operator> (>, >=, <, <=, ===)
+  - should allow for custom shoulds
+  - should have should.flunk
 
+before/after
+  - should run in the right order
+  when nested
+    - should run from higher level
+    - should run at the nested level
+    - should run in the right order
+  - should not run from lower level
+  when nested at a sibling level
+    - should not run from sibling level
 
 shared/behaves_like
-- gets called where it is included
-- raises NameError when the context is not found
-- gets called where it is included
-- can access data
-
-describe arguments
-- should work with stringstring
+  - gets called where it is included
+  - raises NameError when the context is not found
+  - gets called where it is included
+  - can access data
 
+Methods
+  - should be accessible in a test
+  when in a sibling context
+    - should be accessible in a test
 
-- should work with symbolsbehaviour
-
-
-- should work with modulesBacon
-
-
-- should work with namespaced modulesBacon::Context
+describe arguments
+  - should work with string  string
 
+  - should work with symbols  behaviour
 
-- should work with multiple argumentsBacon::Context empty
+  - should work with modules  Bacon
 
+  - should work with namespaced modules  Bacon::Context
 
+  - should work with multiple arguments  Bacon::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
 
-44 specifications (375 requirements), 0 failures, 0 errors
+50 specifications (408 requirements), 0 failures, 0 errors

data/{README → README.rdoc}

@@ -262,6 +262,15 @@ It can be found at http://opensource.thinkrelevance.com/wiki/spec_converter.
   * Add Knock output.
   * Bug fixes.
 
+* December 21th, 2012: Fourth public release 1.2.0.
+  * #satisfy will not pass arguments anymore to the block, use lexical scope.
+  * Fixed Context#change?.
+  * Add support for finding specs named like spec/**/*_spec.rb.
+  * Contexts nest properly.
+  * Timer in TestUnitOutput.
+  * Nested output for SpecDoxOutput.
+  * Small cleanups and more tests.
+
 
 == Contact
 
@@ -275,7 +284,7 @@ git://github.com/chneukirchen/bacon.git
 
 == Copying
 
-Copyright (C) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
+Copyright (C) 2007, 2008, 2012 Christian Neukirchen <purl.org/net/chneukirchen>
 
 Bacon is freely distributable under the terms of an MIT-style license.
 See COPYING or http://www.opensource.org/licenses/mit-license.php.

data/Rakefile

@@ -1,5 +1,5 @@
 # Rakefile for Bacon.  -*-ruby-*-
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 
@@ -50,20 +50,7 @@ end
 
 desc "Generate a ChangeLog"
 task :changelog do
-  File.open("ChangeLog", "w") { |out|
-    `git log -z`.split("\0").map { |chunk|
-      author = chunk[/Author: (.*)/, 1].strip
-      date = chunk[/Date: (.*)/, 1].strip
-      desc, detail = $'.strip.split("\n", 2)
-      detail ||= ""
-      detail = detail.gsub(/.*darcs-hash:.*/, '')
-      detail.rstrip!
-      out.puts "#{date}  #{author}"
-      out.puts "  * #{desc.strip}"
-      out.puts detail  unless detail.empty?
-      out.puts
-    }
-  }
+  sh "git log --format='%ad  %an <%ae>%n%w(79,2,4)* %s%n%n%w(76,4,4)%b' |grep -v darcs-hash: |cat -s >ChangeLog"
 end
 
 
@@ -78,59 +65,14 @@ task :test do
 end
 
 
-begin
-  $" << "sources"  if defined? FromSrc
-  require 'rubygems'
-
-  require 'rake'
-  require 'rake/clean'
-  require 'rake/packagetask'
-  require 'rake/gempackagetask'
-  require 'fileutils'
-rescue LoadError
-  # Too bad.
-else
-  spec = Gem::Specification.new do |s|
-    s.name            = "bacon"
-    s.version         = gem_version
-    s.platform        = Gem::Platform::RUBY
-    s.summary         = "a small RSpec clone"
-
-    s.description = <<-EOF
-Bacon is a small RSpec clone weighing less than 350 LoC but
-nevertheless providing all essential features.
-
-http://github.com/chneukirchen/bacon
-    EOF
-
-    s.files           = manifest + %w(RDOX ChangeLog)
-    s.bindir          = 'bin'
-    s.executables     << 'bacon'
-    s.require_path    = 'lib'
-    s.has_rdoc        = true
-    s.extra_rdoc_files = ['README', 'RDOX']
-    s.test_files      = []
-
-    s.author          = 'Christian Neukirchen'
-    s.email           = 'chneukirchen@gmail.com'
-    s.homepage        = 'http://chneukirchen.org/repos/bacon'
-  end
-
-  Rake::GemPackageTask.new(spec) do |p|
-    p.gem_spec = spec
-    p.need_tar = false
-    p.need_zip = false
-  end
-end
-
 desc "Generate RDoc documentation"
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source' <<
-    '--main' << 'README' <<
+    '--main' << 'README.rdoc' <<
     '--title' << 'Bacon Documentation' <<
     '--charset' << 'utf-8'
   rdoc.rdoc_dir = "doc"
-  rdoc.rdoc_files.include 'README'
+  rdoc.rdoc_files.include 'README.rdoc'
   rdoc.rdoc_files.include 'COPYING'
   rdoc.rdoc_files.include 'RDOX'
   rdoc.rdoc_files.include('lib/bacon.rb')

data/bacon.gemspec

@@ -0,0 +1,25 @@
+Gem::Specification.new do |s|
+  s.name            = "bacon"
+  s.version         = '1.2.0'
+  s.platform        = Gem::Platform::RUBY
+  s.summary         = "a small RSpec clone"
+
+  s.description = <<-EOF
+Bacon is a small RSpec clone weighing less than 350 LoC but
+nevertheless providing all essential features.
+
+http://github.com/chneukirchen/bacon
+  EOF
+
+  s.files           = `git ls-files`.split("\n") - [".gitignore"] + %w(RDOX ChangeLog)
+  s.bindir          = 'bin'
+  s.executables     << 'bacon'
+  s.require_path    = 'lib'
+  s.has_rdoc        = true
+  s.extra_rdoc_files = ['README.rdoc', 'RDOX']
+  s.test_files      = []
+
+  s.author          = 'Christian Neukirchen'
+  s.email           = 'chneukirchen@gmail.com'
+  s.homepage        = 'http://github.com/chneukirchen/bacon'
+end

data/bin/bacon

@@ -99,6 +99,7 @@ if automatic
   files.concat Dir["test/**/test_*.rb"]
   files.concat Dir["test/**/spec_*.rb"]
   files.concat Dir["spec/**/spec_*.rb"]
+  files.concat Dir["spec/**/*_spec.rb"]
 end
 
 if files.empty?

data/lib/autotest/bacon.rb

@@ -31,6 +31,6 @@ class Autotest::Bacon < Autotest
     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}"
+    "#{ruby} -S bacon -I#{libs} -o TestUnit #{args}"
   end
-end
+end

data/lib/bacon.rb

@@ -2,13 +2,13 @@
 #
 # "Truth will sooner come out from error than from confusion." ---Francis Bacon
 
-# Copyright (C) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
+# Copyright (C) 2007, 2008, 2012 Christian Neukirchen <purl.org/net/chneukirchen>
 #
 # Bacon is freely distributable under the terms of an MIT-style license.
 # See COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 module Bacon
-  VERSION = "1.1"
+  VERSION = "1.2"
 
   Counter = Hash.new(0)
   ErrorLog = ""
@@ -23,6 +23,7 @@ module Bacon
 
   def self.summary_on_exit
     return  if Counter[:installed_summary] > 0
+    @timer = Time.now
     at_exit {
       handle_summary
       if $!
@@ -37,13 +38,13 @@ module Bacon
 
   module SpecDoxOutput
     def handle_specification(name)
-      puts name
+      puts spaces + name
       yield
-      puts
+      puts if Counter[:context_depth] == 1
     end
 
     def handle_requirement(description)
-      print "- #{description}"
+      print "#{spaces}  - #{description}"
       error = yield
       puts error.empty? ? "" : " [#{error}]"
     end
@@ -53,6 +54,10 @@ module Bacon
       puts "%d specifications (%d requirements), %d failures, %d errors" %
         Counter.values_at(:specifications, :requirements, :failed, :errors)
     end
+
+    def spaces
+      "  " * (Counter[:context_depth] - 1)
+    end
   end
 
   module TestUnitOutput
@@ -68,7 +73,7 @@ module Bacon
     end
 
     def handle_summary
-      puts
+      puts "", "Finished in #{Time.now - @timer} seconds."
       puts ErrorLog  if Backtraces
       puts "%d tests, %d assertions, %d failures, %d errors" %
         Counter.values_at(:specifications, :requirements, :failed, :errors)
@@ -127,16 +132,18 @@ module Bacon
 
   class Context
     attr_reader :name, :block
-    
+
     def initialize(name, &block)
       @name = name
       @before, @after = [], []
       @block = block
     end
-    
+
     def run
       return  unless name =~ RestrictContext
+      Counter[:context_depth] += 1
       Bacon.handle_specification(name) { instance_eval(&block) }
+      Counter[:context_depth] -= 1
       self
     end
 
@@ -153,7 +160,7 @@ module Bacon
       Counter[:specifications] += 1
       run_requirement description, block
     end
-    
+
     def should(*args, &block)
       if Counter[:depth]==0
         it('should '+args.first,&block)
@@ -210,6 +217,9 @@ module Bacon
 
     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
@@ -217,7 +227,7 @@ module Bacon
 
     def raise?(*args, &block); block.raise?(*args); end
     def throw?(*args, &block); block.throw?(*args); end
-    def change?(*args, &block); block.change?(*args); end
+    def change?(&block); lambda{}.change?(&block); end
   end
 end
 
@@ -237,17 +247,9 @@ end
 
 class Proc
   def raise?(*exceptions)
-    exceptions = [RuntimeError]  if exceptions.empty?
     call
-
-  # Only to work in 1.9.0, rescue with splat doesn't work there right now
-  rescue Object => e
-    case e
-    when *exceptions
-      e
-    else
-      raise e
-    end
+  rescue *(exceptions.empty? ? RuntimeError : exceptions) => e
+    e
   else
     false
   end
@@ -262,7 +264,7 @@ class Proc
 
   def change?
     pre_result = yield
-    called = call
+    call
     post_result = yield
     pre_result != post_result
   end
@@ -285,7 +287,6 @@ module Kernel
   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?
@@ -318,19 +319,15 @@ class Should
   alias a  be
   alias an be
 
-  def satisfy(*args, &block)
-    if args.size == 1 && String === args.first
-      description = args.shift
-    else
-      description = ""
-    end
-
-    r = yield(@object, *args)
+  def satisfy(description="", &block)
+    r = yield(@object)
     if Bacon::Counter[:depth] > 0
       Bacon::Counter[:requirements] += 1
       raise Bacon::Error.new(:failed, description)  unless @negated ^ r
+      r
+    else
+      @negated ? !r : !!r
     end
-    @negated ^ r ? r : false
   end
 
   def method_missing(name, *args, &block)

data/test/spec_bacon.rb

@@ -1,5 +1,5 @@
 $-w,w = nil, $-w
-require File.join(File.dirname(__FILE__), '../lib/bacon')
+require File.expand_path('../../lib/bacon', __FILE__)
 $-w = w
 
 # Hooray for meta-testing.
@@ -27,7 +27,7 @@ end
 
 describe "Bacon" do
   extend MetaTests
-  
+
   it "should have should.satisfy" do
     lambda { should.satisfy { 1 == 1 } }.should succeed
     lambda { should.satisfy { 1 } }.should succeed
@@ -40,6 +40,14 @@ describe "Bacon" do
     lambda { 2.should.satisfy { |n| n % 2 == 0 } }.should succeed
   end
 
+  it "should have should.==" do
+    lambda { "string1".should == "string1" }.should succeed
+    lambda { "string1".should == "string2" }.should fail
+
+    lambda { [1,2,3].should == [1,2,3] }.should succeed
+    lambda { [1,2,3].should == [1,2,4] }.should fail
+  end
+
   it "should have should.equal" do
     lambda { "string1".should == "string1" }.should succeed
     lambda { "string1".should == "string2" }.should fail
@@ -62,6 +70,23 @@ describe "Bacon" do
     }.should.raise
   end
 
+  it "should have should.change" do
+    lambda { lambda {}.should.change { sleep 0.001; Time.now } }.should succeed
+
+    lambda {
+      i = 1
+      lambda { i *= 2 }.should.change { i }
+    }.should succeed
+
+    lambda {
+      i = 0
+      lambda { i *= 2 }.should.change { i }
+    }.should fail
+
+    lambda { should.change { sleep 0.001; Time.now } }.should succeed
+    lambda { should.change { 42 } }.should fail
+  end
+
   it "should have should.raise with a block" do
     lambda { should.raise { raise "Error" } }.should succeed
     lambda { should.raise(RuntimeError) { raise "Error" } }.should succeed
@@ -79,7 +104,7 @@ describe "Bacon" do
     ex.should.be.kind_of RuntimeError
     ex.message.should =~ /foo/
   end
-  
+
   it "should have should.be.an.instance_of" do
     lambda { "string".should.be.instance_of String }.should succeed
     lambda { "string".should.be.instance_of Hash }.should fail
@@ -132,7 +157,7 @@ describe "Bacon" do
         }.should.not.raise(RuntimeError, Comparable)
       }.should.raise ZeroDivisionError
     }.should succeed
-      
+
     lambda { lambda { raise "Error" }.should.not.raise }.should fail
   end
 
@@ -176,7 +201,7 @@ describe "Bacon" do
     lambda { 5.should.respond_to :to_str }.should fail
     lambda { :foo.should.respond_to :nx }.should fail
   end
-  
+
   it "should have should.be.close" do
     lambda { 1.4.should.be.close 1.4, 0 }.should succeed
     lambda { 0.4.should.be.close 0.5, 0.1 }.should succeed
@@ -273,40 +298,40 @@ describe "before/after" do
   after do
     @a.should.equal 3
   end
-  
+
   it "should run in the right order" do
     @a.should.equal 2
     @b.should.equal 2
   end
-  
+
   describe "when nested" do
     before do
       @c = 5
     end
-    
+
     it "should run from higher level" do
       @a.should.equal 2
       @b.should.equal 2
     end
-    
+
     it "should run at the nested level" do
       @c.should.equal 5
     end
-    
+
     before do
       @a = 5
     end
-    
+
     it "should run in the right order" do
       @a.should.equal 5
       @a = 2
     end
   end
-  
+
   it "should not run from lower level" do
     @c.should.be.nil
   end
-  
+
   describe "when nested at a sibling level" do
     it "should not run from sibling level" do
       @c.should.be.nil
@@ -344,6 +369,22 @@ describe "shared/behaves_like" do
   behaves_like "another shared context"
 end
 
+describe "Methods" do
+  def the_meaning_of_life
+    42
+  end
+
+  it "should be accessible in a test" do
+    the_meaning_of_life.should == 42
+  end
+
+  describe "when in a sibling context" do
+    it "should be accessible in a test" do
+      the_meaning_of_life.should == 42
+    end
+  end
+end
+
 describe 'describe arguments' do
 
   def check(ctx,name)
@@ -358,7 +399,7 @@ describe 'describe arguments' do
   it 'should work with symbols' do
     check(describe(:behaviour) {},'behaviour')
   end
-   
+
   it 'should work with modules' do
     check(describe(Bacon) {},'Bacon')
   end

data/test/spec_nontrue.rb

@@ -0,0 +1,14 @@
+$false_is_not_true = false.should.not.be.true
+$nil_is_not_true = nil.should.not.be.true
+
+describe 'A non-true value' do
+  it 'should pass negated tests inside specs' do
+    false.should.not.be.true
+    nil.should.not.be.true
+  end
+  
+  it 'should pass negated tests outside specs' do
+    $false_is_not_true.should.be.true
+    $nil_is_not_true.should.be.true
+  end
+end

data/test/spec_should.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/bacon')
+require File.expand_path('../../lib/bacon', __FILE__)
 
 describe "#should shortcut for #it('should')" do
   

metadata

@@ -1,65 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bacon
-version: !ruby/object:Gem::Version 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Christian Neukirchen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-11-30 00:00:00 +01:00
-default_executable: 
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Bacon is a small RSpec clone weighing less than 350 LoC but
+
+  nevertheless providing all essential features.
+
 
-description: Bacon is a small RSpec clone weighing less than 350 LoC but nevertheless providing all essential features.  http://github.com/chneukirchen/bacon
+  http://github.com/chneukirchen/bacon
+
+'
 email: chneukirchen@gmail.com
-executables: 
+executables:
 - bacon
 extensions: []
-
-extra_rdoc_files: 
-- README
+extra_rdoc_files:
+- README.rdoc
 - RDOX
-files: 
+files:
+- .travis.yml
 - COPYING
-- README
+- README.rdoc
 - Rakefile
+- bacon.gemspec
 - bin/bacon
 - lib/autotest/bacon.rb
 - lib/autotest/bacon_rspec.rb
 - lib/autotest/discover.rb
 - lib/bacon.rb
 - test/spec_bacon.rb
+- test/spec_nontrue.rb
 - test/spec_should.rb
 - RDOX
 - ChangeLog
-has_rdoc: true
-homepage: http://chneukirchen.org/repos/bacon
+homepage: http://github.com/chneukirchen/bacon
+licenses: []
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: a small RSpec clone
 test_files: []
-
+has_rdoc: true