testme 0.4.7 → 0.4.8

data/.testme

@@ -1,5 +1,6 @@
 require "testme"
 
 TESTME_DIR = '/test/'
+TESTME_SUFFIX = '.test.rb'
 TESTME_FORMAT = :console
 TESTME_COLORS = :default

data/README.md

@@ -55,6 +55,7 @@
     require "testme"
 
     TESTME_DIR = '/test/'
+    TESTME_SUFFIX = '.test.rb'
     TESTME_FORMAT = :console
     TESTME_COLORS = :default 
 
@@ -66,6 +67,7 @@
     Bundler.require :default, :test
 
     TESTME_DIR = '/test/'
+    TESTME_SUFFIX = '.test.rb'
     TESTME_FORMAT = :console
     TESTME_COLORS = :default
 

data/bin/testme

@@ -8,6 +8,7 @@ if ARGV[0] == 'setup'
 %q[require "testme"
 
 TESTME_DIR = '/test/'
+TESTME_SUFFIX = '.test.rb'
 TESTME_FORMAT = :console
 TESTME_COLORS = :default]
 )} unless File.exists?("./.testme")
@@ -20,13 +21,13 @@ TESTME_COLORS = :default]
 
   File.open('./test/app.test.rb', 'w') {|f| f.write(
 ""
-)}
+)} unless File.exists?("./.test/app#{TestMe::TESTME_SUFFIX}")
 
   puts 'Setup complete'
 
 else
 
-  TESTME_RUNNING = true
+  TESTME_INIT = true
 
   if File.exists?("#{Dir.pwd}/.testme")
     load "#{Dir.pwd}/.testme"
@@ -34,9 +35,11 @@ else
     require "testme"
   end
 
+  TESTME_RUNNING = true
+
   if ARGV.empty?
     testme do
-      Dir["#{Dir.pwd}/#{TestMe::TESTME_DIR}/**/*.rb"].each{|f| load f } 
+      Dir["#{Dir.pwd}/#{TestMe::TESTME_DIR}/**/*#{TestMe::TESTME_SUFFIX}"].each{|f| load f } 
     end
 
   else
@@ -45,14 +48,21 @@ else
 
       # Check if directory
       if File.directory? @file
-        Dir["#{@file}/**/*.rb"].each{|f| load f } 
+        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? '.test.rb'
+        if @file.include? TestMe::TESTME_SUFFIX
           testme do
             load @file
           end
         else
-          require @file
+          load @file
         end
       end
     end

data/lib/logic.rb

@@ -1,6 +1,8 @@
 def testme &block
-  extend TestMe
-  block.call
+  if defined? TESTME_RUNNING
+    extend TestMe
+    block.call
+  end
 end
 
 module TestMe

data/lib/testme.rb

@@ -54,15 +54,17 @@ def testme █ end
 # Optional configuration
 # ---------------------------------------------------------------- #
 module TestMe
-  TESTME_DIR     = '/test/'  unless defined? TESTME_DIR
+  TESTME_DIR     = ::TESTME_DIR    ? ::TESTME_DIR : '/test/'
     # default: '/test/'
 
-  TESTME_FORMAT  = :console  unless defined? TESTME_FORMAT
+  TESTME_SUFFIX  = ::TESTME_SUFFIX ? ::TESTME_SUFFIX : '.test.rb'
+
+  TESTME_FORMAT  = ::TESTME_FORMAT ? ::TESTME_FORMAT : :console
     # choose how results are displayed
     # options: :none, :text, :console
     # default: :console
 
-  TESTME_COLORS  = :default  unless defined? TESTME_COLORS
+  TESTME_COLORS  = ::TESTME_COLORS ? ::TESTME_COLORS : :default
     # color scheme for console output
     # options: :default
     # default: :default
@@ -73,7 +75,7 @@ end
 # ---------------------------------------------------------------- #
 # This is here to disable inline tests at runtime
 # ---------------------------------------------------------------- #
-if defined? TESTME_RUNNING
+if defined? TESTME_INIT
   # Gems
   require 'rainbow'
   require 'colorize'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testme
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -70,7 +70,6 @@ files:
 - spec/double_spec.rb
 - spec/spec_helper.rb
 - spec/testme_spec.rb
-- test/app.test.rb
 - testme.gemspec
 homepage: http://github.com/danielshuey/testme
 licenses: []
@@ -86,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 88814589
+      hash: -630431999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 88814589
+      hash: -630431999
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24