duoconsole 0.1.2 → 0.1.3

data/lib/duoconsole.rb

@@ -13,7 +13,6 @@ class Duoconsole
     create_socket_pair
     fork_child
     load_application
-    initialize_command_client
     start_console
   end
 
@@ -25,6 +24,7 @@ class Duoconsole
     end
 
     require 'commands'
+    monkeypatch_commands_gem
   end
 
   def create_socket_pair
@@ -36,7 +36,6 @@ class Duoconsole
       Rails.env = ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
 
       load_application
-      monkeypatch_test_environment
 
       trap(:INT) {
         # Ignore. This process needs to stay alive until the parent process exits
@@ -70,29 +69,42 @@ class Duoconsole
     Rails.application.require_environment!
   end
 
-  def initialize_command_client
-    ConsoleDelegation.command_client = CommandClient.new(parent_socket)
-  end
-
   def start_console
     require 'rails/commands/console'
     require 'rails/console/app'
+    ConsoleDelegation.duoconsole = self
     Rails::ConsoleMethods.send :include, ConsoleDelegation
     Rails::Console.start(Rails.application)
   end
 
-  def monkeypatch_test_environment
+  def command_client
+    @command_client ||= CommandClient.new(parent_socket)
+  end
+
+  def monkeypatch_commands_gem
     Rails::Commands::TestEnvironment.module_eval do
       # Overriding this method to add the following behavior:
       #   1. fix issue with Postgres adapter and forking behavior
       #   2. trap INT signal and exit
       def fork
-        ActiveRecord::Base.clear_active_connections!
+        clear_active_record_connections
+
         Rails::Commands::Environment.fork do
           setup_for_test
-          trap(:INT) { exit(1) }
+
+          trap(:INT) {
+            $stderr.flush
+            exit
+          }
 
           yield
+
+          clear_active_record_connections
+        end
+      end
+
+      def clear_active_record_connections
+        if defined? ActiveRecord
           ActiveRecord::Base.clear_active_connections!
         end
       end
@@ -165,12 +177,12 @@ class Duoconsole
 
 
   module ConsoleDelegation
-    def self.command_client= client
-      @@command_client = client
+    def self.duoconsole= dc
+      @@duoconsole = dc
     end
 
     def testenv
-      @@command_client
+      @@duoconsole.command_client
     end
 
     def test *args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duoconsole
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails