doggy 2.0.29 → 2.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c2b9cacf34931798638f66cd8b715c7a82fe90
-  data.tar.gz: fcc7987e9cb35c25fe11aeaeb300837417cda15b
+  metadata.gz: 665ef43b3af2fce1b6ce594bdbd7abb681b7c776
+  data.tar.gz: 775570e213d753cd8aac9d92f7a38c1dd9533b34
 SHA512:
-  metadata.gz: 20dc45a9c05aa91769f94f02dbf99431476826926b89d6380aa0dd3aaf9581ac70fc17fb9b6fbaf75c5c9d9cb00ddb6a6160b544483641cda9cf7bdf975372b2
-  data.tar.gz: fd65d752b941303a69f195b9c1de9f3db838c230771fb31ffcc01b2f71a0366f2d14b8649fb6a86cc86e1fcdc9a1f75c6b71fffb701042a8ae5c0b64886bec51
+  metadata.gz: a18b022fc91c4afe36754ea188488bcee89ab9931462c5c6143c2890da1f714660a60433f9852c1d543558133167fac76af0df828367491626bc02ff04cc9540
+  data.tar.gz: 79a52ce5dd756d4d2cbd3afbf0f7a3d263f107f90780f7a98539cea96c63dfc5ed8a6106f05e3ba264c2a7a6f26b4b24f72a76dcf988c391d6a3885a7d884b00

data/Gemfile.lock

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

data/lib/doggy/cli/edit.rb

@@ -9,60 +9,26 @@ module Doggy
 
     def run
       resource = resource_by_param
-      resource.read_only = false
       return Doggy.ui.error("Could not find resource with #{ @param }") unless resource
 
-      Dir.chdir(File.dirname(resource.path)) do
-        if resource.class.to_s.downcase =~ /dashboard/
-          forked_resource = fork(resource)
-          system("open '#{ forked_resource.human_edit_url }'")
-
-          wait_for_edit
-
-          new_resource             = Doggy::Models::Dashboard.find(forked_resource.id)
-          new_resource.id          = resource.id
-          new_resource.title       = resource.title
-          new_resource.description = resource.description
-          new_resource.path        = resource.path
-          new_resource.save_local
-
-          forked_resource.destroy
-        elsif resource.class.to_s.downcase =~ /screen/
-          forked_resource = fork(resource)
-          system("open '#{ forked_resource.human_edit_url }'")
-
-          wait_for_edit
-
-          new_resource             = Doggy::Models::Screen.find(forked_resource.id)
-          new_resource.id          = resource.id
-          new_resource.board_title = resource.board_title
-          new_resource.path        = resource.path
-          new_resource.save_local
-
-          forked_resource.destroy
-        elsif resource.class.to_s.downcase =~ /monitor/
-          forked_resource = fork(resource)
-          system("open '#{ forked_resource.human_edit_url }'")
-
-          wait_for_edit
-
-          new_resource             = Doggy::Models::Monitor.find(forked_resource.id)
-          new_resource.id          = resource.id
-          new_resource.name        = resource.name
-          new_resource.path        = resource.path
-          new_resource.save_local
-
-          forked_resource.destroy
-        else
-          system("open '#{ resource.human_edit_url }'")
-
-          wait_for_edit
-
-          new_resource      = resource.class.find(resource.id)
-          new_resource.path = resource.path
-          new_resource.save_local
-        end
+      forked_resource = fork(resource)
+      system("open '#{ forked_resource.human_edit_url }'")
+      wait_for_edit
+
+      new_resource = Doggy::Model.infer_type(resource.attributes).find(forked_resource.id)
+      new_resource.id = resource.id
+      if new_resource.is_a?(Doggy::Models::Dashboard)
+        new_resource.title = resource.title
+        new_resource.description = resource.description
+      elsif new_resource.is_a?(Doggy::Models::Monitor)
+        new_resource.name = resource.name
+      elsif new_resource.is_a?(Doggy::Models::Screen)
+        new_resource.board_title = resource.board_title
       end
+      new_resource.path = resource.path
+      new_resource.save_local
+
+      forked_resource.destroy
     end
 
   private
@@ -89,16 +55,16 @@ module Doggy
     end
 
     def wait_for_edit
-      while !Doggy.ui.yes?('Are you done editing?') do
+      while !Doggy.ui.yes?('Are you done editing?(Y/N)') do
         Doggy.ui.say "run, rabbit run / dig that hole, forget the sun / and when at last the work is done / don't sit down / it's time to dig another one"
       end
     end
 
     def fork(resource)
-      salt = (0...12).map { (65 + rand(26)).chr.downcase }.join
-
+      salt = random_word
       forked_resource = resource.dup
       forked_resource.id = nil
