tconsole 1.3.0.pre1 → 1.3.0.pre2

data/lib/tconsole/config.rb

@@ -67,7 +67,6 @@ module TConsole
         sets.each do |set|
           self.file_sets[set] = ["#{test_dir}/#{set}/**/*_spec.rb"]
         end
-        puts self.file_sets.to_s
       else
         self.file_sets = {
           "all" => ["#{test_dir}/**/*_test.rb"]
@@ -84,6 +83,11 @@ module TConsole
       @cached_suite_counts = {}
       @cached_elements = {}
     end
+    
+    # Returns the string name of our current app, i.e. tconsole or rconsole
+    def app
+      Config.app(mode)
+    end
 
     def option_parser
       @option_parser ||= OptionParser.new do |opts|
@@ -234,5 +238,10 @@ module TConsole
     def self.is_rails?
       @rails ||= !!File.exist?("./config/application.rb")
     end
+    
+    # Public: Returns the app name based on the given mode.
+    def self.app(mode)
+      mode == :minitest ? "tconsole" : "rconsole"
+    end
   end
 end

data/lib/tconsole/console.rb

@@ -29,7 +29,7 @@ module TConsole
 
     # Returns true if the app should keep running, false otherwise
     def read_and_execute(pipe_server)
-      prompt = "tconsole> "
+      prompt = "#{config.app}> "
 
       trap("SIGTSTP", "SYSTEM_DEFAULT")
       trap("SIGCONT") do

data/lib/tconsole/minitest_server.rb

@@ -60,7 +60,7 @@ module TConsole
             end
 
           elsif defined?(::Test::Unit)
-            reporter.error("Sorry, but tconsole doesn't support Test::Unit")
+            reporter.error("Sorry, but #{config.app} doesn't support Test::Unit")
           end
 
           result

data/lib/tconsole/reporter.rb

@@ -90,8 +90,8 @@ module TConsole
       puts "Runtime Variables"
       puts
       puts "You can set runtime variables with the set command. This helps out with changing"
-      puts "features of TConsole that you may want to change at runtime. At present, the"
-      puts "following runtime variables are available:"
+      puts "features that you may want to change at runtime. At present, the following"
+      puts "runtime variables are available:"
       puts
       puts "fast        # Turns on fail fast mode. Values: on, off"
       puts
@@ -101,7 +101,7 @@ module TConsole
     # Public: Outputs the tconsole welcome message
     def welcome_message
       info
-      info("Welcome to tconsole (v#{TConsole::VERSION}). Type 'help' for help or 'exit' to quit.")
+      info("Welcome to #{config.app} (v#{TConsole::VERSION}). Type 'help' for help or 'exit' to quit.")
     end
 
     # Public: Outputs the tconsole exit message

data/lib/tconsole/rspec_server.rb

@@ -95,24 +95,6 @@ module TConsole
       reporter.info
     end
 
-    # Preloads our autocomplete cache
-    def preload_test_ids
-      result = nil
-      # result = run_in_fork do
-      #   paths = []
-      #   config.file_sets["all"].each do |glob|
-      #     paths.concat(Dir.glob(glob))
-      #   end
-      # 
-      #   paths.each { |path| require File.expand_path(path) }
-      # 
-      #   require File.join(File.dirname(__FILE__), "minitest_handler")
-      #   MiniTestHandler.preload_elements
-      # end
-
-      config.cache_test_ids(result) unless result.nil?
-    end
-
     # Runs all tests against the match patterns given
     def run_all_tests(match_patterns = nil)
       run_tests(config.file_sets["all"], match_patterns)
@@ -122,14 +104,5 @@ module TConsole
     def run_file_set(set)
       run_tests(config.file_sets[set], nil)
     end
-
-    def run_failed
-      if last_result.failures.empty?
-        reporter.info("No tests failed in your last run, or you haven't run any tests in this session yet.")
-        reporter.info
-      else
-        run_tests(config.file_sets["all"], last_result.failures)
-      end
-    end
   end
 end

data/lib/tconsole/runner.rb

@@ -8,8 +8,8 @@ module TConsole
       self.mode = mode
       
       # try to load the default configs
-      Config.load_config(File.join(Dir.home, ".tconsole"))
-      Config.load_config(File.join(Dir.pwd, ".tconsole"))
+      Config.load_config(File.join(Dir.home, ".#{Config.app(mode)}"))
+      Config.load_config(File.join(Dir.pwd, ".#{Config.app(mode)}"))
       self.config = Config.configure(mode, argv)
       self.reporter = Reporter.new(config)
     end

data/lib/tconsole/server.rb

@@ -7,6 +7,11 @@ module TConsole
       self.reporter = reporter
       self.last_result = TConsole::TestResult.new
     end
+    
+    # Internal: Outputs a message that a feature hasn't been implemented
+    def not_implemented
+      reporter.error("This feature hasn't been implemented yet.")
+    end
 
     # Processes the message sent from the console
     def handle(message)
@@ -92,122 +97,23 @@ module TConsole
       end
     end
 
-    # Loads the files that match globs and then executes tests against them. Limit tests
-    # with class names, method names, and test ids using match_patterns.
-    def run_tests(globs, match_patterns, message = "Running tests...")
-      time = Benchmark.realtime do
-        reporter.info(message)
-        reporter.info
-
-        paths = []
-        globs.each do |glob|
-          paths.concat(Dir.glob(glob))
-        end
-
-        if paths.length == 0
-          reporter.warn("No test files match your requested test set: #{globs.join(",")}.")
-          reporter.warn("Skipping execution.")
-          return nil
-        end
-
-        self.last_result = run_in_fork do
-
-          paths.each do |path|
-            reporter.trace("Requested path `#{path}` doesn't exist.") unless File.exist?(path)
-            require File.expand_path(path)
-          end
-
-          reporter.trace("Running before_test_run callback")
-          config.before_test_run!
-          reporter.trace("Completed before_test_run callback")
-
-          result = nil
-          if defined?(::MiniTest)
-            reporter.trace("Detected minitest.")
-            require File.join(File.dirname(__FILE__), "minitest_handler")
-
-            reporter.trace("Running tests.")
-            runner = MiniTestHandler.setup(match_patterns, config)
-
-            # Handle trapping interrupts
-            trap("SIGINT") do
-              reporter.warn
-              reporter.warn("Trapped interrupt. Halting tests.")
-
-              runner.interrupted = true
-            end
-
-            runner.run
-
-            result = runner.results
-
-            # Make sure minitest doesn't run automatically
-            MiniTestHandler.patch_minitest
-
-            reporter.trace("Finished running tests.")
-
-            if runner.interrupted
-              reporter.error("Test run was interrupted.")
-            end
-
-          elsif defined?(::Test::Unit)
-            reporter.error("Sorry, but tconsole doesn't support Test::Unit yet")
-          elsif defined?(::RSpec)
-            reporter.error("Sorry, but tconsole doesn't support RSpec yet")
-          end
-
-          result
-        end
-
-        if self.last_result == nil
-          # Just in case anything crazy goes down with marshalling
-          self.last_result = TConsole::TestResult.new
-        end
-
-        config.cache_test_ids(self.last_result)
-
-        true
-      end
-
-      reporter.info
-      reporter.info("Tests ran in #{"%0.6f" % time}s. Finished at #{Time.now.strftime('%Y-%m-%d %l:%M:%S %p')}.")
-      reporter.info
-    end
-
     # Preloads our autocomplete cache
     def preload_test_ids
-      result = run_in_fork do
-        paths = []
-        config.file_sets["all"].each do |glob|
-          paths.concat(Dir.glob(glob))
-        end
-
-        paths.each { |path| require File.expand_path(path) }
-
-        require File.join(File.dirname(__FILE__), "minitest_handler")
-        MiniTestHandler.preload_elements
-      end
-
-      config.cache_test_ids(result) unless result.nil?
+      # Does nothing by default
     end
 
     # Runs all tests against the match patterns given
     def run_all_tests(match_patterns = nil)
-      run_tests(config.file_sets["all"], match_patterns)
+      reporter.error("This feature hasn't been implemented yet.")
     end
 
     # Runs a file set out of the config
     def run_file_set(set)
-      run_tests(config.file_sets[set], nil)
+      reporter.error("This feature hasn't been implemented yet.")
     end
 
     def run_failed
-      if last_result.failures.empty?
-        reporter.info("No tests failed in your last run, or you haven't run any tests in this session yet.")
-        reporter.info
-      else
-        run_tests(config.file_sets["all"], last_result.failures)
-      end
+      reporter.error("This feature hasn't been implemented yet.")
     end
 
     def run_info

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.3.0.pre1"
+  VERSION = "1.3.0.pre2"
 end

data/spec/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe TConsole::Config do
   context "a Config without arguments" do
     before do
-      @config = TConsole::Config.new([])
+      @config = TConsole::Config.new(:minitest, [])
       @config.test_dir = "./spec/fixtures/minitest"
     end
 
@@ -30,7 +30,7 @@ describe TConsole::Config do
 
   context "a Config with the trace argument" do
     before do
-      @config = TConsole::Config.new(Shellwords.shellwords("--trace"))
+      @config = TConsole::Config.new(:minitest, Shellwords.shellwords("--trace"))
     end
 
     it "has tracing enabled" do
@@ -40,7 +40,7 @@ describe TConsole::Config do
 
   context "a Config with the once argument" do
     before do
-      @config = TConsole::Config.new(Shellwords.shellwords("--once all"))
+      @config = TConsole::Config.new(:minitest, Shellwords.shellwords("--once all"))
     end
 
     it "has run once enabled" do
@@ -50,7 +50,7 @@ describe TConsole::Config do
 
   context "a Config with remaining arguments" do
     before do
-      @config = TConsole::Config.new(Shellwords.shellwords("--trace set fast on"))
+      @config = TConsole::Config.new(:minitest, Shellwords.shellwords("--trace set fast on"))
     end
 
     it "sets remaining args as first command" do
@@ -79,7 +79,7 @@ describe TConsole::Config do
         config.test_dir = "./awesomer_sauce"
       end
 
-      config = TConsole::Config.configure
+      config = TConsole::Config.configure(:minitest)
       expect(config.test_dir).to eq("./awesomer_sauce")
     end
   end

data/spec/runner_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe TConsole::Runner do
   before do
-    @runner = TConsole::Runner.new
+    @runner = TConsole::Runner.new(:minitest)
     @ps = ChattyProc::PipeServer.new
   end
 
@@ -24,7 +24,7 @@ describe TConsole::Runner do
 
   describe "#console_run_loop" do
     before do
-      @config = TConsole::Config.new
+      @config = TConsole::Config.new(:minitest)
       @reporter = TConsole::Reporter.new(@config)
       @console = TConsole::Console.new(@config, @reporter)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre1
+  version: 1.3.0.pre2
   prerelease: 6
 platform: ruby
 authors: