gazer 0.2.36 → 0.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b171fe3c480e72780a9b90a0373654e7e9e3dafc2e22e148f229fae80cbacdb
-  data.tar.gz: 1e46749fc5a805f9a3632ff832bd147530d5da7c651e90aa4b6f6baaceaa39d6
+  metadata.gz: 63f0133a6db8baa3e1cbb77432444b11b51a9d3f63746b1e18018b9da52ffba1
+  data.tar.gz: b1128abc82113482b0bbc5956f680b4b6e633d26ab9204988e87ce45a83f5cdb
 SHA512:
-  metadata.gz: 64ff99189d390dd6d98bdad6339a094c3b2aa0565c498c6af38b0b81ffe595ace06531e9482b580c83c5916e812459fb507901d8906caf0699687e0579c59fa3
-  data.tar.gz: 6b7cb1b39903606563c13f79ca9c7467c70108840fbe9a00e8a3594ccad4c4506235f434dba054751285ed328b7949a176cbe540cdf68f86eb1b671a9b6a916f
+  metadata.gz: 0c94dda1c71d32c8441c7eeba27c230a5ec35e5b96e3b8b3dd897aa1f4c38f685c4edee7961beb8fe67e4e091922d697e55fd36d8f47fd907c1fa0f4f3a92c48
+  data.tar.gz: 5e56640ba557897596eec20cf99b5465ec8760dba904bc01d0e82e67af97ce559dcc85f7e5a2b286c0aa3c96bd882d350d04c6cac3b431ab8bc44fc12656b188

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.36)
+    gazer (0.2.41)
       looker-sdk (~> 0.0.7)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

data/README.md

@@ -34,6 +34,18 @@ machine foo.bar.mycompany.com
 
 Make sure that the `~/.netrc` file has restricted permissions by running `chmod 600 ~/.netrc`.
 
+### API port
+Most instances of Looker use port 19999 for the API. Gazer will use that port by default when executing a command.
+Looker instances that are hosted in Google Cloud direct both the API and the web
+interface traffic through port 443, the standard https port. Some other
+installations may also use port 443.
+
+If your Looker instance is GCP-hosted (*.cloud.looker.com), you must specify `--port 443`, eg:
+
+```
+$ gzr user me --host mycompany.cloud.looker.com --port 443
+```
+
 ### Options that apply to many commands
 
 #### --su option

data/lib/gzr/command.rb

@@ -116,6 +116,146 @@ module Gzr
       data
     end
 
