The Interactor needed to be part of the SassSpec module

Author: chriseppstein

lib/sass_spec/interactor.rb

@@ -1,60 +1,62 @@
-class Interactor
+module SassSpec
+  class Interactor
 
-  class Choice < Struct.new(:label, :message, :block)
-    def run_block!
-      block.call if block
+    class Choice < Struct.new(:label, :message, :block)
+      def run_block!
+        block.call if block
+      end
     end
-  end
 
-  def initialize
-    @choices = []
-    @choice = nil
-  end
-
-  def prompt(message)
-    @prompt = message
-  end
-
-  def choice(label, message, &block)
-    @choices << Choice.new(label, message, block)
-  end
+    def initialize
+      @choices = []
+      @choice = nil
+    end
 
-  def restart!
-    @choice = nil
-  end
+    def prompt(message)
+      @prompt = message
+    end
 
-  def display_choices!
-    puts
-    puts @prompt if @prompt
-    @choices.each_with_index do |c, i|
-      puts "#{i + 1}. #{c.message}"
+    def choice(label, message, &block)
+      @choices << Choice.new(label, message, block)
     end
-    print "Please select an option > "
-  end
 
-  def run!
-    if @choices.size == 0
-      raise ArgumentError, "No choices to run."
+    def restart!
+      @choice = nil
     end
-    @choice = nil
-    until @choice
-      display_choices!
-      input = $stdin.gets
+
+    def display_choices!
       puts
-      @choice = input ? input.strip.to_i : 0
-      if @choice > 0 && @choice <= @choices.size
-        @choices[@choice - 1].run_block! # We run this in the loop so restart! can be invoked.
-      else
-        @choice = nil
+      puts @prompt if @prompt
+      @choices.each_with_index do |c, i|
+        puts "#{i + 1}. #{c.message}"
       end
+      print "Please select an option > "
     end
-    @choices[@choice - 1].label # we return the label so re-ordering choices doesn't change result
-  end
 
-  def self.interact
-    interactor = new
-    yield interactor
-    interactor.run!
+    def run!
+      if @choices.size == 0
+        raise ArgumentError, "No choices to run."
+      end
+      @choice = nil
+      until @choice
+        display_choices!
+        input = $stdin.gets
+        puts
+        @choice = input ? input.strip.to_i : 0
+        if @choice > 0 && @choice <= @choices.size
+          @choices[@choice - 1].run_block! # We run this in the loop so restart! can be invoked.
+        else
+          @choice = nil
+        end
+      end
+      @choices[@choice - 1].label # we return the label so re-ordering choices doesn't change result
+    end
+
+    def self.interact
+      interactor = new
+      yield interactor
+      interactor.run!
+    end
   end
 end
 

lib/sass_spec/test.rb

@@ -36,7 +36,7 @@ def run_spec_test(test_case, options = {})
 
 def interact(test_case, default, &block)
   if test_case.interactive?
-    return Interactor.interact(&block)
+    return SassSpec::Interactor.interact(&block)
   else
     return default
   end
@@ -235,7 +235,7 @@ def handle_unexpected_pass!(test_case, status, error, options)
   if test_case.should_fail?
     output, _, error, status = test_case.output
     if status == 0 && test_case.interactive?
-      choice = Interactor.interact do |i|
+      choice = SassSpec::Interactor.interact do |i|
         i.prompt "In #{test_case.name}\n" +
                  "A failure was expected but it compiled instead."
         i.choice(:show_source, "Show me the input.") do
@@ -279,7 +279,7 @@ def handle_unexpected_error!(test_case, status, error, options)
   unless test_case.should_fail?
     _output, _clean_output, error, status = test_case.output
     if status != 0 && test_case.interactive?
-      choice = Interactor.interact do |i|
+      choice = SassSpec::Interactor.interact do |i|
         i.prompt "In #{test_case.name}\n" +
                  "An unexpected compiler error was encountered."
         i.choice(:show_source, "Show me the input.") do
@@ -320,7 +320,7 @@ def handle_unexpected_error!(test_case, status, error, options)
 
 def delete_test!(test_case)
   files = Dir.glob(File.join(test_case.folder, "**", "*"))
-  result = Interactor.interact do |i|
+  result = SassSpec::Interactor.interact do |i|
     i.prompt("The following files will be removed:\n  * " + files.join("\n  * "))
     i.choice(:proceed, "Delete them.") do
       FileUtils.rm_rf(test_case.folder)