doggy 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb97cb24320519a7bba30b15a873051f5948728c
-  data.tar.gz: 327e1a6e44d4fcec59eccca3ad057587a6000604
+  metadata.gz: 8fffcdb181744f9d0f48b41877151bb8c39e4ed9
+  data.tar.gz: 576233b7f36fe9004d89f40caaa84c2dec38e5b9
 SHA512:
-  metadata.gz: 07b2acceb8064210cb05db56b6544155a2228f7d2bc679dcbd6c773346dc436e91ad93c2400ffa344db0ab4c59ee4d9c395b93e547f29e90ccbf1bb1916e2e71
-  data.tar.gz: f0beada455921ce51d6b4b5a387654bcf352edef0b0810988a88b91428aebc08584340f1ffa13cafedb20b8a100698bb4f3fb08946a7cbd8d5d276dfad6d87b7
+  metadata.gz: d4299cf9f9f02e9649c7c4e5df28f5a32e470e3ba7f49668e4523d51b5816138d972a66446311a1c6affd5562d864f5926c0526221bdb86ac299a33f7e1225dc
+  data.tar.gz: 8ab7493ec5d0c58b8925d393200364b457bc8fe2db40626a85a4f9c5c6e44b09cd405a1e5053d7e77cb970cb0997c54ccf6bd483806e119f971f6b5ba5f0acdb

data/Gemfile.lock

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

data/lib/doggy/cli/pull.rb

@@ -2,37 +2,61 @@
 
 module Doggy
   class CLI::Pull
-    def initialize(options, ids)
-      @options                = options
-      @ids                    = ids
-      @updated_by_last_action = false
+    def initialize(options, ids_or_names)
+      @options      = options
+      @ids_or_names = ids_or_names
     end
 
     def run
-      pull_resources('dashboards', Models::Dashboard, @ids) if should_pull?('dashboards')
-      pull_resources('monitors',   Models::Monitor, @ids)   if should_pull?('monitors')
-      pull_resources('screens',    Models::Screen, @ids)    if should_pull?('screens')
+      if @ids_or_names.empty?
+        pull_resources('dashboards', Models::Dashboard)
+        pull_resources('monitors',   Models::Monitor)
+        pull_resources('screens',    Models::Screen)
+        return
+      end
 
-      Doggy.ui.say "Nothing to pull: please specify object ID or use '-a' to pull everything" unless @updated_by_last_action
+      @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)
+        end
+      end
     end
 
   private
 
-    def should_pull?(resource)
-      !@options.empty? || @options[resource] || @ids.any?
-    end
+    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
 
-    def pull_resources(name, klass, ids)
-      if ids.any?
-        Doggy.ui.say "Pulling #{ name }: #{ids.join(', ')}"
-        remote_resources = klass.all.find_all { |m| ids.include?(m.id.to_s) }
+        remote_resource.save_local
       else
-        Doggy.ui.say "Pulling #{ name }"
-        remote_resources = klass.all
+        remote_resource = local_resource.class.find(local_resource.id)
+        remote_resource.path = local_resource.path
+        remote_resource.save_local
       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)
-      @updated_by_last_action = true
       remote_resources.each(&:save_local)
     end
   end

data/lib/doggy/model.rb

@@ -56,6 +56,12 @@ module Doggy
         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
@@ -176,6 +182,7 @@ module Doggy
 
     def save
       ensure_managed_emoji!
+      ensure_renotify_interval_valid
 
       body = JSON.dump(to_h)
       if !id then

data/lib/doggy/models/monitor.rb

@@ -13,6 +13,7 @@ module Doggy
         attribute :no_data_timeframe,  Integer
         attribute :timeout_h,          Integer
         attribute :escalation_message, String
+        attribute :renotify_interval,  Integer
 
         def to_h
           return super unless monitor.id && monitor.loading_source == :local
@@ -58,6 +59,15 @@ module Doggy
         self.name += " \xF0\x9F\x90\xB6"
       end
 
+      def ensure_renotify_interval_valid
+        return unless options && options.renotify_interval && 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 #{self.id} uses invalid escalation interval (renotify_interval) #{options.renotify_interval}, using #{best_matching_interval} instead"
+        options.renotify_interval = best_matching_interval
+      end
+
       def mute
         return unless id
         request(:post, "#{ resource_url(id) }/mute")

data/lib/doggy/version.rb

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

data/lib/doggy.rb

@@ -57,19 +57,28 @@ module Doggy
 
   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
+                    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)
+    resolved = object_root.relative_path_from(curr_dir)
+
+    (curr_dir.expand_path(resolved + path) + path).to_s
   end
 
-protected
+
+  protected
 
   def secrets
     @secrets ||= begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json