doggy 2.0.32 → 2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3cd1784eed6502f475faafc0643699b10c10f8
-  data.tar.gz: 12a63d0b93751251d399073c04dc0a44877487e6
+  metadata.gz: ad95ff43f9450ce4693867914f128764349d6991
+  data.tar.gz: 4485a4866920cf37e7ce892106d06f801170b6de
 SHA512:
-  metadata.gz: ec6ac2619a87be49e98ba87801ab0bed8ee44057483587d3f4ce31cfc867f8d8223014b4ab9929b73801b38dc7953690adf7944e888e307d2f1a7dc044c25320
-  data.tar.gz: 9857101cb0aa380e433ad25957478474fea6fdeb52b81a742bf0dba200b5acb42cb8d4b00004f870de5e49a95259440c1c3de9a11f570f6207eacafa411e2772
+  metadata.gz: ce49b0f7c12fe19c9a718c449f0a42d824908106e2c80ae7a7d89cc87f6dbb9e351ee9347f8d27a3a135f33d0249d73661cbf46f06d027ddb6529bbfec6ca501
+  data.tar.gz: 11ae2964ed41c5d2652b7b6bfd5c5afa93fa47f43491443091626ad21966a60a9672354414b6c11979a12ca7b5113c1c5418e47776578cab93c6b6fee02bd527

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.32)
+    doggy (2.0.33)
+      activesupport (~> 4)
       json (~> 1.8.3)
       parallel (~> 1.6.1)
       rugged (~> 0.23.2)
@@ -11,6 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     axiom-types (0.1.1)
@@ -25,6 +32,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
     hashdiff (0.2.3)
+    i18n (0.7.0)
     ice_nine (0.11.2)
     json (1.8.3)
     metaclass (0.0.4)
@@ -36,8 +44,10 @@ GEM
     rake (10.5.0)
     rugged (0.23.3)
     safe_yaml (1.0.4)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)

data/doggy.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor",     "~> 0.19.1"
   spec.add_dependency "virtus",   "~> 1.0.5"
   spec.add_dependency "rugged",   "~> 0.23.2"
+  spec.add_dependency 'activesupport', '~> 4'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/doggy/cli/edit.rb

@@ -8,7 +8,7 @@ module Doggy
     end
 
     def run
-      resource = resource_by_param
+      resource = Doggy::Model.find_local(@param)
       return Doggy.ui.error("Could not find resource with #{ @param }") unless resource
 
       forked_resource = fork(resource)
@@ -31,26 +31,7 @@ module Doggy
       forked_resource.destroy
     end
 
