crabfarm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6a40d52475ec34390f4dca75207062dfdae26b
-  data.tar.gz: 9b298a6d3b4eb50d42eb153c274b638dff02ed63
+  metadata.gz: bb3be13182df3bfb8b36dbf9561680f76b0a8c4a
+  data.tar.gz: f2dfc98fd27fc4523ea715ec8dd811a98977237d
 SHA512:
-  metadata.gz: f2ecc793d6ec88e0dba2cbd806195fc1c94785cefcea02a4384ca0a7a2e5fd5df983e35bf9a1488b8383251122191a30d6222f2a5796f259bcdf009bd3a4a8ef
-  data.tar.gz: 65763873d5038ad0eacb535732c9f0e395f91959b5328eb1726d3bd3e4aa7ee3af77bd5d6f93e398b4a60406f099a89e5952e61ff49e7d7d133524551e67a274
+  metadata.gz: db1a6932c2ff5645f3dfe8c77c3e092a39fd9c43ad52293098180cff4f5732cc1b7cd71eb5460556fcb56de456d11592a2ba04d5681bad4e198552fab12aa71d
+  data.tar.gz: 81b972f5cec55ba61d90ec943944ad17524b20fc199dbab37fad746a26de62631f18680efcc6f67cc12c03f1b383ca9ce800aa91f8d44df300e4579a57e1bdb3

data/lib/crabfarm/cli.rb

@@ -32,6 +32,9 @@ module Crabfarm
       c.desc "Set the server min and max threads, defaults to 0:16"
       c.flag [:t,:threads]
 
+      c.desc "Start the server in verbose mode"
+      c.switch :verbose, :default_value => false
+
       c.desc "Activate code reload before every request"
       c.switch :reload, :default_value => true
 
@@ -45,6 +48,7 @@ module Crabfarm
         server_options[:Host] = options[:host] unless options[:host].nil?
         server_options[:Port] = options[:port] || 3100
         server_options[:Threads] = options[:threads] unless options[:threads].nil?
+        server_options[:Verbose] = options[:verbose]
 
         ActiveSupport::Dependencies.mechanism = :require unless options[:reload]
         Crabfarm.config.set Support::GLI.parse_options options

data/lib/crabfarm/engines/safe_state_loop.rb

@@ -21,13 +21,18 @@ module Crabfarm
 
       def change_state(_name, _params={}, _wait=nil)
         @lock.synchronize {
-          raise StillWorkingError.new if @working
-          # TODO: test class reloading here?
-          @next_state_name = _name
-          @next_state_params = _params
-          @working = true
+          if @working
+            raise StillWorkingError.new unless matches_next_state? _name, _params
+            wait_and_load_struct _wait
+          elsif matches_current_state? _name, _params
+            state_as_struct
+          else
+            @next_state_name = _name
+            @next_state_params = _params
+            @working = true
 
-          wait_and_load_struct _wait
+            wait_and_load_struct _wait
+          end
         }
       end
 
@@ -50,6 +55,14 @@ module Crabfarm
 
     private
 
+      def matches_current_state?(_name, _params)
+        _name == @state_name and _params == @state_params
+      end
+
+      def matches_next_state?(_name, _params)
+        _name == @next_state_name and _params == @next_state_params
+      end
+
       def wait_and_load_struct(_wait)
         # need to use this method because mutex are not reentrant and monitors are slow.
         wait_while_working _wait unless _wait.nil?
@@ -90,9 +103,11 @@ module Crabfarm
               end
             end.real
 
-            @state_name = @next_state_name
-            @state_params = @next_state_params
-            @working = false
+            @lock.synchronize {
+              @state_name = @next_state_name
+              @state_params = @next_state_params
+              @working = false
+            }
           else sleep 0.2 end
         end
       end

data/lib/crabfarm/errors.rb

@@ -37,7 +37,7 @@ module Crabfarm
       {
         exception: @exc,
         backtrace: @trace
-      }
+      }.to_json
     end
   end
 

data/lib/crabfarm/modes/server.rb

@@ -18,7 +18,7 @@ module Crabfarm
         end
 
         rescue_from Crabfarm::ApiError do |e|
-          rack_response(e.to_json.to_json, e.code)
+          rack_response(e.to_json, e.code)
         end
 
         helpers do

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder