cangrejo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2568c9ffefd9a5c7334ac5afa62e4ddb28a8001d
-  data.tar.gz: 74643edc28a1d17e42b056cbe1a2a8e9fb2fe265
+  metadata.gz: 5d9cb5f49f576488055b6f9e9164bbfb6af271b4
+  data.tar.gz: af63078d5ff257624f736e463ab96e8df5be5871
 SHA512:
-  metadata.gz: c5f270a3299bfd41efe555fade77c0c87e01c71bf2897c1751189be6ec41cd9e12bccac31e2e5dc1be80faa696a6c6fcb27666107482342cf0db3c277a6a539c
-  data.tar.gz: e4a919816d2a75474dbe1e0fdbc6369ef7ab346fc153cea01cba9316acdea84be9847c950048fee2c4fab7f1ee7078bd5e1ad9293831dfa815ff0739e423ab8f
+  metadata.gz: 1efc55a238a31a5962e11a41122ec066f1955129a65cd44f4c840f6ce39e4b40325a59f16ab3810cbdf68da8ef382dad617dbfca4f8c3b25cb9163d7c8d2d793
+  data.tar.gz: eede15bb49b8efb34b51520e71fa83fea70819d0768e719a88a36b166626fbfda07fcb923ac41bf17202156037608ffb6a890f5fda5e5702731398824e34309b

data/lib/cangrejo/modes/local.rb

@@ -22,11 +22,15 @@ module Cangrejo
     private
 
       def init_launcher
-        @launcher = Support::Launcher.new @path, launcher_options
+        @launcher = Support::Launcher.new @path, timeout: launch_timeout, argv: launch_cmd_arguments
         @launcher.launch
       end
 
-      def launcher_options
+      def launch_timeout
+        5.0
+      end
+
+      def launch_cmd_arguments
         ['--no-reload']
       end
 

data/lib/cangrejo/support/launcher.rb

@@ -13,9 +13,10 @@ module Cangrejo
       SPAWN_TIMEOUT = 5
       KILL_TIMEOUT = 5
 
-      def initialize(_path, _options=nil)
+      def initialize(_path, _options={})
         @path = _path
-        @options = _options || []
+        @timeout = _options.fetch(:timeout, SPAWN_TIMEOUT)
+        @argv = _options.fetch(:argv, [])
         select_socket_file
       end
 
@@ -26,7 +27,7 @@ module Cangrejo
       def launch
         gem_path = File.join(@path, 'Gemfile')
         # TODO: for some reason, the gemfile path must be specified here, maybe because of rbenv?
-        @pid = Process.spawn({ 'BUNDLE_GEMFILE' => gem_path }, "bin/crabfarm s --host=#{host} #{@options.join(' ')}", chdir: @path, pgroup: true)
+        @pid = Process.spawn({ 'BUNDLE_GEMFILE' => gem_path }, "bin/crabfarm s --host=#{host} #{@argv.join(' ')}", chdir: @path, pgroup: true)
         wait_for_socket
       end
 
@@ -45,7 +46,7 @@ module Cangrejo
       end
 
       def wait_for_socket
-        Timeout::timeout(SPAWN_TIMEOUT, LaunchTimeout) do
+        Timeout::timeout(@timeout, LaunchTimeout) do
           # TODO: detect if the process crashes before timeout
           sleep 0.1 while not File.exist? @socket_file
         end

data/lib/cangrejo/version.rb

@@ -1,3 +1,3 @@
 module Cangrejo
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangrejo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -87,7 +87,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cangrejo.rb
 - lib/cangrejo/configurator.rb
 - lib/cangrejo/errors.rb
 - lib/cangrejo/modes/git.rb
@@ -100,6 +99,7 @@ files:
 - lib/cangrejo/session.rb
 - lib/cangrejo/support/launcher.rb
 - lib/cangrejo/version.rb
+- lib/cangrejo.rb
 homepage: ''
 licenses:
 - MIT
@@ -120,8 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Crabfarm client for ruby
 test_files: []
+has_rdoc: