Exspec 1.0.1 → 1.0.2

data/lib/exspec/context_manager.rb

@@ -64,7 +64,7 @@ module Exspec
       global_instance.instance_variable_set :@exspec, @exspec
       global_instance.class.send :attr_reader, :exspec
       global_eval "_ = nil"
-      Extension.setup_global_context self
+      Extension.setup_global_context self, global_instance
     end
 
     def setup_exspec_context

data/lib/exspec/executor.rb

@@ -6,7 +6,7 @@ module Exspec
       @exspec = exspec
     end
 
-    delegate :puts, :print, :return_spec, :context, :to => :@exspec
+    delegate :puts, :print, :return_spec, :context, :commit, :to => :@exspec
     attr_reader :exspec
 
     def eval(instruction, &callback_block)
@@ -32,10 +32,6 @@ module Exspec
                     execute(command, parameters(param_string), callbacks) do
                       exspec.last_exspec_value
                     end
-                  when "inspect"
-                    execute(command, callbacks) do
-                      exspec.inspect_last_value
-                    end
                   when "redo"
                     execute(command, callbacks) do
                       exspec.redo
@@ -81,8 +77,14 @@ module Exspec
                       exspec.expect_inspect *params
                     end
                   when "skip"
+                    raise SkipSignal
+                  when "spec", "current_spec"
+                    execute(command, callbacks) do
+                      exspec.current_spec.full_name
+                    end
+                  when "description"
                     execute(command, callbacks) do
-                      SkipSignal
+                      exspec.current_spec.full_description
                     end
                   when "load_current", "reload_current", "discard"
                     execute(command, callbacks) do
@@ -146,16 +148,16 @@ module Exspec
                         menu(spec.children) { |spec| spec.name }
                       end
                     end
-                  when "no_log", "without_logging", "silent"
+                  when "no_log", "without_logging", "silent", "no_history"
                     val = exspec.without_logging { exspec.execute param_string }
                     return_spec exspec.logger.last_value
                     val
-                  when "log_off", "disable_log"
+                  when "log_off", "disable_log", "history_off", "disable_history"
                     execute(command, callbacks) do
                       exspec.logger.enabled = false
                       exspec.last_value
                     end
-                  when "log_on", "enable_log"
+                  when "log_on", "enable_log", "history_on", "enable_history"
                     execute(command, callbacks) do
                       exspec.logger.enabled = true
                       return_spec exspec.logger.last_value

data/lib/exspec/extensions/extension.rb

@@ -30,8 +30,8 @@ module Exspec::Extension
     apply :setup_context, context_manager
   end
 
-  def self.setup_global_context(context_manager)
-    apply :setup_global_context, context_manager
+  def self.setup_global_context(context_manager, global_instance)
+    apply :setup_global_context, context_manager, false, global_instance
   end
 
   def self.setup_exspec_context(context_manager)

data/lib/exspec/extensions/mocking.rb

@@ -66,6 +66,10 @@ module Exspec::Mocking
       end
     end
 
+    def _clear_calls
+      @method_calls.clear
+    end
+
     def _have_been_called?(method)
       @method_calls.any? { |call| call[:method] == method.to_sym }
     end

data/lib/exspec/irb/irb_exspec.rb

@@ -20,13 +20,18 @@ module Exspec
 
     def expect_inspect(expect=nil, comment=nil)
       if expect.nil? && @irb_context.io.is_a?(IRB::ReadlineInputMethod)
-        puts "What inspect value do you expect (only the static content, press up to get the last one):"
-        history = @irb_context.io.history
-        @irb_context.io.history = [inspect_last_value]
-        @irb_context.io.prompt = "fuzzy expectation: "
-        input = @irb_context.io.gets.strip
-        @irb_context.io.history = history
-        expect = input.empty? ? expect : input
+        begin
+          history = @irb_context.io.history
+          @irb_context.io.history = [inspect_last_value]
+          @irb_context.io.prompt = "fuzzy expectation: "
+          puts "What inspect value do you expect (only the static content, press up to get the last one):"
+          input = @irb_context.io.gets.strip
+        rescue Exception => e
+          puts "Error: #{e}"
+        ensure
+          @irb_context.io.history = history
+          expect = input.empty? ? expect : input
+        end
       end
       super expect, comment
     end

data/lib/exspec/irb/irb_patch.rb

@@ -40,11 +40,19 @@ class RubyLex
   alias_method :_lex, :lex
 
   def lex
-    if peek_equal?(Exspec::COMMAND_PREFIX)
-      identify_comment
-      ungetc
-      token
-      return get_readed
+    if @lex_state == EXPR_BEG
+      i = 0
+      while peek(i) and (line = @rests.join("").strip).length < Exspec::COMMAND_PREFIX.length
+        i += 1
+      end
+      if line.start_with? Exspec::COMMAND_PREFIX
+        skip = true
+        while c = getc
+          next if skip &&= (c =~ /[\s]/)
+          break if c =~ /[\n\r]/
+        end
+        return get_readed
+      end
     end
     _lex
   end

data/lib/exspec.rb

@@ -112,7 +112,7 @@ module Exspec
       without_logging do
         run spec
       end
-      commit "#{COMMAND_PREFIX}include #{spec.name}"
+      commit "#{COMMAND_PREFIX}include #{spec.full_name}"
     end
 
     def retry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Exspec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport