gazer 0.2.50 → 0.2.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da210ff2b931857f775aaa89fe7572f70ba08f31125bad7779c4367f2a6c643
-  data.tar.gz: e3175810d85edcd23c4203b4600438d6c5d84b925ebec7719e9b497a06718839
+  metadata.gz: b5f44f5af050d76e652c008b4cd8210240522688232a8f747601ad8dd59032b7
+  data.tar.gz: 3f0a76d313a7c640a85f77212af8639f44d39b392604509185847a6e4a3899d7
 SHA512:
-  metadata.gz: b57eb343d41c877e377b854148f1e10cacdc6cafd1ff55023ce72423854afe56de03f7034ddb5b1c5365155b265b0d99274f84586e6c3e5ce55540f86625678c
-  data.tar.gz: d12674f4722279b9a61c50e5324bdd67742f04e9fd4991e5a1f68e180b393f8797555486ae2512cc21bc4aacc71c40931ce5dc3af7904ce511579e29ae6a7c6f
+  metadata.gz: 6e49f6a5f997b55e16e090ab10dd372e0c3ff620d82a13a24379ca8fcb411486cc93e5272883c7f545e0fe544813cd02194f603f405da0b69fac92064b94560e
+  data.tar.gz: a0fa72d8e16b6c4d318814d96aade1434b924b73c6caebfa01f046190fe0fc93ed68f37737d07f2308367c1514d65b352ed0ccb8e92c7b986e1ff43654e9a6f9

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+### [0.2.53](https://www.github.com/looker-open-source/gzr/compare/v0.2.52...v0.2.53) (2021-12-14)
+
+
+### Bug Fixes
+
+* fix version ([#121](https://www.github.com/looker-open-source/gzr/issues/121)) ([f9b0b22](https://www.github.com/looker-open-source/gzr/commit/f9b0b2237eb3c520aabc2f1ff5a63ddf6c934ce4))
+
+### [0.2.52](https://www.github.com/looker-open-source/gzr/compare/v0.2.51...v0.2.52) (2021-12-14)
+
+
+### Bug Fixes
+
+* version number ([#119](https://www.github.com/looker-open-source/gzr/issues/119)) ([b55a892](https://www.github.com/looker-open-source/gzr/commit/b55a892d8d040ce4547924d613a590877e129322))
+
+### [0.2.51](https://www.github.com/looker-open-source/gzr/compare/v0.2.50...v0.2.51) (2021-12-14)
+
+
+### Bug Fixes
+
+* detect if dashboard import gets a look file and vice versa, warn on importing a deleted dashboard or look ([#116](https://www.github.com/looker-open-source/gzr/issues/116)) ([a12dc25](https://www.github.com/looker-open-source/gzr/commit/a12dc2525bed55816b368306f2d05a24dc07aaf4))
+* Gemfile.lock was out of date ([a4e49c3](https://www.github.com/looker-open-source/gzr/commit/a4e49c3972772e0629a8f1589172ddd136ee7e21))
+* refactored look and dashboard cat commands and space export to use the same code to generate each look and dashboard file. ([#114](https://www.github.com/looker-open-source/gzr/issues/114)) ([8dadd50](https://www.github.com/looker-open-source/gzr/commit/8dadd500376e2b971c38dbcd69f507268a3e6b9e))
+* remove Thor deprecation warning ([#115](https://www.github.com/looker-open-source/gzr/issues/115)) ([1100c5a](https://www.github.com/looker-open-source/gzr/commit/1100c5a24b0626c01c6248d87172c7ab624bf42f))
+
 ### [0.2.50](https://www.github.com/looker-open-source/gzr/compare/v0.2.49...v0.2.50) (2021-11-19)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.50)
+    gazer (0.2.53)
       looker-sdk (~> 0.1.1)
       net-http-persistent (~> 4.0, >= 4.0.1)
       netrc (~> 0.11.0)
@@ -38,7 +38,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    looker-sdk (0.1.1)
+    looker-sdk (0.1.2)
       faraday (>= 1.2, < 2.0)
       sawyer (~> 0.8)
     multipart-post (2.1.1)

data/lib/gzr/cli.rb

@@ -29,6 +29,10 @@ module Gzr
   #
   # @api public
   class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
     class_option :debug, type: :boolean, default: false, desc: 'Run in debug mode'
     class_option :host, type: :string, default: 'localhost', desc: 'Looker Host'
     class_option :port, type: :string, default: '19999', desc: 'Looker API Port'

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

@@ -43,29 +43,7 @@ module Gzr
         def execute(*args, input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session("3.1") do
-            data = query_dashboard(@dashboard_id).to_attrs
-            data[:dashboard_elements].each_index do |i|
-              element = data[:dashboard_elements][i]
-              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
-            data[:scheduled_plans] = query_scheduled_plans_for_dashboard(@dashboard_id,"all").to_attrs if @options[:plans]
+            data = cat_dashboard(@dashboard_id)
 
             replacements = {}
             if @options[:transform]

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

@@ -53,8 +53,17 @@ module Gzr
 
             read_file(@file) do |data|
 
-              dashboard = sync_dashboard(data,@dest_space_id, output: output)
+              if data[:deleted]
+                say_warning("Attempt to import a deleted dashboard!")
+                say_warning("This may result in errors.")
+              end
 
+              if !data[:dashboard_elements]
+                say_error("File contains no dashboard_elements! Is this a look?")
+                raise Gzr::CLI::Error, "import file is not a valid dashboard"
+              end
+
+              dashboard = sync_dashboard(data,@dest_space_id, output: output)
 
               dashboard[:dashboard_filters] ||= []
               source_filters = data[:dashboard_filters].sort { |a,b| a[:row] <=> b[:row] }

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

@@ -42,14 +42,7 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            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]
+            data = cat_look(@look_id)
             file_name = if @options[:dir]
                           @options[:simple_filename] ? "Look_#{data[:id]}.json" : "Look_#{data[:id]}_#{data[:title]}.json"
                         else

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

@@ -49,6 +49,17 @@ module Gzr
             @me ||= query_me("id")
 
             read_file(@file) do |data|
+
+              if data[:deleted]
+                say_warning("Attempt to import a deleted look!")
+                say_warning("This may result in errors.")
+              end
+
+              if data[:dashboard_elements]
+                say_error("File contains dashboard_elements! Is this a dashboard?")
+                raise Gzr::CLI::Error, "import file is not a valid look"
+              end
+
               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]
               output.puts "Imported look #{look.id}" unless @options[:plain] 

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

@@ -25,6 +25,7 @@ require_relative '../../command'
 require_relative '../../modules/space'
 require_relative '../../modules/look'
 require_relative '../../modules/dashboard'
+require_relative '../../modules/plan'
 require_relative '../../modules/filehelper'
 require 'pathname'
 require 'stringio'
@@ -37,6 +38,7 @@ module Gzr
         include Gzr::Space
         include Gzr::Look
         include Gzr::Dashboard
+        include Gzr::Plan
         include Gzr::FileHelper
         def initialize(space_id, options)
           super()
@@ -96,39 +98,13 @@ module Gzr
             end)
           end
           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
+            look = cat_look(l[:id])
             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()
-            data[:dashboard_elements].each_index do |i|
-              element = data[:dashboard_elements][i]
-              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
+            data = cat_dashboard(d[:id])
             write_file("Dashboard_#{data[:id]}_#{data[:title]}.json", base, path) do |f|
               f.write JSON.pretty_generate(data)
             end

data/lib/gzr/commands/space.rb

@@ -64,6 +64,8 @@ module Gzr
       desc 'export SPACE_ID', 'Export a space, including all child looks, dashboards, and spaces.'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
+      method_option :plans,  type: :boolean,
+                           desc: 'Include scheduled plans'
       method_option :dir, type: :string, default: '.',
                            desc: 'Directory to store output tree'
       method_option :tar, type: :string,

data/lib/gzr/modules/dashboard.rb

@@ -226,5 +226,32 @@ module Gzr
       end
       data
     end
+
+    def cat_dashboard(dashboard_id)
+      data = query_dashboard(dashboard_id).to_attrs
+      data[:dashboard_elements].each_index do |i|
+        element = data[:dashboard_elements][i]
+        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
+      data[:scheduled_plans] = query_scheduled_plans_for_dashboard(@dashboard_id,"all")&.to_attrs if @options[:plans]
+      data
+    end
   end
 end

data/lib/gzr/modules/look.rb

@@ -188,5 +188,17 @@ module Gzr
       end
       return create_merge_query(new_merge_result)
     end
+
+    def cat_look(look_id)
+      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]
+      data
+    end
   end
 end

data/lib/gzr/modules/plan.rb

@@ -49,6 +49,9 @@ module Gzr
       data = nil
       begin
         data = @sdk.scheduled_plans_for_look(look_id,req)
+        return nil if data.respond_to?(:message) && data.message == 'Not found'
+      rescue LookerSDK::NotFound
+        return nil
       rescue LookerSDK::ClientError => e
         say_error "Unable to get scheduled_plans_for_look(#{look_id},#{JSON.pretty_generate(req)})"
         say_error e.message
@@ -65,6 +68,9 @@ module Gzr
       data = nil
       begin
         data = @sdk.scheduled_plans_for_dashboard(dashboard_id,req)
+        return nil if data.respond_to?(:message) && data.message == 'Not found'
+      rescue LookerSDK::NotFound
+        return nil
       rescue LookerSDK::ClientError => e
         say_error "Unable to get scheduled_plans_for_dashboard(#{dashboard_id},#{JSON.pretty_generate(req)})"
         say_error e.message

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.50"
+  VERSION = '0.2.53'.freeze
 end

metadata

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