gazer 0.2.43 → 0.2.48

data/lib/gzr/command.rb

@@ -119,7 +119,7 @@ module Gzr
     def all_color_collections()
       data = nil
       begin
-        data = @sdk.all_color_collections()
+        data = @sdk.all_color_collections().collect { |o| o.to_attrs if o.respond_to?(:to_attrs) }
       rescue NoMethodError => nme
         say_warning "The api endpoint all_color_collections() is not implemented on this Looker instance"
       rescue LookerSDK::NotFound => nf
@@ -136,7 +136,7 @@ module Gzr
       return @dcc if @dcc
       data = nil
       begin
-        data = @sdk.default_color_collection()
+        data = @sdk.default_color_collection().to_attrs
         @dcc = data
       rescue NoMethodError => nme
         say_warning "The api endpoint default_color_collection() is not implemented on this Looker instance"
@@ -181,7 +181,7 @@ module Gzr
           say_warning "You do not have access to query color palettes so these won't be processed."
           return
         end
-        @default_colors=color_palette_lookup!(dcc.to_attrs)
+        @default_colors=color_palette_lookup!(dcc)
         say_warning("Default colors #{JSON.pretty_generate @default_colors}") if @options[:debug]
       end unless @default_colors
 
@@ -281,7 +281,7 @@ module Gzr
     #   end
 
     def keys_to_keep(operation)
-      o = @sdk.operations[operation]
+      o = @sdk.operations[operation] || @sdk.operations[operation.to_sym]
       begin
         say_error "Operation #{operation} not found"
         return []

data/lib/gzr/commands/attribute/ls.rb

@@ -62,7 +62,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/connection/dialects.rb

@@ -61,7 +61,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/connection/ls.rb

@@ -61,7 +61,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: 1024)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: 1024, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/dashboard/cat.rb

@@ -117,7 +117,12 @@ module Gzr
               outputJSON.gsub! k,v
             end
 
-            write_file(@options[:dir] ? "Dashboard_#{data[:id]}_#{data[:title]}.json" : nil, @options[:dir], nil, output) do |f|
+            file_name = if @options[:dir]
+                          @options[:simple_filename] ? "Dashboard_#{data[:id]}.json" : "Dashboard_#{data[:id]}_#{data[:title]}.json"
+                        else
+                          nil
+                        end
+            write_file(file_name, @options[:dir], nil, output) do |f|
               f.puts outputJSON
             end
           end

data/lib/gzr/commands/dashboard.rb

@@ -52,6 +52,8 @@ module Gzr
                            desc: 'Include scheduled plans'
       method_option :transform,  type: :string,
                            desc: 'Fully-qualified path to a JSON file describing the transformations to apply'
+      method_option :simple_filename, type: :boolean,
+                    desc: 'Use simple filename for output (Dashboard_<id>.json)'
       def cat(dashboard_id)
         if options[:help]
           invoke :help, ['cat']

data/lib/gzr/commands/group/ls.rb

@@ -62,7 +62,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/group/member_groups.rb

@@ -63,7 +63,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/group/member_users.rb

@@ -63,7 +63,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/look/cat.rb

@@ -50,7 +50,12 @@ module Gzr
             end
 
             data[:scheduled_plans] = query_scheduled_plans_for_look(@look_id,"all").to_attrs if @options[:plans]
-            write_file(@options[:dir] ? "Look_#{data[:id]}_#{data[:title]}.json" : nil, @options[:dir],nil, output) do |f|
+            file_name = if @options[:dir]
+                          @options[:simple_filename] ? "Look_#{data[:id]}.json" : "Look_#{data[:id]}_#{data[:title]}.json"
+                        else
+                          nil
+                        end
+            write_file(file_name, @options[:dir],nil, output) do |f|
               f.puts JSON.pretty_generate(data)
             end
           end

data/lib/gzr/commands/look.rb

@@ -82,6 +82,8 @@ module Gzr
                            desc: 'Directory to store output file'
       method_option :plans,  type: :boolean,
                            desc: 'Include scheduled plans'
