oktobertest 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2766bd05820c2140c972c6cb72d2a9bf08f0034f
-  data.tar.gz: 536b310425a0d6b4b845c36ee2500a1720044313
+  metadata.gz: 26c78afdc12b287e7fb1b42bc9df02edf9db80bc
+  data.tar.gz: 395c8827be0f81e2575b57238fbb15e7c716dd5d
 SHA512:
-  metadata.gz: dac4ac71b09de1b9c7a4b59416bb374ef6f0bc4951c13f3a93c63e58fc93e22ea32489c1805cf0d160b68960e0c2c54e5a44976f0e479b20d4fec17275ff8612
-  data.tar.gz: f565aab1347b5fa094d0a3e1efa251bae18e2a76f2f4aa633eb3cef45b86a5c6c5a7a208ba0b73edc9975bcf3b6ab76bdd980522d45225ab3414fd18f6a5b6fb
+  metadata.gz: 364372c78233456737c8b70ab2fd83ee3eb09d938c3b4ec4750848f811f2eaafc88be0240ecfd5abc54af6750d665035cb5d8a370f60f0ad0e0b11faa5465d85
+  data.tar.gz: 0decf196630dcf487feb0b3957b5abcae7246c87204cfd9106406d9963b65e3a29365934e529a7f52de233239047b6a7cb195d5b1070fa4f4e773d2f04d4dea8

data/.travis.yml

@@ -0,0 +1,9 @@
+---
+rvm:
+  - 2.0.0
+  - 2.1.1
+  - ruby-head
+addons:
+  code_climate:
+    repo_token:
+      secure: "D9vSv0Zpxro5tqUneuwtDWQTkUl7ysaA0BN1A17/1l8/omoOSNSgyL+ras01uiquqYA2XmsUNM3PlS1mSKBfYLFpHneFKSL+lpo9gkYlJRY2Rchc5mZxTO/dPOGD3wB+ba1xunLpsG5SuHQB1p+gv09D8DmGG8Bkz+0Hn1RYx2o="

data/README.md

@@ -14,7 +14,7 @@ and I thought: "It shouldn't be so difficult to make a test library".
 runs its own context.
 * Each `scope` is an instance of `Oktobertest::Scope`. Methods defined in a
 scope are copied into each `test` it contains.
-* Extensible: it's easy to add more assertions.
+* Extensible: it's easy to add more assertions (See [oktobertest-contrib](https://github.com/patriciomacadden/oktobertest-contrib)).
 
 ## Installation
 
@@ -92,29 +92,59 @@ module Oktobertest
 end
 ```
 
-### Running the test suite
+### Running a test suite
 
-You can run the test suite using `rake` or the `ok` command.
+You can run a test suite using `rake` or `ruby`.
 
 Using `rake`:
 
 ```ruby
-require 'oktobertest'
+require 'rake/testtask'
 
-task :test do
-  Oktobertest.run Dir['test/*_test.rb']
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
 end
 
 task default: :test
 ```
 
-Using `ok`:
+Using `ruby`:
 
 ```bash
