doggy 2.1.1 → 3.0.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782b3d86af1a0b64f7ddd7816230e1a159e95ab32e22912e9e4aadbdefde5c82
-  data.tar.gz: 7e61f95d945bbd721e2f2ca2ee6070f84940a922dfbf0ec7298c4e77f247cd94
+  metadata.gz: af6510f8934d8d58b5f5cf9a318c7c4fd66893651cc1fcf9c24db4ebfb46e56b
+  data.tar.gz: 264f30ed2bd2ea394a29cc780c266f5345c092dc485ea7eca742cf00d9f6505f
 SHA512:
-  metadata.gz: 05f92c7090313cfb21727e5159a6232532cd44f57ef565c837662f6aa3ed8e6a75a49ce86bda5609acfcb7c3e6384228b05d112dc5ab975894a658ea0508d433
-  data.tar.gz: 7bf88190e67e97e33cfee61a57d83f7f14e15e2889b3384eea86b2d1fd92780307a7e4adafe49d32ee6579446f24d53cc51fc877906ece9b8604cf0b59da0a5a
+  metadata.gz: a7e116d5a61c47f44639695c245d3377c501a826935b33c39fa1b6d5ac487fef6f26ad6bc6395f572311d8101d129c544bac3366b08953fe48dbfeee897f551d
+  data.tar.gz: 55d8c1a9a3bb4797817d6ab012309e45a68855959c3bab9c47081e1ee85f354d0309dd1fbbbdfef2a7321fdbe9985bbd1eb020c4d4538945a10014b88e21f964

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    doggy (2.1.1)
+    doggy (3.0.0.pre.beta1)
       activesupport
       parallel
       rugged
       thor
-      virtus
 
 GEM
   remote: https://rubygems.org/
@@ -19,23 +18,13 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
     coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    equalizer (0.0.11)
-    hashdiff (0.3.8)
+    hashdiff (0.3.9)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     jaro_winkler (1.5.2)
     metaclass (0.0.4)
     method_source (0.9.2)
@@ -43,7 +32,7 @@ GEM
     mocha (1.8.0)
       metaclass (~> 0.0.1)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -68,11 +57,6 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.5.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

data/README.md

@@ -30,10 +30,6 @@ Export `DATADOG_API_KEY` and `DATADOG_APP_KEY` environment variables and `doggy`
 
 Optional: You can set `DATADOG_BASE_HUMAN_URL` environment variable if your organization uses a custom domain. This will change the urls given to users.
 
-#### ejson
-
-Set up `ejson` by putting `secrets.ejson` in your root object store.
-
 #### json (plaintext)
 
 If you're feeling adventurous, just put plaintext `secrets.json` in your root object store like this:

data/dev.yml

@@ -4,7 +4,7 @@ up:
   - homebrew:
     - cmake
   - ruby:
-      version: 2.6.2
+      version: 2.6.3
   - bundler
 commands:
   console:

data/doggy.gemspec

@@ -1,13 +1,8 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'doggy/version'
-
 Gem::Specification.new do |spec|
   spec.name          = "doggy"
-  spec.version       = Doggy::VERSION
+  spec.version       = "3.0.0-beta1"
   spec.authors       = ["Vlad Gorodetsky", "Andre Medeiros"]
   spec.email         = ["v@gor.io", "me@andremedeiros.info"]
 
@@ -25,13 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("parallel")
   spec.add_runtime_dependency("thor")
-  spec.add_runtime_dependency("virtus")
   spec.add_runtime_dependency("rugged")
-  spec.add_runtime_dependency('activesupport')
+  spec.add_runtime_dependency("activesupport")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("minitest")
-  spec.add_development_dependency('pry')
-  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency("pry")
+  spec.add_development_dependency("rubocop")
 end

data/lib/doggy.rb

@@ -1,10 +1,10 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require "pathname"
 require "net/http"
 require "rugged"
 
+require "doggy/hash_sort"
 require "doggy/cli"
 require "doggy/cli/edit"
 require "doggy/cli/mute"
