doggy 2.0.30 → 2.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665ef43b3af2fce1b6ce594bdbd7abb681b7c776
-  data.tar.gz: 775570e213d753cd8aac9d92f7a38c1dd9533b34
+  metadata.gz: 3b3e656b1e0b4fea21117a302fd8869d14b3809c
+  data.tar.gz: 832835e942ae432a1b7d22fa56a648b7f1cbfb8b
 SHA512:
-  metadata.gz: a18b022fc91c4afe36754ea188488bcee89ab9931462c5c6143c2890da1f714660a60433f9852c1d543558133167fac76af0df828367491626bc02ff04cc9540
-  data.tar.gz: 79a52ce5dd756d4d2cbd3afbf0f7a3d263f107f90780f7a98539cea96c63dfc5ed8a6106f05e3ba264c2a7a6f26b4b24f72a76dcf988c391d6a3885a7d884b00
+  metadata.gz: b6a817add2afe0244c40460d3a8e101745cc43fe08d0baa1a21beff09f8412ff1128d10d9f88b02bb74a344e3931eb00ccd3e8b4dc144b699c17929d9126eb5e
+  data.tar.gz: b68b78da576175baec808d12b38e23b235b3fbd4a1b1e97bfea6bb9606b8ce137cb0a38e794b65986d358eee3156cb726778ddf5613ec62f3e6c7fa07772a186

data/Gemfile.lock

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

data/README.md

@@ -44,30 +44,28 @@ If you're feeling adventurous, just put plaintext `secrets.json` in your root ob
 ## Usage
 
 ```bash
-# Download selected items from DataDog
-$ doggy pull ID ID
+# Syncs local changes to Datadog since last deploy.
+$ doggy sync
 
-# Download all items
-$ doggy pull
+# Download items. If no ID is given it will download all the items managed by dog.
+$ doggy pull [IDs]
 
-# Upload selected items to DataDog
-$ doggy push ID ID ID
+# Upload items to Datadog. If no ID is given it will push all items.
+$ doggy push [IDs]
 
-# Upload all items to DataDog
-$ doggy push
-
-# Edit a dashboard in WYSIWYG
+# Edit an item in WYSIWYG
 $ doggy edit ID
 
-# Delete selected items from both DataDog and local storage
-$ doggy delete ID ID ID
+# Delete selected items from both Datadog and local storage
+$ doggy delete IDs
 
 # Mute monitor(s) forever
-$ doggy mute ID ID ID
+$ doggy mute IDs
 
 # Unmute monitor(s)
-$ doggy unmute ID ID ID
+$ doggy unmute IDs
 ```
+Multiple IDs should be separated by space.
 
 ## Development
 

data/lib/doggy.rb

@@ -10,6 +10,7 @@ require "doggy/cli/mute"
 require "doggy/cli/pull"
 require "doggy/cli/push"
 require "doggy/cli/unmute"
+require "doggy/cli/delete"
 require "doggy/model"
 require "doggy/models/dashboard"
 require "doggy/models/monitor"
@@ -39,7 +40,7 @@ module Doggy
     current_dir = Dir.pwd
 
     while current_dir != '/' do
-      if File.exists?(File.join(current_dir, 'Gemfile')) then
+      if File.exist?(File.join(current_dir, 'Gemfile')) then
         return Pathname.new(current_dir)
       else
         current_dir = File.expand_path('../', current_dir)
@@ -55,20 +56,6 @@ module Doggy
     ENV['DATADOG_APP_KEY'] || secrets['datadog_app_key']
   end
 
-  def modified(compare_to, all = false)
-    @modified ||= begin
-                    mods = Set.new
-                    paths = repo.diff(compare_to, 'HEAD').each_delta.map { |delta| delta.new_file[:path] }
-                    paths.each do |path|
-                      parts = path.split('/')
-                      next unless parts[0] =~ /objects/
-                      next unless File.exist?(path)
-                      mods << path
-                    end
-                    mods
-                  end
-  end
-
   def resolve_path(path)
     path     = Pathname.new(path)
     curr_dir = Pathname.new(Dir.pwd)
