xlogin 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100119c40b95cc49c43a1261cb74b634427fc55a
-  data.tar.gz: 082194ffb69e43ee38edd6e2dfb43d39cb22dbbb
+  metadata.gz: 1ecc6ae6eed6152bf4650f916f38eca0ff3dcec0
+  data.tar.gz: c177fa3ef796f71aa61399b5c3014fba6a986691
 SHA512:
-  metadata.gz: b8595fa30834fc14a7f7d7eae334f25baee462b10b0b12c28b1a941a189a9e5cf99c5cc4d649a1e0a82f63da454125a6144b23c143441f2384a10ef9d061b830
-  data.tar.gz: 4c7c722c91ee0f45b992a03506d9b6d840ec1e4cf9ca7dfc7228f16d02a3db08087bb3df05eb46782d95d7b5633617b11e9e1232bb64f9347d38d4cfef296c8a
+  metadata.gz: 2d6b235af4a0280efb990c67fc5a96c906e56ef7450f26fe8416d263b6ac5d545880d7c52b7a15e10e4f3533340afb0b4000baa50d9de97bc534e081ed6f6897
+  data.tar.gz: 47cc3ada1686762bda0b9f3490db28ca7b4ccfbecd323dceb0baefe55d2b9a48a2d464a93d1f8fb8e690c8386503b7247e0d1bde304f5dfd09df011c15248c27

data/bin/xlogin

@@ -51,8 +51,7 @@ module Xlogin
       puts "Trying #{target}..."
       puts "Escape character is '^]'."
 
-      session = Xlogin.get(target, log: loggers)
-      session.enable if options[:e] && session.respond_to?(:enable)
+      session = Xlogin.get(target, force_grant: options[:e], log: loggers)
       session.interact!
     rescue => e
       $stderr.puts("#{e}\n\n")

data/lib/xlogin/firmware.rb

@@ -66,7 +66,7 @@ module Xlogin
         end
       end
 
-      klass.new(
+      session = klass.new(
         {
           host:     uri.host,
           port:     uri.port,
@@ -75,6 +75,9 @@ module Xlogin
           prompts:  @prompts,
         }.merge(opts)
       )
+
+      session.enable if session.respond_to?(:enable) && opts[:force_grant]
+      session
     end
 
   end

data/lib/xlogin/rake_task.rb

@@ -56,6 +56,7 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :lockfile
     attr_accessor :logfile
+    attr_accessor :assume_yes
     attr_accessor :uncomment
 
     def initialize(name)
@@ -68,6 +69,7 @@ module Xlogin
       @silent        = Rake.application.options.silent
       @lockfile      = nil
       @logfile       = nil
+      @assume_yes    = false
       @uncomment     = false
 
       yield(self) if block_given?
@@ -123,6 +125,7 @@ module Xlogin
       end
 
       @xlogin_opts[:log] = loggers unless loggers.empty?
+      @xlogin_opts[:assume_yes] ||= assume_yes
 
       begin
         @session = Xlogin.factory.build(@xlogin_opts)

data/lib/xlogin/session.rb

@@ -32,7 +32,7 @@ module Xlogin
       session_granted = false
 
       begin
-        Timeout.timeout(timeout) { @mutex.lock }
+        Timeout.timeout(timeout, Timeout::Error, 'connection timeout expired') { @mutex.lock }
         retry_count     = 0
         safe_session    = self
         session_granted = true
@@ -41,8 +41,8 @@ module Xlogin
           safe_session ||= self.renew
           yield safe_session
         rescue => e
-          raise e unless (retry_count += 1) > max_retry
           safe_session = nil
+          raise e if max_retry < (retry_count += 1)
           retry
         end
       ensure

data/lib/xlogin/templates/ios.rb

@@ -2,7 +2,7 @@ Xlogin.configure :ios do |os|
   os.timeout(300)
   os.prompt(/[>$#]/)
   os.prompt(/yes \/ no: /) do
-    puts opts[:force] ? 'y' : 'n'
+    puts opts[:assume_yes] ? 'y' : 'n'
   end
 
   os.bind(:login) do |password|

data/lib/xlogin/templates/sros.rb

@@ -2,7 +2,7 @@ Xlogin.configure :sros do |os|
   os.timeout(300)
   os.prompt(/[>$#] /)
   os.prompt(/y\/n:/) do
-    puts opts[:force] ? 'y' : 'n'
+    puts opts[:assume_yes] ? 'y' : 'n'
   end
 
   os.bind(:login) do |*args|

data/lib/xlogin/version.rb

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

metadata

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