+    def all_color_collections()
+      data = nil
+      begin
+        data = @sdk.all_color_collections()
+      rescue NoMethodError => nme
+        say_warning "The api endpoint all_color_collections() is not implemented on this Looker instance"
+      rescue LookerSDK::NotFound => nf
+        say_warning "The current user can't query all color collections"
+      rescue LookerSDK::Error => e
+        say_error "Error querying all_color_collections()"
+        say_error e.message
+        raise
+      end
+      data
+    end
+
+    def default_color_collection()
+      return @dcc if @dcc
+      data = nil
+      begin
+        data = @sdk.default_color_collection()
+        @dcc = data
+      rescue NoMethodError => nme
+        say_warning "The api endpoint default_color_collection() is not implemented on this Looker instance"
+      rescue LookerSDK::NotFound => nf
+        say_warning "The current user can't query the default color collection"
+      rescue LookerSDK::Error => e
+        say_error "Error querying default_color_collection()"
+        say_error e.message
+        raise
+      end
+      data
+    end
+
+    def color_collection(collection_id)
+      data = nil
+      begin
+        data = @sdk.color_collection(collection_id)
+      rescue NoMethodError => nme
+        say_warning "The api endpoint color_collection(collection_id) is not implemented on this Looker instance"
+      rescue LookerSDK::NotFound => nf
+        say_warning "The color_collection(#{collection_id}) is not found"
+      rescue LookerSDK::Error => e
+        say_error "Error querying color_collection(#{collection_id})"
+        say_error e.message
+        raise
+      end
+      data
+    end
+
+    def find_vis_config_reference(obj, &block)
+      if obj.respond_to?(:'has_key?') && obj.has_key?(:vis_config)
+        yield (obj[:vis_config])
+      end
+      if obj.is_a? Enumerable
+        obj.each { |o| find_vis_config_reference(o,&block) }
+      end
+    end
+
+    def find_color_palette_reference(obj, default_colors=nil, &block)
+      begin
+        dcc = default_color_collection()
+        if dcc.nil?
+          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)
+      end unless default_colors
+
+      if obj.respond_to?(:'has_key?') && obj.has_key?(:collection_id) && obj.has_key?(:palette_id)
+        yield(obj,default_colors)
+      end
+      if obj.is_a? Enumerable
+        obj.each { |o| find_color_palette_reference(o,default_colors,&block) }
+      end
+    end
+
+    def color_palette_lookup!(obj)
+      return nil unless obj
+      palettes = []
+      palettes += obj[:categoricalPalettes] if obj[:categoricalPalettes]
+      palettes += obj[:sequentialPalettes] if obj[:sequentialPalettes]
+      palettes += obj[:divergingPalettes] if obj[:divergingPalettes]
+      obj[:palettes]=palettes
+      obj
+    end
+
+    def rewrite_color_palette!(o,default_colors)
+      cc = nil
+      if o[:collection_id] == default_colors[:id]
+        o[:collection_default] = true
+        cc = default_colors
+      else
+        o[:collection_default] = false
+        cc = color_palette_lookup!(color_collection(o[:collection_id]))
+      end
+      return unless cc
+      o[:collection_label] = cc[:label]
+      ps = cc[:palettes].select { |p| p[:id] == o[:palette_id] }
+      if ps.length > 0
+        o[:palette_label] = ps.first[:label]
+        o[:palette_type] = ps.first[:type]
+      end
+    end
+
+    def update_color_palette!(o,default_colors,force_default=false)
+      return unless o.has_key?(:collection_label) && o.has_key?(:palette_type)
+
+      cc = default_colors
+      if !(force_default && o[:collection_default])
+        # look up color collection by id
+        cc = color_palette_lookup!(color_collection(o[:collection_id]))
+        if cc.nil?
+          # find color collection by name
+          ccs = all_color_collections()&.select { |cc| o[:collection_label] == cc[:label]}
+          if ccs.nil? || ccs.length == 0
+            # no color collection found. Use default.
+            say_warning "Color collection #{o[:collection_label]} not found. Using default."
+            cc = default_colors
+          else
+            cc = color_palette_lookup!(ccs.first)
+          end
+        end
+      end
+      o[:collection_id] = cc[:id]
+
+      # look up palette by id
+      ps = cc[:palettes].select {|p| p[:id] == o[:palette_id]}
+      if ps.length == 0
+        # find palette by type
+        ps = cc[:palettes].select {|p| p[:type] == o[:palette_type]}
+        if ps.length > 0
+          o[:palette_id] = ps.first[:id]
+        else
+          # no palette found
+          say_warning "Color palette #{o[:palette_type]} not found."
+          o.delete(:palette_id)
+        end
+      end
+    end
 
     ##
     # This method accepts the name of an sdk operation, then finds the parameter for that
@@ -131,7 +271,7 @@ module Gzr
     #   new_obj_hash = existing_obj_hash.select do |k,v|
     #     keys_to_keep('create_new_obj').include? k
     #   end
-    
+
     def keys_to_keep(operation)
       o = @sdk.operations[operation]
       begin
