gazer 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeaa05d460f0e4a1d8f78f6627a54f679e6c4a80
-  data.tar.gz: 154addb6106b2cb5fa81048478e35a2798e97488
+  metadata.gz: 4f1519e5c9690bd1028b3f899c281502a5d7746c
+  data.tar.gz: 673d9a3e988c95521fedf378ee276834d4d8345d
 SHA512:
-  metadata.gz: da4ae7a8d0636c30ee76ab4a5caee34b6843f4e7a77390f394307d7823d1962e994ec3915944d22e2480df1faf3111a1014324d2d60706cccaff78c66b30dc24
-  data.tar.gz: 5b2f42b86876a1a37f9186284d652d5d13667948b70f7c5e75024b9a782c1cbe146c305264292f81ad587e63c67cafaba098fc6ccfba95aad7d6258f68ac6b04
+  metadata.gz: d4fd5dc05483d6cfd4e38bfb5cfa2b12b808db121ae8dc83855caeb29c40f58fbf232b94c7d26ed413864acde333224d540f33fb5100e3cba9ae56157c42a55f
+  data.tar.gz: fc06b562eecf5daf51072c253dba790459dab3aecf9531969a4993fdfc2ba688894d87ce4684f40f00abbe75a2eaf1ad9e92ff150a3cd5d4fd8e0d933bf2defb

data/Gemfile.lock

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

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

@@ -90,24 +90,32 @@ module Gzr
         end
 
         def sync_dashboard(source,target_space_id)
-          slug_used = search_dashboards_by_slug(source[:slug]).fetch(0,nil) if source[:slug]
-          title_used = search_dashboards_by_title(source[:title], target_space_id).fetch(0,nil)
+          # 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]
-          if existing_dashboard then
-            title_used = false if title_used && title_used.id == existing_dashboard.id
-          else
-            existing_dashboard = title_used
-            title_used = false
-          end
-          slug_used = false if existing_dashboard && slug_used && slug_used.id == existing_dashboard.id
+          # check for dash of same title in target space
+          title_used = search_dashboards_by_title(source[:title], target_space_id).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
+
+          # same_title is now a flag indicating that there is already a dash in the same space with
+          # that title, and it is the one we are updating.
+          same_title = (title_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
+
+          # check if the slug is used by any dashboard
+          slug_used = search_dashboards_by_slug(source[:slug]).fetch(0,nil) if source[:slug]
+
+          # same_slug is now a flag indicating that there is already a dash with
+          # that slug, but it is the one we are updating.
+          same_slug = (slug_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
 
-          if slug_used then
+          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"
           end
 
           if existing_dashboard then
-            if title_used 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
@@ -115,10 +123,10 @@ module Gzr
               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[:slug] = source[:slug] unless slug_used && !same_slug
               return update_dashboard(existing_dashboard.id,new_dash)
             else
-              raise Gzr::CLI::Error, "Dashboard #{source[:title]} 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"
             end
           else
             new_dash = source.select do |k,v|

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.14"
+  VERSION = "0.2.15"
 end

metadata

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