rubytest 0.5.0 → 0.5.1

data/.ruby

@@ -26,9 +26,15 @@ repositories:
   scm: git
   name: upstream
 resources:
-  home: http://rubyworks.github.com/rubytest
-  code: http://github.com/rubyworks/rubytest
-  mail: http://groups.google.com/group/rubyworks-mailinglist
+- uri: http://rubyworks.github.com/rubytest
+  name: home
+  type: home
+- uri: http://github.com/rubyworks/rubytest
+  name: code
+  type: code
+- uri: http://groups.google.com/group/rubyworks-mailinglist
+  name: mail
+  type: mail
 extra: {}
 load_path:
 - lib
@@ -36,9 +42,9 @@ revision: 0
 created: '2011-07-23'
 summary: Ruby Universal Test Harness
 title: Ruby Test
-version: 0.5.0
+version: 0.5.1
 name: rubytest
 description: ! "Ruby Test is a universal test harness for Ruby. It can handle any
   compliant \ntest framework, even running tests from multiple frameworks in a single
   pass."
-date: '2012-02-25'
+date: '2012-04-30'

data/HISTORY.md

@@ -1,5 +1,17 @@
 # RELEASE HISTORY
 
+## 0.5.1 / 2012-04-30
+
+This release adds support for Courtier-based confgiration.
+You can now add `config 'rubytest'` entries into a project's
+Config.rb file, instead of creating a separate stand-alone
+config file just for test configuration.
+
+Changes:
+
+* Adds support for Courtier-based configuration.
+
+
 ## 0.5.0 / 2012-03-22
 
 This release improves the command line interface, the handling of

data/lib/rubytest/cli.rb

@@ -19,7 +19,7 @@ module Test
 
       Test::Config.load
 
-      @profile = 'default'
+      @profile = ENV['profile'] || ENV['p'] || 'default'
       @config  = Test.config
       @runner  = Runner.new
     end

data/lib/rubytest/config.rb

@@ -24,10 +24,6 @@ module Test
     # Either can have an optional `.rb` extension.
     GLOB_RC = '{testfile.rb,testfile,.test.rb,.test}'
 
-    # If a root level test file can't be found, then use this
-    # glob to search the task directory for `*.rubytest` files.
-    GLOB_TASK = 'task/*.rubytest'
-
     # Glob used to find project root directory.
     GLOB_ROOT = '{.ruby,.git,.hg,_darcs,lib/}'
 
@@ -40,67 +36,37 @@ module Test
     #     run.files << 'test/case_*.rb'
     #   end
     #
-    # Use `:default` for name for non-specific profile and `:common` for code that
+    # Use `default` for name for non-specific profile and `common` for code that
     # should apply to all configurations.
     #
     # Failing any traditional configuration files, the Confection system will
-    # be used. An example entry in a projects `Confile` is:
+    # be used. An example entry in a projects `Config.rb` is:
     #
-    #   config :test, :name do |run|
+    #   config 'rubytest', profile: 'name' do |run|
     #     run.files << 'test/case_*.rb'
     #   end
     #
     # You can leave the `:name` parameter out for `:default`.
     #
     def self.load
-      if rc_files.empty?
-        if confection_file
-          require 'confection'
-          confection('test', '*').each do |c|
-            name = c.profile ? c.profile : :default
-            Test.run(name, &c)
-          end
-        end
-      else
-        rc_files.each do |file|
-          super(file)
-        end
+      if rc_file
+        super(rc_file)
+      #else
+      #  if config = Test.rc_config
+      #    config.each do |c|
+      #      Test.run(c.profile, &c)
+      #    end
+      #  end
       end
     end
 
-    #
-    def self.confection_file
-      @confection_file ||= (
-        Dir.glob(File.join(root, '{,.}confile{,.rb}'), File::FNM_CASEFOLD).first
+    # Find traditional rc file.
+    def self.rc_file
+      @rc_file ||= (
+        Dir.glob(File.join(root, GLOB_RC), File::FNM_CASEFOLD).first
       )
     end
 
-    # Find rc file.
-    def self.rc_files
-      @rc_files ||= (
-        if file = Dir.glob(File.join(root, GLOB_RC), File::FNM_CASEFOLD).first
-          [file]
-        else
-          Dir.glob(File.join(root, GLOB_TASK))
-        end
-      )
-
-      #  glob    = GLOB_RC
-      #  stop    = root
-      #  default = nil
-      #  dir     = Dir.pwd
-      #  file    = nil
-      #  loop do
-      #    files = Dir.glob(File.join(dir, glob), File::FNM_CASEFOLD)
-      #    file = files.find{ |f| File.file?(f) }
-      #    break file if file
-      #    break if dir == stop
-      #    dir = File.dirname(dir)
-      #    break if dir == '/'
-      #  end
-      #  file ? file : default
-    end
-
     # Find and cache project root directory.
     #
     # @return [String] Project's root path.

data/lib/rubytest/rc.rb

@@ -0,0 +1,6 @@
+require 'rc'
+
+configure('rubytest') do |config|
+  Test.run(config.profile, &config)
+end
+

data/lib/rubytest.rb

@@ -10,6 +10,7 @@ if RUBY_VERSION < '1.9'
   require 'rubytest/core_ext'
   require 'rubytest/code_snippet'
   require 'rubytest/config'
+  require 'rubytest/rc'
   require 'rubytest/recorder'
   require 'rubytest/advice'
   require 'rubytest/runner'
@@ -20,6 +21,7 @@ else
   require_relative 'rubytest/core_ext'
   require_relative 'rubytest/code_snippet'
   require_relative 'rubytest/config'
+  require_relative 'rubytest/rc'
   require_relative 'rubytest/recorder'
   require_relative 'rubytest/advice'
   require_relative 'rubytest/runner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &14620080 !ruby/object:Gem::Requirement
+  requirement: &22651080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14620080
+  version_requirements: *22651080
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &14639980 !ruby/object:Gem::Requirement
+  requirement: &22650340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14639980
+  version_requirements: *22650340
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &14638520 !ruby/object:Gem::Requirement
+  requirement: &22649800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14638520
+  version_requirements: *22649800
 description: ! "Ruby Test is a universal test harness for Ruby. It can handle any
   compliant \ntest framework, even running tests from multiple frameworks in a single
   pass."
@@ -76,6 +76,7 @@ files:
 - lib/rubytest/core_ext/string.rb
 - lib/rubytest/core_ext.rb
 - lib/rubytest/rake.rb
+- lib/rubytest/rc.rb
 - lib/rubytest/recorder.rb
 - lib/rubytest/reporters/abstract.rb
 - lib/rubytest/reporters/abstract_hash.rb