gazer 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e108603b48eccf755e49bb74db4f1d3a8095c0
-  data.tar.gz: c5df7d93f59e9231880904bfa1bcbce1400153e1
+  metadata.gz: 87c9fc855fb39c5b2db03afb3495706a6acbc341
+  data.tar.gz: 924bf3c6fd99783bd6d94960c9aac2a0404e6c36
 SHA512:
-  metadata.gz: 2d22b564ba4fd7ef8f0f98b33fdb0b6d522a77448f7de44e01ec90631c378da4c1f8dedc8df7b509e8bf07fde139ed9470b82be37f14886da9f7f392c4541ae2
-  data.tar.gz: b9d39d2ce886949c42f5681c23fe795fdce14c211aad94fb3e5ed34f95458eab4a475dfb5082e0725137e17aa77df3ad3775ac0324f28f8332aaae5d4753571d
+  metadata.gz: fe576cfebc5fa0f91339c07934818239899d214cb0c738fa3ff403a09129c2d97eb27fa8f5d7ba53d5caa9ba93f8a10f75b09f4490b0418589fa8d2dfeb3146e
+  data.tar.gz: 6bd4af2afb618333b1cd5ecff92bb4d4acd03289bcf26aac5f323a98c632e1cafbbc48baa7f8ff70cdbc6d562e5ef57898a56188623192ba01284a1589ff625e

data/Gemfile.lock

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

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

@@ -123,14 +123,14 @@ module Gzr
 
             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
+              (keys_to_keep('update_dashboard') - [:space_id,:folder_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
+              (keys_to_keep('create_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
             end
             new_dash[:slug] = source[:slug] unless slug_used
             new_dash[:space_id] = target_space_id

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

@@ -49,7 +49,7 @@ module Gzr
             @me ||= query_me("id")
             
             read_file(@file) do |data|
-              look = upsert_look(@me.id,create_fetch_query(data[:query]).id,@dest_space_id,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]
               output.puts "Imported look #{look.id}" unless @options[:plain] 
               output.puts look.id if @options[:plain] 

data/lib/gzr/modules/look.rb

@@ -36,11 +36,13 @@ module Gzr
     end
 
     def search_looks_by_slug(slug, space_id=nil)
-      data = nil
+      data = []
       begin
         req = { :slug => slug }
         req[:space_id] = space_id if space_id 
         data = @sdk.search_looks(req)
+        req[:deleted] = true
+        data = @sdk.search_looks(req) if data.empty?
       rescue LookerSDK::Error => e
         say_error "Error search_looks_by_slug(#{JSON.pretty_generate(req)})"
         say_error e.message
@@ -50,11 +52,13 @@ module Gzr
     end
 
     def search_looks_by_title(title, space_id=nil)
-      data = nil
+      data = []
       begin
         req = { :title => title }
         req[:space_id] = space_id if space_id 
         data = @sdk.search_looks(req)
+        req[:deleted] = true
+        data = @sdk.search_looks(req) if data.empty?
       rescue LookerSDK::Error => e
         say_error "Error search_looks_by_title(#{JSON.pretty_generate(req)})"
         say_error e.message
@@ -97,44 +101,55 @@ module Gzr
       data
     end
 
-    def upsert_look(user_id, query_id, space_id, source_look)
-      existing_look = search_looks_by_title(source_look[:title], space_id).fetch(0,nil)
-      slug_used = search_looks_by_slug(source_look[:slug]).fetch(0,nil) if source_look[:slug]
+    def upsert_look(user_id, query_id, space_id, source, output: $stdout)
+      # try to find look by slug in target space
+      existing_look = search_looks_by_slug(source[:slug], space_id).fetch(0,nil) if source[:slug]
+      # check for look of same title in target space
+      title_used = search_looks_by_title(source[:title], space_id).fetch(0,nil)
 
-      if slug_used then
-        if existing_look then
-          if !(existing_look.space_id == slug_used.space_id && existing_look.title == slug_used.title) then
-            say_warning "slug #{slug_used.slug} already used for look #{slug_used.title} in space #{slug_used.space_id}"
-            say_warning "look will be imported with new slug"
-          end
-        else
-          say_warning "slug #{slug_used.slug} already used for look #{slug_used.title} in space #{slug_used.space_id}"
-          say_warning "look will be imported with new slug"
-        end
+      # If there is no match by slug in target space or no slug given, then we match by title
+      existing_look ||= title_used
+
+      # same_title is now a flag indicating that there is already a look in the same space with
+      # that title, and it is the one we are updating.
+      same_title = (title_used&.fetch(:id,nil) == existing_look&.fetch(:id,nil))
+
+      # check if the slug is used by any look
+      slug_used = search_looks_by_slug(source[:slug]).fetch(0,nil) if source[:slug]
+
+      # same_slug is now a flag indicating that there is already a look with
+      # that slug, but it is the one we are updating.
+      same_slug = (slug_used&.fetch(:id,nil) == existing_look&.fetch(:id,nil))
+
+      if slug_used && !same_slug then
+        say_warning "slug #{slug_used.slug} already used for look #{slug_used.title} in space #{slug_used.space_id}", output: output
+        say_warning("That look is in the 'Trash' but not fully deleted yet", output: output) if slug_used.deleted
+        say_warning "look will be imported with new slug", output: output
       end
 
       if existing_look then
-        if @options[:force] then
-          say_ok "Modifying existing Look #{source_look[:title]} in space #{space_id}"
-          new_look = source_look.select do |k,v|
-            (keys_to_keep('update_look') - [:space_id,:user_id,:query_id,:slug]).include? k
-          end
-          new_look[:slug] = source_look[:slug] unless slug_used
+        if title_used && !same_title then
+          raise Gzr::CLI::Error, "Look #{source[:title]} already exists in space #{space_id}\nDelete it before trying to upate another Look to have that title."
+        end
+        raise Gzr::CLI::Error, "Look #{existing_look[:title]} with slug #{existing_look[:slug]} already exists in space #{space_id}\nUse --force if you want to overwrite it" unless @options[:force]
+        say_ok "Modifying existing Look #{existing_look.id} #{existing_look.title} in space #{space_id}", output: output
+        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
-          raise Gzr::CLI::Error, "Look #{source_look[:title]} already exists in space #{space_id}\nUse --force if you want to overwrite it"
-        end
-      else
-        new_look = source_look.select do |k,v|
-          (keys_to_keep('create_look') - [:space_id,:user_id,:query_id,:slug]).include? k
-        end
-        new_look[:slug] = source_look[:slug] unless slug_used
-        new_look[:query_id] = query_id
-        new_look[:user_id] = user_id
-        new_look[:space_id] = space_id
+          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
 
-        return create_look(new_look)
+          return create_look(new_look)
       end
     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.16"
+  VERSION = "0.2.17"
 end

metadata

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