-  private
-
-    def resource_by_param
-      resources  = Doggy::Model.all_local_resources
-      if @param =~ /^[0-9]+$/ then
-        id = @param.to_i
-        return resources.find { |res| res.id == id }
-      elsif @param =~ /^http/ then
-        id = case @param
-          when /com\/dash/     then Integer(@param[/dash\/(\d+)/i, 1])
-          when /com\/screen/   then Integer(@param[/screen\/(\d+)/i, 1])
-          when /com\/monitors/ then Integer(@param[/monitors#(\d+)/i, 1])
-          else raise StandardError.new('Unknown resource type, cannot edit.')
-          end
-        return resources.find { |res| res.id == id }
-      else
-        full_path = File.expand_path(@param.gsub('objects/', ''), Doggy.object_root)
-        return resources.find { |res| res.path == full_path }
-      end
-    end
+    private
 
     def wait_for_edit
       while !Doggy.ui.yes?('Are you done editing?(Y/N)') do
@@ -82,4 +63,3 @@ module Doggy
     end
   end
 end
-

data/lib/doggy/cli/mute.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'doggy/duration'
+
 module Doggy
   class CLI::Mute
     def initialize(options, ids)
@@ -9,8 +11,11 @@ module Doggy
 
     def run
       monitors = @ids.map { |id| Doggy::Models::Monitor.find(id) }
-      monitors.each { |monitor| monitor.toggle_mute!('mute') }
+      body = {}
+      if @options['duration']
+        body[:end] = Time.now.utc.to_i + Duration.parse(@options['duration']).to_i
+      end
+      monitors.each { |monitor| monitor.toggle_mute!('mute', JSON.dump(body)) }
     end
   end
 end
-

data/lib/doggy/cli/push.rb

@@ -29,7 +29,7 @@ module Doggy
         return
       end
       Doggy::Model.all_local_resources.each do |resource|
-        next if ids && !ids.include?(resource.id.to_s)
+        next if ids.any? && !ids.include?(resource.id.to_s)
         Doggy.ui.say "Pushing #{resource.path}, with id #{resource.id}"
         resource.ensure_read_only!
         resource.save

data/lib/doggy/cli.rb

@@ -43,8 +43,11 @@ module Doggy
     desc "mute IDs", "Mutes given monitors indefinitely"
     long_desc <<-D
       IDs is a space separated list of item IDs.
+      If `--duration` is not given, item will be muted indefinitely.
     D
 
+    method_option "duration", type: :string, desc: 'Mute only for the given period of time.'
+
     def mute(*ids)
       CLI::Mute.new(options.dup, ids).run
     end

data/lib/doggy/duration.rb

@@ -0,0 +1,32 @@
+# Copied from https://github.com/Shopify/spy/blob/ac7bfb9550bfd7bafd191bc31f1bcd9dc4ce9ee6/lib/spy/duration.rb
+# and edited accordingly
+
+require 'active_support/core_ext/module'
+require 'active_support/core_ext/integer'
+
+module Duration
+  DURATION_FORMAT = /
+    \A
+    (?<days>\d+d)?
+    (?<hours>\d+h)?
+    (?<minutes>\d+m)?
+    (?<seconds>\d+s)?
+    \z
+  /x
+  DURATION_UNITS = {
+    's' => :seconds,
+    'm' => :minutes,
+    'h' => :hours,
+    'd' => :days,
+  }
+
+  def self.parse(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
+    DURATION_UNITS.values.inject(0) do |sum, unit|
+      sum + match[unit].to_i.public_send(unit)
+    end.seconds
+  end
+end

data/lib/doggy/model.rb

@@ -31,8 +31,20 @@ module Doggy
         resource
       end
 
+      def find_local(param)
+        resources  = Doggy::Model.all_local_resources
+        if (id = param).is_a?(Integer) || (param =~ /^[0-9]+$/ && id = Integer(param)) then
+          return resources.find { |res| res.id == id }
+        end
+        if id = param[/(dash\/|screen\/|monitors#)(\d+)/i, 2]
+          return resources.find { |res| res.id == Integer(id) }
+        end
+        full_path = File.expand_path(param.gsub('objects/', ''), Doggy.object_root)
+        resources.find { |res| res.path == full_path }
+      end
+
       def all_local_resources
-        @all_local_resources ||= Parallel.map((Dir[Doggy.object_root.join("**/*.json")])) do |file|
+        @@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)

data/lib/doggy/models/monitor.rb

@@ -68,13 +68,16 @@ module Doggy
         ensure_renotify_interval_valid
       end
 
-      def toggle_mute!(action)
+      def toggle_mute!(action, body=nil)
         return unless ['mute', 'unmute'].include?(action) && id
-        attributes = request(:post, "#{ resource_url(id) }/#{action}")
+        attributes = request(:post, "#{ resource_url(id) }/#{action}", body)
         if message = attributes['errors']
           Doggy.ui.error(message)
         else
           self.attributes = attributes
+          if local_version = Doggy::Model.find_local(id)
+            self.path = local_version.path
+          end
           save_local
         end
       end

data/lib/doggy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.32
+  version: 2.0.33
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +167,7 @@ files:
 - lib/doggy/cli/pull.rb
 - lib/doggy/cli/push.rb
 - lib/doggy/cli/unmute.rb
+- lib/doggy/duration.rb
 - lib/doggy/model.rb
 - lib/doggy/models/dashboard.rb
 - lib/doggy/models/monitor.rb