cangrejo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f828edd2bbf18691852e6df23d67090f8c0d20f2
-  data.tar.gz: 0ca8abeeaa9517af061b316825043b39a6f4ffc2
+  metadata.gz: ae3ceddcc75aa3488d8b945009a725259487023d
+  data.tar.gz: 4f0fc0a1386cdf9af7f9eaa362d5e884255bea19
 SHA512:
-  metadata.gz: d45dfc802d608466a0ef26ae519ca0b65150980e013eaac69f17363e7d121e0ae503bba201aee6c3c7f6775b216cb9b9c44b2c0778960339d535b8bc9267dafe
-  data.tar.gz: e9173a0c7cbc3f52132ff8c40d2a4d616efc954728189e09af2a2ec2b13c75190742f7be8fbd690e064e1d7d32a660f537b0949eec7de1e8860e8547e4207db8
+  metadata.gz: 3d5296989ab3ec15c8a190d46736fb518e16feac5caecfdedf06ccbbb71d2e7f5f9cf139dcd5269b500fb2074dbe9c9e42374bee53787100c108e4391a5d6d5c
+  data.tar.gz: 2d43b279a9c7a37b7fbc60e28c6c10979d219a54c661c7f8a97ccc364295fdfa36f6bbbdf7ef80ed706672a094e3235a6d96e24e22788fc195c62acae589e6ae

data/lib/cangrejo/modes/local.rb

@@ -16,7 +16,7 @@ module Cangrejo
       end
 
       def release
-        @launcher.kill
+        @launcher.kill unless @launcher.nil?
       end
 
     private

data/lib/cangrejo/net/socket_http.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 module Net
   #  Overrides the connect method to simply connect to a unix domain socket.
   class SocketHttp < HTTP

data/lib/cangrejo/session.rb

@@ -3,7 +3,9 @@ require "ostruct"
 module Cangrejo
   class Session
 
-    attr_reader :doc
+    WAIT_STEP = 45.0 # Ruby sockets automatically timeout after 60 secs
+
+    attr_reader :doc, :state_name, :state_params
 
     def initialize(_name, _options={})
       @name = _name
@@ -18,12 +20,8 @@ module Cangrejo
       self
     end
 
-    def state_name
-      @rest.name
-    end
-
-    def state_params
-      @rest.params
+    def elapsed
+      @rest.elapsed
     end
 
     def raw_doc
@@ -32,8 +30,16 @@ module Cangrejo
 
     def crawl(_state, _params={})
       raise ConfigurationError.new 'Session not started' if @rest.nil?
-      @rest.put(name: _state, params: _params)
-      @doc = OpenStruct.new @rest.doc
+
+      params = add_timestamp(_params)
+
+      while_times_out do
+        @rest.put(name: _state, params: params, wait: WAIT_STEP)
+        @state_name = _state
+        @state_params = _params
+      end
+
+      wrap_response_doc
       self
     end
 
@@ -44,8 +50,31 @@ module Cangrejo
 
   private
 
+    def add_timestamp(_params)
+      _params.merge({
+        '_ts' => DateTime.now.strftime('%Q')
+      })
+    end
+
+    def while_times_out
+      loop do
+        begin
+          yield
+          break
+        rescue RestClient::RequestTimeout
+          # retry on timeout
+        end
+      end
+    end
+
+    def wrap_response_doc
+      @doc = OpenStruct.new @rest.doc
+    end
+
     def select_mode(_options)
-      @mode = if _options.has_key? :path
+      @mode = if _options.has_key? :mode
+        _options[:mode]
+      elsif _options.has_key? :path
         require "cangrejo/modes/local"
         Modes::Local.new _options[:path]
       elsif _options.has_key? :git_remote

data/lib/cangrejo/support/launcher.rb

@@ -14,7 +14,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}", chdir: @path)
+        @pid = Process.spawn({ 'BUNDLE_GEMFILE' => gem_path }, "bin/crabfarm s --host #{host} --no-reload", chdir: @path)
         wait_for_socket
       end
 

data/lib/cangrejo/version.rb

@@ -1,3 +1,3 @@
 module Cangrejo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

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