doggy 2.0.42 → 2.1.0

data/.rubocop.yml

@@ -0,0 +1,20 @@
+inherit_from: http://shopify.github.io/ruby-style-guide/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+  Exclude:
+    - bin/*
+    - db/schema.rb
+    - node_modules/**/*
+
+Rails:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/WordArray:
+  MinSize: 2
+
+Metrics/LineLength:
+  Enabled: false

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.5.5

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,60 +1,79 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.42)
-      activesupport (~> 4)
-      json (~> 1.8.3)
-      parallel (~> 1.6.1)
-      rugged (~> 0.23.2)
-      thor (~> 0.19.1)
-      virtus (~> 1.0.5)
+    doggy (2.1.0)
+      activesupport
+      parallel
+      rugged
+      thor
+      virtus
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    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.0.5)
+    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.2.3)
-    i18n (0.9.3)
+    hashdiff (0.3.8)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (1.8.6)
+    jaro_winkler (1.5.2)
     metaclass (0.0.4)
-    minitest (5.9.0)
-    mocha (1.1.0)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    parallel (1.6.2)
-    public_suffix (2.0.4)
-    rake (10.5.0)
-    rugged (0.23.3)
-    safe_yaml (1.0.4)
-    thor (0.19.4)
+    parallel (1.17.0)
+    parser (2.6.2.1)
+      ast (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    psych (3.1.0)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rubocop (0.67.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.0)
+    rugged (0.28.1)
+    safe_yaml (1.0.5)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    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 (1.22.6)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -63,12 +82,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
+  bundler
   doggy!
   minitest
   mocha
-  rake (~> 10.0)
+  pry
+  rake
+  rubocop
   webmock
 
 BUNDLED WITH
-   1.16.0
+   2.0.1

data/README.md

@@ -81,7 +81,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/bai/doggy/fork )
+1. Fork it ( https://github.com/shopify/doggy/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task(default: :test)

data/dev.yml

@@ -0,0 +1,8 @@
+name: doggy
+
+up:
+  # - homebrew:
+  #   - cmake
+  - ruby:
+      version: 2.6.2
+  - bundler

data/doggy.gemspec

@@ -1,4 +1,6 @@
 # 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'
@@ -9,26 +11,27 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Vlad Gorodetsky", "Andre Medeiros"]
   spec.email         = ["v@gor.io", "me@andremedeiros.info"]
 
-  spec.summary       = %q{Syncs DataDog dashboards, alerts, screenboards, and monitors.}
-  spec.description   = %q{Syncs and manages DataDog dashboards, alerts, screenboards, and monitors.}
+  spec.summary       = 'Syncs DataDog dashboards, alerts, screenboards, and monitors.'
+  spec.description   = 'Syncs and manages DataDog dashboards, alerts, screenboards, and monitors.'
   spec.homepage      = "http://github.com/bai/doggy"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.5'
 
-  spec.add_dependency "json",     "~> 1.8.3"
-  spec.add_dependency "parallel", "~> 1.6.1"
-  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_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_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
+  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')
 end

data/exe/doggy

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "doggy"
 Doggy::CLI.start(ARGV)

data/lib/doggy.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "pathname"
 require "net/http"
@@ -45,8 +46,8 @@ module Doggy
     # TODO: Raise error when root can't be found
     current_dir = Dir.pwd
 
-    while current_dir != '/' do
-      if File.exist?(File.join(current_dir, 'Gemfile')) then
+    while current_dir != '/'
+      if File.exist?(File.join(current_dir, 'Gemfile'))
         return Pathname.new(current_dir)
       else
         current_dir = File.expand_path('../', current_dir)
@@ -74,7 +75,6 @@ module Doggy
     (curr_dir.expand_path(resolved + path) + path).to_s
   end
 
-
   protected
 
   def secrets

data/lib/doggy/cli.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "thor"
 
@@ -79,4 +80,3 @@ module Doggy
     end
   end
 end
-

data/lib/doggy/cli/delete.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Doggy
   class CLI::Delete

data/lib/doggy/cli/edit.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Doggy
   class CLI::Edit
@@ -9,10 +10,10 @@ module Doggy
 
     def run
       resource = Doggy::Model.find_local(@param)
-      return Doggy.ui.error("Could not find resource with #{ @param }") unless resource
+      return Doggy.ui.error("Could not find resource with #{@param}") unless resource
 
       forked_resource = fork(resource)
-      system("open '#{ forked_resource.human_edit_url }'")
+      system("open '#{forked_resource.human_edit_url}'")
       wait_for_edit
 
       new_resource = Doggy::Model.infer_type(resource.attributes).find(forked_resource.id)
@@ -34,9 +35,7 @@ module Doggy
     private
 
     def wait_for_edit
-      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
+      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") until Doggy.ui.yes?('Are you done editing?(Y/N)')
     end
 
     def fork(resource)
@@ -44,15 +43,15 @@ module Doggy
       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
-      elsif resource.class.to_s.downcase =~ /screen/
-        forked_resource.board_title = "[#{ salt }] " + forked_resource.board_title
-      elsif resource.class.to_s.downcase =~ /monitor/
-        forked_resource.name = "[#{ salt }] " + forked_resource.name
+      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
+      elsif /monitor/.match?(resource.class.to_s.downcase)
+        forked_resource.name = "[#{salt}] " + forked_resource.name
       else
-        raise StandardError.new('Unknown resource type, cannot edit.')
+        raise StandardError, 'Unknown resource type, cannot edit.'
       end
       forked_resource.save
       forked_resource

data/lib/doggy/cli/mute.rb

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

data/lib/doggy/cli/pull.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'parallel'
 
@@ -35,8 +36,8 @@ module Doggy
       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] }
