remarkable 4.0.0.alpha1 → 4.0.0.alpha2

data/README

@@ -4,6 +4,28 @@ This is the core package of Remarkable. It provides a DSL for creating matchers
 with I18n support, decouples messages from matchers logic, add rspec extra features,
 create macros automatically and allow those macros to be configurable wth blocks.
 
+== Installation
+
+  sudo gem install remarkable --pre
+
+Add this to your Gemfile:
+
+  group :test do
+     gem 'remarkable', '>=4.0.0.alpha2'
+  end
+
+Drop this into your spec/spec_helper.rb or spec/support/remarkable.rb file:
+
+  require 'remarkable/core'
+
+To include custom matchers:
+
+  Remarkable.include_matchers!(MyApp::MyCustomMatchers)
+
+If you use Shoulda-style syntax, you will need to target Rspec::Core::ExampleGroup
+
+  Remarkable.include_matchers!(MyApp::MyCustomMatchers, Rspec::Core::ExampleGroup)
+
 == Macros
 
 Each matcher in Remarkable is also available as a macro. So this matcher:
@@ -44,7 +66,7 @@ And it will show in your specs output:
 All matchers come with I18n support. You can find an example locale file under
 the locale folder of each project.
 
-To change the locale, you have first to add your locale file:
+To change the locale, you have first to add your locale file in spec/support/remarkable.rb:
 
   Remarkable.add_locale 'path/to/my_locale.yml'
 
@@ -53,10 +75,9 @@ And then:
   Remarkable.locale = :my_locale
 
 Internationalization is powered by the I18n gem. If you are using it with Rails,
-it will use the built in gem, otherwise you will have to install the gem by hand:
+it will use the gem, otherwise you will have to install the gem by hand:
 
-  gem sources -a http://gems.github.com
-  sudo gem install svenfuchs-i18n
+  gem install i18n
 
 == Creating you own matcher
 

data/lib/remarkable/core.rb

@@ -0,0 +1,15 @@
+# Load core files
+require 'remarkable/core/version'
+require 'remarkable/core/matchers'
+require 'remarkable/core/macros'
+require 'remarkable/core/i18n'
+require 'remarkable/core/dsl'
+require 'remarkable/core/messages'
+require 'remarkable/core/base'
+require 'remarkable/core/negative'
+require 'remarkable/core/core_ext/array'
+require 'remarkable/core/rspec' 
+
+# Add default locale
+dir = File.dirname(__FILE__)
+Dir["#{dir}/../../locale/*yml"].each {|f| Remarkable.add_locale(f) }

data/lib/remarkable/{dsl.rb → core/dsl.rb}

@@ -1,7 +1,6 @@
-dir = File.dirname(__FILE__)
-require File.join(dir, 'dsl', 'assertions')
-require File.join(dir, 'dsl', 'optionals')
-require File.join(dir, 'dsl', 'callbacks')
+require 'remarkable/core/dsl/assertions'
+require 'remarkable/core/dsl/optionals'
+require 'remarkable/core/dsl/callbacks'
 
 module Remarkable
   # The DSL module is responsable for all Remarkable convenience methods.

data/lib/remarkable/core/version.rb

@@ -0,0 +1,3 @@
+module Remarkable
+  VERSION = '4.0.0.alpha2' unless self.const_defined?(:VERSION)
+end

data/remarkable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "4.0.0.alpha1"
+  s.version = "4.0.0.alpha2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ho-Sheng Hsiao", "Carlos Brando", "Jos\303\251 Valim"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-05-26}
   s.description = %q{Remarkable: a framework for rspec matchers and macros, with support for I18n.}
   s.email = ["hosh@sparkfly.com", "eduardobrando@gmail.com", "jose.valim@gmail.com"]
   s.extra_rdoc_files = [
@@ -21,20 +21,20 @@ Gem::Specification.new do |s|
     "CHANGELOG",
      "LICENSE",
      "README",
-     "lib/remarkable.rb",
-     "lib/remarkable/base.rb",
-     "lib/remarkable/core_ext/array.rb",
-     "lib/remarkable/dsl.rb",
-     "lib/remarkable/dsl/assertions.rb",
-     "lib/remarkable/dsl/callbacks.rb",
-     "lib/remarkable/dsl/optionals.rb",
-     "lib/remarkable/i18n.rb",
-     "lib/remarkable/macros.rb",
-     "lib/remarkable/matchers.rb",
-     "lib/remarkable/messages.rb",
-     "lib/remarkable/negative.rb",
-     "lib/remarkable/rspec.rb",
-     "lib/remarkable/version.rb",
+     "lib/remarkable/core.rb",
+     "lib/remarkable/core/base.rb",
+     "lib/remarkable/core/core_ext/array.rb",
+     "lib/remarkable/core/dsl.rb",
+     "lib/remarkable/core/dsl/assertions.rb",
+     "lib/remarkable/core/dsl/callbacks.rb",
+     "lib/remarkable/core/dsl/optionals.rb",
+     "lib/remarkable/core/i18n.rb",
+     "lib/remarkable/core/macros.rb",
+     "lib/remarkable/core/matchers.rb",
+     "lib/remarkable/core/messages.rb",
+     "lib/remarkable/core/negative.rb",
+     "lib/remarkable/core/rspec.rb",
+     "lib/remarkable/core/version.rb",
      "locale/en.yml",
      "remarkable.gemspec"
   ]
