cangrejo 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daef61a793c8f8e3af5117cd75cb6e500bac6db4
-  data.tar.gz: 8062ccd24d70ed67ef8e26e8836067cf831697c3
+  metadata.gz: 703b2df6a02a87298a6cffa637d2388824701c4c
+  data.tar.gz: 52dd0656452b865a3736f6b1c66243ae9392bf39
 SHA512:
-  metadata.gz: 56fedf1bdc2c7e0cf3087865170f7bd9bf575919fc0119288924a347900d9a7c70c93537fa2cf29045d2053a97333fddf08a2b2f9baa02c811ab3884cc82cb84
-  data.tar.gz: b9ea2e85c2ec1c6e9113419ddec7c055788c036e748f71d9cb04c9abc53231ecea1dfa799864797f2196125703d9a46c0e5cfc07bca0702f353aa4eddeba33e3
+  metadata.gz: 003cabe21d5e3433468359f4cfd07212bf0a50e5f20ac3b08edf4fa7eef622abbab7b14d5301b1e42f187c85aa07b50397ba4a6ee19c740f5008e0755e2ab786
+  data.tar.gz: d3e425085e90f6ad4e82bba68c4040d9de6915171b5b414faac96cfb8546b9ff7c10e7763b489a25d8ef1ef101c50e40ea618aa6e599fac2d8a1b6a53a082d2b

data/lib/cangrejo/modes/git.rb

@@ -39,6 +39,10 @@ module Cangrejo
         File.join cache_path, @name
       end
 
+      def gemfile_path
+        File.join(deploy_path, 'Gemfile')
+      end
+
       def ensure_repo_clone
         unless File.exists? File.join(repo_path, '.git')
           ::Git.clone(@url, @name, :path => cache_path)
@@ -56,7 +60,7 @@ module Cangrejo
       end
 
       def ensure_deps
-        %x[cd '#{deploy_path}' && bundle install] if @needs_bundle
+        system({ 'BUNDLE_GEMFILE' => gemfile_path }, 'bundle install', chdir: deploy_path) if @needs_bundle
         @needs_bundle = false
       end
     end

data/lib/cangrejo/support/launcher.rb

@@ -4,7 +4,14 @@ module Cangrejo
   module Support
     class Launcher
 
-      KILL_TIMEOUT = 5.0
+      class LaunchTimeout < Cangrejo::Error
+        def initialize(_msg)
+          super "Timed out trying to start crawler"
+        end
+      end
+
+      SPAWN_TIMEOUT = 5
+      KILL_TIMEOUT = 5
 
       def initialize(_path, _options=nil)
         @path = _path
@@ -38,7 +45,10 @@ module Cangrejo
       end
 
       def wait_for_socket
-        sleep 0.1 while not File.exist? @socket_file
+        Timeout::timeout(SPAWN_TIMEOUT, LaunchTimeout) do
+          # TODO: detect if the process crashes before timeout
+          sleep 0.1 while not File.exist? @socket_file
+        end
       end
 
       def safe_kill _pid

data/lib/cangrejo/version.rb

@@ -1,3 +1,3 @@
 module Cangrejo
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangrejo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client