dtest 0.0.1 → 0.0.2

data/Rakefile

@@ -10,12 +10,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.ruby_opts = ['-rubygems'] if defined? Gem
-  spec.rcov = true
-end
-
 task :default => :spec
 
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/dtest

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
+$LOAD_PATH << File.expand_path(File.join('..', 'lib'), File.dirname(__FILE__))
 require 'dtest/command'

data/examples/sample2.rb

@@ -0,0 +1,11 @@
+# Example for dtest description
+#  ruby sample2.rb --color
+require 'rubygems'
+require 'dtest'
+
+TestCase "hello" do
+  test "hello world" do
+    expect_equal(0,1)
+  end
+end
+

data/lib/dtest.rb

@@ -0,0 +1,14 @@
+require 'dtest/runner'
+require 'dtest/dsl'
+
+at_exit do
+  # parse and run
+  option = DTest::Runner.parse!(ARGV)
+  res = DTest::Runner.run
+  DTest::Runner.report(res)
+  # output xml
+  if option[:xml_path]
+    res.outputxml(option[:xml_path])
+  end
+end
+

data/lib/dtest/command.rb

@@ -11,23 +11,15 @@ if ARGV.empty?
   usage
 else
   # Command line parser
-  xml_path = nil
-  opt = OptionParser.new
-  opt.on('--color') do |b|
-    DTest::Report.color_enabled = b
-  end
-  opt.on('--xml PATH') do |path|
-    xml_path = path
-  end
-  opt.parse!(ARGV)
+  option = DTest::Runner.parse!(ARGV)
 
   # execute test
   res = DTest::Runner.run(ARGV)
   DTest::Runner.report(res)
 
   # output xml
-  if xml_path
-    res.outputxml(xml_path)
+  if option[:xml_path]
+    res.outputxml(option[:xml_path])
   end
 end
 

data/lib/dtest/core.rb

@@ -156,24 +156,30 @@ module DTest
 
     # abort
     def abort_if(condition, message = nil)
-      str = "Abort"
-      str += ": #{message}\n" if message
-      failed(str)
-      raise AbortTest.new(str) if condition
+      if condition
+        str = "Abort"
+        str += ": #{message}\n" if message
+        failed(str)
+        raise AbortTest.new(str)
+      end
     end
 
     def abort_case_if(condition, message = nil)
-      str = "Abort TestCase"
-      str += ": #{message}\n" if message
-      failed(str)
-      raise AbortTestCase.new(str) if condition
+      if condition
+        str = "Abort TestCase"
+        str += ": #{message}\n" if message
+        failed(str)
+        raise AbortTestCase.new(str)
+      end
     end
 
     def abort_global_if(condition, message = nil)
-      str = "Abort global"
-      str += ": #{message}\n" if message
-      failed(str)
-      raise AbortGlobal.new(str) if condition
+      if condition
+        str = "Abort global"
+        str += ": #{message}\n" if message
+        failed(str)
+        raise AbortGlobal.new(str)
+      end
     end
 
     private #internal methods

data/lib/dtest/failure.rb

@@ -20,8 +20,5 @@ module DTest
     end
   end
 
-  def self.failure_caller(level)
-    failure_line(caller(level).first)
-  end
 end # DTest
 

data/lib/dtest/report.rb

@@ -31,11 +31,8 @@ module DTest
 
     # symbol to string
     def self.tag_s(tag)
-      if TAG_MAP.include?(tag)
-        text = TAG_MAP[tag]
-      else
-        text = tag.to_s
-      end
+      # must be in TAG_MAP.include?(tag)
+      TAG_MAP[tag]
     end
 
     def self.colored_tag(tag)

data/lib/dtest/runner.rb

@@ -1,11 +1,28 @@
 
 
+require 'optparse'
 require 'dtest/core'
 require 'dtest/progress'
 
 module DTest
   class Runner
-    def self.run(files)
+    def self.parse!(argv)
+      # Command line parser
+      res = {}
+      xml_path = nil
+      opt = OptionParser.new
+      opt.on('--color') do |b|
+        DTest::Report.color_enabled = b
+      end
+      opt.on('--xml PATH') do |path|
+        res[:xml_path] = path
+      end
+      opt.parse!(ARGV)
+
+      res
+    end
+
+    def self.run(files = [])
       files.each do |file|
         load file
       end