@@ -15,12 +15,10 @@ require "doggy/cli/delete"
 require "doggy/model"
 require "doggy/models/dashboard"
 require "doggy/models/monitor"
-require "doggy/models/screen"
-require "doggy/version"
 
 module Doggy
-  DOG_SKIP_REGEX         = /\xF0\x9F\x98\xB1|:scream:/i.freeze
-  MANAGED_BY_DOGGY_REGEX = /\xF0\x9F\x90\xB6|:dog:/i.freeze
+  DOG_SKIP_REGEX         = /😱|:scream:/i.freeze
+  MANAGED_BY_DOGGY_REGEX = /🐶|:dog:/i.freeze
 
   class DoggyError < StandardError; end
 

data/lib/doggy/cli.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require "thor"
@@ -7,13 +6,6 @@ module Doggy
   class CLI < Thor
     include Thor::Actions
 
-    map %w(--version -v) => :__print_version
-
-    desc '--version, -v', 'print the version'
-    def __print_version
-      puts Doggy::VERSION
-    end
-
     desc "pull [IDs]", "Pulls objects from Datadog"
 
     def pull(*ids)

data/lib/doggy/cli/delete.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy

data/lib/doggy/cli/edit.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy
@@ -23,8 +22,6 @@ module Doggy
         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
@@ -39,20 +36,18 @@ module Doggy
     end
 
     def fork(resource)
-      salt = Doggy.random_word
-      forked_resource = resource.dup
-      forked_resource.id = nil
+      forked_resource = resource.class.new(resource.attributes.except("id")) # TODO: Except "url" too
+      forked_resource.path = resource.path # TODO: should not be forked
       forked_resource.refute_read_only!
+
       if /dashboard/.match?(resource.class.to_s.downcase)
-        forked_resource.title = "[#{salt}] " + forked_resource.title
-        forked_resource.description = "[fork of #{resource.id}] " + forked_resource.title
-      elsif /screen/.match?(resource.class.to_s.downcase)
-        forked_resource.board_title = "[#{salt}] " + forked_resource.board_title
+        forked_resource.title = "[#{Doggy.random_word}] #{resource.title}"
       elsif /monitor/.match?(resource.class.to_s.downcase)
-        forked_resource.name = "[#{salt}] " + forked_resource.name
+        forked_resource.name = "[#{Doggy.random_word}] #{resource.name}"
       else
         raise StandardError, 'Unknown resource type, cannot edit.'
       end
+
       forked_resource.save
       forked_resource
     end

data/lib/doggy/cli/mute.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'doggy/duration'

data/lib/doggy/cli/pull.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'parallel'
@@ -12,9 +11,20 @@ module Doggy
 
     def run
       @local_resources = Doggy::Model.all_local_resources
+      id_migration_mapping = {}
+
       if @ids.empty?
         Parallel.each(@local_resources) do |local_resource|
-          if remote_resource = local_resource.class.find(local_resource.id)
+          remote_resource = local_resource.class.find(local_resource.id)
+          if (new_id = remote_resource&.attributes&.dig("dash", "new_id")) || (new_id = remote_resource&.attributes&.dig("new_id"))
+            id_migration_mapping[local_resource.id.to_s] = local_resource.class.find(new_id)
+          end
+
+          if remote_resource
+            if id_migration_mapping.key?(local_resource.id)
+              remote_resource.attributes = id_migration_mapping[local_resource.id].attributes
+            end
+
             remote_resource.path = local_resource.path
             remote_resource.save_local
           else
@@ -22,29 +32,34 @@ module Doggy
           end
         end
       else
-        @ids.each { |id| pull_by_id(id.to_i) }
+        @ids.each { |id| pull_by_id(id.to_s) }
       end
     end
 
     private
 
     def pull_by_id(id)
-      local_resources = @local_resources.find_all { |l| l.id == id }
+      local_resources = @local_resources.find_all { |l| l.id.to_s == id.to_s }
+      id_migration_mapping = {}
 
-      remote_resources = [Models::Dashboard, Models::Monitor, Models::Screen].map do |klass|
-        klass.find(id)
+      remote_resources = [Models::Dashboard, Models::Monitor].map do |klass|
+        result = klass.find(id.to_s)
+        if (new_id = result&.attributes&.dig("dash", "new_id")) || (new_id = result&.attributes&.dig("new_id"))
+          id_migration_mapping[id.to_s] = klass.find(new_id)
+        end
+        result
       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_remote_resources = remote_resources.map { |remote_resource| [remote_resource.class.name, remote_resource.id.to_s] }
+        normalized_local_resources = local_resources.map { |local_resource| [local_resource.class.name, local_resource.id.to_s] }
         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, normalized_resource_id|
           remote_resources.find do |rr|
-            rr.class.name == klass && rr.id == normalized_resource_id
+            rr.class.name == klass && rr.id.to_s == normalized_resource_id.to_s
           end
         end
 
@@ -52,6 +67,11 @@ module Doggy
       else
         local_resources.each do |local_resource|
           remote_resource = local_resource.class.find(local_resource.id)
+
+          if id_migration_mapping.key?(local_resource.id)
+            remote_resource.attributes = id_migration_mapping[local_resource.id].attributes
+          end
+
           remote_resource.path = local_resource.path
           remote_resource.save_local
         end

data/lib/doggy/cli/push.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy

data/lib/doggy/cli/unmute.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy

data/lib/doggy/duration.rb

@@ -23,7 +23,7 @@ module Duration
   }
 
   def self.parse(value)
-    unless match = DURATION_FORMAT.match(value)
+    unless (match = DURATION_FORMAT.match(value))
       raise ArgumentError, "not a duration: #{value.inspect}, "\
       "use digits followed by a unit (#{DURATION_UNITS.map { |k, v| "#{k} for #{v}" }.join(', ')})"
     end

data/lib/doggy/hash_sort.rb

@@ -0,0 +1,13 @@
+class Hash
+  def sort_by_key(&block)
+    self.keys.sort(&block).reduce({}) do |seed, key|
+      seed[key] = self[key]
+      if seed[key].is_a?(Hash)
+        seed[key] = seed[key].sort_by_key(&block)
+      elsif seed[key].is_a?(Array)
+        seed[key] = seed[key].map { |i| i.sort_by_key(&block) }
+      end
+      seed
+    end
+  end
+end

data/lib/doggy/model.rb

@@ -1,30 +1,32 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require "json"
 require "parallel"
 require "uri"
-require "virtus"
+require "active_support/core_ext/hash/keys"
 
 module Doggy
   class Model
-    include Virtus.model
+    # Denormalized object attributes.
+    attr_accessor :attributes
 
     # This stores the path on disk. We don't define it as a model attribute so
     # it doesn't get serialized.
     attr_accessor :path
 
-    # indicates whether an object locally deleted
+    # 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
-      attr_accessor :root
-
       def find(id)
-        attributes = request(:get, resource_url(id), nil, [404])
+        attributes = request(:get, resource_url(id), nil, [404, 400])
+        if self == Doggy::Models::Dashboard
+          attributes = request(:get, resource_url(id, "dash"), nil, [404, 400]) if attributes['errors']
+          attributes = request(:get, resource_url(id, "screen"), nil, [404, 400]) if attributes['errors']
+        end
         return if attributes['errors']
         resource = new(attributes)
 
@@ -34,11 +36,13 @@ module Doggy
 
       def find_local(param)
         resources = Doggy::Model.all_local_resources
-        if (id = param).is_a?(Integer) || (param =~ /^[0-9]+$/ && id = Integer(param))
-          return resources.find { |res| res.id == id }
+        param = param.to_s
+        if (param =~ /^[0-9]+$/) || (param =~ /^[a-z0-9]+-[a-z0-9]+-[a-z0-9]+$/)
+          id = param
+          return resources.find { |res| res.id == id.to_s || res.id == id.to_i }
         end
