testme 0.5.45 → 0.5.85

data/README.md

@@ -308,6 +308,15 @@ default test folder: `/test/**/*`
 
     before { topic.do_some_factory_stuff }
 
+***
+
+#### Describing or Commenting
+Use `-` followed by a String
+
+    -'this is a test description'
+
+***
+
 ## "This is too easy! How can I make this more challenging?"
 
 There is something about you that troubles me. Your manner is strange for a lonely code warrior.
@@ -321,6 +330,7 @@ When these features are completed
  - Test more complex method stubbing
  - Console color schemes
  - HTML reporting
+ - JSON/XML logging
 
 ## Design Decisions
 

data/lib/double.rb

@@ -19,5 +19,16 @@ module TestMe
       end
     end
 
+    def test *args, &block
+      method_missing :test, *args, &block
+    end
+
+    def class
+      return @subject.class
+    end
+
+    def to_str
+      return @subject.to_s
+    end
   end
 end

data/lib/formatter.rb

@@ -11,6 +11,10 @@ module TestMe
           return Formatter::Console.new
         when :html
           return Formatter::HTML.new
+        when :json
+          return false
+        when :xml
+          return false
       end
     end
  
@@ -34,7 +38,7 @@ module TestMe
       #TODO color_scheme
 
       def test topic
-        log "\n  test ".bright + topic.name.bright.color(250, 37, 115)
+        log "\n  test ".bright + topic.to_s.bright.color(250, 37, 115)
       end
 
       def given desc=nil, stubs=nil, &block
@@ -48,16 +52,25 @@ module TestMe
       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"
+        if method.class == Proc
+          log '      is ' + block_to_string(&method) + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
+        else
+          log '      is ' + method.to_s + ', ' + expected.to_s.yellow + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
+        end
       end
 
       def compile
         #do nothing
       end
 
+      def describe msg
+        log '    ' + msg.bright.yellow
+      end
+
     private
       def block_to_string &block
-        "(block)"
+        loc = block.source_location
+        `head -#{loc[1]} #{loc[0]} | tail -1 | grep -o {.*}`[2..-4]
       end
       
       def log msg
@@ -68,7 +81,7 @@ module TestMe
         str = ""
 
         if desc.class == String || desc.class == Symbol
-          str += ":#{desc}: ".blue
+          str += ":#{desc}: ".bright.cyan
         end
 
         if desc.class == Hash
@@ -76,7 +89,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
@@ -90,7 +103,7 @@ module TestMe
 
     class Text < Console
       def test topic
-        log "test " + topic.name
+        log "test " + topic.to_s
       end
 
       def given desc=nil, stubs=nil, &block
@@ -111,6 +124,10 @@ module TestMe
         #do nothing
       end
 
+      def describe msg
+        log msg
+      end
+
     private
       def block_to_string &block
         "(block)"

data/lib/logic.rb

@@ -3,27 +3,24 @@ module TestMe
     @topic
   end
 
-  def test topic
+  def test topic, *args
     @topic = nil
     @before = nil
     @contexts = {}
+    @args = args
   
     @@formatter = Formatter::create(testme.format)
-    @@formatter.test topic
     
-    @topic_class = topic
-    
-    if topic.instance_of? Module
-      o = Object.new
-      o.extend topic
-      @topic = Double.new(o) 
-    end
-    
-    if topic.instance_of? Class
-      @topic = Double.new(topic.new)
+    case topic.class
+      when String || Symbol
+        @topic_class = Object
+        @@formatter.test topic
+      else
+        @topic_class = topic
+        @@formatter.test @topic_class
     end
     
-    raise Exception, "Topic needs to be a Class or a Module" unless @topic
+    reset_topic
   end
  
   def given desc=nil, stubs=nil, &block
@@ -31,7 +28,7 @@ module TestMe
   
     @@formatter.given desc, stubs, &block
 
-    @topic = Double.new(@topic_class.new)
+    reset_topic
 
     if desc.class == String || desc.class == Symbol
       if stubs == nil and block == nil
@@ -80,7 +77,7 @@ module TestMe
         expected = args[1]
         actual = topic.send(args[0], *params)
       
-        method = args[0].to_s + (params ? '(' + params.join(',') + ')' : '')
+        method = args[0].to_s + ( params.size > 0 ? '(' + params.join(',') + ')' : '')
       end
       
       expected = true if expected.nil?
@@ -96,11 +93,27 @@ module TestMe
     @before = block
   end
 
+  def self.formatter
+    return @@formatter
+  end
+
 private
   class Context
     attr_accessor :name, :block, :stubs
   end
   
+  def reset_topic
+   if @topic_class.instance_of? Module
+      o = Object.new
+      o.extend @topic_class
+      @topic = Double.new(o) 
+    end
+    
+    if @topic_class.instance_of? Class
+      @topic = Double.new(@topic_class.new(*@args))
+    end
+  end
+
   def class_from_string(str)
     str.split('::').inject(Object) do |mod, class_name|
       mod.const_get(class_name)
@@ -133,3 +146,9 @@ private
     end
   end
 end
+
+class String
+  def -@
+    TestMe::formatter.describe self
+  end
+end

data/lib/testme.rb

@@ -19,7 +19,7 @@ module TestMe
 
   # Set the topic of the test
   #   ` test Player `
-  def test topic; end
+  def test topic, *args; end
   # ---------------------------------------------------------------- #
 
   # Provide a context
@@ -50,6 +50,9 @@ module TestMe
   def before █ end
   # ---------------------------------------------------------------- #
 
+  # Describe the context (if necessary)
+  #  ` -'create the context'`
+
   # ---------------------------------------------------------------- #
   # Config Module
   # ---------------------------------------------------------------- #

data/spec/testme_spec.rb

@@ -9,7 +9,7 @@ describe 'TestMe' do
   end
 
   describe '#topic' do
-    specify('is created') {topic.class.name.should == 'TestMe::Double'}
+    specify('is created') {topic.class.name.should == 'Mock'}
   end
 
   describe '#given' do

data/test/double.test.rb

@@ -0,0 +1,17 @@
+class TestObject
+  def hello; return 'hello'; end
+  def world; return 'world'; end
+end
+
+test TestMe::Double
+ given test: 5
+  is? :test, 5
+
+ #Stub chain
+ given { topic.test.test2 = 5 }
+  is? { topic.test.test2 == 5 }
+
+ #Stub chain over object
+ given test: TestMe::Double.new(TestObject.new)
+  also { topic.test.test2 = 5 }
+   is? { topic.test.test2 == 5 }

data/test/formatter.test.rb

@@ -7,6 +7,7 @@ module TestMe::Formatter
 end
 
 test TestMe::Formatter::Text
-  #is? :test[TestMe::Formatter::Text], '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'
+  is? :describe['testme'], 'testme'

data/test/testme.test.rb

@@ -0,0 +1,3 @@
+test 'TestMe'
+ -'Topic creation'
+ 

metadata

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