data/lib/dtest/version.rb

@@ -1,5 +1,5 @@
 module DTest
 
-VERSION = '0.0.1'
+VERSION = '0.0.2'
 
 end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+$LOAD_PATH << File.expand_path(File.join('..', 'lib'), File.dirname(__FILE__))
+require 'dtest/dsl'
+require 'dtest/runner'

data/spec/test_abort_spec.rb

@@ -1,9 +1,5 @@
-
-require 'dtest/dsl'
-require 'dtest/runner'
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
 include DTest
-
-
 #
 # グローバル、テストケース、テスト before/after
 #  abortは3種類ある

data/spec/test_assert_spec.rb

@@ -1,6 +1,4 @@
-
-require 'dtest/dsl'
-require 'dtest/runner'
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
 include DTest
 
 describe Global::Manager, 'test assert' do

data/spec/test_command1_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
+
+ARGV = []
+
+Dir::glob(File.dirname(__FILE__) + "/dtest/*.rb").each {|f|
+  ARGV << f
+}
+
+def exec_cmd
+  begin
+    load 'dtest/command.rb'
+  ensure
+    DTest::Global::Manager.instance.clear
+    DTest::Test::Manager.instance.clear
+  end
+end
+
+# execute dtest 1(without color, no output xml)
+exec_cmd
+
+# execute dtest 2(with color, output xml)
+require 'tempfile'
+temp = Tempfile.new('foo')
+begin
+  temp.close
+  ARGV.insert(0, '--xml')
+  ARGV.insert(1, temp.path)
+  ARGV << '--color'
+  exec_cmd
+ensure
+  temp.unlink
+end
+

data/spec/test_command2_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
+
+ARGV = []
+begin
+  load 'dtest/command.rb'
+ensure
+  DTest::Global::Manager.instance.clear
+  DTest::Test::Manager.instance.clear
+end
+
+

data/spec/test_exception_spec.rb

@@ -1,7 +1,6 @@
-require 'dtest/dsl'
-require 'dtest/runner'
 include DTest
 
+
 describe Global::Manager, 'global before/after exception' do
   before do
     $call = []

data/spec/test_expect_spec.rb

@@ -1,5 +1,4 @@
-require 'dtest/dsl'
-require 'dtest/runner'
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
 include DTest
 
 

data/spec/test_spec.rb

@@ -1,5 +1,4 @@
-require 'dtest/dsl'
-require 'dtest/runner'
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
 include DTest
 
 describe Global::Manager, 'dtest instance' do

data/spec/test_value_parameterized_spec.rb

@@ -1,5 +1,4 @@
-require 'dtest/dsl'
-require 'dtest/runner'
+require File.expand_path(File.join('.', 'spec_helper'), File.dirname(__FILE__))
 include DTest
 
 describe Global::Manager, 'value_parameterized' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70264612395960 !ruby/object:Gem::Requirement
+  requirement: &70104550738940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70264612395960
+  version_requirements: *70104550738940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70264612395400 !ruby/object:Gem::Requirement
+  requirement: &70104550738480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70264612395400
+  version_requirements: *70104550738480
 description: DTest is a testing tool to describe integrating test for distributed
   systems.
 email: suma@sourceforge.jp
@@ -49,6 +49,7 @@ files:
 - bin/dtest
 - dtest.gemspec
 - examples/sample.rb
+- examples/sample2.rb
 - lib/dtest.rb
 - lib/dtest/command.rb
 - lib/dtest/core.rb
@@ -62,8 +63,11 @@ files:
 - lib/dtest/test.rb
 - lib/dtest/util.rb
 - lib/dtest/version.rb
+- spec/spec_helper.rb
 - spec/test_abort_spec.rb
 - spec/test_assert_spec.rb
+- spec/test_command1_spec.rb
+- spec/test_command2_spec.rb
 - spec/test_exception_spec.rb
 - spec/test_expect_spec.rb
 - spec/test_spec.rb
@@ -88,13 +92,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DTest is a testing tool to describe integrating test for distributed systems.
 test_files:
+- spec/spec_helper.rb
 - spec/test_abort_spec.rb
 - spec/test_assert_spec.rb
+- spec/test_command1_spec.rb
+- spec/test_command2_spec.rb
 - spec/test_exception_spec.rb
 - spec/test_expect_spec.rb
 - spec/test_spec.rb