+      method_option :simple_filename,  type: :boolean,
+                           desc: 'Use simple filename for output (Look_<id>.json)'
       def cat(look_id)
         if options[:help]
           invoke :help, ['cat']

data/lib/gzr/commands/model/ls.rb

@@ -61,7 +61,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/permissions/ls.rb

@@ -63,7 +63,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: 1024)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: 1024, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/plan/failures.rb

@@ -87,7 +87,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/plan/ls.rb

@@ -91,7 +91,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/role/group_ls.rb

@@ -65,7 +65,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/role/ls.rb

@@ -64,7 +64,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/role/rm.rb

@@ -38,7 +38,7 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            delete_role(@plan_id)
+            delete_role(@role_id)
           end
         end
       end

data/lib/gzr/commands/role/user_ls.rb

@@ -65,7 +65,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, multiline: true, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/space/ls.rb

@@ -101,7 +101,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/space/top.rb

@@ -65,7 +65,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: [:right])
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: [:right], width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/user/ls.rb

@@ -71,7 +71,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/commands/user/me.rb

@@ -55,7 +55,7 @@ module Gzr
               if @options[:csv] then
                 output.puts render_csv(table)
               else
-                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments)
+                output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
           end

data/lib/gzr/modules/session.rb

@@ -46,13 +46,19 @@ module Gzr
       output.puts pastel.red data
     end
 
-    def v3_1_available?
-      @v3_1_available ||= false
+    @versions = []
+    @current_version = nil
+
+    def sufficient_version?(given_version, minimum_version)
+      return true unless (given_version && minimum_version)
+      versions = @versions.map {|v| v.version}.sort
+      !versions.drop_while {|v| v < minimum_version}.reverse.drop_while {|v| v > given_version}.empty?
     end
 
-    def build_connection_hash(api_version='3.0')
+
+    def build_connection_hash(api_version=nil)
       conn_hash = Hash.new
-      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/api/#{api_version}"
+      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/api/#{api_version||@current_version||""}"
       if @options[:http_proxy]
         conn_hash[:connection_options] ||= {}
         conn_hash[:connection_options][:proxy] = {
@@ -68,7 +74,8 @@ module Gzr
           }
         else
           conn_hash[:connection_options][:ssl] = {
-            :verify => false
+            :verify => false,
+            :verify_mode => (OpenSSL::SSL::VERIFY_NONE)
           }
         end
       end
@@ -95,17 +102,45 @@ module Gzr
       conn_hash
     end
 