@@ -145,12 +285,12 @@ module Gzr
       schema_ref = parameters[0][:schema][:$ref].split(/\//)
       return @sdk.swagger[schema_ref[1].to_sym][schema_ref[2].to_sym][:properties].reject { |k,v| v[:readOnly] }.keys
     end
-    
+
     ##
     # The tty-table gem is normally used to output tabular data. This method accepts a Table
     # object as used by the tty-table gem, and generates CSV output. It returns a string
     # with crlf encoding
-    
+
     def render_csv(t)
       io = StringIO.new
       io.puts (

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

@@ -46,12 +46,22 @@ module Gzr
             data = query_dashboard(@dashboard_id).to_attrs
             data[:dashboard_elements].each_index do |i|
               element = data[:dashboard_elements][i]
-              if element[:merge_result_id]
-                merge_result = merge_query(element[:merge_result_id]).to_attrs
+              find_vis_config_reference(element) do |vis_config|
+                find_color_palette_reference(vis_config) do |o,default_colors|
+                  rewrite_color_palette!(o,default_colors)
+                end
+              end
+              merge_result = merge_query(element[:merge_result_id])&.to_attrs if element[:merge_result_id]
+              if merge_result
                 merge_result[:source_queries].each_index do |j|
                   source_query = merge_result[:source_queries][j]
                   merge_result[:source_queries][j][:query] = query(source_query[:query_id]).to_attrs
                 end
+                find_vis_config_reference(merge_result) do |vis_config|
+                  find_color_palette_reference(vis_config) do |o,default_colors|
+                    rewrite_color_palette!(o,default_colors)
+                  end
+                end
                 data[:dashboard_elements][i][:merge_result] = merge_result
               end
             end
@@ -86,7 +96,7 @@ module Gzr
                   elsif e[:position] === 'bottom'
                     row = max_row.to_s
                   end
-                  
+
                   column = '0'
                   width = e[:width].to_s
                   height = e[:height].to_s

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

@@ -55,31 +55,60 @@ module Gzr
 
               dashboard = sync_dashboard(data,@dest_space_id, output: output)
 
+
+              dashboard[:dashboard_filters] ||= []
               source_filters = data[:dashboard_filters].sort { |a,b| a[:row] <=> b[:row] }
-              existing_filters = dashboard.dashboard_filters.sort { |a,b| a.row <=> b.row }
-              existing_filters.collect! do |e|
-                matches_by_name_title = source_filters.select { |s| s[:row] != e.row && (s[:title] == e.title || s[:name] == e.name) }
-                if matches_by_name_title.length > 0
-                  delete_dashboard_filter(e.id)
-                  nil
-                else
-                  e
+              source_filters.each do |new_filter|
+                filter = new_filter.select do |k,v|
+                  (keys_to_keep('create_dashboard_filter') + [:row]).include? k
                 end
-              end
-              pairs(source_filters,existing_filters,dashboard.id) do |source,target,id|
-                say_warning("Synching dashboard filter for dashboard #{id}", output: output) if @options[:debug]
-                sync_dashboard_filter(source,target,id)
+                filter[:dashboard_id] = dashboard.id
+                say_warning "Creating filter" if @options[:debug]
+                dashboard[:dashboard_filters].push create_dashboard_filter(filter)
               end
 
-              elem_table = pairs(data[:dashboard_elements],dashboard.dashboard_elements,dashboard.id) do |source,target,id|
-                sync_dashboard_element(source,target,id)
+              dashboard[:dashboard_elements] ||= []
+              elem_table = data[:dashboard_elements].map do |new_element|
+                element = new_element.select do |k,v|
+                  (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id, :result_maker_id]).include? k
+                end
+                (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
+                say_warning "Creating dashboard element #{element.inspect}" if @options[:debug]
+                element[:dashboard_id] = dashboard.id
+                result_maker = copy_result_maker_filterables(new_element)
+                element[:result_maker] = result_maker if result_maker
+                dashboard_element = create_dashboard_element(element)
+                dashboard[:dashboard_elements].push dashboard_element
+                [new_element[:id], dashboard_element.id]
               end
 
-              source_dashboard_layouts = data[:dashboard_layouts].sort_by { |v| (v[:active] ? 0 : 1) }
-              existing_dashboard_layouts = dashboard.dashboard_layouts.sort_by { |v| (v.active ? 0 : 1) }
-              pairs(source_dashboard_layouts,existing_dashboard_layouts) do |s,t|
-                sync_dashboard_layout(dashboard.id,s,t) do |s,t|
-                  sync_dashboard_layout_component(s,t,elem_table)
+              source_dashboard_layouts = data[:dashboard_layouts].map do |new_layout|
+                layout_obj = nil
+                if new_layout[:active] 
+                  layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].first.id)
+                  say_warning "Updating layout #{layout_obj.id}" if @options[:debug]
+                else  
+                  layout = new_layout.select do |k,v|
+                    (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
+                  end
+                  layout[:dashboard_id] = dashboard.id
+                  say_warning "Creating dashboard layout #{layout}" if @options[:debug]
+                  layout_obj = create_dashboard_layout(layout)
+                end
+                layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
+                layout_components.each do |source,target|
+                  component = keys_to_keep('update_dashboard_layout_component').collect do |e|
+                    [e,nil]
+                  end.to_h
+                  component[:dashboard_layout_id] = target.dashboard_layout_id
+
+                  component.merge!(source.select do |k,v|
+                    (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id]).include? k
+                  end)
+
+                  component[:dashboard_element_id] = elem_table.assoc(source[:dashboard_element_id])[1]
+                  say_warning "Updating dashboard layout component #{target.id}" if @options[:debug]
+                  update_dashboard_layout_component(target.id,component)
                 end
               end
               upsert_plans_for_dashboard(dashboard.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]
