tconsole 0.0.2.pre → 0.0.3.pre

data/lib/tconsole.rb

@@ -1,110 +1,100 @@
 require "tconsole/version"
+require "tconsole/server"
 
-require 'readline'
-require 'benchmark'
+require "readline"
+require "benchmark"
+require "drb/drb"
 
 module TConsole
   class Runner
+
+    SERVER_URI = "druby://localhost:8788" 
     # Spawns a new environment. Looks at the results of the environment to determine whether to stop or
     # keep running
     def self.run
-
       stty_save = `stty -g`.chomp
 
-      # We're only going to handle interrupts on the inner process
-      trap("SIGINT", "IGNORE");
       running = true
+      trap("SIGINT", "SYSTEM_DEFAULT")
+
+      # A little welcome
+      puts
+      puts "Welcome to tconsole. Type 'help' for help or 'exit' to quit."
 
+      # Start the server
       while running
+        # ignore ctrl-c during load, since things can get kind of messy if we don't
+
         pid = fork do
-          exit run_environment ? 0 : 1
-        end
+          begin
+            server = Server.new
 
-        pid, status = Process.wait2(pid)
-        running = false if status.exitstatus != 0
-      end
+            DRb.start_service(SERVER_URI, server)
 
-      puts
-      puts "Exiting. Bye!"
-      system("stty", stty_save);
-    end
-
-    # Starts our Rails environment and listens for console commands
-    # Returns true if we should keep running or false if we need to exit
-    def self.run_environment
+            DRb.thread.join
+          rescue Interrupt
+            # do nothing here since the outer process will shut things down for us
+          end
+        end
 
-      trap("SIGINT", "SYSTEM_DEFAULT");
+        # Set up our client connection to the server
+        server = DRbObject.new_with_uri(SERVER_URI)
+
+        loaded = false
+        wait_until = Time.now + 10
+        until loaded || Time.now > wait_until
+          begin
+            running = server.load_environment
+            loaded = true
+          rescue
+            loaded = false
+          rescue Interrupt
+            # do nothing if we get an interrupt
+            puts "Interrupted in client"
+          end
+        end
 
-      puts
-      puts "Loading Rails environment..."
-      time = Benchmark.realtime do
-        begin
-          # Ruby environment loading is shamelessly borrowed from spork
-          ENV["RAILS_ENV"] ||= "test"
-          $:.unshift("./test")
-
-          require 'rake'
-          Rake.application.init
-          Rake.application.load_rakefile
-          Rake.application.invoke_task("test:prepare")
-        rescue Exception => e
-          puts "Error: Loading your environment failed."
-          puts "    #{e.message}"
-          return false
+        if !loaded
+          puts
+          puts "Couldn't connect to test environment. Exiting."
+          exit(1)
         end
+
+        running = command_loop(server) if running
+
+        server.stop
+        Process.wait2(pid)
       end
 
-      puts "Environment loaded in #{time}s."
       puts
+      puts "Exiting. Bye!"
+      system("stty", stty_save);
+    end
 
-      while line = Readline.readline('> ', true)
-        if line == "exit"
+    def self.command_loop(server)
+      while line = Readline.readline("tconsole> ", true)
+        if line == ""
+          # do nothing
+        elsif line == "exit"
           return false
         elsif line == "reload"
           return true
         elsif line == "help"
           help
         elsif line == "units"
-          run_tests(["test/unit/**/*_test.rb"])
+          server.run_tests(["test/unit/**/*_test.rb"])
         elsif line == "functionals"
-          run_tests(["test/functional/**/*_test.rb"])
+          server.run_tests(["test/functional/**/*_test.rb"])
         elsif line == "integration"
-          run_tests(["test/integration/**/*_test.rb"])
+          server.run_tests(["test/integration/**/*_test.rb"])
         elsif line == "all"
-          run_tests(["test/unit/**/*_test.rb", "test/functional/**/*_test.rb", "test/integration/**/*_test.rb"])
+          server.run_tests(["test/unit/**/*_test.rb", "test/functional/**/*_test.rb", "test/integration/**/*_test.rb"])
         else
-          run_tests([line])
-        end
-      end
-
-      return false
-    end
-
-    # Taks an array of globs and loads all of the files in the globs
-    # and then runs the tests in those files
-    def self.run_tests(globs)
-      time = Benchmark.realtime do
-        pid = fork do
-
-          puts "Running tests..."
-          puts
-
-          paths = []
-          globs.each do |glob|
-            paths.concat(Dir.glob(glob))
-          end
-
-          paths.each do |path|
-            require File.realpath(path)
-          end
+          server.run_tests([line])
         end
-
-        Process.wait2(pid)
       end
 
-      puts
-      puts "Test time (including load): #{time}s"
-      puts
+      return true
     end
 
     # Prints a list of available commands

data/lib/tconsole/server.rb

@@ -0,0 +1,62 @@
+module TConsole
+  class Server
+    def stop
+      DRb.stop_service
+    end
+
+    def load_environment
+      puts
+      puts "Loading Rails environment..."
+      time = Benchmark.realtime do
+        begin
+          # Ruby environment loading is shamelessly borrowed from spork
+          ENV["RAILS_ENV"] ||= "test"
+          $:.unshift("./test")
+
+          require 'rake'
+          Rake.application.init
+          Rake.application.load_rakefile
+          Rake.application.invoke_task("test:prepare")
+        rescue Exception => e
+          puts "Error: Loading your environment failed."
+          puts "    #{e.message}"
+          return false
+        end
+      end
+
+      puts "Environment loaded in #{time}s."
+      puts
+
+      return true
+    end
+
+    def run_tests(globs)
+      time = Benchmark.realtime do
+        pid = fork do
+
+          puts "Running tests..."
+          puts
+
+          paths = []
+          globs.each do |glob|
+            paths.concat(Dir.glob(glob))
+          end
+
+          paths.each do |path|
+            require File.realpath(path)
+          end
+
+          if defined? ActiveRecord
+            ActiveRecord::Base.connection.reconnect!
+          end
+        end
+
+        Process.wait2(pid)
+      end
+
+      puts
+      puts "Test time (including load): #{time}s"
+      puts
+    end
+  end
+end

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "0.0.2.pre"
+  VERSION = "0.0.3.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre
+  version: 0.0.3.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies: []
 description: tconsole gives you a helpful console for running Rails tests
 email:
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - bin/tconsole
 - lib/tconsole.rb
+- lib/tconsole/server.rb
 - lib/tconsole/version.rb
 - tconsole.gemspec
 homepage: ''