ae 1.7.1 → 1.7.2

data/.ruby

@@ -24,6 +24,10 @@ resources:
 maintainers: []
 
 requires: 
+- group: []
+
+  name: ansi
+  version: 0+
 - group: 
   - build
   name: redline
@@ -33,7 +37,7 @@ requires:
   name: qed
   version: 0+
 manifest: MANIFEST
-version: 1.7.1
+version: 1.7.2
 licenses: 
 - Apache 2.0
 copyright: Copyright (c) 2008 Thomas Sawyer

data/HISTORY.rdoc

@@ -1,14 +1,31 @@
 = RELEASE HISTORY
 
+== 1.7.2 / 2011-06-02
+
+Minor release adds color diffs for failed equality comparisons to
+the error message, and it fixes an issue in which class references
+needed the toplevel prefix (`::`) to ensure they can be found in 
+all cases. Note that ANSI color diffs can be deactivated via
+AE.ansi = false or using the master switch an upcoming release
+of the ANSI gem.
+
+Changes:
+
+* Add toplevel prefix (`::`) to class references in assertor.rb.
+* Provide ANSI colored diffs for failed equality comparisons.
+
+
 == 1.7.1 / 2011-05-06
 
 This release adds a specialized message for certain comparision
 operators to allow them have a more forensic output. This is done
-via ANSI::Diff library.
+via ANSI::Diff library. This release also deprecateds the optional
+dot.rb and detest.rb emulation scripts.
 
 Changes:
 
 * Add special message for comparison assertions.
+* Remove optional dot.rb and detest.rb emulation scripts.
 
 
 == 1.7.0 / 2011-04-28

data/lib/ae.rb

@@ -24,6 +24,24 @@ module AE
     $VERBOSE = verbose
   end
 
+  @ansi = true
+
+  #
+  def self.ansi?
+    @ansi
+  end
+
+  # To turn of ANSI colorized error messages off, set 
+  # ansi to +false+ in your test helper.
+  #
+  # Example
+  #
+  #   AE.ansi = false
+  #
+  def self.ansi=(boolean)
+    @ansi = boolean
+  end
+
 end
 
 require 'ae/version'

data/lib/ae.yml

@@ -24,6 +24,10 @@ resources:
 maintainers: []
 
 requires: 
+- group: []
+
+  name: ansi
+  version: 0+
 - group: 
   - build
   name: redline
@@ -33,7 +37,7 @@ requires:
   name: qed
   version: 0+
 manifest: MANIFEST
-version: 1.7.1
+version: 1.7.2
 licenses: 
 - Apache 2.0
 copyright: Copyright (c) 2008 Thomas Sawyer

data/lib/ae/assertor.rb

@@ -1,5 +1,6 @@
 require 'ae/assertion'
 require 'ae/basic_object'
+require 'ansi/diff'
 
 module AE
 
@@ -71,7 +72,7 @@ module AE
     # The intent of the method is to raise an assertion failure
     # class that the test framework supports.
     def self.raise_assertion(error, negated, backtrace=nil)
-      if not Exception === error
+      if not ::Exception === error
         error = assertion_error.new(error)
       end
       error.set_negative(negated)
@@ -307,10 +308,18 @@ module AE
     COMPARISON_OPERATORS = { :"==" => :"!=" }
 
     # Message to use when making a comparion assertion.
+    #
+    # NOTE: This message utilizes the ANSI gem to produce colorized
+    # comparisons. If you need to remove color output (for non-ANSI
+    # terminals) you can either set `AE.ansi = false` or use the
+    # ANSI library's master switch to deactive all ANSI codes,
+    # which can be set in your test helper.
+    # 
+    # @see http://rubyworks.github.com/ansi
     def compare_message(operator, *args, &blk)
       return nil unless COMPARISON_OPERATORS.key?(operator)
       prefix = ""
-      a, b   = @delegate, args.first
+      a, b = @delegate.inspect, args.first.inspect
       if @negated
         op = COMPARISON_OPERATORS[operator]
         if op
@@ -319,11 +328,15 @@ module AE
           prefix   = "NOT "
         end
       end
+      if AE.ansi?
+        diff = ::ANSI::Diff.new(a,b)
+        a = diff.diff1
+        b = diff.diff2
+      end
       if a.size > 13 or b.size > 13
-        diff = ANSI::Diff.new(a,b)
-        prefix + "a #{operator} b\na) " + diff.diff1 + "\nb) " + diff.diff2
+        prefix + "a #{operator} b\na) " + a + "\nb) " + b
       else
-        prefix + "#{a.inspect} #{operator} #{b.inspect}"
+        prefix + "#{a} #{operator} #{b}"
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -04:00
-default_executable: 
+date: 2011-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: redline
+  name: ansi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,10 +29,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: qed
+  name: redline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,6 +45,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: qed
+  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
 description: Assertive Expressive is an assertions library specifically designed for reuse by other test frameworks.
 email: transfire@gmail.com
 executables: []
@@ -87,9 +100,7 @@ files:
 - HISTORY.rdoc
 - APACHE2.txt
 - README.rdoc
-- Redfile
 - NOTICE.rdoc
-has_rdoc: true
 homepage: http://rubyworks.github.com/ae
 licenses: 
 - Apache 2.0
@@ -122,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ae
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Assertive Expressive

data/Redfile

@@ -1,82 +0,0 @@
----
-gem:
-  service: Gem
-  active : true
-
-dnote:
-  service  : DNote
-  loadpath : ~
-  labels   : ~
-  output   : ~
-  format   : ~
-  active   : true
-
-stats:
-  service  : Stats
-  title    : ~
-  loadpath : ~
-  exclude  : ~
-  output   : ~
-  active   : true
-
-rdoc:
-  service : rdoc
-  format  : redfish
-  exclude : [Redfile, Profile, MANIFEST, Version]
-  output  : site/doc/api
-
-ri:
-  service: RI
-  include: ~
-  exclude: ~
-  output : .ri
-  active : true
-
-qedoc:
-  service: custom
-  cycle: main
-  document: |
-    puts `qedoc -o site/doc/qed -t "AE Demonstrandum" qed`
-
-testrb:
-  service  : testrb
-  tests    : ~
-  exclude  : ~
-  loadpath : ~
-  requires : ~
-  live     : false   
-  active   : false
-
-grancher:
-  service: Grancher
-  active: true
-  #sitemap:
-  #  - site
-  #  - [doc/rdoc, rdoc]
-  #  - [doc/qedoc, qedoc]
-
-gemcutter:
-  active: true
-
-email:
-  service : Email
-  file    : ~
-  subject : ~
-  mailto  : ruby-talk@ruby-lang.org
-#  from    : transfire@gmail.com
-#  server  : <%= ENV['EMAIL_SERVER'] %>
-#  port    : <%= ENV['EMAIL_PORT'] %>
-#  account : <%= ENV['EMAIL_ACCOUNT'] %>
-#  domain  : <%= ENV['EMAIL_DOMAIN'] %>
-#  login   : <%= ENV['EMAIL_LOGIN'] %>
-#  secure  : <%= ENV['EMAIL_SECURE'] %>
-  active  : true
-
-vclog:
-  service  : VClog
-  format   : html   # xml, txt
-  layout   : rel    # gnu
-  typed    : false
-  output   : ~
-  active   : false
-