@@ -86,8 +73,4 @@ module Doggy
                    JSON.parse(raw)
                  end
   end
-
-  def repo
-    @repo ||= Rugged::Repository.new(Doggy.object_root.parent.to_s)
-  end
-end # Doggy
+end

data/lib/doggy/cli.rb

@@ -6,57 +6,59 @@ module Doggy
   class CLI < Thor
     include Thor::Actions
 
-    desc "pull", "Pulls objects from Datadog"
-    long_desc <<-D
-      Pull objects from Datadog. All objects are pulled unless the type switches
-      are used.
-    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'
+    desc "pull [IDs]", "Pulls objects from Datadog"
 
     def pull(*ids)
       CLI::Pull.new(options.dup, ids).run
     end
 
-    desc "push", "Pushes objects to Datadog"
+    desc "delete IDs", "Deletes objects with given IDs from both local repository and Datadog"
+
+    def delete(*ids)
+      CLI::Delete.new.run(ids)
+    end
+
+    desc "sync", "Pushes the changes to Datadog"
     long_desc <<-D
-      Pushes objects to Datadog. Any objects that aren't skipped and don't have
-      the marker in their title will get it as a result of a push.
+      Performs git diff between the HEAD and last deployed SHA to get the changes,
+      then accordingly either deletes or pushes objects to Datadog.
     D
 
-    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 sync
+      CLI::Push.new.sync_changes
+    end
+
+    desc "push [IDs]", "Hard pushes objects to Datadog"
+    long_desc <<-D
+      Pushes objects to Datadog. You can provide list of IDs to scope it to certain objects,
+      otherwise it will push all local objects to Datadog. The changes in Datadog that are not in
+      the repository will be overridden. This action does not delete anything.
+      IDs is a space separated list of item IDs.
+    D
 
     def push(*ids)
-      CLI::Push.new(options.dup, ids).run
+      CLI::Push.new.push_all(ids)
     end
 
-    desc "mute OBJECT_ID OBJECT_ID OBJECT_ID", "Mutes monitor on DataDog"
+    desc "mute IDs", "Mutes given monitors indefinitely"
     long_desc <<-D
-      Mutes monitors on Datadog.
+      IDs is a space separated list of item IDs.
     D
 
     def mute(*ids)
       CLI::Mute.new(options.dup, ids).run
     end
 
-    desc "unmute OBJECT_ID OBJECT_ID OBJECT_ID", "Unmutes monitor on DataDog"
+    desc "unmute IDs", "Unmutes given monitors"
     long_desc <<-D
-      Unmutes monitors on datadog
+      IDs is a space separated list of item IDs.
     D
 
     def unmute(*ids)
       CLI::Unmute.new(options.dup, ids).run
     end
 
-    desc "edit OBJECT_ID", "Edits an object"
-    long_desc <<-D
-      Edits an object
-    D
+    desc "edit ID", "Edits given item in Datadog UI"
 
     def edit(id)
       CLI::Edit.new(options.dup, id).run

data/lib/doggy/cli/delete.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Doggy
+  class CLI::Delete
+    def run(ids)
+      Doggy::Model.all_local_resources.each do |resource|
+        next unless ids.include?(resource.id.to_s)
+        Doggy.ui.say("Deleting #{resource.path}, with id #{resource.id}")
+        resp = resource.destroy
+        if resp['errors']
+          Doggy.ui.error("Could not delete. Error: #{resp['errors']}. Skipping")
+        else
+          resource.destroy_local
+        end
+      end
+    end
+  end
+end

data/lib/doggy/cli/edit.rb

@@ -34,9 +34,7 @@ module Doggy
   private
 
     def resource_by_param
-      resources  = Doggy::Models::Dashboard.all_local
-      resources += Doggy::Models::Monitor.all_local
-      resources += Doggy::Models::Screen.all_local
+      resources  = Doggy::Model.all_local_resources
       if @param =~ /^[0-9]+$/ then
         id = @param.to_i
         return resources.find { |res| res.id == id }

data/lib/doggy/cli/mute.rb

@@ -9,7 +9,7 @@ module Doggy
 
     def run
       monitors = @ids.map { |id| Doggy::Models::Monitor.find(id) }
-      monitors.each(&:mute)
+      monitors.each { |monitor| monitor.toggle_mute!('mute') }
     end
   end
 end

data/lib/doggy/cli/pull.rb

@@ -1,31 +1,31 @@
 # encoding: utf-8
 
+require 'parallel'
+
 module Doggy
   class CLI::Pull
-    def initialize(options, ids_or_names)
-      @options      = options
-      @ids_or_names = ids_or_names
+    def initialize(options, ids)
+      @options = options
+      @ids = ids
     end
 
     def run
-      if @ids_or_names.empty?
-        pull_resources('dashboards', Models::Dashboard) if !@options.any? || @options['dashboards']
-        pull_resources('monitors',   Models::Monitor)   if !@options.any? || @options['monitors']
-        pull_resources('screens',    Models::Screen)    if !@options.any? || @options['screens']
-        return
-      end
-
-      @ids_or_names.each do |id_or_name|
-        @local_resources = Doggy::Model.all_local_resources
-        if id_or_name =~ /^\d+$/
-          pull_by_id(id_or_name.to_i)
-        else
-          pull_by_file(id_or_name)
+      @local_resources = Doggy::Model.all_local_resources
+      if @ids.empty?
+        Parallel.each(@local_resources) do |local_resource|
+          if remote_resource = local_resource.class.find(local_resource.id)
+            remote_resource.path = local_resource.path
+            remote_resource.save_local
+          else
+            local_resource.destroy_local
+          end
         end
+      else
+        @ids.each { |id| pull_by_id(id.to_i) }
       end
     end
 
-  private
+    private
 
     def pull_by_id(id)
       local_resources = @local_resources.find_all { |l| l.id == id }
@@ -41,9 +41,9 @@ module Doggy
 
         # 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_to_be_saved = normalized_resource_diff.map do |klass, normalized_resource_id|
           remote_resources.find do |rr|
-            rr.class.name == klass && rr.id == id
+            rr.class.name == klass && rr.id == normalized_resource_id
           end
         end
 
@@ -56,29 +56,5 @@ module Doggy
         end
       end
     end
-
-    def pull_by_file(file)
-      resolved_path = Doggy.resolve_path(file)
-      local_resource = @local_resources.find { |l| l.path == resolved_path }
-
-      remote_resource = local_resource.class.find(local_resource.id)
-      remote_resource.path = local_resource.path
-      remote_resource.save_local
-    end
-
-    def pull_resources(name, klass)
-      Doggy.ui.say "Pulling #{ name }..."
-      local_resources  = klass.all_local
-      remote_resources = klass.all
-
-      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

@@ -6,41 +6,34 @@ module Doggy
       "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, ids)
-      @options = options
-      @ids = ids
-    end
-
-    def run
-      if @ids.empty?
-        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']
-      else
-        Doggy::Model.all_local_resources.each do |resource|
-          next unless @ids.include?(resource.id.to_s)
-          Doggy.ui.say "Pushing #{ resource.path }"
+    def sync_changes
+      changed_resources = Doggy::Model.changed_resources
+      Doggy.ui.say "Syncing #{changed_resources.size} objects to Datadog..."
+      changed_resources.each do |resource|
+        if resource.is_deleted
+          Doggy.ui.say "Deleting #{resource.path}, with id = #{resource.id}"
+          resp = resource.destroy
+          Dog.ui.error("Could not delete. Error: #{resp['errors']}. Skipping") if resp['errors']
+        else
+          Doggy.ui.say "Saving #{resource.path}, with id = #{resource.id}"
           resource.ensure_read_only!
           resource.save
         end
       end
