wrong 0.4.0 → 0.4.5

data/lib/wrong/helpers.rb

@@ -27,12 +27,7 @@ module Wrong
       streams.each do |stream|
         original[stream] = (stream == :stdout ? $stdout : $stderr)
         captured[stream] = StringIO.new
-        case stream
-          when :stdout
-            $stdout = captured[stream]
-          when :stderr
-            $stderr = captured[stream]
-        end
+        reassign_stream(stream, captured)
       end
 
       yield
@@ -53,14 +48,20 @@ module Wrong
         end
         # support nested calls to capturing
         original[stream] << captured[stream].string if original[stream].is_a? StringIO
-        case stream
-          when :stdout
-            $stdout = original[stream]
-          when :stderr
-            $stderr = original[stream]
-        end
+        reassign_stream(stream, original)
+      end
+    end
+
+    private
+    def reassign_stream(which, streams)
+      case which
+        when :stdout
+          $stdout = streams[which]
+        when :stderr
+          $stderr = streams[which]
       end
     end
+
   end
 
 end

data/lib/wrong/message/array_diff.rb

@@ -13,7 +13,7 @@ module Wrong
 
     def arrayish?(object)
       # in some Rubies, String is Enumerable
-      object.is_a?(Enumerable) && !object.is_a?(String)
+      object.is_a?(Enumerable) && !(object.is_a?(String) || object.is_a?(Hash))
     end
 
     def describe

data/lib/wrong/rainbow.rb

@@ -27,18 +27,23 @@ module Sickill
       :hide => 8,
     }
 
+    private
+    def set_color(color, ground = :foreground)
+      color = color.first if color.size == 1
+      wrap_with_code(get_color_code(color, ground))
+    end
+
+    public
     # Sets foreground color of this text.
     def foreground(*color)
-      color = color.first if color.size == 1
-      wrap_with_code(get_color_code(color, :foreground))
+      set_color(color, :foreground)
     end
     alias_method :color, :foreground
     alias_method :colour, :foreground
 
     # Sets background color of this text.
     def background(*color)
-      color = color.first if color.size == 1
-      wrap_with_code(get_color_code(color, :background))
+      set_color(color, :background)
     end
 
     # Resets terminal to default colors/backgrounds.

data/lib/wrong/sexp_ext.rb

@@ -5,15 +5,15 @@ require 'wrong/config'
 class Sexp < Array
 
   def to_ruby
-    d = self.deep_clone
-    ruby = Ruby2Ruby.new.process(d)
+    sexp = self.deep_clone
+    ruby = Ruby2Ruby.new.process(sexp)
     ruby
   end
 
   # visit every node in the tree, including the root, that is an Sexp
   # todo: test
-  def each_subexp(&block)
-    yield self
+  def each_subexp(include_root = true, &block)
+    yield self if include_root
     each do |child|
       if child.is_a?(Sexp)
         child.each_subexp(&block)
@@ -26,7 +26,7 @@ class Sexp < Array
       self[0] == :iter and
       self[1].is_a? Sexp and
       self[1][0] == :call and
-      Wrong.config.assert_methods.include? self[1][2] # todo: allow aliases for assert (e.g. "is")
+      Wrong.config.assert_methods.include? self[1][2]
   end
 
   def assertion
@@ -42,7 +42,7 @@ class Sexp < Array
   private
   def nested_assertions
     assertions = []
-    self.each_of_type(:iter) { |sexp| assertions << sexp if sexp.assertion? }
+    self.each_subexp(false) { |sexp| assertions << sexp if sexp.assertion? }
     assertions
   end
 

data/lib/wrong/version.rb

@@ -1,3 +1,3 @@
 module Wrong
-  VERSION = "0.4.0" unless defined?(Wrong::VERSION)
+  VERSION = "0.4.5" unless defined?(Wrong::VERSION)
 end

data/lib/wrong.rb

@@ -20,8 +20,19 @@ module Wrong
   extend Wrong::Helpers
 end
 
-# this does some magic; if you don't like it, `require 'wrong/assert'` et al. individually and don't `require 'wrong/close_to'` or `require 'wrong'`
+# this does some magic; if you don't like it...
+
+# ...`require 'wrong/assert'` et al. individually and don't `require 'wrong/close_to'` or `require 'wrong'`
 require "wrong/close_to"
 
