testme 0.4.85 → 0.5.3

data/.gitignore

@@ -5,3 +5,4 @@ doc
 /Gemfile.lock
 /notes
 /*.gem
+/test/app.test.rb

data/.testme

@@ -1,6 +1,8 @@
 require "testme"
 
-TESTME_DIR = '/test/'
-TESTME_SUFFIX = '.test.rb'
-TESTME_FORMAT = :console
-TESTME_COLORS = :default
+boot :test, '/test' do
+  testme.dir = '/test/'
+  testme.suffix = '.test.rb'
+  testme.format = :console
+  testme.colors = :default
+end

data/README.md

@@ -45,19 +45,23 @@
 
 `testme setup`
 
-    /.testme
-    /test/
-    /test/app.test.rb
+## Config
+
+In your project root will be a `.testme` file, this is your bootstrap that runs before your tests
+
+The `/test/` folder will house all your test files, you can change this in your bootstrap
+
+## Bootstrap
 
 *Default .testme boiler plate on setup*
 *this might need to be reconfigured to cater to your project*
 
     require "testme"
 
-    TESTME_DIR = '/test/'
-    TESTME_SUFFIX = '.test.rb'
-    TESTME_FORMAT = :console
-    TESTME_COLORS = :default 
+    testme.dir = '/test/'
+    testme.suffix = '.test.rb'
+    testme.format = :console
+    testme.colors = :default
 
 #### Example config with bundler
 
@@ -66,28 +70,42 @@
     require "bundler/setup"
     Bundler.require :default, :test
 
-    TESTME_DIR = '/test/'
-    TESTME_SUFFIX = '.test.rb'
-    TESTME_FORMAT = :console
-    TESTME_COLORS = :default
+    testme.dir = '/test/'
+    testme.suffix = '.test.rb'
+    testme.format = :console
+    testme.colors = :default
 
-## Config
+#### Named bootstraps are also possible
 
-In your project root will be a `.testme` file, this is your bootstrap that runs before your tests
+    require "testme"
 
-The `/test/` folder will house all your test files, you can change this in your bootstrap
+    boot :test, '/test' do
+      testme.dir = '/test/'
+      testme.suffix = '.test.rb'
+      testme.format = :console
+      testme.colors = :default
+    end
+
+    boot :quiet, '/test' do
+      testme.dir = '/test/'
+      testme.suffix = '.test.rb'
+      testme.format = :none
+    end
 
 ### Config options
 
-TESTME_DIR = '/test/'
+`testme.dir`
 * default: '/test/'
 
-TESTME_FORMAT = :console
+`testme.suffix`
+* default: '.test.rb'
+
+`testme.format`
 * choose how results are displayed
 * options: :none, :text, :console
 * default: :console
 
-TESTME_COLORS = :default
+`testme.colors`
 * color scheme for console output
 * options: :default
 * default: :default
@@ -101,6 +119,10 @@ default test folder: `/test/**/*`
 
     $ testme
 
+#### Test with named bootstrap
+    
+    $ testme :test
+
 #### Test all in directory
     
     $ testme test/features

data/bin/testme

@@ -1,72 +1,74 @@
 #!/usr/bin/env ruby
 
-if ARGV[0] == 'setup'
+@testme_boot = {}
+def boot name, folder, &block
+  @testme_boot[name.to_sym] = [folder, block]
+end
 
-  puts 'Creating bootstrap "/.testme"'
+def testme_load filepath
+  if @file.include?(TestMe::testme.suffix)
+    testme do
+      load filepath
+    end
+  else
+    load filepath
+  end
+end
 
+def testme_setup
+  puts 'Creating bootstrap "/.testme"'
   File.open("./.testme", "w") {|f| f.write(
 %q[require "testme"
 
-TESTME_DIR = '/test/'
-TESTME_SUFFIX = '.test.rb'
-TESTME_FORMAT = :console
-TESTME_COLORS = :default]
+testme.dir = '/test/'
+testme.suffix = '.test.rb'
+testme.format = :console
+testme.colors = :default
+]
 )} unless File.exists?("./.testme")
-
   puts 'Creating test folder "/test"'
-
   Dir::mkdir('./test/') unless File.directory?("./test/") || File.exists?("./test/")
-  
   puts 'Creating empty test file "/app.test.rb"'
+  File.open('./test/app.test.rb', 'w') {|f| f.write("")} unless File.exists?("./.test/app.test.rb")
+  puts 'Setup complete'
+end
 
-  File.open('./test/app.test.rb', 'w') {|f| f.write(
-""
-)} unless File.exists?("./.test/app#{TestMe::TESTME_SUFFIX}")
+if ARGV[0] == 'setup'
+  testme_setup
+  exit
+end
 
-  puts 'Setup complete'
+TESTME_INIT = true
 
+if File.exists?("#{Dir.pwd}/.testme")
+  load "#{Dir.pwd}/.testme"
 else
+  require "testme"
+end
 
-  TESTME_INIT = true
-
-  if File.exists?("#{Dir.pwd}/.testme")
-    load "#{Dir.pwd}/.testme"
-  else
-    require "testme"
+TESTME_RUNNING = true
+  
+if ARGV.empty?
+  testme do
+    Dir["#{Dir.pwd}/#{testme.DIR}/**/*#{testme.suffix}"].each{|f| load f } 
   end
+elsif ARGV[0][0] == ':'
+  o = @testme_boot[ARGV[0][1..-1].to_sym][1]
+  o.call
 
-  TESTME_RUNNING = true
-
-  if ARGV.empty?
-    testme do
-      Dir["#{Dir.pwd}/#{TestMe::TESTME_DIR}/**/*#{TestMe::TESTME_SUFFIX}"].each{|f| load f } 
-    end
-
-  else
-    ARGV.each do |arg|
-      @file = "#{Dir.pwd}/#{arg}"
+  Dir["#{o[0]}/**/*#{testme.suffix}"].each do |f| 
+    testme_load(f)
+  end
+else
+  ARGV.each do |arg|
+    @file = "#{Dir.pwd}/#{arg}"
 
-      # Check if directory
-      if File.directory? @file
-        Dir["#{@file}/**/*.rb"].each do |f| 
-          if @file.include? TestMe::TESTME_SUFFIX
-            testme do
-              load @file
-            end
-          else
-            load @file
-          end
-      elsif File.exists? @file
-        if @file.include? TestMe::TESTME_SUFFIX
-          testme do
-            load @file
-          end
-        else
-          load @file
-        end
+    if File.directory?(@file)
+      Dir["#{@file}/**/*#{testme.suffix}"].each do |f| 
+        testme_load(@file)
       end
+    elsif File.exists?(@file)
+      testme_load(@file)
     end
-
   end
-
 end

data/lib/logic.rb

@@ -1,12 +1,4 @@
-def testme &block
-  if defined? TESTME_RUNNING
-    extend TestMe
-    block.call
-  end
-end
-
 module TestMe
-
   def topic
     @topic
   end
@@ -16,7 +8,7 @@ module TestMe
     @before = nil
     @contexts = {}
   
-    @@formatter ||= Formatter::create(TESTME_FORMAT)
+    @@formatter ||= Formatter::create(testme.format)
     @@formatter.test topic
     
     @topic_class = topic

data/lib/testme.rb

@@ -5,6 +5,7 @@
 #********************************************************************#
 
 module TestMe
+  # Dummy interface for inline tests - you don't want tests to run at application runtime!
 
   # ---------------------------------------------------------------- #
   # Alleviate the 'the big ball of mud'
@@ -43,32 +44,57 @@ module TestMe
   def is? *args, █ end
   # ---------------------------------------------------------------- #
 
+  # Create a base context
+  # Re-runs every time 'given' is called
+  #    ` before do <block> end `
+  def before &block; end
+  # ---------------------------------------------------------------- #
+
+  # ---------------------------------------------------------------- #
+  # Config Module
+  # ---------------------------------------------------------------- #
+  require "configatron"
+  @config = Configatron::Store.new
+
+  # Defaults
+  @config.dir = '/test/'
+  @config.suffix = '.test.rb'
+  @config.format = :console
+  @config.colors = :default
+
+  def self.config; @config; end
 end
 
 # ---------------------------------------------------------------- #
-# Inline Testing
+# Test Runner : Inline Testing
 # ---------------------------------------------------------------- #
-def testme &block; end
+def testme &block
+  if block && defined? TESTME_RUNNING && block
+    extend TestMe
+    block.call
+  end
+
+  return TestMe::config
+end
 
 # ---------------------------------------------------------------- #
 # Optional configuration
 # ---------------------------------------------------------------- #
-module TestMe
-  TESTME_DIR     = defined?(::TESTME_DIR)    ? ::TESTME_DIR : '/test/'
-    # default: '/test/'
+#testme.dir
+  # default: '/test/'
 
-  TESTME_SUFFIX  = defined?(::TESTME_SUFFIX) ? ::TESTME_SUFFIX : '.test.rb'
+#testme.suffix
+  # default: '.test.rb'
 
-  TESTME_FORMAT  = defined?(::TESTME_FORMAT) ? ::TESTME_FORMAT : :console
-    # choose how results are displayed
-    # options: :none, :text, :console
-    # default: :console
+#testme.format
+  # choose how results are displayed
+  # options: :none, :text, :console
+  # default: :console
 
-  TESTME_COLORS  = defined?(::TESTME_COLORS) ? ::TESTME_COLORS : :default
-    # color scheme for console output
-    # options: :default
-    # default: :default
-end
+#testme.colors
+  # color scheme for console output
+  # options: :default
+  # default: :default
 
 # ---------------------------------------------------------------- #
 

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 TESTME_INIT = true
 TESTME_RUNNING = true
-TESTME_FORMAT = :none
 
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require :default
+
+testme.dir = '/test/'
+testme.suffix = '.test.rb'
+testme.format = :none
+testme.colors = :default

data/testme.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('rainbow', ['>= 1.1.3'])
   s.add_runtime_dependency('colorize', ['>= 0.5.8'])
+  s.add_runtime_dependency('configatron', ['>= 2.9.1'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testme
 version: !ruby/object:Gem::Version
-  version: 0.4.85
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.8
+- !ruby/object:Gem::Dependency
+  name: configatron
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 description: ! '    Minimalistic testing framework
 
 '
@@ -85,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -363458065
+      hash: 734885775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -363458065
+      hash: 734885775
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24