@@ -42,20 +42,20 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{remarkable}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Remarkable: a framework for rspec matchers and macros, with support for I18n.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.alpha8"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.alpha8"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.alpha8"])
   end
 end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
+  hash: -1710980496
   prerelease: true
   segments: 
   - 4
   - 0
   - 0
-  - alpha1
-  version: 4.0.0.alpha1
+  - alpha2
+  version: 4.0.0.alpha2
 platform: ruby
 authors: 
 - Ho-Sheng Hsiao
@@ -17,22 +18,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -04:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1710980374
         segments: 
         - 2
         - 0
         - 0
-        - alpha7
-        version: 2.0.0.alpha7
+        - alpha8
+        version: 2.0.0.alpha8
   type: :runtime
   version_requirements: *id001
 description: "Remarkable: a framework for rspec matchers and macros, with support for I18n."
@@ -52,20 +55,20 @@ files:
 - CHANGELOG
 - LICENSE
 - README
-- lib/remarkable.rb
-- lib/remarkable/base.rb
-- lib/remarkable/core_ext/array.rb
-- lib/remarkable/dsl.rb
-- lib/remarkable/dsl/assertions.rb
-- lib/remarkable/dsl/callbacks.rb
-- lib/remarkable/dsl/optionals.rb
-- lib/remarkable/i18n.rb
-- lib/remarkable/macros.rb
-- lib/remarkable/matchers.rb
-- lib/remarkable/messages.rb
-- lib/remarkable/negative.rb
-- lib/remarkable/rspec.rb
-- lib/remarkable/version.rb
+- lib/remarkable/core.rb
+- lib/remarkable/core/base.rb
+- lib/remarkable/core/core_ext/array.rb
+- lib/remarkable/core/dsl.rb
+- lib/remarkable/core/dsl/assertions.rb
+- lib/remarkable/core/dsl/callbacks.rb
+- lib/remarkable/core/dsl/optionals.rb
+- lib/remarkable/core/i18n.rb
+- lib/remarkable/core/macros.rb
+- lib/remarkable/core/matchers.rb
+- lib/remarkable/core/messages.rb
+- lib/remarkable/core/negative.rb
+- lib/remarkable/core/rspec.rb
+- lib/remarkable/core/version.rb
 - locale/en.yml
 - remarkable.gemspec
 has_rdoc: true
@@ -78,16 +81,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -96,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: remarkable
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Remarkable: a framework for rspec matchers and macros, with support for I18n."

data/lib/remarkable.rb

@@ -1,19 +0,0 @@
-# Load core files
-dir = File.dirname(__FILE__)
-require File.join(dir, 'remarkable', 'version')
-require File.join(dir, 'remarkable', 'matchers')
-require File.join(dir, 'remarkable', 'i18n')
-require File.join(dir, 'remarkable', 'dsl')
-require File.join(dir, 'remarkable', 'messages')
-
-require File.join(dir, 'remarkable', 'base')
-require File.join(dir, 'remarkable', 'macros')
-#require File.join(dir, 'remarkable', 'pending')
-require File.join(dir, 'remarkable', 'negative')
-require File.join(dir, 'remarkable', 'core_ext', 'array')
-
-if defined?(Rspec)
-  require File.join(dir, 'remarkable', 'rspec')
-end
-
-Remarkable.add_locale File.join(dir, '..', 'locale', 'en.yml')

data/lib/remarkable/version.rb

@@ -1,3 +0,0 @@
-module Remarkable
-  VERSION = '4.0.0.alpha1' unless self.const_defined?(:VERSION)
-end