-# this does some magic; if you don't like it, `require 'wrong/assert'` et al. individually, don't `require 'wrong'`, and `include Wrong::D` only in the modules you want to call `d` from
-Object.send :include, Wrong::D
+# ...don't `require 'wrong'`, and `include Wrong::D` only in the modules you want to call `d` from
+class Object
+  include Wrong::D
+end
+
+# ...don't `require 'wrong'`
+# this part isn't working yet -- it's supposed to make 'assert' available at the top level but it breaks the minitest adapter
+# include Wrong
+# class Object
+#   include Wrong
+# end

data/test/adapters/minitest_test.rb

@@ -61,11 +61,10 @@ describe "basic assert features" do
     end
 
     msg = rescuing { MyFailingAssertTest.new.test_fail }.message
-
-    assert { msg.include?("1 is not equal to 2") }
+    assert { msg.include?("Expected (1 == 2)") }
 
     msg = rescuing { MyFailingDenyTest.new.test_fail }.message
-    assert { msg.include?("1 is equal to 1") }
+    assert { msg.include?("Didn't expect (1 == 1)") }
   end
 end
 

data/test/adapters/railsapp/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/adapters/railsapp/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/adapters/railsapp/autotest/discover.rb

@@ -0,0 +1,2 @@
+Autotest.add_discovery { "rails" }
+Autotest.add_discovery { "rspec2" }

data/test/adapters/railsapp/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Railsapp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    config.action_view.javascript_expansions[:defaults] = %w()
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/test/adapters/railsapp/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/test/adapters/railsapp/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Railsapp::Application.initialize!

data/test/adapters/railsapp/config/environments/development.rb

@@ -0,0 +1,26 @@
+Railsapp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/test/adapters/railsapp/config/environments/production.rb

@@ -0,0 +1,49 @@
+Railsapp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/adapters/railsapp/config/environments/test.rb

@@ -0,0 +1,35 @@
+Railsapp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/adapters/railsapp/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/adapters/railsapp/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/adapters/railsapp/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/adapters/railsapp/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Railsapp::Application.config.secret_token = '60ef44ef55c7289c9013546cef8ef9aa67efd47177d7b4dbd85535f25de545a448e97eb62b9ce64df8aad9ec765d6c08d3725b738b9cbb503b978a61d765224b'

data/test/adapters/railsapp/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Railsapp::Application.config.session_store :cookie_store, :key => '_railsapp_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# Railsapp::Application.config.session_store :active_record_store

data/test/adapters/railsapp/config/routes.rb

@@ -0,0 +1,58 @@
+Railsapp::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+end

data/test/adapters/railsapp/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)

data/test/adapters/railsapp/spec/spec_helper.rb

@@ -0,0 +1,28 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require "wrong/adapters/rspec"
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end

data/test/adapters/railsapp/spec/wrong_spec.rb

@@ -0,0 +1,8 @@
+
+require './spec/spec_helper.rb'
+describe 'wrong in rspec in rails' do
+  it 'calls the wrong assert' do
+    assert { 1 + 1 == 3}
+  end
+end
+

data/test/adapters/rspec_rails_test.rb