+        normalized_local_resources = local_resources.map { |local_resource| [local_resource.class.name, local_resource.id] }
         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.

data/lib/doggy/cli/push.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Doggy
   class CLI::Push
@@ -8,14 +9,14 @@ module Doggy
 
     def sync_changes
       changed_resources = Doggy::Model.changed_resources
-      Doggy.ui.say "Syncing #{changed_resources.size} objects to Datadog..."
+      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}"
+          Doggy.ui.say("Deleting #{resource.path}, with id = #{resource.id}")
           resp = resource.destroy
-          Doggy.ui.say "Response: #{resp.inspect}"
+          Doggy.ui.say("Response: #{resp.inspect}")
         else
-          Doggy.ui.say "Saving #{resource.path}, with id = #{resource.id}"
+          Doggy.ui.say("Saving #{resource.path}, with id = #{resource.id}")
           resource.ensure_read_only!
           resource.save
         end
@@ -30,7 +31,7 @@ module Doggy
       end
       Doggy::Model.all_local_resources.each do |resource|
         next if ids.any? && !ids.include?(resource.id.to_s)
-        Doggy.ui.say "Pushing #{resource.path}, with id #{resource.id}"
+        Doggy.ui.say("Pushing #{resource.path}, with id #{resource.id}")
         resource.ensure_read_only!
         resource.save
       end

data/lib/doggy/cli/unmute.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Doggy
   class CLI::Unmute

data/lib/doggy/duration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copied from https://github.com/Shopify/spy/blob/ac7bfb9550bfd7bafd191bc31f1bcd9dc4ce9ee6/lib/spy/duration.rb
 # and edited accordingly
 
@@ -5,14 +7,14 @@ require 'active_support/core_ext/module'
 require 'active_support/core_ext/integer'
 
 module Duration
-  DURATION_FORMAT = /
+  DURATION_FORMAT = %r{
     \A
     (?<days>\d+d)?
     (?<hours>\d+h)?
     (?<minutes>\d+m)?
     (?<seconds>\d+s)?
     \z
-  /x
+  }x
   DURATION_UNITS = {
     's' => :seconds,
     'm' => :minutes,

data/lib/doggy/model.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "json"
 require "parallel"
@@ -25,18 +26,18 @@ module Doggy
       def find(id)
         attributes = request(:get, resource_url(id), nil, [404])
         return if attributes['errors']
-        resource   = new(attributes)
+        resource = new(attributes)
 
         resource.loading_source = :remote
         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
+        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 }
         end