+      forked_resource.refute_read_only!
       if resource.class.to_s.downcase =~ /dashboard/
         forked_resource.title = "[#{ salt }] " + forked_resource.title
         forked_resource.description = "[fork of #{ resource.id }] " + forked_resource.title
@@ -112,6 +78,10 @@ module Doggy
       forked_resource.save
       forked_resource
     end
+
+    def random_word
+      (0...12).map { (65 + rand(26)).chr.downcase }.join
+    end
   end
 end
 

data/lib/doggy/cli/push.rb

@@ -6,20 +6,29 @@ 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)
+    def initialize(options, ids)
       @options = options
+      @ids = ids
     end
 
     def run
-      if @options['all_objects'] && !Doggy.ui.yes?(WARNING_MESSAGE)
-        Doggy.ui.say "Operation cancelled"
-        return
+      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 }"
+          resource.ensure_read_only!
+          resource.save
+        end
       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
 

data/lib/doggy/cli.rb

@@ -31,8 +31,8 @@ module Doggy
     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
+    def push(*ids)
+      CLI::Push.new(options.dup, ids).run
     end
 
     desc "mute OBJECT_ID OBJECT_ID OBJECT_ID", "Mutes monitor on DataDog"

data/lib/doggy/model.rb

@@ -9,8 +9,6 @@ module Doggy
   class Model
     include Virtus.model
 
-    attribute :read_only, Boolean
-
     # This stores the path on disk. We don't define it as a model attribute so
     # it doesn't get serialized.
     attr_accessor :path
@@ -96,9 +94,10 @@ module Doggy
       end
 
       def infer_type(attributes)
-        return Models::Dashboard if attributes['graphs']
-        return Models::Monitor   if attributes['message']
-        return Models::Screen    if attributes['board_title']
+        has_key = ->(key) { attributes.has_key?(key.to_s) || attributes.has_key?(key.to_sym) }
+        return Models::Dashboard if has_key.call('graphs')
+        return Models::Monitor   if has_key.call('message')
+        return Models::Screen    if has_key.call('board_title')
       end
 
       def request(method, url, body = nil)
@@ -176,18 +175,8 @@ module Doggy
       super(attributes)
     end
 
-    def ensure_read_only!
-      self.read_only = true
-    end
-
     def save_local
       ensure_read_only!
-      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/models/dashboard.rb

@@ -11,6 +11,19 @@ module Doggy
 
       attribute :graphs,             Array[Hash]
       attribute :template_variables, Array[Hash]
+      attribute :read_only,          Boolean
+
+      def prefix
+        'dash'
+      end
+
+      def ensure_read_only!
+        self.read_only = true
+      end
+
+      def refute_read_only!
+        self.read_only = false
+      end
 
       def self.resource_url(id = nil)
         "https://app.datadoghq.com/api/v1/dash".tap do |base_url|

data/lib/doggy/models/monitor.rb

@@ -15,14 +15,15 @@ module Doggy
         attribute :timeout_h,          Integer
         attribute :escalation_message, String
         attribute :renotify_interval,  Integer
+        attribute :locked,             Boolean
 
         def to_h
-          return super unless 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
+          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
@@ -38,6 +39,26 @@ module Doggy
       attribute :type,    String
       attribute :multi,   Boolean
 
+      def prefix
+        'monitor'
+      end
+
+      def ensure_read_only!
+        if options
+          self.options.locked = true
+        else
+          self.options = Options.new(locked: true)
+        end
+      end
+
+      def refute_read_only!
+        if options
+          self.options.locked = false
+        else
+          self.options = Options.new(locked: false)
+        end
+      end
+
       def self.resource_url(id = nil)
         "https://app.datadoghq.com/api/v1/monitor".tap do |base_url|
           base_url << "/#{ id }" if id
@@ -83,7 +104,7 @@ module Doggy
       end
 
       def to_h
-        super.merge(options: options.to_h)
+        Doggy::Model.sort_by_key(super.merge(options: options.to_h))
       end
 
       private

data/lib/doggy/models/screen.rb

@@ -12,6 +12,19 @@ module Doggy
       attribute :widgets,            Array[Hash]
       attribute :height,             String
       attribute :width,              String
+      attribute :read_only,          Boolean
+
+      def prefix
+        'screen'
+      end
+
+      def ensure_read_only!
+        self.read_only = true
+      end
+
+      def refute_read_only!
+        self.read_only = false
+      end
 
       def self.resource_url(id = nil)
         "https://app.datadoghq.com/api/v1/screen".tap do |base_url|

data/lib/doggy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.29
+  version: 2.0.30
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json