-    def login(api_version)
+    def login(min_api_version=nil)
+      if (@options[:client_id].nil? && ENV["LOOKERSDK_CLIENT_ID"])
+        @options[:client_id] = ENV["LOOKERSDK_CLIENT_ID"]
+      end
+
+      if (@options[:client_secret].nil? && ENV["LOOKERSDK_CLIENT_SECRET"])
+        @options[:client_secret] = ENV["LOOKERSDK_CLIENT_SECRET"]
+      end
+
+      if (@options[:api_version].nil? && ENV["LOOKERSDK_API_VERSION"])
+        @options[:api_version] = ENV["LOOKERSDK_API_VERSION"]
+      end
+
+      if (@options[:verify_ssl] && ENV["LOOKERSDK_VERIFY_SSL"])
+        @options[:verify_ssl] = !(/^f(alse)?$/i =~ ENV["LOOKERSDK_VERIFY_SSL"])
+      end
+
+      if ((@options[:host] == 'localhost') && ENV["LOOKERSDK_BASE_URL"])
+        base_url = ENV["LOOKERSDK_BASE_URL"]
+        @options[:ssl] = !!(/^https/ =~ base_url)
+        @options[:host] = /^https?:\/\/([^:\/]+)/.match(base_url)[1]
+        md = /:([0-9]+)\/?$/.match(base_url)
+        @options[:port] = md[1] if md
+      end
+
+      say_ok("using options #{@options.select { |k,v| k != 'client_secret' }.map { |k,v| "#{k}=>#{v}" }}") if @options[:debug]
+
       @secret = nil
-      versions = nil
-      current_version = nil
       begin
         conn_hash = build_connection_hash
 
         sawyer_options = {
           :links_parser => Sawyer::LinkParsers::Simple.new,
           :serializer  => LookerSDK::Client::Serializer.new(JSON),
-          :faraday => Faraday.new(conn_hash[:connection_options])
+          :faraday => Faraday.new(conn_hash[:connection_options]) do |conn|
+            if @options[:persistent]
+              conn.adapter :net_http_persistent
+            end
+          end
         }
 
         endpoint = conn_hash[:api_endpoint]
@@ -119,8 +154,8 @@ module Gzr
 
         begin
           versions_response = agent.call(:get,"/versions")
-          versions = versions_response.data.supported_versions
-          current_version = versions_response.data.current_version
+          @versions = versions_response.data.supported_versions
+          @current_version = versions_response.data.current_version.version
         rescue Faraday::SSLError => e
           raise Gzr::CLI::Error, "SSL Certificate could not be verified\nDo you need the --no-verify-ssl option or the --no-ssl option?"
         rescue Faraday::ConnectionFailed => cf
@@ -128,23 +163,30 @@ module Gzr
         rescue LookerSDK::NotFound => nf
           say_warning "endpoint #{root}/versions was not found"
         end
-        versions.each do |v|
-          @v3_1_available = true if v.version == "3.1"
-        end
       end
 
-      say_warning "API 3.1 available? #{v3_1_available?}" if @options[:debug]
+      say_warning "API current_version #{@current_version}" if @options[:debug]
+      say_warning "API versions #{@versions.map{|v| v.version}}" if @options[:debug]
+
+      raise Gzr::CLI::Error, "Operation requires API v#{min_api_version}, but user specified version #{@options[:api_version]}" unless sufficient_version?(@options[:api_version],min_api_version)
 
-      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?
+      api_version = [min_api_version, @current_version].max
+      raise Gzr::CLI::Error, "Operation requires API v#{api_version}, which is not available from this host" if api_version && !@versions.any? {|v| v.version == api_version}
+      raise Gzr::CLI::Error, "User specified API v#{@options[:api_version]}, which is not available from this host" if @options[:api_version] && !@versions.any? {|v| v.version == @options[:api_version]}
 
-      conn_hash = build_connection_hash(@options[:api_version] || current_version.version)
+      conn_hash = build_connection_hash(@options[:api_version] || api_version)
       @secret = nil
 
       say_ok("connecting to #{conn_hash.map { |k,v| "#{k}=>#{(k == :client_secret) ? '*********' : v}" }}") if @options[:debug]
 
       begin
-        @sdk = LookerSDK::Client.new(conn_hash) unless @sdk
+        faraday = Faraday.new(conn_hash[:connection_options]) do |conn|
+          if @options[:persistent]
+            conn.adapter :net_http_persistent
+          end
+        end
+        @sdk = LookerSDK::Client.new(conn_hash.merge(faraday: faraday)) unless @sdk
+
         say_ok "check for connectivity: #{@sdk.alive?}" if @options[:debug]
         say_ok "verify authentication: #{@sdk.authenticated?}" if @options[:debug]
       rescue LookerSDK::Unauthorized => e
@@ -200,10 +242,10 @@ module Gzr
       end
     end
 
-    def with_session(api_version="3.0")
+    def with_session(min_api_version="3.0")
       return nil unless block_given?
       begin
-        login(api_version) unless @sdk
+        login(min_api_version) unless @sdk
         yield
       rescue LookerSDK::Error => e
         say_error e.errors if e.respond_to?(:errors) && e.errors

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.43"
+  VERSION = "0.2.48"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.43
+  version: 0.2.48
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: tty-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -114,82 +114,86 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
+        version: 4.0.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: tty
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 description: Command line tool to manage the content of a Looker instance.
 email:
-- deangelo@looker.com
+- drstrangelove@google.com
 executables:
 - gzr
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/scripts/wait_for_looker.sh"
+- ".github/workflows/release.yml"
+- ".github/workflows/ruby-ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile