joumae 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef042d05aeab5b8c0b04b20bc7d941cb12662f2
-  data.tar.gz: 9db5f0ee408e17c7f6a25d1e1131f908af75ad9d
+  metadata.gz: c697de02d12f82cff623f3c5b32529e4e3f98507
+  data.tar.gz: 93872db6a95f5070a74a05c237b3123307616513
 SHA512:
-  metadata.gz: ee52c72f005d0debe8829fe4ddbf659fdbc11f4850c4ac08811c84b8c52fdb6684ea73fb09ead5283ca90d1a29d7b031006a9c160815a0904ae42f2948ce0ba7
-  data.tar.gz: e636aec70a610a459cce4c397e5a6d5c73240aef3cd6d05877d47b9e2785a4b8802d9acd1380538c44a513c14ac7a3f9d187c79ae2fb0c274c10e308799af94f
+  metadata.gz: f30e70813a4ba74f99b930e9854768ed1d3c0545d32d2fcccb33f5334e3da8f5740445362a0b47f65973dcc2d9cb8b207019926673e4b935df83be6d69d0af08
+  data.tar.gz: 47846145224e929adf014e08b6d5641fceeb9e371144f2d8793c07e7ffb3494e1e63c52921a4949f0f51e3816fccdc0883e5623d570d2d09ebc29b63853f379f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joumae (0.2.2)
+    joumae (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/joumae/client.rb

@@ -7,25 +7,32 @@ module Joumae
     attr_reader :api_endpoint
     attr_reader :api_key
 
-    def self.create(api_endpoint: nil, api_key: nil)
-      new(api_endpoint: api_endpoint || ENV['JOUMAE_API_ENDPOINT'], api_key: api_key || ENV['JOUMAE_API_KEY'])
+    def self.create(api_endpoint: nil, api_key: nil, ttl: 15)
+      new(
+        api_endpoint: api_endpoint || ENV['JOUMAE_API_ENDPOINT'],
+        api_key: api_key || ENV['JOUMAE_API_KEY'],
+	ttl: ttl
+      )
     end
 
-    def initialize(api_endpoint:, api_key:)
+    def initialize(api_endpoint:, api_key:, ttl:)
       @api_endpoint = api_endpoint
       @api_key = api_key
+      @ttl = ttl
     end
 
     def create(name)
       post_json(resources_url, {api_key: api_key, name: name})
     end
 
-    def acquire(name)
-      post_json(acquire_resource_url(name), {api_key: api_key})
+    def acquire(name, ttl: nil)
+      params = {api_key: api_key, ttl: ttl || @ttl}
+      post_json(acquire_resource_url(name), params)
     end
 
-    def renew(name)
-      post_json(renew_resource_url(name), {api_key: api_key})
+    def renew(name, ttl: nil)
+      params = {api_key: api_key, ttl: ttl || @ttl}
+      post_json(renew_resource_url(name), params)
     end
 
     def release(name)

data/lib/joumae/command.rb

@@ -61,6 +61,7 @@ module Joumae
             data = f.read_nonblock(1024)
 
             mapping[f].write(data)
+            mapping[f].flush
           rescue EOFError => e
             debug e.to_s;
           end

data/lib/joumae/transaction.rb

@@ -1,14 +1,15 @@
 module Joumae
   class Transaction
-    def initialize(resource_name:, client:, renew_interval: 1)
+    def initialize(resource_name:, client:, renew_interval: 20, ttl: 30)
       @resource_name = resource_name
       @client = client
       @renew_interval = renew_interval
+      @ttl = ttl
       @finished = false
     end
 
     def start
-      @client.acquire(@resource_name)
+      @client.acquire(@resource_name, ttl: @ttl)
 
       start_thread
     end
@@ -18,9 +19,12 @@ module Joumae
 
       @thread = Thread.start {
         loop do
-          sleep @renew_interval
-          @thread.exit if finished?
-          @client.renew(@resource_name)
+          wait_started_time = Time.now
+          while Time.now - wait_started_time < @renew_interval
+            sleep 0.1
+            @thread.exit if finished?
+          end
+          @client.renew(@resource_name, ttl: @ttl)
         end
       }
     end

data/lib/joumae/version.rb

@@ -1,3 +1,3 @@
 module Joumae
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joumae
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Yusuke KUOKA