-        if id = param[/(dash\/|screen\/|monitors#)(\d+)/i, 2]
+        if id = param[%r{(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)
@@ -49,7 +50,7 @@ module Doggy
           begin
             attributes = JSON.parse(raw)
           rescue JSON::ParserError
-            Doggy.ui.error "Could not parse #{ file }."
+            Doggy.ui.error("Could not parse #{file}.")
             next
           end
           resource = infer_type(attributes).new(attributes)
@@ -65,13 +66,13 @@ module Doggy
         diff.find_similar!
         diff.each_delta.map do |delta|
           new_file_path = delta.new_file[:path]
-          next unless new_file_path.match(/\Aobjects\//)
+          next unless new_file_path =~ %r{\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...")
+            Doggy.ui.error("Could not parse #{new_file_path}. Skipping...")
             next
           end
           resource = infer_type(attributes).new(attributes)
@@ -83,7 +84,7 @@ module Doggy
       end
 
       def infer_type(attributes)
-        has_key = ->(key) { attributes.has_key?(key.to_s) || attributes.has_key?(key.to_sym) }
+        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')
@@ -92,10 +93,10 @@ module Doggy
       def request(method, url, body = nil, accepted_errors = nil)
         uri = URI(url)
 
-        if uri.query
-          uri.query = "api_key=#{ Doggy.api_key }&application_key=#{ Doggy.application_key }" + '&' + uri.query
+        uri.query = if uri.query
+          "api_key=#{Doggy.api_key}&application_key=#{Doggy.application_key}" + '&' + uri.query
         else
-          uri.query = "api_key=#{ Doggy.api_key }&application_key=#{ Doggy.application_key }"
+          "api_key=#{Doggy.api_key}&application_key=#{Doggy.application_key}"
         end
 
         http = Net::HTTP.new(uri.host, uri.port)
@@ -112,16 +113,16 @@ module Doggy
         request.body = body if body
 
         response = http.request(request)
-        parsed_response = response.body ? JSON.parse(response.body) : nil
+        parsed_response = response.body.present? ? JSON.parse(response.body) : nil
 
         unless accepted_response(response.code.to_i, accepted_errors)
-          raise DoggyError, "Unexpected response code #{response.code} for #{url}, body: #{parsed_response.to_s}"
+          raise DoggyError, "Unexpected response code #{response.code} for #{url}, body: #{parsed_response}"
         end
         parsed_response
       end
 
       def accepted_response(code, accepted_errors = nil)
-        if (accepted_errors != nil) && (accepted_errors.include? code)
+        if !accepted_errors.nil? && accepted_errors.include?(code)
           true
         else
           code >= 200 && code < 400
@@ -131,7 +132,7 @@ module Doggy
       def current_sha
         now = Time.now.to_i
         month_ago = now - 3600 * 24 * 30
-        result = request(:get, "https://app.datadoghq.com/api/v1/events?start=#{ month_ago }&end=#{ now }&tags=audit,shipit")
+        result = request(:get, "https://app.datadoghq.com/api/v1/events?start=#{month_ago}&end=#{now}&tags=audit,shipit")
         result['events'][0]['text'] # most recetly deployed SHA
       end
 
@@ -144,25 +145,24 @@ module Doggy
           tags: %w(audit shipit),
           date_happened: Time.now.to_i,
           priority: 'normal',
-          source_type_name: 'shipit'
+          source_type_name: 'shipit',
         }.to_json)
       end
 
       def sort_by_key(hash, &block)
-        hash.keys.sort(&block).reduce({}) do |seed, key|
+        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
-          seed
         end
       end
 
       protected
 
-      def resource_url(id = nil)
+      def resource_url(_id = nil)
         raise NotImplementedError, "#resource_url has to be implemented."
       end
     end # class << self
@@ -200,14 +200,14 @@ module Doggy
       validate
 
       body = JSON.dump(to_h)
-      if !id then
+      if !id
         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
 
@@ -230,4 +230,3 @@ module Doggy
     end
   end # Model
 end # Doggy
-