doggy 2.0.25 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f8434387b7dd0a3e6cf04e576978b44d820cd84
-  data.tar.gz: ac0362cc3d9a5b9e95374e5854801f4eca0b7892
+  metadata.gz: 34c9e3abbc694a088709003978294cc500338c8e
+  data.tar.gz: 1cc97bcb81bb1198f1bd936d1080a9ee0307b7bd
 SHA512:
-  metadata.gz: bed0338d823b01bd8e203235d1f03c46a5ff7544bda7381d049e49bc556566538b81f66c1f6a3854f476cac09b12c3679242137529dfdc685db9c1b362bcad31
-  data.tar.gz: aae169f9e3cc7a61851631dcb21fefe16cb48651300ed6c67fd781f3be255afea8c542aea63e75950655b73ee8d1c553c03d54cd78bea48c78f8a7939c388e6d
+  metadata.gz: bb54356ef11e5bc7f23cdf192f06870546390725959898294fb1d70b4a5315764ad311fb5e42467192722033de2e6b48583815f17c49993812ee479e7eb07cca
+  data.tar.gz: 54c8b8957a0590a66bfbd365fd00477a012032658f59e4bd069a310354312fbc626b194806519d37360f5326e5d9fd5518012a1752dad5e10fd993c224449aea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.25)
+    doggy (2.0.26)
       json (~> 1.8.3)
       parallel (~> 1.6.1)
       rugged (~> 0.23.2)

data/lib/doggy/cli/pull.rb

@@ -28,17 +28,32 @@ module Doggy
   private
 
     def pull_by_id(id)
-      local_resource = @local_resources.find { |l| l.id == id }
-      if !local_resource
-        remote_resource = [Models::Dashboard, Models::Monitor, Models::Screen].map do |klass|
-          klass.find(id)
-        end.compact.first
+      local_resources = @local_resources.find_all { |l| l.id == id }
 
-        remote_resource.save_local
+      remote_resources = [Models::Dashboard, Models::Monitor, Models::Screen].map do |klass|
+        klass.find(id)
+      end.compact
+
+      if local_resources.size != remote_resources.size
+        normalized_remote_resources = remote_resources.map { |remote_resource| [ remote_resource.class.name, remote_resource.id ] }
+        normalized_local_resources = local_resources.map { |local_resource| [ local_resource.class.name, local_resource.id ] }
+        normalized_resource_diff = Hash[normalized_remote_resources - normalized_local_resources]
+
+        # Here we traverse `remote_resources` to find remote resource with matching class name and id.
+        # We cannot subtract `local_resources` from `remote_resources` because those are different kind of objects.
+        remote_resources_to_be_saved = normalized_resource_diff.map do |klass, id|
+          remote_resources.find do |rr|
+            rr.class.name == klass && rr.id == id
+          end
+        end
+
+        remote_resources_to_be_saved.each(&:save_local)
       else
-        remote_resource = local_resource.class.find(local_resource.id)
-        remote_resource.path = local_resource.path
-        remote_resource.save_local
+        local_resources.each do |local_resource|
+          remote_resource = local_resource.class.find(local_resource.id)
+          remote_resource.path = local_resource.path
+          remote_resource.save_local
+        end
       end
     end
 

data/lib/doggy/model.rb

@@ -173,7 +173,13 @@ module Doggy
     end
 
     def save_local
-      @path ||= Doggy.object_root.join("#{ id }.json")
+      prefix = case self.class.name
+        when 'Doggy::Models::Dashboard' then 'dash'
+        when 'Doggy::Models::Monitor' then 'monitor'
+        when 'Doggy::Models::Screen' then 'screen'
+        end
+
+      @path ||= Doggy.object_root.join("#{prefix}-#{id}.json")
       File.open(@path, 'w') { |f| f.write(JSON.pretty_generate(to_h)) }
     end
 

data/lib/doggy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Doggy
-  VERSION = "2.0.25"
+  VERSION = "2.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.26
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.5
 signing_key: 
 specification_version: 4
 summary: Syncs DataDog dashboards, alerts, screenboards, and monitors.