doggy 2.0.27 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29ecf585930ccdb1f334709b051986e2ca043d0
-  data.tar.gz: 8d12fb7333a8fc3055180a643ad8ef67f3a56945
+  metadata.gz: bfcc017d59badc8a0675e416fa434442b398c9a5
+  data.tar.gz: a12619e920d86487a3f4f9c0cd34965887a4f287
 SHA512:
-  metadata.gz: f46164a13a4faf7a9d27480d23c10fd511325cfb49b97609c9f3918f591cdaabfbc9213c4f33b782f232a337ce07ce5799892ff948b866fe64505f06819d1932
-  data.tar.gz: 73d475bf401c14a6e0577d503432a7bda868c875364c8ef566bf1ed882192709253de26eb1724ae78f7a86e44d4635a774f37692a5a8cfbedce2528e4ad35492
+  metadata.gz: 0af17fe252387b340ed14e4af39d3d55b2cb0daba4ea459e253625a77f1fab39208a953934077e7d4ec09c775be1c36a233927dbf74e865b6af7fbff1689856a
+  data.tar.gz: 4a101b17faf5d51ccefb88d68cd6f051462d709c87cfcac59bc5520d9afd211af73ae2ca63631ddd8371d1aa27aaab5011940835ef3d9951be0de146b0878a84

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.27)
+    doggy (2.0.28)
       json (~> 1.8.3)
       parallel (~> 1.6.1)
       rugged (~> 0.23.2)
@@ -44,4 +44,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/doggy/cli/pull.rb

@@ -73,6 +73,11 @@ module Doggy
 
       klass.assign_paths(remote_resources, local_resources)
       remote_resources.each(&:save_local)
+
+      ids = local_resources.map(&:id) - remote_resources.map(&:id)
+      local_resources.each do |local_resource|
+        local_resource.destroy_local if ids.include?(local_resource.id)
+      end
     end
   end
 end

data/lib/doggy/cli/push.rb

@@ -2,27 +2,33 @@
 
 module Doggy
   class CLI::Push
+    WARNING_MESSAGE = "You are about to force push all the objects. "\
+      "This will override changes in Datadog if they have not been sycned to the dog repository. "\
+      "Do you want to proceed?(Y/N)"
+
     def initialize(options)
       @options = options
     end
 
     def run
-      push_resources('dashboards', Models::Dashboard) if should_push?('dashboards')
-      push_resources('monitors',   Models::Monitor)   if should_push?('monitors')
-      push_resources('screens',    Models::Screen)    if should_push?('screens')
+      if @options['all_objects'] && !Doggy.ui.yes?(WARNING_MESSAGE)
+        Doggy.ui.say "Operation cancelled"
+        return
+      end
+
+      push_resources('dashboards', Models::Dashboard) if @options['dashboards']
+      push_resources('monitors',   Models::Monitor)   if @options['monitors']
+      push_resources('screens',    Models::Screen)    if @options['screens']
 
       Doggy::Model.emit_shipit_deployment
     end
 
   private
 
-    def should_push?(resource)
-      @options.empty? || @options[resource]
-    end
-
     def push_resources(name, klass)
       Doggy.ui.say "Pushing #{ name }"
-      local_resources = klass.all_local(only_changed: true)
+      local_resources = klass.all_local(only_changed: !@options['all_objects'])
+      Doggy.ui.say "#{ local_resources.size } objects to push"
       local_resources.each(&:save)
     end
   end

data/lib/doggy/cli.rb

@@ -26,9 +26,10 @@ module Doggy
       the marker in their title will get it as a result of a push.
     D
 
-    method_option "dashboards", type: :boolean, desc: 'Pull dashboards'
-    method_option "monitors",   type: :boolean, desc: 'Pull monitors'
-    method_option "screens",    type: :boolean, desc: 'Pull screens'
+    method_option "dashboards",   type: :boolean, default: true, desc: 'Pull dashboards'
+    method_option "monitors",     type: :boolean, default: true, desc: 'Pull monitors'
+    method_option "screens",      type: :boolean, default: true, desc: 'Pull screens'
+    method_option "all_objects",  type: :boolean, default: false, desc: 'Push all objects even if they are not changed'
 
     def push
       CLI::Push.new(options.dup).run

data/lib/doggy/model.rb

@@ -200,8 +200,10 @@ module Doggy
         attributes = request(:post, resource_url, body)
         self.id    = self.class.new(attributes).id
         save_local
+        Doggy.ui.say "Created #{ @path }"
       else
         request(:put, resource_url(id), body)
+        Doggy.ui.say "Updated #{ @path }"
       end
     end
 
@@ -209,6 +211,10 @@ module Doggy
       request(:delete, resource_url(id))
     end
 
+    def destroy_local
+      File.delete(@path)
+    end
+
     protected
 
     def resource_url(id = nil)

data/lib/doggy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.27
+  version: 2.0.28
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-11-23 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.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Syncs DataDog dashboards, alerts, screenboards, and monitors.