-$ ok test/*_test.rb
+$ ruby -r oktobertest test/*_test.rb
 ```
 
-Please check the default options by running `ok`.
+When using `ruby` directly, you can specify two options: `--scope` and `--test`.
+
+```bash
+$ ruby -r oktobertest test/*_test.rb --test 'test this'
+```
+
+### Testing Rack applications
+
+Pretty simple:
+
+```ruby
+require 'rack/test'
+
+module Oktobertest
+  class Test
+    include Rack::Test::Methods
+
+    def app
+      Proc.new { |env| [200, {}, ['hello world']] }
+    end
+  end
+end
+
+scope 'rack app' do
+  test 'GET /' do
+    get '/'
+    assert last_response.status == 200
+  end
+end
+```
 
 ## Contributing
 

data/Rakefile

@@ -1,10 +1,9 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-require 'oktobertest'
-
-desc 'Run the tests'
-task :test do
-  Oktobertest.run Dir['test/*_test.rb']
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
 end
 
 task default: :test

data/lib/oktobertest.rb

@@ -1,43 +1,35 @@
+require 'clap'
+
 module Oktobertest
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 
   TestFailed = Class.new StandardError
   TestSkipped = Class.new StandardError
 
-  def self.run(files)
-    files.each { |file| load file }
+  def self.display_errors
     puts
     errors.each do |error|
       case error
       when TestFailed
-        file, line, _ = error.backtrace[2].split(':')
+        file, line, _ = error.backtrace[2].split ':'
         print "\nerror: #{error.message}"
       when TestSkipped
-        file, line, _ = error.backtrace[1].split(':')
+        file, line, _ = error.backtrace[1].split ':'
         print "\nskip"
-        print ": #{error.message}" unless error.message == error.class.name
       else
-        file, line, _ = error.backtrace[0].split(':')
+        file, line, _ = error.backtrace[0].split ':'
         print "\nerror: #{error.message}"
       end
       print "\nfile: #{file}\nline: #{line}\n"
     end
   end
 
-  def self.run_test=(name)
-    @run_test = name
-  end
-
-  def self.run_test
-    @run_test
-  end
-
-  def self.run_scope=(name)
-    @run_scope = name
+  def self.errors
+    @errors ||= []
   end
 
-  def self.run_scope
-    @run_scope
+  def self.options
+    @options ||= {}
   end
 
   module Assertions
@@ -60,8 +52,8 @@ module Oktobertest
       raise TestFailed, message
     end
 
-    def skip(message = nil)
-      raise TestSkipped, message
+    def skip
+      raise TestSkipped
     end
   end
 
@@ -75,12 +67,16 @@ module Oktobertest
       instance_eval &@block
     end
 
+    def run?
+      !Oktobertest.options[:run_scope] || Oktobertest.options[:run_scope] == @name
+    end
+
     protected
 
     def test(name = nil, &block)
-      if !Oktobertest.run_test || Oktobertest.run_test == name
-        test = Test.new(name, &block)
-        singleton_methods.each { |m| test.define_singleton_method m, &method(m) }
+      test = Test.new name, &block
+      public_methods(false).reject { |m| m == :run || m == :run? }.each { |m| test.define_singleton_method m, &method(m) }
+      if test.run?
         @setup.each { |b| test.instance_eval &b }
         test.run
         @teardown.each { |b| test.instance_eval &b }
@@ -96,13 +92,11 @@ module Oktobertest
     end
 
     def scope(name = nil, &block)
-      if !Oktobertest.run_scope || Oktobertest.run_scope == name
-        scope = Scope.new(name, &block)
-        singleton_methods.each { |m| scope.define_singleton_method m, &method(m) }
-        @setup.each { |b| scope.setup &b }
-        @teardown.each { |b| scope.teardown &b }
-        scope.run
-      end
+      scope = Scope.new name, &block
+      singleton_methods.each { |m| scope.define_singleton_method m, &method(m) }
+      @setup.each { |b| scope.setup &b }
+      @teardown.each { |b| scope.teardown &b }
+      scope.run if scope.run?
     end
   end
 
@@ -117,28 +111,32 @@ module Oktobertest
       instance_eval &@block
       print '.'
     rescue TestFailed => error
-      Oktobertest.errors << error
       print 'F'
     rescue TestSkipped => error
-      Oktobertest.errors << error
       print 'S'
     rescue StandardError => error
-      Oktobertest.errors << error
       print 'E'
+    ensure
+      Oktobertest.errors << error unless error.nil?
     end
-  end
 
-  private
-
-  def self.errors
-    @errors ||= []
+    def run?
+      !Oktobertest.options[:run_test] || Oktobertest.options[:run_test] == @name
+    end
   end
 end
 
 module Kernel
+  private
+
   def scope(name = nil, &block)
-    if !Oktobertest.run_scope || Oktobertest.run_scope == name
-      Oktobertest::Scope.new(name, &block).run
-    end
+    scope = Oktobertest::Scope.new name, &block
+    scope.run if scope.run?
   end
 end
+
+Clap.run ARGV,
+  '--scope' => ->(name) { Oktobertest.options[:run_scope] = name },
+  '--test' => ->(name) { Oktobertest.options[:run_test] = name }
+
+at_exit { Oktobertest.display_errors }

data/oktobertest.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rake'
 
   spec.add_runtime_dependency 'clap', '~> 1.0.0'

data/test/assertions_test.rb

@@ -1,43 +1,35 @@
+require 'helper'
+
 scope 'assert' do
   test 'passes if the value is true' do
     assert true
   end
 
   test 'fails if the value is false' do
-    assert_raises Oktobertest::TestFailed do
-      assert false
-    end
+    assert_raises(Oktobertest::TestFailed) { assert false }
   end
 end
 
 scope 'assert_raises' do
   test 'passes if the block raises the given exception' do
-    assert_raises RuntimeError do
-      raise RuntimeError
-    end
+    assert_raises(RuntimeError) { raise RuntimeError }
   end
 
   test 'fails if the block does not raise the given exception' do
     assert_raises Oktobertest::TestFailed do
-      assert_raises RuntimeError do
-        raise ArgumentError
-      end
+      assert_raises(RuntimeError) { raise ArgumentError }
     end
   end
 end
 
 scope 'flunk' do
   test 'raises Oktobertest::TestFailed exception' do
-    assert_raises Oktobertest::TestFailed do
-      flunk
-    end
+    assert_raises(Oktobertest::TestFailed) { flunk }
   end
 end
 
 scope 'skip' do
   test 'raises Oktobertest::TestSkipped exception' do
-    assert_raises Oktobertest::TestSkipped do
-      skip
-    end
+    assert_raises(Oktobertest::TestSkipped) { skip }
   end
 end

data/test/fixtures/error_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope do
   test { raise RuntimeError }
 end

data/test/fixtures/failing_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope do
   test { assert false }
 end

data/test/fixtures/run_scope_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope 'run this' do
   test 'run this' do
     assert true

data/test/fixtures/run_test_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope do
   test 'run this' do
     assert true

data/test/fixtures/skipped_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope do
   test { skip }
 end

data/test/fixtures/successful_test.rb

@@ -1,3 +1,5 @@
+require 'oktobertest'
+
 scope do
   test { assert true }
 end

data/test/helper.rb

@@ -0,0 +1,5 @@
+require 'codeclimate-test-reporter'
+SimpleCov.command_name 'Unit tests'
+CodeClimate::TestReporter.start
+
+require 'oktobertest'

data/test/oktobertest_test.rb

@@ -1,7 +1,9 @@
+require 'helper'
+
 scope do
   test 'successful run' do
     expected = ".\n"
-    output = %x(bin/ok test/fixtures/successful_test.rb)
+    output = %x(ruby test/fixtures/successful_test.rb)
     assert expected == output
   end
 
@@ -11,9 +13,9 @@ E
 
 error: RuntimeError
 file: test/fixtures/error_test.rb
-line: 2
+line: 4
 EOS
-    output = %x(bin/ok test/fixtures/error_test.rb)
+    output = %x(ruby test/fixtures/error_test.rb)
     assert expected == output
   end
 
@@ -23,9 +25,9 @@ F
 
 error: condition is not true: false
 file: test/fixtures/failing_test.rb
-line: 2
+line: 4
 EOS
-    output = %x(bin/ok test/fixtures/failing_test.rb)
+    output = %x(ruby test/fixtures/failing_test.rb)
     assert expected == output
   end
 
@@ -35,21 +37,21 @@ S
 
 skip
 file: test/fixtures/skipped_test.rb
-line: 2
+line: 4
 EOS
-    output = %x(bin/ok test/fixtures/skipped_test.rb)
+    output = %x(ruby test/fixtures/skipped_test.rb)
     assert expected == output
   end
 
   test 'run only one scope' do
     expected = "..\n"
-    output = %x(bin/ok -s 'run this' test/fixtures/run_scope_test.rb)
+    output = %x(ruby test/fixtures/run_scope_test.rb --scope 'run this')
     assert expected == output
   end
 
   test 'run only one test' do
     expected = ".\n"
-    output = %x(bin/ok -t 'run this' test/fixtures/run_test_test.rb)
+    output = %x(ruby test/fixtures/run_test_test.rb --test 'run this')
     assert expected == output
   end
 end

data/test/scope_test.rb

@@ -1,19 +1,33 @@
+require 'helper'
+
 scope do
   def foo
     'foo'
   end
 
   test 'responds to foo' do
+    assert respond_to? :foo
     assert foo == 'foo'
   end
 
   scope do
-    test 'responds to foo too' do
+    test 'responds to foo' do
+      assert respond_to? :foo
       assert foo == 'foo'
     end
   end
 end
 
+scope do
+  test 'does not respond to foo' do
+    assert !respond_to?(:foo)
+  end
+
+  def foo
+    'foo'
+  end
+end
+
 scope do
   setup do
     @foo = 'foo'
@@ -24,13 +38,13 @@ scope do
       @bar = 'bar'
     end
 
-    test 'foo and bar must be defined' do
+    test 'foo and bar are defined' do
       assert @foo == 'foo'
       assert @bar == 'bar'
     end
   end
 
-  test 'foo must be defined and bar wont be' do
+  test 'foo is defined and bar is not' do
     assert @foo == 'foo'
     assert @bar.nil?
   end

data/test/setup_test.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 scope do
   setup do
     @foo = 'foo'
@@ -8,7 +10,7 @@ scope do
   end
 
   scope do
-    test 'foo is defined too' do
+    test 'foo is defined' do
       assert @foo == 'foo'
     end
   end
@@ -24,7 +26,7 @@ scope do
     @foo = 'bar'
   end
 
-  test 'foo is not changed' do
+  test 'foo has not changed' do
     assert @foo == 'foo'
   end
 end

data/test/teardown_test.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 scope do
   setup do
     @foo = 'foo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oktobertest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,17 +69,16 @@ dependencies:
 description: Small test library
 email:
 - patriciomacadden@gmail.com
-executables:
-- ok
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/ok
 - lib/oktobertest.rb
 - oktobertest.gemspec
 - test/assertions_test.rb
@@ -75,6 +88,7 @@ files:
 - test/fixtures/run_test_test.rb
 - test/fixtures/skipped_test.rb
 - test/fixtures/successful_test.rb
+- test/helper.rb
 - test/oktobertest_test.rb
 - test/scope_test.rb
 - test/setup_test.rb
@@ -111,6 +125,7 @@ test_files:
 - test/fixtures/run_test_test.rb
 - test/fixtures/skipped_test.rb
 - test/fixtures/successful_test.rb
+- test/helper.rb
 - test/oktobertest_test.rb
 - test/scope_test.rb
 - test/setup_test.rb

data/bin/ok

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'usage: ok [-r lib] [-s scope] [-t test] [-v] file ...' if ARGV.empty?
-
-require 'clap'
-require_relative '../lib/oktobertest'
-
-files = Clap.run ARGV,
-  '-r' => ->(file) { require file },
-  '-s' => ->(name) { Oktobertest.run_scope = name },
-  '-t' => ->(name) { Oktobertest.run_test = name },
-  '-v' => -> { puts Oktobertest::VERSION }
-
-Oktobertest.run files if files.any?