@@ -0,0 +1,58 @@
+here = File.expand_path(File.dirname(__FILE__))
+
+require "open3"
+require "fileutils"
+
+require "./test/test_helper"
+require "wrong/adapters/minitest"
+
+include Wrong
+
+# If a new version of Rails comes along, alter and then run the script in this directory
+# called rspec-rails-generate.sh -- if you dare
+
+
+if RUBY_VERSION == "1.9.2" # too many issues with other versions
+describe "testing rspec-rails" do
+
+  [2].each do |rspec_version|
+    it "in version #{rspec_version}" do
+      railsapp_dir = "#{here}/railsapp"
+
+      unless File.exist?(railsapp_dir)
+        Dir.chdir(here) do
+          clear_bundler_env
+          sys "sh ./railsapp-gen.sh"
+        end
+      end
+
+      spec_output = nil
+      Dir.chdir(railsapp_dir) do
+        clear_bundler_env
+        FileUtils.rm "#{railsapp_dir}/Gemfile.lock", :force => true
+
+        # todo: extract into common function
+        sys "bundle check" do |output|
+          unless output == "The Gemfile's dependencies are satisfied\n"
+            sys "bundle install --gemfile=#{railsapp_dir}/Gemfile"
+          end
+        end
+
+        # todo: extract into common function
+        sys "bundle list" do |output|
+          lines = output.split("\n")
+          lines.grep(/rspec/) do |line|
+            assert { line =~ /rspec[-\w]* \(#{rspec_version}\.[\w.]*\)/ }
+          end
+        end
+
+        spec_output = sys "rspec spec/wrong_spec.rb",
+                          (rspec_version == 1 || RUBY_VERSION =~ /^1\.8\./ || RUBY_VERSION == '1.9.1' ? nil : 1) # RSpec v1 exits with 0 on failure :-(
+      end
+
+      assert { spec_output.include? "1 example, 1 failure" }
+      assert { spec_output.include? "Expected ((1 + 1) == 3), but" }
+    end
+  end
+end
+end

data/test/adapters/rspec_test.rb

@@ -11,28 +11,6 @@ include Wrong
 # Okay, this looks like RSpec but it's actually minitest
 describe "testing rspec" do
 
-  def sys(cmd, expected_status = 0)
-    start_time = Time.now
-    $stderr.print cmd
-    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
-      # in Ruby 1.8, wait_thread is nil :-( so just pretend the process was successful (status 0)
-      exit_status = (wait_thread.value.exitstatus if wait_thread) || 0
-      output = stdout.read + stderr.read
-      unless expected_status.nil?
-        assert { output and exit_status == expected_status }
-      end
-      yield output if block_given?
-      output
-    end
-  ensure
-    $stderr.puts " (#{"%.2f" % (Time.now - start_time)} sec)"
-  end
-
-  def clear_bundler_env
-    # Bundler inherits its environment by default, so clear it here
-    %w{BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE}.each { |var| ENV.delete(var) }
-  end
-
   [1, 2].each do |rspec_version|
     it "version #{rspec_version}" do
       dir = "#{here}/rspec#{rspec_version}"
@@ -63,42 +41,3 @@ describe "testing rspec" do
     end
   end
 end
-
-=begin
-    # I would use
-    #    out, err = capturing(:stdout, :stderr) do
-    # but minitest does its own arcane stream munging and it's not working
-
-    out = StringIO.new
-    err = StringIO.new
-    Spec::Runner.use(Spec::Runner::Options.new(out, err))
-
-    module RSpecWrapper
-      include Spec::DSL::Main
-      describe "inside rspec land" do
-        it "works" do
-          sky = "blue"
-          assert { sky == "green" }
-        end
-      end
-    end
-
-    Spec::Runner.options.parse_format("nested")
-    Spec::Runner.options.run_examples
-
-    assert(err.string.index(<<-RSPEC) == 0, "make sure the rspec formatter was used")
-inside rspec land
-  works (FAILED - 1)
-
-1)
-'inside rspec land works' FAILED
-    RSPEC
-
-    failures = Spec::Runner.options.reporter.instance_variable_get(:@failures) # todo: use my own reporter?
-    assert !failures.empty?
-    exception = failures.first.exception
-    assert(exception.is_a?(Spec::Expectations::ExpectationNotMetError))
-    assert(exception.message =~ /^Expected \(sky == \"green\"\), but/, "message is #{exception.message.inspect}")
-  end
-end
-=end

data/test/adapters/test_unit_test.rb

@@ -32,13 +32,13 @@ class MyFailingAssertTest <  Test::Unit::TestCase
     #I can do without all the TU Listener business, thank you
     failures = result.instance_variable_get("@failures".to_sym)
     assert{ failures.length==1 }
-    assert{ failures.first.long_display.include?("1 is not equal to 2") }
+    assert{ failures.first.long_display.include?("Expected (1 == 2)") }
     
     result = Test::Unit::TestResult.new
     failures = result.instance_variable_get("@failures".to_sym)
     my_failing_deny_test.new("test_fail").run(result) {|started, name| }
     assert{ failures.length==1 }
-    assert{ failures.first.long_display.include?("1 is equal to 1") }
+    assert{ failures.first.long_display.include?("Didn't expect (1 == 1)") }
   end
 
   def test_passes_asserts_with_no_block_up_to_the_frameworks_assert_method