rspec_runner 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53daae848dfe791940da70582763099d84fb014
-  data.tar.gz: 1be24fbdc7fbb1f91aa125a62174beee0fd6a7a7
+  metadata.gz: 6537a01d0edf8244bee0f8e8c1561950e92260a2
+  data.tar.gz: a6b5dde3a76f11d61f30b2f593ff3a8dc9674e31
 SHA512:
-  metadata.gz: b0106b07a621099d30ef228ed722fd7580a33931928d726c4efd4cf9837a8a50c3cd83aba37135ad716f916b74e117cfdf6ac3fa424286b76414b62d916135f8
-  data.tar.gz: 82c077d5c2ea9641dcbf7ee32bba3d353bc9fa8da1f51fb40c26cd2a8e334251e366b9666eeb6f6ee09cb9c12553b29355b0cd4a8c938e30d5f38225c82a2b7e
+  metadata.gz: 8d260b1df5d8ffc2ff71d0df28a912ac37b532a220c15315cbbbbc6afa23aff2eb7776f4cc388f65b8e1bc23d8ffefea67353a4674d067f949f4213e2dbfdb5e
+  data.tar.gz: 6b4aee0adc08c8b15f80bfa52066be7c2dc73b29935e8c8cd8c57822eab882d9e15335754861fd48000e1bbce3cd32b8cd2955ffeb2d71c61cee0b751ba2cfcd

data/README.md

@@ -37,6 +37,12 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rspec_runner. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
+## TODO
+
+* Try to kill a process without `kill -9`
+* Make it configurable
+* Add tests!
+* Speedup client
 
 ## License
 

data/bin/rspec_runner

@@ -6,9 +6,6 @@ case cmd
 when 'monitor'.freeze
   require 'rspec_runner/monitor'
   RspecRunner::Monitor.run
-when 'start'.freeze
-  require 'rspec_runner/server'
-  RspecRunner::Server.run
 else
   require 'rspec_runner/client'
   RspecRunner::Client.execute(cmd)

data/lib/rspec_runner/client.rb

@@ -6,12 +6,16 @@ module RspecRunner
     class << self
       def execute(*args)
         DRb.start_service
-        runner = DRbObject.new_with_uri(RspecRunner.configuration.uri)
-
         try_count = 0
-        print 'Running tests... '
-        while try_count <= RspecRunner.configuration.client_timeout
+        print 'Connecting... '
+
+        while try_count < RspecRunner.configuration.client_timeout
           begin
+            uri = fetch_uri
+            raise DRb::DRbConnError unless uri
+
+            runner = DRbObject.new_with_uri(uri)
+            print 'running... '
             runner.execute(*args)
             puts 'done!'
             return true
@@ -23,6 +27,12 @@ module RspecRunner
 
         puts 'Server is down :('
       end
+
+      private
+
+      def fetch_uri
+        File.read(RspecRunner.configuration.uri_filepath) if File.exist?(RspecRunner.configuration.uri_filepath)
+      end
     end
   end
 end

data/lib/rspec_runner/configuration.rb

@@ -1,10 +1,10 @@
 module RspecRunner
   class Configuration
-    attr_accessor :uri, :client_timeout, :watch_directories, :watch_pattern, :ignore_pattern
+    attr_accessor :uri_filepath, :client_timeout, :watch_directories, :watch_pattern, :ignore_pattern
 
     def initialize
-      @uri = 'druby://localhost:8787'.freeze
-      @client_timeout = 10 # seconds
+      @uri_filepath = "#{Dir.pwd}/tmp/rspec_runner"
+      @client_timeout = 60 # seconds
       @watch_directories = ["#{Dir.pwd}"]
       @watch_pattern = /\.rb$/
       @ignore_pattern = /spec\/.+_spec\.rb$/

data/lib/rspec_runner/monitor.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'rspec_runner/server'
 require 'rspec_runner/watcher'
 
 module RspecRunner
@@ -23,13 +24,15 @@ module RspecRunner
       private
 
       def start
-        @pid = fork { exec(CMD) }
+        @pid = fork { RspecRunner::Server.run }
         Process.detach(@pid) # so if the child exits, it dies
       end
 
       def stop
         if @pid && @pid != 0
-          send_signal('KILL') # TODO: try to kill without -9
+          # TODO: try to kill without -9
+          send_signal('KILL')
+          RspecRunner::Server.stop
         end
       end
 

data/lib/rspec_runner/server.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'drb/drb'
 require 'rspec_runner/configuration'
 
@@ -11,9 +12,11 @@ module RspecRunner
         require 'rspec'
         require 'spec_helper.rb'
 
-        DRb.start_service(RspecRunner.configuration.uri, self)
+        DRb.start_service(assign_uri, self)
         puts 'Server started!'
 
+        at_exit { stop }
+
         DRb.thread.join
       end
 
@@ -24,8 +27,25 @@ module RspecRunner
         reset_rspec!
       end
 
+      def stop
+        File.delete(RspecRunner.configuration.uri_filepath) if File.exist?(RspecRunner.configuration.uri_filepath)
+      end
+
       private
 
+      def assign_uri
+        socket = Socket.new(:INET, :STREAM, 0)
+        socket.bind(Addrinfo.tcp('127.0.0.1'.freeze, 0))
+        free_port = socket.local_address.ip_port
+        uri = "druby://localhost:#{free_port}"
+
+        dirname = File.dirname(RspecRunner.configuration.uri_filepath)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+        File.write(RspecRunner.configuration.uri_filepath, uri)
+
+        uri
+      end
+
       def filepaths(path)
         multiple_files?(path) ? Dir.glob(path) : [path]
       end

data/lib/rspec_runner/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - exAspArk