-
       Doggy::Model.emit_shipit_deployment
     end
 
-  private
-
-    def push_resources(name, klass)
-      Doggy.ui.say "Pushing #{ name }"
-      local_resources = klass.all_local(only_changed: !@options['all_objects'])
-      local_resources.each(&:ensure_read_only!)
-      Doggy.ui.say "#{ local_resources.size } objects to push"
-      local_resources.each(&:save)
+    def push_all(ids)
+      if ids.empty? && !Doggy.ui.yes?(WARNING_MESSAGE)
+        Doggy.ui.say('Operation cancelled')
+        return
+      end
+      Doggy::Model.all_local_resources.each do |resource|
+        next if ids && !ids.include?(resource.id.to_s)
+        Doggy.ui.say "Pushing #{resource.path}, with id #{resource.id}"
+        resource.ensure_read_only!
+        resource.save
+      end
     end
   end
 end
-

data/lib/doggy/cli/unmute.rb

@@ -9,7 +9,7 @@ module Doggy
 
     def run
       monitors = @ids.map { |id| Doggy::Models::Monitor.find(id) }
-      monitors.each(&:unmute)
+      monitors.each { |monitor| monitor.toggle_mute!('unmute') }
     end
   end
 end

data/lib/doggy/model.rb

@@ -13,17 +13,14 @@ module Doggy
     # it doesn't get serialized.
     attr_accessor :path
 
+    # indicates whether an object locally deleted
+    attr_accessor :is_deleted
+
     # This stores whether the resource has been loaded locally or remotely.
     attr_accessor :loading_source
 
     class << self
-      def root=(root)
-        @root = root.to_s
-      end
-
-      def root
-        @root || nil
-      end
+      attr_accessor :root
 
       def find(id)
         attributes = request(:get, resource_url(id))
@@ -34,63 +31,41 @@ module Doggy
         resource
       end
 
-      def assign_paths(remote_resources, local_resources)
-        remote_resources.each do |remote|
-          local = local_resources.find { |l| l.id == remote.id }
-          next unless local
-
-          remote.path = local.path
+      def all_local_resources
+        @all_local_resources ||= Parallel.map((Dir[Doggy.object_root.join("**/*.json")])) do |file|
+          raw = File.read(file, encoding: 'utf-8')
+          begin
+            attributes = JSON.parse(raw)
+          rescue JSON::ParserError
+            Doggy.ui.error "Could not parse #{ file }."
+            next
+          end
+          resource = infer_type(attributes).new(attributes)
+          resource.path = file
+          resource.loading_source = :local
+          resource
         end
       end
 
-      def all
-        collection = request(:get, resource_url)
-        if collection.is_a?(Hash) && collection.keys.length == 1
-          collection = collection.values.first
+      def changed_resources
+        repo = Rugged::Repository.new(Doggy.object_root.parent.to_s)
+        repo.diff(current_sha, 'HEAD').each_delta.map do |delta|
+          new_file_path = delta.new_file[:path]
+          next unless new_file_path.match(/\Aobjects\//)
+          is_deleted = delta.status == :deleted
+          oid = is_deleted ? delta.old_file[:oid] : delta.new_file[:oid]
+          begin
+            attributes = JSON.parse(repo.read(oid).data)
+          rescue JSON::ParserError
+            Doggy.ui.error("Could not parse #{ new_file_path }. Skipping...")
+            next
+          end
+          resource = infer_type(attributes).new(attributes)
+          resource.loading_source = :local
+          resource.path = Doggy.object_root.parent.join(new_file_path).to_s
+          resource.is_deleted = is_deleted
+          resource
         end
-
-        ids = collection
-          .map    { |record| new(record) }
-          .select { |instance| instance.managed? }
-          .map    { |instance| instance.id }
-
-        Parallel.map(ids) { |id| find(id) }
-      end
-
-      def all_local_resources
-        @resources ||= [ Models::Dashboard,
-                         Models::Monitor,
-                         Models::Screen ].flat_map(&:all_local)
-      end
-
-      def all_local(only_changed: false)
-        @all_local ||= begin
-                         # TODO: Add serializer support here
-                         if only_changed
-                           files   = Doggy.modified(Doggy::Model.current_sha).map { |i| Doggy.object_root.parent.join(i).to_s }
-                         else
-                           files   = Dir[Doggy.object_root.join("**/*.json")]
-                         end
-                         resources = Parallel.map(files) do |file|
-                           raw = File.read(file, encoding: 'utf-8')
-
-                           begin
-                             attributes = JSON.parse(raw)
-                           rescue JSON::ParserError
-                             Doggy.ui.error "Could not parse #{ file }."
-                             next
-                           end
-
-                           next unless infer_type(attributes) == self
-
-                           resource                = new(attributes)
-                           resource.path           = file
-                           resource.loading_source = :local
-                           resource
-                         end
-
-                         resources.compact
-                       end
       end
 
       def infer_type(attributes)
@@ -177,7 +152,7 @@ module Doggy
 
     def save_local
       ensure_read_only!
-      @path ||= Doggy.object_root.join("#{prefix}-#{id}.json")
+      self.path ||= Doggy.object_root.join("#{prefix}-#{id}.json")
       File.open(@path, 'w') { |f| f.write(JSON.pretty_generate(to_h)) }
     end
 
@@ -198,10 +173,10 @@ module Doggy
         attributes = request(:post, resource_url, body)
         self.id    = self.class.new(attributes).id
         save_local
-        Doggy.ui.say "Created #{ @path }"
+        Doggy.ui.say "Created #{ path }"
       else
         request(:put, resource_url(id), body)
-        Doggy.ui.say "Updated #{ @path }"
+        Doggy.ui.say "Updated #{ path }"
       end
     end
 

data/lib/doggy/models/monitor.rb

@@ -5,7 +5,6 @@ module Doggy
     class Monitor < Doggy::Model
       class Options
         include Virtus.model
-        attr_accessor :monitor
 
         attribute :silenced,           Hash
         attribute :thresholds,         Hash
@@ -16,16 +15,6 @@ module Doggy
         attribute :escalation_message, String
         attribute :renotify_interval,  Integer
         attribute :locked,             Boolean
-
-        def to_h
-          if monitor.id && monitor.loading_source == :local
-            # Pull remote silenced state. If we don't send this value, Datadog
-            # assumes that we want to unmute the monitor.
-            remote_monitor = Monitor.find(monitor.id)
-            self.silenced  = remote_monitor.options.silenced if remote_monitor.options
-          end
-          super
-        end
       end
 
       attribute :id,     Integer
@@ -65,12 +54,6 @@ module Doggy
         end
       end
 
-      def initialize(attributes = nil)
-        super(attributes)
-
-        options.monitor = self if options
-      end
-
       def managed?
         !(name =~ Doggy::DOG_SKIP_REGEX)
       end
@@ -85,14 +68,15 @@ module Doggy
         ensure_renotify_interval_valid
       end
 
-      def mute
-        return unless id
-        request(:post, "#{ resource_url(id) }/mute")
-      end
-
-      def unmute
-        return unless id
-        request(:post, "#{ resource_url(id) }/unmute")
+      def toggle_mute!(action)
+        return unless ['mute', 'unmute'].include?(action) && id
+        attributes = request(:post, "#{ resource_url(id) }/#{action}")
+        if message = attributes['errors']
+          Doggy.ui.error(message)
+        else
+          self.attributes = attributes
+          save_local
+        end
       end
 
       def human_url

data/lib/doggy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.30
+  version: 2.0.31
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -147,6 +147,7 @@ files:
 - exe/doggy
 - lib/doggy.rb
 - lib/doggy/cli.rb
+- lib/doggy/cli/delete.rb
 - lib/doggy/cli/edit.rb
 - lib/doggy/cli/mute.rb
 - lib/doggy/cli/pull.rb