doggy 0.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf029d6c55560584ae887c90bb30d74c330e028b
-  data.tar.gz: c3e318a4c4ef35243fbc5e95f163e896b81b7cc3
+  metadata.gz: da4b32c34a67bbe226feff1f3a478d9d06c583c5
+  data.tar.gz: 5fa09a99ea2dc0380b464cb77e0d4f53ca89419b
 SHA512:
-  metadata.gz: d8413005760d002bbb137e09ba19b1907ac0ed778873c680d6ca2f1e659bd621a36fada78843a837da862e207ba369d5a48779f4ee117b7dc30db40f2ee91825
-  data.tar.gz: 7df10df686ff27ec591e6dd5acfe405d701c4f36fbcf3b3ef1c3c5f3e70021feb4fc015713bf2ae6321de668f8e23f426b817912558bf42bcb4aae2408ab6d4d
+  metadata.gz: 38682b7ea6457edbc412f8b2255a88f51bbe960d9665b31527c7fa881db1c9c0d3dcc93f7b70d7bfe3363af4153d48f0a79fb4823ef80647ed115a330a2d3cb6
+  data.tar.gz: effd9803a381361a31e3a161876cfa22b0807493f5090bb87903af5d545b2b9a018b6066bff41f28d60dba6daf9330061093c83705150900a2f01eedabfe1969

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2.2
+before_install: gem install bundler -v 1.10.6

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in doggy.gemspec
 gemspec

data/Gemfile.lock

@@ -1,29 +1,44 @@
 PATH
   remote: .
   specs:
-    doggy (0.2.0)
-      dogapi (~> 1.17)
-      ejson (~> 1.0)
-      thor (~> 0.19)
-      thread (~> 0.2)
+    doggy (2.0.0)
+      json (~> 1.8.3)
+      parallel (~> 1.6.1)
+      thor (~> 0.19.1)
+      virtus (~> 1.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    dogapi (1.20.0)
-      multi_json
-    ejson (1.0.0)
-    multi_json (1.11.2)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.11)
+    ice_nine (0.11.1)
+    json (1.8.3)
+    minitest (5.8.0)
+    parallel (1.6.1)
     rake (10.4.2)
     thor (0.19.1)
-    thread (0.2.2)
+    thread_safe (0.3.5)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.9)
+  bundler (~> 1.10)
   doggy!
+  minitest
   rake (~> 10.0)
 
 BUNDLED WITH

data/README.md

