duoconsole 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abf14816a0573ee19583a436b6c52aac3f92891
-  data.tar.gz: 86a8a79b0305f8d216f7e3f4b9c02a4cfbd0211b
+  metadata.gz: cf225ca24e2561e4b81a1225f774bac71dd52dbf
+  data.tar.gz: 99a99ccb9a1e6c6604c36b875a1f80e285f1f382
 SHA512:
-  metadata.gz: 812c7af8d68a7c9e445c58d8047792bb9954ba0bcf1415ec1b0b25ca7e6768cb284ce9fdae9e790d2ba904a959d2990b4b3217fd575f646d4448f95fa5d20356
-  data.tar.gz: 20c5f45d26ded389ecb18fe7e8845bb0f9d24537af4087f922b4136d2f490207125caf83919127c3b16913995f02427adc0aa724c747fca4b27ba1c92febd844
+  metadata.gz: 7288a267ea48f3977093a3862e6506eb52e2ebed1d9250521678582bb56a5d718255585f353dab6f19260c46258e71b854e8e9350846f290c200906d26fc0a48
+  data.tar.gz: 8882ed908a326dcf54e40b88a7ff0919c0cae5db645a16c346da9491739e82f494edbb72750b4553886bac45d23721efa132092ffbffefc8b8b5d5f622bfcd7c

data/lib/duoconsole.rb

@@ -22,9 +22,6 @@ class Duoconsole
     if defined?(Bundler)
       Bundler.require(:default, :assets)
     end
-
-    require 'commands'
-    monkeypatch_commands_gem
   end
 
   def create_socket_pair
@@ -33,10 +30,6 @@ class Duoconsole
 
   def fork_child
     child_pid = fork do
-      Rails.env = ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
-
-      load_application
-
       trap(:INT) {
         # Ignore. This process needs to stay alive until the parent process exits
       }
@@ -54,18 +47,6 @@ class Duoconsole
 
   def load_application
     require APP_PATH
-
-    if Rails.env.test?
-      # Initializer copied from https://github.com/jonleighton/spring/blob/master/lib/spring/application.rb#L30
-      #
-      # The test environment has config.cache_classes = true set by default.
-      # However, we don't want this to prevent us from performing class reloading,
-      # so this gets around that.
-      Rails::Application.initializer :initialize_dependency_mechanism, group: :all do
-        ActiveSupport::Dependencies.mechanism = :load
-      end
-    end
-
     Rails.application.require_environment!
   end
 
@@ -81,32 +62,6 @@ class Duoconsole
     @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
-        defined?(ActiveRecord::Base) and
-          ActiveRecord::Base.connection.disconnect!
-
-        Rails::Commands::Environment.fork do
-          defined?(ActiveRecord::Base) and
-            ActiveRecord::Base.establish_connection
-
-          setup_for_test
-
-          trap(:INT) {
-            $stderr.flush
-            exit
-          }
-
-          yield
-        end
-      end
-    end
-  end
-
 
   class CommandClient
     attr_reader :socket
@@ -135,6 +90,7 @@ class Duoconsole
       # Clear it out now so that it won't be in the buffer for next run
       socket.recv(1000)
       raise e
+      # e.class.name
     end
   end
 
@@ -153,6 +109,7 @@ class Duoconsole
         command, args = Marshal.load(msg)
 
         retval = if valid_command?(command)
+          require_app unless @app_required
           run_command(command, args)
         else
           "Unrecognized command. Valid commands are #{RECOGNIZED_COMMANDS.join(', ')}"
@@ -183,6 +140,37 @@ class Duoconsole
       puts "#{e.class}: #{e.message}"
       puts e.backtrace.map {|line| "\t#{line}"}
     end
+
+    def require_app
+      Rails.env = ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
+      require APP_PATH
+      require 'commands'
+      monkeypatch_commands_gem
+      @app_required = true
+    end
+
+    def monkeypatch_commands_gem
+      Rails::Commands::TestEnvironment.module_eval do
+        def fork
+          Rails::Commands::Environment.fork do
+            trap(:INT) {
+              $stderr.flush
+              exit
+            }
+
+            Rails.application.require_environment!
+
+            if defined?(ActiveRecord::Base)
+              ActiveRecord::Base.establish_connection
+            end
+
+            add_test_dir_to_load_path
+
+            yield
+          end
+        end
+      end
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duoconsole
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Geoff Buesing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Launch Rails development console with test environment as a child process