-        if id = param[%r{(dash/|screen/|monitors#)(\d+)}i, 2]
-          return resources.find { |res| res.id == Integer(id) }
+        if (id = param[%r{(dashboard/|monitors#)(\d+)}i, 2])
+          return resources.find { |res| res.id == id.to_s || res.id == id.to_i }
         end
         full_path = File.expand_path(param.gsub('objects/', ''), Doggy.object_root)
         resources.find { |res| res.path == full_path }
@@ -84,10 +88,7 @@ module Doggy
       end
 
       def infer_type(attributes)
-        has_key = ->(key) { attributes.key?(key.to_s) || attributes.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')
+        attributes.key?("message") ? Models::Monitor : Models::Dashboard
       end
 
       def request(method, url, body = nil, accepted_errors = nil)
@@ -103,11 +104,11 @@ module Doggy
         http.use_ssl = (uri.scheme == 'https')
 
         request = case method
-                  when :get    then Net::HTTP::Get.new(uri.request_uri)
-                  when :post   then Net::HTTP::Post.new(uri.request_uri)
-                  when :put    then Net::HTTP::Put.new(uri.request_uri)
-                  when :delete then Net::HTTP::Delete.new(uri.request_uri)
-                  end
+        when :get    then Net::HTTP::Get.new(uri.request_uri)
+        when :post   then Net::HTTP::Post.new(uri.request_uri)
+        when :put    then Net::HTTP::Put.new(uri.request_uri)
+        when :delete then Net::HTTP::Delete.new(uri.request_uri)
+        end
 
         request.content_type = 'application/json'
         request.body = body if body
@@ -149,15 +150,8 @@ module Doggy
         }.to_json)
       end
 
-      def sort_by_key(hash, &block)
-        hash.keys.sort(&block).each_with_object({}) do |key, seed|
-          seed[key] = hash[key]
-          if seed[key].is_a?(Hash)
-            seed[key] = Doggy::Model.sort_by_key(seed[key], &block)
-          elsif seed[key].is_a?(Array)
-            seed[key].each_with_index { |e, i| seed[key][i] = sort_by_key(e, &block) if e.is_a?(Hash) }
-          end
-        end
+      def sort_by_key(hash)
+        hash
       end
 
       protected
@@ -167,18 +161,15 @@ module Doggy
       end
     end # class << self
 
-    def ==(another_model)
-      to_h == another_model.to_h
+    def ==(other)
+      to_h == other.to_h
     end
 
-    def initialize(attributes = nil)
-      root_key = self.class.root
-
-      return super unless attributes && root_key
-      return super unless attributes[root_key].is_a?(Hash)
+    def initialize(attributes = {})
+      @attributes = attributes.deep_stringify_keys
 
-      attributes = attributes[root_key]
-      super(attributes)
+      @attributes["id"] = @attributes["id"].to_s if @attributes["id"]
+      @attributes["options"] ||= {} if self.class == Doggy::Models::Monitor
     end
 
     def save_local
@@ -188,7 +179,7 @@ module Doggy
     end
 
     def to_h
-      Doggy::Model.sort_by_key(super)
+      Doggy::Model.sort_by_key(attributes)
     end
 
     def validate
@@ -212,7 +203,7 @@ module Doggy
     end
 
     def destroy
-      self.class.request(:delete, resource_url(id), nil, [404])
+      self.class.request(:delete, resource_url(id), nil, [404, 400])
     end
 
     def destroy_local

data/lib/doggy/models/dashboard.rb

@@ -1,21 +1,50 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy
   module Models
     class Dashboard < Doggy::Model
-      self.root = 'dash'
+      def id
+        attributes["id"]
+      end
+
+      def id=(v)
+        attributes["id"] = v
+      end
 
-      attribute :id,          Integer
-      attribute :title,       String
-      attribute :description, String
+      def title
+        attributes["title"]
+      end
 
-      attribute :graphs,             Array[Hash]
-      attribute :template_variables, Array[Hash]
-      attribute :read_only,          Boolean
+      def title=(v)
+        attributes["title"] = v
+      end
+
+      def description
+        attributes["description"]
+      end
+
+      def description=(v)
+        attributes["description"] = v
+      end
+
+      def read_only
+        if attributes["widgets"]
+          attributes["is_read_only"]
+        else
+          attributes["read_only"]
+        end
+      end
+
+      def read_only=(v)
+        if attributes["widgets"]
+          attributes["is_read_only"] = v
+        else
+          attributes["read_only"] = v
+        end
+      end
 
       def prefix
-        'dash'
+        'dashboard'
       end
 
       def ensure_read_only!
@@ -26,22 +55,22 @@ module Doggy
         self.read_only = false
       end
 
-      def self.resource_url(id = nil)
-        ["https://app.datadoghq.com/api/v1/dash", id].compact.join("/")
+      def self.resource_url(id = nil, kind = "dashboard")
+        ["https://app.datadoghq.com/api/v1/#{kind}", id].compact.join("/")
       end
 
       def managed?
-        !(title =~ Doggy::DOG_SKIP_REGEX)
+        title !~ Doggy::DOG_SKIP_REGEX
       end
 
       def ensure_managed_emoji!
         return unless managed?
-        return if title =~ /\xF0\x9F\x90\xB6/
-        self.title += " \xF0\x9F\x90\xB6"
+        return if title =~ /🐶/
+        self.title = "#{title} 🐶"
       end
 
       def human_url
-        "https://#{Doggy.base_human_url}/dash/#{id}"
+        "https://#{Doggy.base_human_url}/dashboard/#{id}"
       end
 
       # Dashboards don't have a direct edit URL

data/lib/doggy/models/monitor.rb

@@ -1,70 +1,64 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Doggy
   module Models
     class Monitor < Doggy::Model
-      class Options
-        include Virtus.model
-
-        attribute :escalation_message,  String
-        attribute :evaluation_delay,    Integer
-        attribute :include_tags,        Boolean
-        attribute :locked,              Boolean
-        attribute :new_host_delay,      Integer
-        attribute :no_data_timeframe,   Integer
-        attribute :notify_audit,        Boolean
-        attribute :notify_no_data,      Boolean
-        attribute :renotify_interval,   Integer
-        attribute :require_full_window, Boolean
-        attribute :silenced,            Hash
-        attribute :thresholds,          Hash
-        attribute :timeout_h,           Integer
-      end
-
-      attribute :id,     Integer
-      attribute :org_id, Integer
-      attribute :name,   String
-
-      attribute :message, String
-      attribute :query,   String
-      attribute :options, Options
-      attribute :tags,    Array[String]
-      attribute :type,    String
-      attribute :multi,   Boolean
+      def id
+        attributes["id"]
+      end
+
+      def id=(v)
+        attributes["id"] = v
+      end
+
+      def name
+        attributes["name"]
+      end
+
+      def name=(v)
+        attributes["name"] = v
+      end
+
+      def locked
+        attributes["options"]["locked"]
+      end
+
+      def locked=(v)
+        attributes["options"]["locked"] = v
+      end
+
+      def silenced
+        attributes["options"]["silenced"]
+      end
+
+      def silenced=(v)
+        attributes["options"]["silenced"] = v
+      end
 
       def prefix
         'monitor'
       end
 
       def ensure_read_only!
-        if options
-          options.locked = true
-        else
-          self.options = Options.new(locked: true)
-        end
+        attributes["options"]["locked"] = true
       end
 
       def refute_read_only!
-        if options
-          options.locked = false
-        else
-          self.options = Options.new(locked: false)
-        end
+        attributes["options"]["locked"] = false
       end
 
-      def self.resource_url(id = nil)
-        ["https://app.datadoghq.com/api/v1/monitor", id].compact.join("/")
+      def self.resource_url(id = nil, kind = "monitor")
+        ["https://app.datadoghq.com/api/v1/#{kind}", id].compact.join("/")
       end
 
       def managed?
-        !(name =~ Doggy::DOG_SKIP_REGEX)
+        name !~ Doggy::DOG_SKIP_REGEX
       end
 
       def ensure_managed_emoji!
         return unless managed?
-        return if name =~ /\xF0\x9F\x90\xB6/
-        self.name += " \xF0\x9F\x90\xB6"
+        return if name =~ /🐶/
+        self.name += " 🐶"
       end
 
       def validate
@@ -74,11 +68,11 @@ module Doggy
       def toggle_mute!(action, body = nil)
         return unless %w[mute unmute].include?(action) && id
         attributes = request(:post, "#{resource_url(id)}/#{action}", body)
-        if message = attributes['errors']
+        if (message = attributes['errors'])
           Doggy.ui.error(message)
         else
           self.attributes = attributes
-          if local_version = Doggy::Model.find_local(id)
+          if (local_version = Doggy::Model.find_local(id))
             self.path = local_version.path
           end
           save_local
@@ -93,19 +87,15 @@ module Doggy
         "https://#{Doggy.base_human_url}/monitors##{id}/edit"
       end
 
-      def to_h
-        Doggy::Model.sort_by_key(super.merge(options: options.to_h))
-      end
-
       private
 
       def ensure_renotify_interval_valid
-        return unless options&.renotify_interval && options.renotify_interval.to_i > 0
+        return unless attributes.dig("options", "renotify_interval") && attributes.dig("options", "renotify_interval").to_i > 0
 
         allowed_renotify_intervals = [10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440] # minutes
-        best_matching_interval = allowed_renotify_intervals.min_by { |x| (x.to_f - options.renotify_interval).abs }
-        puts "WARN: Monitor #{id} uses invalid escalation interval (renotify_interval) #{options.renotify_interval}, using #{best_matching_interval} instead"
-        options.renotify_interval = best_matching_interval
+        best_matching_interval = allowed_renotify_intervals.min_by { |x| (x.to_f - attributes["options"]["renotify_interval"]).abs }
+        puts "WARN: Monitor #{id} uses invalid escalation interval (renotify_interval) #{attributes["options"]["renotify_interval"]}, using #{best_matching_interval} instead"
+        attributes["options"]["renotify_interval"] = best_matching_interval
       end
     end # Monitor
   end # Models

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0.pre.beta1
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -184,11 +170,10 @@ files:
 - lib/doggy/cli/push.rb
 - lib/doggy/cli/unmute.rb
 - lib/doggy/duration.rb
+- lib/doggy/hash_sort.rb
 - lib/doggy/model.rb
 - lib/doggy/models/dashboard.rb
 - lib/doggy/models/monitor.rb
-- lib/doggy/models/screen.rb
-- lib/doggy/version.rb
 homepage: http://github.com/shopify/doggy
 licenses:
 - MIT
@@ -204,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/doggy/models/screen.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Doggy
-  module Models
-    class Screen < Doggy::Model
-      attribute :id,                 Integer
-      attribute :board_title,        String
-
-      attribute :board_bgtype,       String
-      attribute :templated,          Boolean
-      attribute :template_variables, Array[Hash]
-      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", id].compact.join("/")
-      end
-
-      def managed?
-        !(board_title =~ Doggy::DOG_SKIP_REGEX)
-      end
-
-      def ensure_managed_emoji!
-        return unless managed?
-        return if board_title =~ /\xF0\x9F\x90\xB6/
-        self.board_title += " \xF0\x9F\x90\xB6"
-      end
-
-      def human_url
-        "https://#{Doggy.base_human_url}/screen/#{id}"
-      end
-
-      # Screens don't have a direct edit URL
-      alias_method :human_edit_url, :human_url
-    end # Screen
-  end # Models
-end # Doggy

data/lib/doggy/version.rb

@@ -1,6 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Doggy
-  VERSION = '2.1.1'
-end