@@ -69,29 +69,6 @@ $ doggy mute ID ID ID
 $ doggy unmute ID ID ID
 ```
 
-## Example object definition
-
-#### Ruby DSL
-
-A DataDog object will be populated from `obj()` hash as shown below.
-
-```ruby
-created_at = Time.parse('2015-01-01 14:00:01').to_i * 1000
-
-query = "sum(last_1m):sum:Engine.current_thrust.status{status:error}.as_count() < 50"
-
-obj({
-  created_at: created_at,
-  id: 100500,
-  message: "Houston, we have a problem @pagerduty-Houston",
-  name: "Engine thrust",
-  query: query,
-  type: "query alert"
-})
-```
-
-For more examples, check the `examples` directory.
-
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies.

data/Rakefile

@@ -1,9 +1,10 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-desc "Run tests"
 task :default => :test

data/bin/console

@@ -2,5 +2,13 @@
 
 require "bundler/setup"
 require "doggy"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
 require "irb"
 IRB.start

data/bin/setup

@@ -3,3 +3,5 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
+
+# Do any other automated setup that you need to do here

data/doggy.gemspec

@@ -6,8 +6,8 @@ require 'doggy/version'
 Gem::Specification.new do |spec|
   spec.name          = "doggy"
   spec.version       = Doggy::VERSION
-  spec.authors       = ["Vlad Gorodetsky"]
-  spec.email         = ["v@gor.io"]
+  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 DataDog dashboards, alerts, screenboards, and monitors.}
@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9"
+  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_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "dogapi", "~> 1.17"
-  spec.add_dependency "thread", "~> 0.2"
-  spec.add_dependency "ejson", "~> 1.0"
+  spec.add_development_dependency "minitest"
 end

data/exe/doggy

@@ -1,12 +1,4 @@
 #!/usr/bin/env ruby
 
-# Exit cleanly from an early interrupt
-Signal.trap('INT') { exit 1 }
-
-require 'bundler/setup'
-require 'doggy/friendly_errors'
-
-Doggy.with_friendly_errors do
-  require 'doggy/cli'
-  Doggy::CLI.start(ARGV, :debug => true)
-end
+require "doggy"
+Doggy::CLI.start(ARGV)

data/lib/doggy.rb

@@ -1,103 +1,63 @@
-require 'fileutils'
-require 'pathname'
-require 'json'
-require 'yaml'
-require 'dogapi'
-
-require 'doggy/friendly_errors'
-
-require 'doggy/version'
-require 'doggy/errors'
-require 'doggy/shared_helpers'
-require 'doggy/client'
-require 'doggy/worker'
-require 'doggy/definition'
-require 'doggy/dsl'
-require 'doggy/serializer/json'
-require 'doggy/serializer/yaml'
-require 'doggy/model/dash'
-require 'doggy/model/monitor'
-require 'doggy/model/screen'
+require "pathname"
+require "net/http"
+
+require "doggy/cli"
+require "doggy/cli/edit"
+require "doggy/cli/mute"
+require "doggy/cli/pull"
+require "doggy/cli/push"
+require "doggy/cli/unmute"
+require "doggy/model"
+require "doggy/models/dashboard"
+require "doggy/models/monitor"
+require "doggy/models/screen"
+require "doggy/version"
 
 module Doggy
-  DOG_SKIP_REGEX = /😱|:scream:/i.freeze
-  MANAGED_BY_DOGGY_REGEX = /🐶|\:dog\:/i.freeze
-  DEFAULT_SERIALIZER_CLASS = Doggy::Serializer::Json
+  DOG_SKIP_REGEX         = /\xF0\x9F\x98\xB1|:scream:/i.freeze
+  MANAGED_BY_DOGGY_REGEX = /\xF0\x9F\x90\xB6|:dog:/i.freeze
 
-  class << self
-    # @option arguments [Constant] :serializer A specific serializer class to use, will be initialized by doggy and passed the object instance
-    def serializer(options = {})
-      @serializer ||= options[:serializer] ? options[:serializer] : DEFAULT_SERIALIZER_CLASS
-    end
+  extend self
 
-    def client
-      Doggy::Client.new
-    end
+  def ui
+    (defined?(@ui) && @ui) || (self.ui = Thor::Shell::Color.new)
+  end
 
-    def objects_path
-      @objects_path ||= Pathname.new('objects').expand_path(SharedHelpers.find_root).expand_path.tap { |path| FileUtils.mkdir_p(path) }
-    end
+  def ui=(ui)
+    @ui = ui
+  end
 
-    def load_item(f)
-      item = case File.extname(f)
-      when '.yaml', '.yml' then Doggy::Serializer::Yaml.load(File.read(f))
-      when '.json'         then Doggy::Serializer::Json.load(File.read(f))
-      when '.rb'           then Doggy::Dsl.evaluate(f).obj
-      else                      raise InvalidItemType
-      end
+  def object_root
+    @object_root ||= Pathname.new('objects').expand_path(repo_root)
+  end
 
-      # Hackery to support legacy dash format
-      {
-        [
-          determine_type(item), item['id'] || item['dash']['id']
-        ] => item['dash'] ? item['dash'] : item
-      }
-    end
+  def repo_root
+    # TODO: Raise error when root can't be found
+    current_dir = Dir.pwd
 
-    def edit(id_or_filename)
-      if id_or_filename =~ /json|yml|yaml/
-        item_from_filename = Doggy.load_item(Doggy.objects_path.join(id_or_filename))
-        id = item_from_filename.keys[0][1]
+    while current_dir != '/' do
+      if File.exists?(File.join(current_dir, 'Gemfile')) then
+        return Pathname.new(current_dir)
       else
-        id = id_or_filename
+        current_dir = File.expand_path('../', current_dir)
       end
-
-      object = (item_from_filename || all_local_items).detect { |(type, object_id), object| object_id.to_s == id.to_s }
-      if object && object[0] && object[0][0] && type = object[0][0].sub(/^[a-z\d]*/) { $&.capitalize }
-        Object.const_get("Doggy::#{type}").edit(id)
-      end
-    end
-
-    def determine_type(item)
-      return 'dash'    if item['graphs'] || item['dash']
-      return 'monitor' if item['message']
-      return 'screen'  if item['board_title']
-      raise InvalidItemType
     end
+  end
 
-    def emit_shipit_deployment
-      Doggy.client.dog.emit_event(
-        Dogapi::Event.new(ENV['REVISION'], msg_title: "ShipIt Deployment by #{ENV['USER']}", tags: %w(audit shipit), source_type_name: 'shipit')
-      )
-    rescue => e
-      puts "Exception: #{e.message}"
-    end
+  def api_key
+    ENV['DATADOG_API_KEY'] || secrets['datadog_api_key']
+  end
 
-    def current_sha
-      now = Time.now.to_i
-      month_ago = now - 3600 * 24 * 30
-      events = Doggy.client.dog.stream(month_ago, now, tags: %w(audit shipit))[1]['events']
+  def application_key
+    ENV['DATADOG_APP_KEY'] || secrets['datadog_app_key']
+  end
 
-      events[0]['text'] # most recetly deployed SHA
-    rescue => e
-      puts "Exception: #{e.message}"
-    end
+protected
 
-    def all_local_items
-      @all_local_items ||= Dir[Doggy.objects_path.join('**/*')].inject({}) do |memo, file|
-        next if File.directory?(file)
-        memo.merge!(load_item(file))
-      end
-    end
+  def secrets
+    @secrets ||= begin
+                   raw = File.read(repo_root.join('secrets.json'))
+                   JSON.parse(raw)
+                 end
   end
-end
+end # Doggy

data/lib/doggy/cli.rb

@@ -1,106 +1,64 @@
-require 'thor'
-require 'doggy'
+require "thor"
 
 module Doggy
   class CLI < Thor
     include Thor::Actions
 
-    def self.start(*)
-      super
-    rescue Exception => e
-      raise e
-    ensure
-    end
-
-    def initialize(*args)
-      super
-    rescue UnknownArgumentError => e
-      raise Doggy::InvalidOption, e.message
-    ensure
-      self.options ||= {}
-    end
-
-    check_unknown_options!(:except => [:config, :exec])
-    stop_on_unknown_option! :exec
-
-    desc "pull OBJECT_ID OBJECT_ID OBJECT_ID", "Pulls objects from DataDog"
+    desc "pull", "Pulls objects from Datadog"
     long_desc <<-D
-      Pull objects from DataDog. If pull is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
+      Pull objects from Datadog. All objects are pulled unless the type switches
+      are used.
     D
-    def pull(*ids)
-      require 'doggy/cli/pull'
-      Pull.new(options.dup, ids).run
-    end
 
-    desc "push [OBJECT_ID OBJECT_ID OBJECT_ID]", "Pushes objects to DataDog"
-    long_desc <<-D
-      Pushes objects to DataDog. If push is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
-    D
-    def push(*ids)
-      require 'doggy/cli/push'
-      Push.new(options.dup, ids).run
-    end
+    method_option "dashboards", type: :boolean, desc: 'Pull dashboards'
+    method_option "monitors",   type: :boolean, desc: 'Pull monitors'
+    method_option "screens",    type: :boolean, desc: 'Pull screens'
 
-    desc "edit OBJECT_ID", "Edit an existing object on DataDog"
-    long_desc <<-D
-      Opens default browser pointing to an object to edit it visually. After you finish, it will
-      display edit result.
-    D
-    def edit(id)
-      require 'doggy/cli/edit'
-      Edit.new(options.dup, id).run
+    def pull
+      CLI::Pull.new(options.dup).run
     end
 
-    desc "delete OBJECT_ID OBJECT_ID OBJECT_ID", "Deletes objects from DataDog"
+    desc "push", "Pushes objects to Datadog"
     long_desc <<-D
-      Deletes objects from DataDog. If delete is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
+      Pushes objects to Datadog. Any objects that aren't skipped and don't have
+      the marker in their title will get it as a result of a push.
     D
-    def delete(*ids)
-      require 'doggy/cli/delete'
-      Delete.new(options.dup, ids).run
+
+    method_option "dashboards", type: :boolean, desc: 'Pull dashboards'
+    method_option "monitors",   type: :boolean, desc: 'Pull monitors'
+    method_option "screens",    type: :boolean, desc: 'Pull screens'
+
+    def push
+      CLI::Push.new(options.dup).run
     end
 
+
     desc "mute OBJECT_ID OBJECT_ID OBJECT_ID", "Mutes monitor on DataDog"
     long_desc <<-D
-      Mutes monitor on DataDog. If mute is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
+      Mutes monitors on Datadog.
     D
+
     def mute(*ids)
-      require 'doggy/cli/mute'
-      Mute.new(options.dup, ids).run
+      CLI::Mute.new(options.dup, ids).run
     end
 
     desc "unmute OBJECT_ID OBJECT_ID OBJECT_ID", "Unmutes monitor on DataDog"
     long_desc <<-D
-      Deletes objects from DataDog. If delete is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
+      Unmutes monitors on datadog
     D
+
     def unmute(*ids)
-      require 'doggy/cli/unmute'
-      Unmute.new(options.dup, ids).run
+      CLI::Unmute.new(options.dup, ids).run
     end
 
-    desc "sha", "Detects the most recent SHA deployed by ShipIt"
+    desc "edit OBJECT_ID", "Edits an object"
     long_desc <<-D
-      Scans DataDog event stream for shipit events what contain most recently deployed version
-      of DataDog properties.
-      If not, the error is displayed and Doggy exits status 1.
+      Edits an object
     D
-    def sha
-      require 'doggy/cli/sha'
-      Sha.new.run
-    end
 
-    desc "version", "Prints Doggy version"
-    long_desc <<-D
-      Prints Doggy version
-    D
-    def version
-      require 'doggy/cli/version'
-      Version.new.run
+    def edit(id)
+      CLI::Edit.new(options.dup, id).run
     end
   end
 end
+