rspec_runner 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6537a01d0edf8244bee0f8e8c1561950e92260a2
-  data.tar.gz: a6b5dde3a76f11d61f30b2f593ff3a8dc9674e31
+  metadata.gz: 068cee9187e40f7479ace40250ecfea90a7977ba
+  data.tar.gz: c637235611c38bd7bdc9b817c47b11ff1c2d8368
 SHA512:
-  metadata.gz: 8d260b1df5d8ffc2ff71d0df28a912ac37b532a220c15315cbbbbc6afa23aff2eb7776f4cc388f65b8e1bc23d8ffefea67353a4674d067f949f4213e2dbfdb5e
-  data.tar.gz: 6b4aee0adc08c8b15f80bfa52066be7c2dc73b29935e8c8cd8c57822eab882d9e15335754861fd48000e1bbce3cd32b8cd2955ffeb2d71c61cee0b751ba2cfcd
+  metadata.gz: 76d15ffba43111a859ef7646b4d6c4e8f5ed61481764cb20602a061c054646f17637a5cb0f6208c978cb450e46b8bcba5ba70edb10f853dac143f747bba4d7f7
+  data.tar.gz: b7d6cecf3503bdec8bc90b357f47bfbf7f3bd5503ebdca64bbae429929ebaf12a942451b44879f0662ed1449609a12f814357d2ce745ab3674c7803478c645f8

data/bin/rspec_runner

@@ -5,7 +5,7 @@ cmd = ARGV[0]
 case cmd
 when 'monitor'.freeze
   require 'rspec_runner/monitor'
-  RspecRunner::Monitor.run
+  RspecRunner::Monitor.start
 else
   require 'rspec_runner/client'
   RspecRunner::Client.execute(cmd)

data/lib/rspec_runner/monitor.rb

@@ -1,20 +1,17 @@
-require 'open3'
 require 'rspec_runner/server'
 require 'rspec_runner/watcher'
 
 module RspecRunner
   class Monitor
-    CMD = 'bundle exec rspec_runner start'.freeze
-
     class << self
-      def run
-        start
+      def start
+        RspecRunner::Server.start
 
-        at_exit { die }
+        at_exit { stop }
 
-        watcher_thread = Watcher.run do |changes|
+        watcher_thread = Watcher.start do |changes|
           puts 'Restarting...'
-          restart
+          RspecRunner::Server.restart
         end
 
         watcher_thread.join
@@ -23,32 +20,10 @@ module RspecRunner
 
       private
 
-      def start
-        @pid = fork { RspecRunner::Server.run }
-        Process.detach(@pid) # so if the child exits, it dies
-      end
-
       def stop
-        if @pid && @pid != 0
-          # TODO: try to kill without -9
-          send_signal('KILL')
-          RspecRunner::Server.stop
-        end
-      end
-
-      def send_signal(signal)
-        Process.kill(signal, @pid)
-      end
-
-      def die
-        stop
+        RspecRunner::Server.stop
         exit 0
       end
-
-      def restart
-        stop
-        start
-      end
     end
   end
 end

data/lib/rspec_runner/server.rb

@@ -5,19 +5,32 @@ require 'rspec_runner/configuration'
 module RspecRunner
   class Server
     class << self
-      def run
-        puts 'Loading dependencies...'
+      def start
+        puts 'Preloading gems...'
+        require 'rubygems'
+        require 'bundler'
+
+        Bundler.load.dependencies.reject! do |d|
+          spec = d.to_spec
+
+          if spec.gem_dir == Dir.pwd
+            @gem_name = spec.name
+          else
+            spec.name == 'rspec_runner'
+          end
+        end
+
+        if gem?
+          Bundler.require(:default, :development)
+        else
+          Bundler.require(:default, :test)
+        end
 
         $LOAD_PATH.unshift File.expand_path("#{Dir.pwd}/spec")
-        require 'rspec'
-        require 'spec_helper.rb'
 
-        DRb.start_service(assign_uri, self)
-        puts 'Server started!'
+        fork_process
 
         at_exit { stop }
-
-        DRb.thread.join
       end
 
       def execute(path)
@@ -27,12 +40,44 @@ module RspecRunner
         reset_rspec!
       end
 
+      def restart
+        stop
+        fork_process
+      end
+
       def stop
+        if @pid && @pid != 0
+          # TODO: try to kill without -9
+          send_signal('KILL')
+        end
         File.delete(RspecRunner.configuration.uri_filepath) if File.exist?(RspecRunner.configuration.uri_filepath)
       end
 
       private
 
+      def gem?
+        !!@gem_name
+      end
+
+      def fork_process
+        @pid = fork do
+          puts 'Preloading dependencies...'
+          require @gem_name if gem?
+          require 'spec_helper.rb'
+
+          DRb.start_service(assign_uri, self)
+          puts 'Server started!'
+
+          DRb.thread.join
+        end
+
+        Process.detach(@pid) # so if the child exits, it dies
+      end
+
+      def send_signal(signal)
+        Process.kill(signal, @pid)
+      end
+
       def assign_uri
         socket = Socket.new(:INET, :STREAM, 0)
         socket.bind(Addrinfo.tcp('127.0.0.1'.freeze, 0))

data/lib/rspec_runner/version.rb

@@ -1,3 +1,3 @@
 module RspecRunner
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/rspec_runner/watcher.rb

@@ -4,7 +4,7 @@ require 'rspec_runner/configuration'
 module RspecRunner
   class Watcher
     class << self
-      def run(&block)
+      def start(&block)
         if @thread then
           raise RuntimeError, "already started"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - exAspArk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec