MuranoCLI 3.0.0 → 3.0.1

data/lib/MrMurano/commands/show.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -10,7 +10,7 @@ require 'MrMurano/Business'
 require 'MrMurano/ReCommander'
 require 'MrMurano/Solution'
 
-command 'show' do |c|
+command :show do |c|
   c.syntax = %(murano show)
   c.summary = %(Show readable information about the current configuration)
   c.description = %(
@@ -18,89 +18,94 @@ Show readable information about the current configuration.
   ).strip
   c.project_not_required = true
 
-  c.action do |args, _options|
-    if args.include?('help')
-      ::Commander::UI.enable_paging
-      say MrMurano::SubCmdGroupHelp.new(c).get_help
-    else
-      acc = MrMurano::Account.instance
-      biz = MrMurano::Business.new
-
-      selected_business = nil
-      selected_business_id = $cfg['business.id']
-      unless selected_business_id.to_s.empty?
-        acc.businesses.each do |sol|
-          selected_business = sol if sol.bizid == selected_business_id
-        end
-      end
+  c.option '--[no-]ids', 'Show IDs'
 
-      selected_application = nil
-      selected_application_id = $cfg['application.id']
-      unless selected_application_id.to_s.empty?
-        MrMurano::Verbose.whirly_start('Fetching Applications...')
-        biz.applications.each do |sol|
-          selected_application = sol if sol.apiId == selected_application_id
-        end
-        MrMurano::Verbose.whirly_stop
-      end
+  c.action do |args, options|
+    c.verify_arg_count!(args)
 
-      selected_product = nil
-      selected_product_id = $cfg['product.id']
-      unless selected_product_id.to_s.empty?
-        MrMurano::Verbose.whirly_start('Fetching Products...')
-        biz.products.each do |sol|
-          selected_product = sol if sol.apiId == selected_product_id
-        end
-        MrMurano::Verbose.whirly_stop
-      end
+    acc = MrMurano::Account.instance
+    biz = MrMurano::Business.new
 
-      if $cfg['user.name']
-        puts %(user: #{$cfg['user.name']})
-      else
-        puts 'no user selected'
+    selected_business = nil
+    selected_business_id = $cfg['business.id']
+    unless selected_business_id.to_s.empty?
+      acc.businesses.each do |sol|
+        selected_business = sol if sol.bizid == selected_business_id
       end
+    end
 
-      if selected_business
-        puts %(business: #{selected_business.name})
-      else
-        #puts 'no business selected'
-        MrMurano::Verbose.error MrMurano::Business.missing_business_id_msg
+    selected_application = nil
+    selected_application_id = $cfg['application.id']
+    unless selected_application_id.to_s.empty?
+      MrMurano::Verbose.whirly_start('Fetching Applications...')
+      biz.applications.each do |sol|
+        selected_application = sol if sol.apiId == selected_application_id
       end
+      MrMurano::Verbose.whirly_stop
+    end
 
-      id_not_in_biz = false
-
-      # E.g., {:bizid=>"ABC", :type=>"application", :apiId=>"XXX", :sid=>"XXX",
-      #        :name=>"ABC", :domain=>"ABC.apps.exosite.io" }
-      if selected_application
-        puts %(application: https://#{selected_application.domain})
-      elsif selected_application_id
-        #puts 'selected application not in business'
-        puts "application ID from config is not in business (#{selected_application_id})"
-        id_not_in_biz = true
-      elsif !selected_business
-        puts 'application ID depends on business ID'
-      else
-        #puts 'no application selected'
-        puts 'application ID not found in config'
+    selected_product = nil
+    selected_product_id = $cfg['product.id']
+    unless selected_product_id.to_s.empty?
+      MrMurano::Verbose.whirly_start('Fetching Products...')
+      biz.products.each do |sol|
+        selected_product = sol if sol.apiId == selected_product_id
       end
+      MrMurano::Verbose.whirly_stop
+    end
 
-      # E.g., {:bizid=>"ABC", :type=>"product", :apiId=>"XXX", :sid=>"XXX",
-      #        :name=>"ABC", :domain=>"ABC.m2.exosite.io" }
-      if selected_product
-        puts %(product: #{selected_product.name})
-      elsif selected_product_id
-        #puts 'selected product not in business'
-        puts "product ID from config is not in business (#{selected_product_id})"
-        id_not_in_biz = true
-      elsif !selected_business
-        puts 'product ID depends on business ID'
-      else
-        #puts 'no product selected'
-        puts 'product ID not found in config'
-      end
+    if $cfg['user.name']
+      puts %(user: #{$cfg['user.name']})
+    else
+      puts 'no user selected'
+    end
+
+    if selected_business
+      biz_info = %(business: #{selected_business.name})
+      biz_info += %( <#{selected_business.bid}>) if options.ids
+      puts biz_info
+    else
+      #puts 'no business selected'
+      MrMurano::Verbose.error MrMurano::Business.missing_business_id_msg
+    end
 
-      MrMurano::SolutionBase.warn_configfile_env_maybe if id_not_in_biz
+    id_not_in_biz = false
+
+    # E.g., {:bizid=>"ABC", :type=>"application", :apiId=>"XXX", :sid=>"XXX",
+    #        :name=>"ABC", :domain=>"ABC.apps.exosite.io" }
+    if selected_application
+      sol_info = %(application: https://#{selected_application.domain})
+      sol_info += %( <#{selected_application.sid}>) if options.ids
+      puts sol_info
+    elsif selected_application_id
+      #puts 'selected application not in business'
+      puts "application ID from config is not in business (#{selected_application_id})"
+      id_not_in_biz = true
+    elsif !selected_business
+      puts 'application ID depends on business ID'
+    else
+      #puts 'no application selected'
+      puts 'application ID not found in config'
     end
+
+    # E.g., {:bizid=>"ABC", :type=>"product", :apiId=>"XXX", :sid=>"XXX",
+    #        :name=>"ABC", :domain=>"ABC.m2.exosite.io" }
+    if selected_product
+      sol_info = %(product: #{selected_product.name})
+      sol_info += %( <#{selected_product.sid}>) if options.ids
+      puts sol_info
+    elsif selected_product_id
+      #puts 'selected product not in business'
+      puts "product ID from config is not in business (#{selected_product_id})"
+      id_not_in_biz = true
+    elsif !selected_business
+      puts 'product ID depends on business ID'
+    else
+      #puts 'no product selected'
+      puts 'product ID not found in config'
+    end
+
+    MrMurano::SolutionBase.warn_configfile_env_maybe if id_not_in_biz
   end
 end
 

data/lib/MrMurano/commands/solution.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -19,9 +19,10 @@ command :solution do |c|
 Commands for working with Application and Product solutions.
   ).strip
   c.project_not_required = true
+  c.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end
@@ -156,7 +157,7 @@ def cmd_solution_del_get_names_and_ids!(biz, args, options)
   end
   solz = must_fetch_solutions!(options, args, biz)
   solz.each do |sol|
-    nmorids += [[sol.sid, "‘#{sol.name}’ <#{sol.sid}>", sol]]
+    nmorids += [[sol.sid, "#{MrMurano::Verbose.fancy_ticks(sol.name)} <#{sol.sid}>", sol]]
   end
   nmorids
 end
@@ -230,7 +231,8 @@ def solution_delete(name_or_id, use_sol: nil, type: :all, yes: false)
   n_faulted = 0
   if solz.empty?
     if !name_or_id.empty?
-      MrMurano::Verbose.error("No solution matching ‘#{name_or_id}’ found")
+      name_or_id_q = MrMurano::Verbose.fancy_ticks(name_or_id)
+      MrMurano::Verbose.error("No solution matching #{name_or_id_q} found")
     else
       MrMurano::Verbose.error(MSG_SOLUTIONS_NONE_FOUND)
     end

data/lib/MrMurano/commands/solution_picker.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -156,12 +156,12 @@ def must_fetch_solutions!(options, args=[], biz=nil)
 
   if args.none? && !any_solution_pickers!(options)
     if !options.all
-      if $cfg['application.id']
+      if %i[all application].include?(options.type) && $cfg['application.id']
         solz += solution_get_solutions(
           biz, :application, sid: $cfg['application.id']
         )
       end
-      if $cfg['product.id']
+      if %i[all product].include?(options.type) && $cfg['product.id']
         solz += solution_get_solutions(
           biz, :product, sid: $cfg['product.id']
         )
@@ -449,7 +449,8 @@ module MrMurano
             say "Found #{sol.type_name} #{sol.pretty_desc}"
           elsif !@searching
             # The solution ID in the config was not found for this business.
-            say "The #{sol.type_name} ID ‘#{tried_sid}’ from the config was not found"
+            tried_sid = MrMurano::Verbose.fancy_ticks(tried_sid)
+            say "The #{sol.type_name} ID #{tried_sid} from the config was not found"
           end
           puts ''
         end

data/lib/MrMurano/commands/status.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.18 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -109,6 +109,7 @@ Endpoints can be selected with a "#<method>#<path glob>" pattern.
       unless item[:pp_desc].to_s.empty? || item[:pp_desc] == item[:synckey]
         desc += " (#{item[:pp_desc]})"
       end
+      # NOTE: This path is the endpoint path.
       desc += " [#{item[:method]} #{item[:path]}]" if item[:method] && item[:path]
       desc
     end
@@ -149,6 +150,16 @@ Endpoints can be selected with a "#<method>#<path glob>" pattern.
         end
       end
 
+      unless ret[:clash].empty?
+        pretty_group_header(
+          ret[:clash], 'Conflicting items', 'in conflict', options.grouped
+        )
+        ret[:clash].each do |item|
+          abbrev = $cfg['tool.ascii'] && 'x' || '✗'
+          interject " #{abbrev} #{item[:pp_type]}  #{highlight_del(fmtr(item, options))}"
+        end
+      end
+
       return unless options.show_all
       interject 'Unchanged:' if options.grouped
       ret[:unchg].each { |item| interject "   #{item[:pp_type]}  #{fmtr(item, options)}" }
@@ -171,15 +182,15 @@ Endpoints can be selected with a "#<method>#<path glob>" pattern.
       Rainbow(msg).red.bright
     end
 
-    @grouped = { toadd: [], todel: [], tomod: [], unchg: [], skipd: [] }
+    @grouped = { toadd: [], todel: [], tomod: [], unchg: [], skipd: [], clash: [] }
     def gmerge(ret, type, desc, options)
       if options.grouped
         out = @grouped
       else
-        out = { toadd: [], todel: [], tomod: [], unchg: [], skipd: [] }
+        out = { toadd: [], todel: [], tomod: [], unchg: [], skipd: [], clash: [] }
       end
 
-      %i[toadd todel tomod unchg skipd].each do |kind|
+      %i[toadd todel tomod unchg skipd clash].each do |kind|
         ret[kind].each do |item|
           item = item.to_h
           item[:pp_type] = type

data/lib/MrMurano/commands/timeseries.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -42,9 +42,10 @@ The timeseries sub-commands let you interact directly with the Timeseries
 instance in a solution. This allows for easier debugging, being able to
 quickly try out different queries or write test data.
   ).strip
+  c.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end

data/lib/MrMurano/commands/tsdb.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -59,9 +59,10 @@ solution. This allows for easier debugging, being able to quickly try out
 different queries or write test data.
   ).strip
   c.project_not_required = true
+  c.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end

data/lib/MrMurano/hash.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -14,8 +14,8 @@ class Hash
   # Take keys of hash and transform those to symbols.
   def self.transform_keys_to_symbols(value)
     return value.map { |v| Hash.transform_keys_to_symbols(v) } if value.is_a?(Array)
-    return value if not value.is_a?(Hash)
-    value.inject({}) { |memo, (k,v)| memo[k.to_sym] = Hash.transform_keys_to_symbols(v); memo }
+    return value unless value.is_a?(Hash)
+    value.inject({}) { |memo, (k, v)| memo[k.to_sym] = Hash.transform_keys_to_symbols(v); memo }
   end
 
   # From:
@@ -24,8 +24,8 @@ class Hash
   # Take keys of hash and transform those to strings.
   def self.transform_keys_to_strings(value)
     return value.map { |v| Hash.transform_keys_to_strings(v) } if value.is_a?(Array)
-    return value if not value.is_a?(Hash)
-    value.inject({}) { |memo, (k,v)| memo[k.to_s] = Hash.transform_keys_to_strings(v); memo }
+    return value unless value.is_a?(Hash)
+    value.inject({}) { |memo, (k, v)| memo[k.to_s] = Hash.transform_keys_to_strings(v); memo }
   end
 
   # From Rails.
@@ -35,7 +35,7 @@ class Hash
       if this_value.is_a?(Hash) && other_value.is_a?(Hash)
         self[current_key] = this_value.deep_merge(other_value, &block)
       elsif block_given? && key?(current_key)
-        self[current_key] = block.call(current_key, this_value, other_value)
+        self[current_key] = yield(current_key, this_value, other_value)
       else
         self[current_key] = other_value
       end

data/lib/MrMurano/http.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.14 /coding: utf-8
+# Last Modified: 2017.08.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -30,50 +30,48 @@ module MrMurano
     end
 
     def ensure_token!(tok)
-      if tok.nil?
-        error 'Not logged in!'
-        exit 1
-      end
+      return unless tok.nil?
+      error 'Not logged in!'
+      exit 1
     end
 
     def json_opts
-      return @json_opts unless not defined?(@json_opts) or @json_opts.nil?
+      return @json_opts unless !defined?(@json_opts) || @json_opts.nil?
       @json_opts = {
-        :allow_nan => true,
-        :symbolize_names => true,
-        :create_additions => false
+        allow_nan: true,
+        symbolize_names: true,
+        create_additions: false,
       }
     end
 
     def curldebug(request)
-      if $cfg['tool.curldebug']
-        formp = (request.content_type =~ %r{multipart/form-data})
-        a = []
-        a << %{curl -s}
-        if request.key?('Authorization')
-          a << %{-H 'Authorization: #{request['Authorization']}'}
-        end
-        a << %{-H 'User-Agent: #{request['User-Agent']}'}
-        a << %{-H 'Content-Type: #{request.content_type}'} unless formp
-        a << %{-X #{request.method}}
-        a << %{'#{request.uri.to_s}'}
-        unless request.body.nil?
-          if formp
-            m = request.body.match(
-              %r{form-data;\s+name="(?<name>[^"]+)";\s+filename="(?<filename>[^"]+)"}
-            )
-            a << %{-F #{m[:name]}=@#{m[:filename]}} unless m.nil?
-          else
-            a << %{-d '#{request.body}'}
-          end
-        end
-        if $cfg.curlfile_f.nil?
-          MrMurano::Progress.instance.whirly_interject { puts a.join(' ') }
+      return unless $cfg['tool.curldebug']
+      formp = (request.content_type =~ %r{multipart/form-data})
+      a = []
+      a << %(curl -s)
+      if request.key?('Authorization')
+        a << %(-H 'Authorization: #{request['Authorization']}')
+      end
+      a << %(-H 'User-Agent: #{request['User-Agent']}')
+      a << %(-H 'Content-Type: #{request.content_type}') unless formp
+      a << %(-X #{request.method})
+      a << %('#{request.uri}')
+      unless request.body.nil?
+        if formp
+          m = request.body.match(
+            /form-data;\s+name="(?<name>[^"]+)";\s+filename="(?<filename>[^"]+)"/
+          )
+          a << %(-F #{m[:name]}=@#{m[:filename]}) unless m.nil?
         else
-          $cfg.curlfile_f << a.join(' ') + "\n\n"
-          $cfg.curlfile_f.flush
+          a << %(-d '#{request.body}')
         end
       end
+      if $cfg.curlfile_f.nil?
+        MrMurano::Progress.instance.whirly_interject { puts a.join(' ') }
+      else
+        $cfg.curlfile_f << a.join(' ') + "\n\n"
+        $cfg.curlfile_f.flush
+      end
     end
 
     # Default endpoint unless Class overrides it.
@@ -83,18 +81,19 @@ module MrMurano
 
     def http
       uri = URI('https://' + $cfg['net.host'])
-      if not defined?(@http) or @http.nil?
+      if !defined?(@http) || @http.nil?
         @http = Net::HTTP.new(uri.host, uri.port)
         @http.use_ssl = true
         @http.start
       end
       @http
     end
+
     def http_reset
       @http = nil
     end
 
-    def set_def_headers(request)
+    def add_headers(request)
       request.content_type = 'application/json'
       # 2017-08-14: MrMurano::Account overrides the token method, and
       # it doesn't exit if no token, and then we end up here.
@@ -104,24 +103,24 @@ module MrMurano
       request
     end
 
+    # rubocop:disable Style/MethodName "Use snake_case for method names."
+    # 2017-08-20: isJSON and showHttpError are grandparented into lint exceptions.
     def isJSON(data)
-      begin
-        [true, JSON.parse(data, json_opts)]
-      rescue
-        [false, data]
-      end
+      [true, JSON.parse(data, json_opts)]
+    rescue
+      [false, data]
     end
 
     def showHttpError(request, response)
       if $cfg['tool.debug']
-        puts "Sent #{request.method} #{request.uri.to_s}"
-        request.each_capitalized{|k,v| puts "> #{k}: #{v}"}
+        puts "Sent #{request.method} #{request.uri}"
+        request.each_capitalized { |k, v| puts "> #{k}: #{v}" }
         if request.body.nil?
         else
           puts ">> #{request.body[0..156]}"
         end
         puts "Got #{response.code} #{response.message}"
-        response.each_capitalized{|k,v| puts "< #{k}: #{v}"}
+        response.each_capitalized { |k, v| puts "< #{k}: #{v}" }
       end
       isj, jsn = isJSON(response.body)
       resp = "Request Failed: #{response.code}: "
@@ -130,25 +129,25 @@ module MrMurano
         # to support Ruby 3.0 frozen string literals.
         if $cfg['tool.fullerror']
           resp += JSON.pretty_generate(jsn)
-        elsif jsn.kind_of? Hash
-          resp += "[#{jsn[:statusCode]}] " if jsn.has_key? :statusCode
-          resp += jsn[:message] if jsn.has_key? :message
+        elsif jsn.is_a? Hash
+          resp += "[#{jsn[:statusCode]}] " if jsn.key? :statusCode
+          resp += jsn[:message] if jsn.key? :message
         else
           resp += jsn.to_s
         end
       else
-        resp += (jsn or 'nil')
+        resp += (jsn || 'nil')
       end
       # assuming verbosing was included.
       error resp
     end
 
-    def workit(request, &block)
+    def workit(request)
       curldebug(request)
       if block_given?
-        yield request, http()
+        yield request, http
       else
-        response = http().request(request)
+        response = http.request(request)
         case response
         when Net::HTTPSuccess
           workit_response(response)
@@ -174,13 +173,13 @@ module MrMurano
     def get(path='', query=nil, &block)
       uri = endpoint(path)
       uri.query = URI.encode_www_form(query) unless query.nil?
-      workit(set_def_headers(Net::HTTP::Get.new(uri)), &block)
+      workit(add_headers(Net::HTTP::Get.new(uri)), &block)
     end
 
     def post(path='', body={}, &block)
       uri = endpoint(path)
       req = Net::HTTP::Post.new(uri)
-      set_def_headers(req)
+      add_headers(req)
       req.body = JSON.generate(body)
       workit(req, &block)
     end
@@ -188,7 +187,7 @@ module MrMurano
     def postf(path='', form={}, &block)
       uri = endpoint(path)
       req = Net::HTTP::Post.new(uri)
-      set_def_headers(req)
+      add_headers(req)
       req.content_type = 'application/x-www-form-urlencoded; charset=utf-8'
       req.form_data = form
       workit(req, &block)
@@ -197,7 +196,7 @@ module MrMurano
     def put(path='', body={}, &block)
       uri = endpoint(path)
       req = Net::HTTP::Put.new(uri)
-      set_def_headers(req)
+      add_headers(req)
       req.body = JSON.generate(body)
       workit(req, &block)
     end
@@ -205,14 +204,14 @@ module MrMurano
     def patch(path='', body={}, &block)
       uri = endpoint(path)
       req = Net::HTTP::Patch.new(uri)
-      set_def_headers(req)
+      add_headers(req)
       req.body = JSON.generate(body)
       workit(req, &block)
     end
 
     def delete(path='', &block)
       uri = endpoint(path)
-      workit(set_def_headers(Net::HTTP::Delete.new(uri)), &block)
+      workit(add_headers(Net::HTTP::Delete.new(uri)), &block)
     end
   end
 end
@@ -238,17 +237,17 @@ if RUBY_VERSION == '2.0.0'
         end
 
         D "opening connection to #{conn_address}:#{conn_port}..."
-        s = Timeout.timeout(@open_timeout, Net::OpenTimeout) {
+        s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
           TCPSocket.open(conn_address, conn_port, @local_host, @local_port)
-        }
+        end
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        D "opened"
+        D 'opened'
         if use_ssl?
-          ssl_parameters = Hash.new
+          ssl_parameters = {}
           iv_list = instance_variables
           SSL_IVNAMES.each_with_index do |ivname, i|
-            if iv_list.include?(ivname) and
-                value = instance_variable_get(ivname)
+            if iv_list.include?(ivname)
+              value = instance_variable_get(ivname)
               ssl_parameters[SSL_ATTRIBUTES[i]] = value if value
             end
           end
@@ -257,7 +256,7 @@ if RUBY_VERSION == '2.0.0'
           D "starting SSL for #{conn_address}:#{conn_port}..."
           s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
           s.sync_close = true
-          D "SSL established"
+          D 'SSL established'
         end
         @socket = BufferedIO.new(s)
         @socket.read_timeout = @read_timeout
@@ -281,8 +280,8 @@ if RUBY_VERSION == '2.0.0'
             end
             # Server Name Indication (SNI) RFC 3546
             s.hostname = @address if s.respond_to? :hostname=
-            if @ssl_session and
-                Time.now < @ssl_session.time + @ssl_session.timeout
+            if @ssl_session &&
+               Time.now < @ssl_session.time + @ssl_session.timeout
               s.session = @ssl_session if @ssl_session
             end
             Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect }
@@ -292,7 +291,7 @@ if RUBY_VERSION == '2.0.0'
             @ssl_session = s.session
           rescue => exception
             D "Conn close because of connect error #{exception}"
-            @socket.close if @socket and not @socket.closed?
+            @socket.close if @socket && !@socket.closed?
             raise exception
           end
         end