testme 0.5.3 → 0.5.45

data/bin/testme

@@ -6,7 +6,7 @@ def boot name, folder, &block
 end
 
 def testme_load filepath
-  if @file.include?(TestMe::testme.suffix)
+  if filepath.include?(testme.suffix)
     testme do
       load filepath
     end
@@ -26,6 +26,7 @@ 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"'
@@ -50,13 +51,12 @@ TESTME_RUNNING = true
   
 if ARGV.empty?
   testme do
-    Dir["#{Dir.pwd}/#{testme.DIR}/**/*#{testme.suffix}"].each{|f| load f } 
+    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
-
-  Dir["#{o[0]}/**/*#{testme.suffix}"].each do |f| 
+  Dir["#{Dir.pwd}/#{testme.dir}/**/*#{testme.suffix}"].each do |f| 
     testme_load(f)
   end
 else
@@ -65,7 +65,7 @@ else
 
     if File.directory?(@file)
       Dir["#{@file}/**/*#{testme.suffix}"].each do |f| 
-        testme_load(@file)
+        testme_load(f)
       end
     elsif File.exists?(@file)
       testme_load(@file)

data/lib/formatter.rb

@@ -30,23 +30,25 @@ module TestMe
       def compile; end
     end
     
-    class Text
+    class Console
+      #TODO color_scheme
+
       def test topic
-        log "test " + topic.name
+        log "\n  test ".bright + topic.name.bright.color(250, 37, 115)
       end
 
       def given desc=nil, stubs=nil, &block
-        log "given " + context_to_string(desc, stubs, &block)
+        log "    given " + context_to_string(desc, stubs, &block)
       end
 
       def also desc=nil, stubs=nil, &block
-        log "also " + context_to_string(desc, stubs, &block)
+        log "     also " + context_to_string(desc, stubs, &block)
       end
 
       def is? method, actual, expected
         success = actual == expected
 
-        log 'is ' + method.to_s + ', ' + expected.to_s + '? ' + (success ? 'YES' : "NO, it was '#{actual}'")
+        log '      is '.bright + method.to_s + ', ' + expected.to_s.yellow + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
       end
 
       def compile
@@ -57,12 +59,16 @@ module TestMe
       def block_to_string &block
         "(block)"
       end
+      
+      def log msg
+        puts msg
+      end
 
       def context_to_string desc=nil, stubs=nil, &block
         str = ""
 
         if desc.class == String || desc.class == Symbol
-          str += ":#{desc}: "
+          str += ":#{desc}: ".blue
         end
 
         if desc.class == Hash
@@ -70,7 +76,7 @@ module TestMe
         end
 
         if stubs
-          str += stubs.map{|k,v| (k.to_s + ': ' + v.to_s)}.join(', ')
+          str += stubs.map{|k,v| (k.to_s + ': ' + v.to_s).bright}.join(', ') + ' '
         end
 
         if block
@@ -79,27 +85,26 @@ module TestMe
 
         return str
       end
+
     end
-    
-    class Console
-      #TODO color_scheme
 
+    class Text < Console
       def test topic
-        log "\n  test ".bright + topic.name.bright.color(250, 37, 115)
+        log "test " + topic.name
       end
 
       def given desc=nil, stubs=nil, &block
-        log "    given " + context_to_string(desc, stubs, &block)
+        log "given " + context_to_string(desc, stubs, &block)
       end
 
       def also desc=nil, stubs=nil, &block
-        log "     also " + context_to_string(desc, stubs, &block)
+        log "also " + context_to_string(desc, stubs, &block)
       end
 
       def is? method, actual, expected
         success = actual == expected
 
-        log '      is '.bright + method.to_s + ', ' + expected.to_s.yellow + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
+        log 'is ' + method.to_s + ', ' + expected.to_s + '? ' + (success ? 'YES' : "NO, it was '#{actual}'")
       end
 
       def compile
@@ -110,16 +115,12 @@ module TestMe
       def block_to_string &block
         "(block)"
       end
-      
-      def log msg
-        puts msg
-      end
 
       def context_to_string desc=nil, stubs=nil, &block
         str = ""
 
         if desc.class == String || desc.class == Symbol
-          str += ":#{desc}: ".blue
+          str += ":#{desc}: "
         end
 
         if desc.class == Hash
@@ -127,7 +128,7 @@ module TestMe
         end
 
         if stubs
-          str += stubs.map{|k,v| (k.to_s + ': ' + v.to_s).bright}.join(', ') + ' '
+          str += stubs.map{|k,v| (k.to_s + ': ' + v.to_s)}.join(', ')
         end
 
         if block
@@ -136,7 +137,6 @@ module TestMe
 
         return str
       end
-
     end
 
   end

data/lib/logic.rb

@@ -8,7 +8,7 @@ module TestMe
     @before = nil
     @contexts = {}
   
-    @@formatter ||= Formatter::create(testme.format)
+    @@formatter = Formatter::create(testme.format)
     @@formatter.test topic
     
     @topic_class = topic
@@ -69,13 +69,13 @@ module TestMe
       method = block
       result = block.call
     else
-      if args[0].class == Hash
+      if args[0].is_a? Hash
         method = args[0].first[0]
         expected = args[0].first[1]
         actual = topic.send(method)
       end
       
-      if args[0].class == Symbol
+      if args[0].is_a? Symbol
         params = args[0].args
         expected = args[1]
         actual = topic.send(args[0], *params)

data/lib/testme.rb

@@ -54,15 +54,15 @@ module TestMe
   # Config Module
   # ---------------------------------------------------------------- #
   require "configatron"
-  @config = Configatron::Store.new
+  @@config = Configatron::Store.new
 
   # Defaults
-  @config.dir = '/test/'
-  @config.suffix = '.test.rb'
-  @config.format = :console
-  @config.colors = :default
+  @@config.dir = '/test/'
+  @@config.suffix = '.test.rb'
+  @@config.format = :console
+  @@config.colors = :default
 
-  def self.config; @config; end
+  def self.config; @@config; end
 end
 
 # ---------------------------------------------------------------- #

data/test/formatter.test.rb

@@ -0,0 +1,12 @@
+module TestMe::Formatter
+  class Text
+    def log msg
+      return msg
+    end
+  end
+end
+
+test TestMe::Formatter::Text
+  #is? :test[TestMe::Formatter::Text], 'test TestMe::Formatter::Text'
+  is? :given[{description: "I format things"}], 'given description: I format things'
+  is? :also[{description: "I format things"}], 'also description: I format things'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testme
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -86,6 +86,7 @@ files:
 - spec/double_spec.rb
 - spec/spec_helper.rb
 - spec/testme_spec.rb
+- test/formatter.test.rb
 - testme.gemspec
 homepage: http://github.com/danielshuey/testme
 licenses: []
@@ -101,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 734885775
+      hash: -955234925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 734885775
+      hash: -955234925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24