@@ -127,7 +156,24 @@ module Gzr
             end
             new_dash[:slug] = source[:slug] unless slug_used
             new_dash[:deleted] = false if existing_dashboard[:deleted]
-            return update_dashboard(existing_dashboard.id,new_dash)
+            d = update_dashboard(existing_dashboard.id,new_dash)
+
+            d.dashboard_filters.each do |f|
+              delete_dashboard_filter(f.id)
+            end
+            d.dashboard_filters = []
+
+            d.dashboard_elements.each do |e|
+              delete_dashboard_element(e.id)
+            end
+            d.dashboard_elements = []
+
+            d.dashboard_layouts.each do |l|
+              delete_dashboard_layout(l.id) unless l.active
+            end
+            d.dashboard_layouts.select! { |l| l.active }
+
+            return d
           else
             new_dash = source.select do |k,v|
               (keys_to_keep('create_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
@@ -139,26 +185,6 @@ module Gzr
           end
         end
 
-        def sync_dashboard_filter(new_filter,existing_filter,dashboard_id)
-          if new_filter && !existing_filter then
-            filter = new_filter.select do |k,v|
-              (keys_to_keep('create_dashboard_filter') + [:row]).include? k
-            end
-            filter[:dashboard_id] = dashboard_id
-            say_warning "Creating filter" if @options[:debug]
-            return create_dashboard_filter(filter)
-          end
-          if existing_filter && new_filter then
-            filter = new_filter.select do |k,v|
-              (keys_to_keep('update_dashboard_filter') + [:row]).include? k
-            end
-            say_warning "Updating filter #{existing_filter.id}" if @options[:debug]
-            return update_dashboard_filter(existing_filter.id,filter)
-          end
-          say_warning "Deleting filter #{existing_filter.id}" if @options[:debug]
-          return delete_dashboard_filter(existing_filter.id)
-        end
-
         def copy_result_maker_filterables(new_element)
           return nil unless new_element[:result_maker]
           if new_element[:result_maker].fetch(:filterables,[]).length > 0
@@ -173,51 +199,6 @@ module Gzr
           nil
         end
 
-        def sync_dashboard_element(new_element,existing_element,dashboard_id)
-          if (new_element&.fetch(:type) == 'text' && existing_element && existing_element[:type] != 'text')
-            say_warning "Deleting dashboard element #{existing_element.id} to recreate it" if @options[:debug]
-            delete_dashboard_element(existing_element.id)
-            existing_element = nil
-          end
-
-          if new_element && !existing_element then
-            element = new_element.select do |k,v|
-              (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id]).include? k
-            end
-            (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
-            say_warning "Creating dashboard element #{element.inspect}" if @options[:debug]
-            element[:dashboard_id] = dashboard_id
-            result_maker = copy_result_maker_filterables(new_element)
-            element[:result_maker] = result_maker if result_maker
-            return [new_element[:id], create_dashboard_element(element).id]
-          end
-          if existing_element && new_element then
-            element = keys_to_keep('update_dashboard_element').collect do |e|
-              [e,nil]
-            end.to_h
-
-            element[:dashboard_id] = dashboard_id
-
-            element.merge!( new_element.select do |k,v|
-              (keys_to_keep('update_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id]).include? k
-            end
-            )
-            (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
-            if existing_element[:result_maker] && !new_element[:result_maker]
-              element[:result_maker] = nil
-            elsif new_element[:result_maker]
-              result_maker = copy_result_maker_filterables(new_element)
-              element[:result_maker] = result_maker if result_maker
-            end
-
-            say_warning "Updating dashboard element #{existing_element.id}" if @options[:debug]
-            return [new_element[:id], update_dashboard_element(existing_element.id,element).id]
-          end
-          say_warning "Deleting dashboard element #{existing_element.id}" if @options[:debug]
-          delete_dashboard_element(existing_element.id)
-          return [nil,existing_element.id]
-        end
-
         def process_dashboard_element(dash_elem)
           return [nil, upsert_look(@me.id, create_fetch_query(dash_elem[:look][:query]).id, @dest_space_id, dash_elem[:look]).id, nil] if dash_elem[:look]
 
@@ -230,56 +211,6 @@ module Gzr
           [nil,nil,nil]
         end
 
-        def sync_dashboard_layout(dashboard_id,new_layout,existing_layout)
-          layout_obj = nil
-          if new_layout && !existing_layout then
-            layout = new_layout.select do |k,v|
-              (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
-            end
-            layout[:dashboard_id] = dashboard_id
-            say_warning "Creating dashboard layout #{layout}" if @options[:debug]
-            layout_obj = create_dashboard_layout(layout)
-          end
-          if new_layout && existing_layout then
-            layout = new_layout.select do |k,v|
-              (keys_to_keep('update_dashboard_layout') - [:dashboard_id]).include? k
-            end
-            say_warning "Updating dashboard layout #{existing_layout.id}" if @options[:debug]
-            layout_obj = update_dashboard_layout(existing_layout.id,layout)
-          end
-          if !new_layout && existing_layout then
-            say_warning "Deleting dashboard layout #{existing_layout.id}" if @options[:debug]
-            delete_dashboard_layout(existing_layout.id)
-          end
-
-          return unless layout_obj
-
-          #say_warning "new_layout[:active] is #{new_layout&.fetch(:active)} for #{layout_obj.id}"
-          #if layout_obj && new_layout&.fetch(:active,false)
-          #  say_warning "Setting layout #{layout_obj.id} active"
-          #  update_dashboard_layout(layout_obj.id, { :active => true })
-          #end
-
-          layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
-          return layout_components unless block_given?
-
-          layout_components.each { |s,t| yield(s,t) }
-        end
-
-        def sync_dashboard_layout_component(source, target, elem_table)
-          component = keys_to_keep('update_dashboard_layout_component').collect do |e|
-            [e,nil]
-          end.to_h
-          component[:dashboard_layout_id] = target.dashboard_layout_id
-
-          component.merge!(source.select do |k,v|
-            (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id]).include? k
-          end)
-
-          component[:dashboard_element_id] = elem_table.assoc(source[:dashboard_element_id])[1]
-          say_warning "Updating dashboard layout component #{target.id}" if @options[:debug]
-          update_dashboard_layout_component(target.id,component)
-        end
       end
     end
   end

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

@@ -42,10 +42,16 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            data = query_look(@look_id)
-            data[:scheduled_plans] = query_scheduled_plans_for_look(@look_id,"all") if @options[:plans]
-            write_file(@options[:dir] ? "Look_#{data.id}_#{data.title}.json" : nil, @options[:dir],nil, output) do |f|
-              f.puts JSON.pretty_generate(data.to_attrs)
+            data = query_look(@look_id).to_attrs
+            find_vis_config_reference(data) do |vis_config|
+              find_color_palette_reference(vis_config) do |o,default_colors|
+                rewrite_color_palette!(o,default_colors)
+              end
+            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|
+              f.puts JSON.pretty_generate(data)
             end
           end
         end

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

@@ -47,7 +47,7 @@ module Gzr
           with_session do
 
             @me ||= query_me("id")
-            
+
             read_file(@file) do |data|
               look = upsert_look(@me.id,create_fetch_query(data[:query]).id,@dest_space_id,data,output: output)
               upsert_plans_for_look(look.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]

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

@@ -84,33 +84,48 @@ module Gzr
         end
 
         def process_space(space_id, base, rel_path = nil)
-          space = query_space(space_id)
-          name = space.name
+          space = query_space(space_id).to_attrs
+          name = space[:name]
           name = "nil (#{space_id})" if name.nil?
           path = Pathname.new(name.gsub('/',"\u{2215}"))
           path = rel_path + path if rel_path
 
-          write_file("Space_#{space.id}_#{name}.json", base, path) do |f|
-            f.write JSON.pretty_generate(space.to_attrs.reject do |k,v|
+          write_file("Space_#{space[:id]}_#{name}.json", base, path) do |f|
+            f.write JSON.pretty_generate(space.reject do |k,v|
               [:looks, :dashboards].include?(k)
             end)
           end
-          space.looks.each do |l|
-            look = query_look(l.id)
-            write_file("Look_#{look.id}_#{look.title}.json", base, path) do |f|
-              f.write JSON.pretty_generate(look.to_attrs) 
+          space[:looks].each do |l|
+            look = query_look(l[:id]).to_attrs
+            find_vis_config_reference(look) do |vis_config|
+              find_color_palette_reference(vis_config) do |o,default_colors|
+                rewrite_color_palette!(o,default_colors)
+              end
+            end
+            write_file("Look_#{look[:id]}_#{look[:title]}.json", base, path) do |f|
+              f.write JSON.pretty_generate(look)
             end
           end
-          space.dashboards.each do |d|
-            data = query_dashboard(d.id).to_attrs()
+          space[:dashboards].each do |d|
+            data = query_dashboard(d[:id]).to_attrs()
             data[:dashboard_elements].each_index do |i|
               element = data[:dashboard_elements][i]
-              if element[:merge_result_id]
-                merge_result = merge_query(element[:merge_result_id]).to_attrs()
+              find_vis_config_reference(element) do |vis_config|
+                find_color_palette_reference(vis_config) do |o,default_colors|
+                  rewrite_color_palette!(o,default_colors)
+                end
+              end
+              merge_result = merge_query(element[:merge_result_id])&.to_attrs() if element[:merge_result_id]
+              if merge_result
                 merge_result[:source_queries].each_index do |j|
                   source_query = merge_result[:source_queries][j]
                   merge_result[:source_queries][j][:query] = query(source_query[:query_id]).to_attrs()
                 end
+                find_vis_config_reference(merge_result) do |vis_config|
+                  find_color_palette_reference(vis_config) do |o,default_colors|
+                    rewrite_color_palette!(o,default_colors)
+                  end
+                end
                 data[:dashboard_elements][i][:merge_result] = merge_result
               end
             end
@@ -120,7 +135,7 @@ module Gzr
           end
           space_children = query_space_children(space_id)
           space_children.each do |child_space|
-            process_space(child_space.id, base, path)
+            process_space(child_space[:id], base, path)
           end
         end
       end

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

@@ -36,6 +36,28 @@ module Gzr
           @options = options
         end
 
+        def flatten_data(raw_array)
+          rows = raw_array.map do |entry|
+            entry.select do |k,v|
+              !(v.kind_of?(Array) || v.kind_of?(Hash))
+            end
+          end
+          raw_array.map do |entry|
+            entry.select do |k,v|
+              v.kind_of? Array
+            end.each do |section,section_value|
+              section_value.each do |section_entry|
+                h = {}
+                section_entry.each_pair do |k,v|
+                  h[:"#{section}.#{k}"] = v
+                end
+                rows.push(h)
+              end
+            end
+          end
+          rows
+        end
+
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
@@ -45,40 +67,33 @@ module Gzr
               return nil
             end unless space_ids && space_ids.length > 0
 
+            @options[:fields] = 'dashboards(id,title)' if @filter_spec == 'lookml'
+            f = @options[:fields]
+
             data = space_ids.map do |space_id|
-              query_space(space_id, @options[:fields])
+              query_space(space_id, f).to_attrs
             end.compact
+            space_ids.each do |space_id|
+              query_space_children(space_id, 'id,name,parent_id').map {|child| child.to_attrs}.each do |child|
+                data.push child
+              end
+            end
+
 
             begin
               puts "No data returned for spaces #{space_ids.inspect}"
               return nil
             end unless data && data.length > 0
 
-            @options[:fields] = 'dashboards(id,title)' if @filter_spec == 'lookml'
             table_hash = Hash.new
             fields = field_names(@options[:fields])
-            table_hash[:header] = field_names(@options[:fields]) unless @options[:plain]
-            rows = []
-            data.each do |r|
-              h = r.to_attrs
-              if @filter_spec != 'lookml' then
-                rows << [h[:parent_id],h[:id],h[:name], nil, nil, nil, nil]
-                subspaces = query_space_children(h[:id], "id,name,parent_id")
-                rows += subspaces.map do |r|
-                  h1 = r.to_attrs
-                  [h1[:parent_id], h1[:id], h1[:name], nil, nil, nil, nil]
-                end
+            table_hash[:header] = fields unless @options[:plain]
+            table_hash[:rows] = flatten_data(data).map do |row|
+              fields.collect do |e|
+                row.fetch(e.to_sym,nil)
               end
-              h[:looks].each do |r|
-                rows << [h[:parent_id],h[:id],h[:name], r[:id], r[:title], nil, nil]
-              end if h[:looks]
-              h[:dashboards].each do |r|
-                rows << [h[:parent_id],h[:id],h[:name], nil, nil, r[:id], r[:title]] unless @filter_spec == 'lookml'
-                rows << [r[:id], r[:title]] if @filter_spec == 'lookml'
-              end if h[:dashboards]
             end
-            table_hash[:rows] = rows
-            table = TTY::Table.new(table_hash) if data[0]
+            table = TTY::Table.new(table_hash)
             alignments = fields.collect do |k|
               (k =~ /id\)*$/) ? :right : :left
             end

data/lib/gzr/modules/dashboard.rb

@@ -139,6 +139,17 @@ module Gzr
       data
     end
 
+    def get_dashboard_layout(id)
+      begin
+        data = @sdk.dashboard_layout(id)
+      rescue LookerSDK::Error => e
+        say_error "Error getting dashboard_layout(#{id})"
+        say_error e.message
+        raise
+      end
+      data
+    end
+
     def create_dashboard_layout(dash_layout)
       begin
         data = @sdk.create_dashboard_layout(dash_layout)

data/lib/gzr/modules/look.rb

@@ -136,34 +136,44 @@ module Gzr
         new_look = source.select do |k,v|
           (keys_to_keep('update_look') - [:space_id,:folder_id,:user_id,:query_id,:slug]).include? k
         end
-        new_look[:slug] = source[:slug] if source[:slug] && !slug_used 
-          new_look[:deleted] = false if existing_look[:deleted]
-          new_look[:query_id] = query_id
-          return update_look(existing_look.id,new_look)
-        else
-          new_look = source.select do |k,v|
-            (keys_to_keep('create_look') - [:space_id,:folder_id,:user_id,:query_id,:slug]).include? k
+        new_look[:slug] = source[:slug] if source[:slug] && !slug_used
+        new_look[:deleted] = false if existing_look[:deleted]
+        new_look[:query_id] = query_id
+        return update_look(existing_look.id,new_look)
+      else
+        new_look = source.select do |k,v|
+          (keys_to_keep('create_look') - [:space_id,:folder_id,:user_id,:query_id,:slug]).include? k
+        end
+        new_look[:slug] = source[:slug] unless slug_used
+        new_look[:query_id] = query_id
+        new_look[:user_id] = user_id
+        new_look[:space_id] = space_id
+
+        find_vis_config_reference(new_look) do |vis_config|
+          find_color_palette_reference(vis_config) do |o,default_colors|
+            update_color_palette!(o,default_colors)
           end
-          new_look[:slug] = source[:slug] unless slug_used
-          new_look[:query_id] = query_id
-          new_look[:user_id] = user_id
-          new_look[:space_id] = space_id
-
-          return create_look(new_look)
+        end
+        return create_look(new_look)
       end
     end
 
     def create_fetch_query(source_query)
       new_query = source_query.select do |k,v|
         (keys_to_keep('create_query') - [:client_id]).include? k
-      end 
+      end
+      find_vis_config_reference(new_query) do |vis_config|
+        find_color_palette_reference(vis_config) do |o,default_colors|
+          update_color_palette!(o,default_colors)
+        end
+      end
       return create_query(new_query)
     end
 
     def create_merge_result(merge_result)
       new_merge_result = merge_result.select do |k,v|
         (keys_to_keep('create_merge_query') - [:client_id,:source_queries]).include? k
-      end 
+      end
       new_merge_result[:source_queries] = merge_result[:source_queries].map do |query|
         new_query = {}
         new_query[:query_id] = create_fetch_query(query[:query]).id
@@ -171,6 +181,11 @@ module Gzr
         new_query[:merge_fields] = query[:merge_fields]
         new_query
       end
+      find_vis_config_reference(new_merge_result) do |vis_config|
+        find_color_palette_reference(vis_config) do |o,default_colors|
+          update_color_palette!(o,default_colors)
+        end
+      end
       return create_merge_query(new_merge_result)
     end
   end

data/lib/gzr/modules/session.rb

@@ -116,15 +116,15 @@ module Gzr
           http.headers[:accept] = 'application/json'
           http.headers[:user_agent] = conn_hash[:user_agent]
         end
-        
-        begin 
+
+        begin
           versions_response = agent.call(:get,"/versions")
           versions = versions_response.data.supported_versions
           current_version = versions_response.data.current_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
-          raise Gzr::CLI::Error, "Connection Failed.\nDid you specify the --no-ssl option for an ssl secured server?"
+          raise Gzr::CLI::Error, "Connection Failed.\nDid you specify the --no-ssl option for an ssl secured server?\nYou may need to use --port=443 in some cases as well."
         rescue LookerSDK::NotFound => nf
           say_warning "endpoint #{root}/versions was not found"
         end

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.36"
+  VERSION = "0.2.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.36
+  version: 0.2.41
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Command line tool to manage the content of a Looker instance.