gazer 0.2.30 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d752a6c9ab6c912a7ccabaafe45141f3e70e75
-  data.tar.gz: 6907072bde4d5f3150cea70615acb8ae693b3178
+  metadata.gz: 5a9e83bd6f2cc7b63023de94547564ef698039d1
+  data.tar.gz: ede1fad9d9d6aae55f7cefa41920a5369707b993
 SHA512:
-  metadata.gz: bd7d987e4e78960c739a0b63e10eb16642392e5f4b1baecf3964e755521f2686b186a0951da02be95dd66e722526663132168d7ab1eebc1117da6718a28ca14e
-  data.tar.gz: d087140b4ae80317e54289e31d09b89ba859675b18422e51ed28e4d1cc14f0bf90b419fd36d00c3ee253de03fe13b399f9e97250cd95823ee7cbb017209ab7a9
+  metadata.gz: 5454a2edf446a6d4be52994420b58b2ab164d3e9317dcf52461c0fedef9c1c282096fa70bb349ee7ea60e92b8cc8876ea3f5dbedebcf4f16a5833c66befffefc
+  data.tar.gz: a58baf3edd1795bbce10cc8529da8faf54c89fa6791b9b45b4a8e96922d0a09c61e14bff848a80b716ea2f25150c49d70a38a8b7d300d02743a5e283419567c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.30)
+    gazer (0.2.31)
       looker-sdk (~> 0.0.6)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

data/lib/gzr/modules/session.rb

@@ -82,9 +82,9 @@ module Gzr
       @v3_1_available ||= false
     end
 
-    def build_connection_hash()
+    def build_connection_hash(api_version='3.0')
       conn_hash = Hash.new
-      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/"
+      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/api/#{api_version}"
       if @options[:http_proxy]
         conn_hash[:connection_options] ||= {}
         conn_hash[:connection_options][:proxy] = {
@@ -137,10 +137,14 @@ module Gzr
         sawyer_options = {
           :links_parser => Sawyer::LinkParsers::Simple.new,
           :serializer  => LookerSDK::Client::Serializer.new(JSON),
-          :faraday => conn_hash[:faraday] || Faraday.new(conn_hash[:connection_options])
+          :faraday => Faraday.new(conn_hash[:connection_options])
         }
 
-        agent = Sawyer::Agent.new(conn_hash[:api_endpoint], conn_hash) do |http|
+        endpoint = conn_hash[:api_endpoint]
+        endpoint_uri = URI.parse(endpoint)
+        root = endpoint.slice(0..-endpoint_uri.path.length)
+
+        agent = Sawyer::Agent.new(root, sawyer_options) do |http|
           http.headers[:accept] = 'application/json'
           http.headers[:user_agent] = conn_hash[:user_agent]
         end
@@ -154,7 +158,7 @@ module Gzr
         rescue Faraday::ConnectionFailed => cf
           raise Gzr::CLI::Error, "Connection Failed.\nDid you specify the --no-ssl option for an ssl secured server?"
         rescue LookerSDK::NotFound => nf
-          say_warning "endpoint #{conn_hash[:api_endpoint]}/versions was not found"
+          say_warning "endpoint #{root}/versions was not found"
         end
         versions.each do |v|
           @v3_1_available = true if v.version == "3.1"
@@ -166,8 +170,7 @@ module Gzr
       raise Gzr::CLI::Error, "Operation requires API v3.1, but user specified a different version" if (api_version == "3.1") && @options[:api_version] && !("3.1" == @options[:api_version])
       raise Gzr::CLI::Error, "Operation requires API v3.1, which is not available from this host" if (api_version == "3.1") && !v3_1_available?
 
-      conn_hash = build_connection_hash()
-      conn_hash[:api_endpoint] = "#{conn_hash[:api_endpoint]}api/#{@options[:api_version] || current_version.version}"
+      conn_hash = build_connection_hash(@options[:api_version] || current_version.version)
       @secret = nil
 
       say_ok("connecting to #{conn_hash.map { |k,v| "#{k}=>#{(k == :client_secret) ? '*********' : v}" }}") if @options[:debug]

data/lib/gzr/version.rb

@@ -20,5 +20,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Gzr
-  VERSION = "0.2.30"
+  VERSION = "0.2.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader