xlogin 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ecc6ae6eed6152bf4650f916f38eca0ff3dcec0
-  data.tar.gz: c177fa3ef796f71aa61399b5c3014fba6a986691
+  metadata.gz: f5cae10e317124a423c1aa86ebb0461645ecd54f
+  data.tar.gz: 9d69438c6cefdb260c2503abb4575d6afc057d17
 SHA512:
-  metadata.gz: 2d6b235af4a0280efb990c67fc5a96c906e56ef7450f26fe8416d263b6ac5d545880d7c52b7a15e10e4f3533340afb0b4000baa50d9de97bc534e081ed6f6897
-  data.tar.gz: 47cc3ada1686762bda0b9f3490db28ca7b4ccfbecd323dceb0baefe55d2b9a48a2d464a93d1f8fb8e690c8386503b7247e0d1bde304f5dfd09df011c15248c27
+  metadata.gz: d5686ebbb6036c35d71a7a10bedd63f3be198bc4bcfe2fa53e2c9680811f388cf1debcf04b68c15447dda45821b16c035b357310d221f90df850dfe131fe263c
+  data.tar.gz: 44abe1bda6ea08bba42613fd9f6fc7b016aff20d3b107c9e40db591b4e553184f2db71f9611aff79efe5c0b9faed0ad4b7486f3929f2a3cd7c87e6934761ac22

data/lib/xlogin/firmware_factory.rb

@@ -38,6 +38,12 @@ module Xlogin
     end
 
     def source(*files)
+      if files.empty?
+        files += [ENV['HOME'], Dir.pwd].flat_map do |dir|
+          [File.join(dir, '_xloginrc'), File.join(dir, '.xloginrc')]
+        end
+      end
+
       files.compact.uniq.each do |file|
         next unless File.exist?(file)
         instance_eval(IO.read(file))

data/lib/xlogin/session.rb

@@ -25,28 +25,30 @@ module Xlogin
     end
 
     def renew(opts = @opts)
-      self.class.new(opts)
+      self.class.new(opts).tap { |s| @sock = s.sock }
     end
 
-    def lock(timeout: @timeout, max_retry: 1)
-      session_granted = false
+    def lock(timeout: @timeout)
+      granted = false
 
       begin
-        Timeout.timeout(timeout, Timeout::Error, 'connection timeout expired') { @mutex.lock }
-        retry_count     = 0
-        safe_session    = self
-        session_granted = true
-
-        begin
-          safe_session ||= self.renew
-          yield safe_session
-        rescue => e
-          safe_session = nil
-          raise e if max_retry < (retry_count += 1)
-          retry
-        end
+        Timeout.timeout(timeout) { @mutex.lock }
+        granted = true
+        yield self
       ensure
-        @mutex.unlock if @mutex.locked? && session_granted
+        @mutex.unlock if @mutex.locked? && granted
+      end
+    end
+
+    def with_retry(max_retry: 1, renew: false)
+      retry_count = 0
+
+      begin
+        yield self
+      rescue => e
+        raise e if (retry_count += 1) > max_retry
+        self.renew if renew
+        retry
       end
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler