gazer 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f1519e5c9690bd1028b3f899c281502a5d7746c
-  data.tar.gz: 673d9a3e988c95521fedf378ee276834d4d8345d
+  metadata.gz: c1e108603b48eccf755e49bb74db4f1d3a8095c0
+  data.tar.gz: c5df7d93f59e9231880904bfa1bcbce1400153e1
 SHA512:
-  metadata.gz: d4fd5dc05483d6cfd4e38bfb5cfa2b12b808db121ae8dc83855caeb29c40f58fbf232b94c7d26ed413864acde333224d540f33fb5100e3cba9ae56157c42a55f
-  data.tar.gz: fc06b562eecf5daf51072c253dba790459dab3aecf9531969a4993fdfc2ba688894d87ce4684f40f00abbe75a2eaf1ad9e92ff150a3cd5d4fd8e0d933bf2defb
+  metadata.gz: 2d22b564ba4fd7ef8f0f98b33fdb0b6d522a77448f7de44e01ec90631c378da4c1f8dedc8df7b509e8bf07fde139ed9470b82be37f14886da9f7f392c4541ae2
+  data.tar.gz: b9d39d2ce886949c42f5681c23fe795fdce14c211aad94fb3e5ed34f95458eab4a475dfb5082e0725137e17aa77df3ad3775ac0324f28f8332aaae5d4753571d

data/Gemfile.lock

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

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

@@ -46,14 +46,14 @@ module Gzr
         end
 
         def execute(input: $stdin, output: $stdout)
-          say_warning("options: #{@options.inspect}") if @options[:debug]
+          say_warning("options: #{@options.inspect}", output) if @options[:debug]
           with_session("3.1") do
 
             @me ||= query_me("id")
 
             read_file(@file) do |data|
 
-              dashboard = sync_dashboard(data,@dest_space_id)
+              dashboard = sync_dashboard(data,@dest_space_id, output: output)
 
               source_filters = data[:dashboard_filters].sort { |a,b| a[:row] <=> b[:row] }
               existing_filters = dashboard.dashboard_filters.sort { |a,b| a.row <=> b.row }
@@ -67,7 +67,7 @@ module Gzr
                 end
               end
               pairs(source_filters,existing_filters,dashboard.id) do |source,target,id|
-                say_warning "Synching dashboard filter for dashboard #{id}" if @options[:debug]
+                say_warning("Synching dashboard filter for dashboard #{id}", output: output) if @options[:debug]
                 sync_dashboard_filter(source,target,id)
               end
 
@@ -89,11 +89,11 @@ module Gzr
           end
         end
 
-        def sync_dashboard(source,target_space_id)
+        def sync_dashboard(source, target_space_id, output: $stdout)
           # try to find dashboard by slug in target space
           existing_dashboard = search_dashboards_by_slug(source[:slug], target_space_id).fetch(0,nil) if source[:slug]
           # check for dash of same title in target space
-          title_used = search_dashboards_by_title(source[:title], target_space_id).fetch(0,nil)
+          title_used = search_dashboards_by_title(source[:title], target_space_id).select {|d| !d[:deleted] }.fetch(0,nil)
 
           # If there is no match by slug in target space or no slug given, then we match by title
           existing_dashboard ||= title_used
@@ -110,24 +110,24 @@ module Gzr
           same_slug = (slug_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
 
           if slug_used && !same_slug then
-            say_warning "slug #{slug_used.slug} already used for dashboard #{slug_used.title} in space #{slug_used.space_id}"
-            say_warning "dashboard will be imported with new slug"
+            say_warning "slug #{slug_used.slug} already used for dashboard #{slug_used.title} in space #{slug_used.space_id}", output: output
+            say_warning("That dashboard is in the 'Trash' but not fully deleted yet", output: output) if slug_used.deleted
+            say_warning "dashboard will be imported with new slug", output: output
           end
 
           if existing_dashboard then
             if title_used && !same_title then
               raise Gzr::CLI::Error, "Dashboard #{source[:title]} already exists in space #{target_space_id}\nDelete it before trying to upate another dashboard to have that title."
             end
-            if @options[:force] then
-              say_ok "Modifying existing dashboard #{existing_dashboard.id} #{existing_dashboard[:title]} in space #{target_space_id}"
-              new_dash = source.select do |k,v|
-                (keys_to_keep('update_dashboard') - [:space_id,:user_id,:slug]).include? k
-              end
-              new_dash[:slug] = source[:slug] unless slug_used && !same_slug
-              return update_dashboard(existing_dashboard.id,new_dash)
-            else
-              raise Gzr::CLI::Error, "Dashboard #{existing_dashboard[:title]} with slug #{existing_dashboard[:slug]} already exists in space #{target_space_id}\nUse --force if you want to overwrite it"
+            raise Gzr::CLI::Error, "Dashboard #{existing_dashboard[:title]} with slug #{existing_dashboard[:slug]} already exists in space #{target_space_id}\nUse --force if you want to overwrite it" unless @options[:force]
+
+            say_ok "Modifying existing dashboard #{existing_dashboard.id} #{existing_dashboard[:title]} in space #{target_space_id}", output: output
+            new_dash = source.select do |k,v|
+              (keys_to_keep('update_dashboard') - [:space_id,:user_id,:slug]).include? k
             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)
           else
             new_dash = source.select do |k,v|
               (keys_to_keep('create_dashboard') - [:space_id,:user_id,:slug]).include? k

data/lib/gzr/modules/dashboard.rb

@@ -50,11 +50,13 @@ module Gzr
     end
 
     def search_dashboards_by_slug(slug, space_id=nil)
-      data = nil
+      data = []
       begin
         req = { :slug => slug }
         req[:space_id] = space_id if space_id 
         data = @sdk.search_dashboards(req)
+        req[:deleted] = true
+        data = @sdk.search_dashboards(req) if data.empty?
       rescue LookerSDK::Error => e
         say_error "Error search_dashboards_by_slug(#{JSON.pretty_generate(req)})"
         say_error e.message
@@ -64,11 +66,13 @@ module Gzr
     end
 
     def search_dashboards_by_title(title, space_id=nil)
-      data = nil
+      data = []
       begin
         req = { :title => title }
         req[:space_id] = space_id if space_id 
         data = @sdk.search_dashboards(req)
+        req[:deleted] = true
+        data = @sdk.search_dashboards(req) if data.empty?
       rescue LookerSDK::Error => e
         say_error "Error search_dashboards_by_title(#{JSON.pretty_generate(req)})"
         say_error e.message

data/lib/gzr/modules/session.rb

@@ -33,16 +33,16 @@ module Gzr
       @pastel ||= Pastel.new
     end
 
-    def say_ok(data)
-      puts pastel.green data
+    def say_ok(data, output: $stdout)
+      output.puts pastel.green data
     end
 
-    def say_warning(data)
-      puts pastel.yellow data
+    def say_warning(data, output: $stdout)
+      output.puts pastel.yellow data
     end
 
-    def say_error(data)
-      puts pastel.red data
+    def say_error(data, output: $stdout)
+      output.puts pastel.red data
     end
 
     def v3_1_available?

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.15"
+  VERSION = "0.2.16"
 end

metadata

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