shindo 0.1.12 → 0.2.0

data/Gemfile.lock

@@ -1,21 +1,17 @@
 PATH
   remote: .
   specs:
-    shindo (0.1.9)
+    shindo (0.1.12)
       formatador (>= 0.0.16)
-      gestalt (>= 0.0.11)
 
 GEM
   remote: http://rubygems.org/
   specs:
     formatador (0.0.16)
-    gestalt (0.0.11)
-      formatador (>= 0.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   formatador (>= 0.0.16)
-  gestalt (>= 0.0.11)
   shindo!

data/lib/shindo.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'formatador'
-require 'gestalt'
 
 module Shindo
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.12'
+    VERSION = '0.2.0'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -118,9 +117,14 @@ module Shindo
           end
           value, success = case type
           when :raises
-            raises?(expectation, &block)
+            value = begin
+              instance_eval(&block)
+            rescue => error
+              error
+            end
+            [value, value.is_a?(expectation)]
           when :returns
-            returns?(expectation, &block)
+            [value = instance_eval(&block), value == expectation]
           end
           for after in @afters.flatten.compact
             after.call
@@ -161,7 +165,7 @@ module Shindo
 
     def prompt(description, &block)
       return if Thread.main[:exit] || Thread.current[:reload]
-      Formatador.display("Action? [c,e,i,q,r,t,?]? ")
+      Formatador.display("Action? [c,q,r,?]? ")
       choice = STDIN.gets.strip
       continue = false
       Formatador.display_line
@@ -169,54 +173,17 @@ module Shindo
         case choice
         when 'c', 'continue'
           continue = true
-        when /^e .*/, /^eval .*/
-          begin
-            value = eval(choice[2..-1], @gestalt.bindings.last)
-            if value.nil?
-              value = 'nil'
-            end
-            Formatador.display_line(value)
-          rescue => error
-            display_error(error)
-          end
-        when 'i', 'interactive', 'irb'
-          Formatador.display_line('Starting interactive session...')
-          if @irb.nil?
-            require 'irb'
-            ARGV.clear # Avoid passing args to IRB
-            IRB.setup(nil)
-            @irb = IRB::Irb.new(nil)
-            IRB.conf[:MAIN_CONTEXT] = @irb.context
-            IRB.conf[:PROMPT][:SHINDO] = {}
-          end
-          for key, value in IRB.conf[:PROMPT][:SIMPLE]
-            IRB.conf[:PROMPT][:SHINDO][key] = "#{Formatador.indentation}#{value}"
-          end
-          @irb.context.prompt_mode = :SHINDO
-          @irb.context.workspace = IRB::WorkSpace.new(@gestalt.bindings.last)
-          begin
-            @irb.eval_input
-          rescue SystemExit
-          end
         when 'q', 'quit', 'exit'
           Formatador.display_line("Exiting...")
           Thread.main[:exit] = true
         when 'r', 'reload'
           Formatador.display_line("Reloading...")
           Thread.current[:reload] = true
-        when 't', 'backtrace', 'trace'
-          if @gestalt.calls.empty?
-            Formatador.display_line("[red]No methods were called, so no backtrace was captured.[/]")
-          else
-            @gestalt.display_calls
-          end
         when '?', 'help'
           Formatador.display_lines([
             'c - ignore this error and continue',
-            'i - interactive mode',
             'q - quit Shindo',
             'r - reload and run the tests again',
-            't - display backtrace',
             '? - display help'
           ])
         else

data/lib/shindo/taciturn.rb

@@ -47,18 +47,5 @@ module Shindo
       print Formatador.parse("[green]+[/]")
     end
 
-    def raises?(expectation, &block)
-      value = begin
-        instance_eval(&block)
-      rescue => error
-        error
-      end
-      [value, value.is_a?(expectation)]
-    end
-
-    def returns?(expectation, &block)
-      [value = instance_eval(&block), value == expectation]
-    end
-
   end
 end

data/lib/shindo/verbose.rb

@@ -31,15 +31,5 @@ module Shindo
       Formatador.display_line("[green]+ #{description}[/]")
     end
 
-    def raises?(expectation, &block)
-      @gestalt = Gestalt.new({'formatador' => Formatador})
-      [value = @gestalt.run(&block), value.is_a?(expectation)]
-    end
-
-    def returns?(expectation, &block)
-      @gestalt = Gestalt.new({'formatador' => Formatador})
-      [value = @gestalt.run(&block), value == expectation]
-    end
-
   end
 end

data/shindo.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'shindo'
-  s.version           = '0.1.12'
-  s.date              = '2011-01-03'
+  s.version           = '0.2.0'
+  s.date              = '2011-01-24'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('formatador', '>=0.0.16')
-  s.add_dependency('gestalt', '>=0.0.11')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 12
-  version: 0.1.12
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,22 +34,6 @@ dependencies:
         version: 0.0.16
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gestalt
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 0
-        - 11
-        version: 0.0.11
-  type: :runtime
-  version_requirements: *id002
 description: Work with your tests, not against them.
 email: geemus@gmail.com
 executables: