wso2_toolbox 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830a70b3c1e859b9daab9918aa7a3bbf932ffc62
-  data.tar.gz: af1c09c9c035f9a99c2693230d5adf27759d080e
+  metadata.gz: 0f5ee367ecc8489e4e5595cc5837afb758d6fdff
+  data.tar.gz: 4fe61ef409d2626789594fec52fd4888a5967933
 SHA512:
-  metadata.gz: c9dc6dbeca2ab24b60bc507d853df448204f0639b408dea5f8b04881fe6ac79590f80d6a084969012618a29b0925a41ad4bdf384242c5aec22b188f38ca329f8
-  data.tar.gz: 68c0556025fa54f9c1908a1057c2ffd29de213db1904b2a254c1af0d6a1f16cfaaec0368346f9caf5bf553d1ffa66b3108d18be5de4ff9adb18a2bd7cf7d1592
+  metadata.gz: 00be8156cd3a5b4751887890ec3114946569a628d93e5463cc5f8971576791ca7cbce2782aac4c1b3b2c286c326b742ce422b8c29ff95f90436d38feedf8bbf1
+  data.tar.gz: 1a76a88c5ab5c025cce86bffa99026b09747a9a7d42b4d9873eaaaea45a49e8ff6b9dc003c12fefdfa13b6ea440376444a40639618e4dedadeee1f6dd0ab539a

data/CHANGELOG.md

@@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.3.2] - 2018-11-07
+## [0.3.3] - 2018-11-14
+### Changed
+- Fix bug in local file adapter, refactoring lock file with core language
+
+## [0.3.2] - 2018-11-12
 ### Changed
 - Fix bug in local file adapter, when 2 or more process try to read same file
 

data/lib/wso2_toolbox/token_manager/adapters/local_file_adapter.rb

@@ -12,7 +12,6 @@ module Wso2Toolbox
         class << self
           include LockFile
 
-          FILE_PATH = 'tmp/localstorage.json'
           TOKEN_DELAY = 5.minutes
 
           def generate_token
@@ -21,18 +20,16 @@ module Wso2Toolbox
           end
 
           def read(key)
-            try_unlock
-
-            lock_file do
-              local_storage { |store| return store.try(:[], key.to_s) }
+            with_free_localstorage do |file|
+              local_storage(file.read) do |store|
+                return store.try(:[], key.to_s)
+              end
             end
           end
 
           def write(key, value)
-            try_unlock
-
-            lock_file do
-              local_storage { |store| store.merge!(key => value) }
+            with_free_localstorage do |file|
+              local_storage(file.read) { |store| store.merge!(key => value) }
             end
           end
 
@@ -58,8 +55,7 @@ module Wso2Toolbox
             Time.parse(read(:token_time_for_job)) - TOKEN_DELAY > Time.now
           end
 
-          def local_storage
-            file = File.open(FILE_PATH, 'a+').read
+          def local_storage(file)
             parsed_stored = file == '' ? {} : JSON.parse(file)
 
             yield(parsed_stored)

data/lib/wso2_toolbox/token_manager/adapters/lock_file.rb

@@ -1,46 +1,38 @@
 # frozen_string_literal: true
 
-require 'fileutils'
-
 module Wso2Toolbox
   module TokenManager
     module Adapters
       module LockFile
-        LockFileExistError = Class.new(StandardError)
-        ATTEMPTS = 30
+        FileLockedError = Class.new(StandardError)
+
+        ATTEMPTS = 5
         TIME_INTERVAL = 1
-        LOCK_PATH = 'tmp/localstorage.lock'
+        FILE_PATH = 'tmp/localstorage.json'
 
-        def try_unlock
+        def with_free_localstorage
           ATTEMPTS.times do |i|
-            raise LockFileExistError if lock_valid? && i == (ATTEMPTS - 1)
-
-            if lock_valid?
-              sleep(TIME_INTERVAL)
-            else
-              FileUtils.rm_r(LOCK_PATH, force: true)
-              break
+            locked_file = lock_file do |localstorage|
+              yield(localstorage)
             end
+
+            raise FileLockedError if !locked_file && i == (ATTEMPTS - 1)
+
+            !locked_file ? sleep(TIME_INTERVAL) : break
           end
         end
 
         def lock_file
-          File.open(LOCK_PATH, 'a+') do |f|
-            f.write File.basename(LOCK_PATH, '.*')
-          end
+          File.open(FILE_PATH, 'a+') do |file|
+            lock_status = file.flock(File::LOCK_EX | File::LOCK_NB)
 
-          block_value = yield
+            if lock_status
+              block_value = yield(file)
 
-          FileUtils.rm_r(LOCK_PATH, force: true)
-
-          block_value
-        end
-
-        def lock_valid?
-          return false unless File.exist?(LOCK_PATH)
-
-          file_modified = File.ctime(LOCK_PATH)
-          file_modified + 1.minutes < Time.current
+              file.flock(File::LOCK_UN)
+              block_value
+            end
+          end
         end
       end
     end

data/lib/wso2_toolbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wso2Toolbox
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/wso2_toolbox.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'request_store', '~> 1.3.2'
   spec.add_dependency 'rest-client', '>= 2.0.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.16.1'
+  spec.add_development_dependency 'bundler', '~> 1.17.1'
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rails-controller-testing', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wso2_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Abner Carleto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement