doggy 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a08db9823ee6c5ed48f47766bfd0efbea67b6ed
-  data.tar.gz: dbd6aa580574f14850b44d1b9ceea5038171127b
+  metadata.gz: ae47149af8df1d2a4f5e977b85ec4659b396c524
+  data.tar.gz: 4ba1dffaf222c19e4c6a6f6f64c75643d9bb4924
 SHA512:
-  metadata.gz: 2a14f340fe533e1169ea5ad4612fcaca875c6a903a4a9d8c7b3c82ef59cbfefa5d500426e59c1767553aef7de07249a8cdf742d3841abdc0fb91b998df0b29ca
-  data.tar.gz: 9a9917fd410dd1d4648a574d6b8f2f1371e9b5d43b8834af9ab33e1b49c3be9d0637dff54e0a4a928089b43460aa99f2208609a62f9b385fea1bf1c7fc54e124
+  metadata.gz: 256336173e7b014f436b936a57eca85b9d73f9eae3dbab1a8cd73cb41b6617dc89ff4b0ee6499329270b862213816b5019be9857b57f6d2f1f056262ecaadd3f
+  data.tar.gz: 16d53a9d77766dcc441f49cf2ee8b12ee9636fed3cf155f54eb4576eb1cc624385fa20072deeff91fa8ff23a2eb26763c6e8a9d1be148f30bb4e177350cf6dc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doggy (0.1.3)
+    doggy (0.2.0)
       dogapi (~> 1.17)
       ejson (~> 1.0)
       thor (~> 0.19)

data/README.md

@@ -18,13 +18,32 @@ Or install it yourself as:
 
     $ gem install doggy
 
-## Usage
+## Authentication
+
+To authenticate, you need to set API and APP keys for your DataDog account.
+
+#### Environment variables
+
+Export `DATADOG_API_KEY` and `DATADOG_APP_KEY` environment variables and `doggy` will catch them up automatically.
+
+#### 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:
+
+```json
+{
+  "datadog_api_key": "key1",
+  "datadog_app_key": "key2"
+}
 ```
-# Export your DataDog credentials or use ejson
-$ export DATADOG_API_KEY=api_key_goes_here
-$ export DATADOG_APP_KEY=app_key_goes_here
 
+## Usage
+
+```bash
 # Download selected items from DataDog
 $ doggy pull ID ID
 
@@ -37,14 +56,41 @@ $ doggy push ID ID ID
 # Upload all items to DataDog
 $ doggy push
 
-# Create a new dashboard
-$ doggy create dash 'My New Dash'
+# Edit a dashboard in WYSIWYG
+$ doggy edit ID
 
 # Delete selected items from both DataDog and local storage
 $ doggy delete ID ID ID
+
+# Mute monitor(s) forever
+$ doggy mute ID ID ID
+
+# Unmute monitor(s)
+$ 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"
+})
 ```
 
-Note that we currently don't support global upload due to high risk of overwriting things. We'll turn this feature on after initial testing period.
+For more examples, check the `examples` directory.
 
 ## Development
 

data/examples/my-monitor.rb

@@ -0,0 +1,14 @@
+created_at = Time.parse('2015-01-01 14:00:01').to_i * 1000
+
+query <<-QUERY
+  sum(last_1m):sum:Engine.current_thrust.status{status:error}.as_count() < 50
+QUERY
+
+obj({
+  created_at: created_at,
+  id: 100500,
+  message: "Houston, we have a problem @pagerduty-Houston",
+  name: "Engine thrust",
+  query: query,
+  type: "query alert"
+})

data/exe/doggy

@@ -4,6 +4,9 @@
 Signal.trap('INT') { exit 1 }
 
 require 'bundler/setup'
-require 'doggy/cli'
+require 'doggy/friendly_errors'
 
-Doggy::CLI.start(ARGV, :debug => true)
+Doggy.with_friendly_errors do
+  require 'doggy/cli'
+  Doggy::CLI.start(ARGV, :debug => true)
+end

data/lib/doggy.rb

@@ -4,9 +4,15 @@ 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'
@@ -14,18 +20,9 @@ require 'doggy/model/monitor'
 require 'doggy/model/screen'
 
 module Doggy
-  DOG_SKIP_REGEX = /\[dog\s+skip\]/i.freeze
+  DOG_SKIP_REGEX = /😱|:scream:/i.freeze
+  MANAGED_BY_DOGGY_REGEX = /🐶|\:dog\:/i.freeze
   DEFAULT_SERIALIZER_CLASS = Doggy::Serializer::Json
-  MAX_TRIES = 5
-
-  class DoggyError < StandardError
-    def self.status_code(code)
-      define_method(:status_code) { code }
-    end
-  end
-
-  class InvalidOption < DoggyError; status_code(15); end
-  class InvalidItemType < DoggyError; status_code(10); end
 
   class << self
     # @option arguments [Constant] :serializer A specific serializer class to use, will be initialized by doggy and passed the object instance
@@ -37,50 +34,42 @@ module Doggy
       Doggy::Client.new
     end
 
-    # Absolute path of where alerts are stored on the filesystem.
-    #
-    # @return [Pathname]
-    def alerts_path
-      @alerts_path ||= Pathname.new('alerts').expand_path(Dir.pwd).expand_path.tap { |path| FileUtils.mkdir_p(path) }
-    end
-
-    # Absolute path of where dashes are stored on the filesystem.
-    #
-    # @return [Pathname]
-    def dashes_path
-      @dashes_path ||=  Pathname.new('dashes').expand_path(Dir.pwd).expand_path.tap { |path| FileUtils.mkdir_p(path) }
-    end
-
-    # Absolute path of where screens are stored on the filesystem.
-    #
-    # @return [Pathname]
-    def screens_path
-      @screens_path ||= Pathname.new('screens').expand_path(Dir.pwd).expand_path.tap { |path| FileUtils.mkdir_p(path) }
-    end
-
-    # Cleans up directory
-    def clean_dir(dir)
-      Dir.foreach(dir) { |f| fn = File.join(dir, f); File.delete(fn) if f != '.' && f != '..'}
-    end
-
-    def all_local_items
-      @all_local_items ||= Dir[Doggy.dashes_path.join('**/*'), Doggy.alerts_path.join('**/*'), Doggy.screens_path.join('**/*')].inject({}) { |memo, file| memo.merge load_item(f) }
+    def objects_path
+      @objects_path ||= Pathname.new('objects').expand_path(Dir.pwd).expand_path.tap { |path| FileUtils.mkdir_p(path) }
     end
 
     def load_item(f)
-      filetype = File.extname(f)
-
-      item = case filetype
+      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
 
-      { [ determine_type(item), item['id'] ] => item }
+      # Hackery to support legacy dash format
+      {
+        [
+          determine_type(item), item['id'] || item['dash']['id']
+        ] => item['dash'] ? item['dash'] : item
+      }
+    end
+
+    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]
+      else
+        id = id_or_filename
+      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']
+      return 'dash'    if item['graphs'] || item['dash']
       return 'monitor' if item['message']
       return 'screen'  if item['board_title']
       raise InvalidItemType
@@ -94,24 +83,7 @@ module Doggy
       puts "Exception: #{e.message}"
     end
 
-    def with_retry(times: MAX_TRIES, reraise: false)
-      tries = 0
-      while tries < times
-        begin
-          yield
-          break
-        rescue => e
-          error "Caught error in create_record! attempt #{tries}..."
-          error "#{e.class.name}: #{e.message}"
-          error "#{e.backtrace.join("\n")}"
-          tries += 1
-
-          raise e if tries >= times && reraise
-        end
-      end
-    end
-
-    def current_version
+    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']
@@ -121,15 +93,10 @@ module Doggy
       puts "Exception: #{e.message}"
     end
 
-    def all_remote_dashes
-      @all_remote_dashes ||= Doggy.client.dog.get_dashboards[1]['dashes'].inject({}) do |memo, dash|
-        memo.merge([ 'dash', dash['id'] ] => dash)
-      end
-    end
-
-    def all_remote_monitors
-      @all_remote_monitors ||= Doggy.client.dog.get_all_monitors[1].inject({}) do |memo, monitor|
-        memo.merge([ 'monitor', monitor['id'] ] => monitor)
+    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
   end

data/lib/doggy/cli.rb

@@ -23,7 +23,7 @@ module Doggy
     check_unknown_options!(:except => [:config, :exec])
     stop_on_unknown_option! :exec
 
-    desc "pull [SPACE SEPARATED IDs]", "Pulls objects from DataDog"
+    desc "pull OBJECT_ID OBJECT_ID OBJECT_ID", "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.
@@ -33,7 +33,7 @@ module Doggy
       Pull.new(options.dup, ids).run
     end
 
-    desc "push [SPACE SEPARATED IDs]", "Pushes objects to DataDog"
+    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.
@@ -43,17 +43,17 @@ module Doggy
       Push.new(options.dup, ids).run
     end
 
-    desc "create OBJECT_TYPE OBJECT_NAME", "Creates a new object on DataDog"
+    desc "edit OBJECT_ID", "Edit an existing object on DataDog"
     long_desc <<-D
-      Creates a new object on DataDog. If create is successful, Doggy exits with a status of 0.
-      If not, the error is displayed and Doggy exits status 1.
+      Opens default browser pointing to an object to edit it visually. After you finish, it will
+      display edit result.
     D
-    def create(kind, name)
-      require 'doggy/cli/create'
-      Create.new(options.dup, kind, name).run
+    def edit(id)
+      require 'doggy/cli/edit'
+      Edit.new(options.dup, id).run
     end
 
-    desc "delete SPACE SEPARATED IDs", "Deletes objects from DataDog"
+    desc "delete OBJECT_ID OBJECT_ID OBJECT_ID", "Deletes objects from 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.
@@ -63,7 +63,7 @@ module Doggy
       Delete.new(options.dup, ids).run
     end
 
-    desc "mute [SPACE SEPARATED IDs]", "Mutes monitor on DataDog"
+    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.
@@ -73,7 +73,7 @@ module Doggy
       Mute.new(options.dup, ids).run
     end
 
-    desc "unmute [SPACE SEPARATED IDs]", "Unmutes monitor on DataDog"
+    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.
@@ -83,12 +83,21 @@ module Doggy
       Unmute.new(options.dup, ids).run
     end
 
-    desc "version", "Detects the most recent SHA deployed by ShipIt"
+    desc "sha", "Detects the most recent SHA deployed by ShipIt"
     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.
     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

data/lib/doggy/cli/delete.rb

@@ -13,7 +13,7 @@ module Doggy
         Doggy::Monitor.delete(ids)
         Doggy::Screen.delete(ids)
       rescue DoggyError
-        puts "Create failed."
+        puts "Delete failed."
         exit 1
       end
     end

data/lib/doggy/cli/edit.rb

@@ -0,0 +1,14 @@
+module Doggy
+  class CLI::Edit
+    attr_reader :options, :id
+
+    def initialize(options, id)
+      @options = options
+      @id = id
+    end
+
+    def run
+      Doggy.edit(id)
+    end
+  end
+end

data/lib/doggy/cli/pull.rb

@@ -9,15 +9,9 @@ module Doggy
 
     def run
       begin
-        if ids.any?
-          Doggy::Dash.download(ids)
-          Doggy::Monitor.download(ids)
-          Doggy::Screen.download(ids)
-        else
-          Doggy::Dash.download_all
-          Doggy::Monitor.download_all
-          Doggy::Screen.download_all
-        end
+        Doggy::Dash.download(ids)
+        Doggy::Monitor.download(ids)
+        Doggy::Screen.download(ids)
       rescue DoggyError
         puts "Pull failed."
         exit 1

data/lib/doggy/cli/sha.rb

@@ -0,0 +1,12 @@
+module Doggy
+  class CLI::Sha
+    def run
+      begin
+        print Doggy.current_sha
+      rescue DoggyError
+        puts "Could not fetch latest SHA from DataDog."
+        exit 1
+      end
+    end
+  end
+end

data/lib/doggy/cli/version.rb

@@ -1,12 +1,7 @@
 module Doggy
   class CLI::Version
     def run
-      begin
-        print Doggy.current_version
-      rescue DoggyError
-        puts "Could not fetch latest SHA from DataDog."
-        exit 1
-      end
+      print Doggy::VERSION
     end
   end
 end

data/lib/doggy/definition.rb

@@ -0,0 +1,9 @@
+module Doggy
+  class Definition
+    attr_reader :obj
+
+    def initialize(obj)
+      @obj = obj
+    end
+  end
+end

data/lib/doggy/dsl.rb

@@ -0,0 +1,73 @@
+module Doggy
+  class Dsl
+    def self.evaluate(object_file)
+      builder = new
+      builder.eval_file(object_file)
+      builder.to_definition
+    end
+
+    def initialize
+      @obj = {}
+    end
+
+    def eval_file(object_file, contents = nil)
+      contents ||= File.open(object_file.to_s, "rb") { |f| f.read }
+      instance_eval(contents, object_file.to_s, 1)
+    rescue Exception => e
+      message = "There was an error " \
+        "#{e.is_a?(ObjectFileEvalError) ? "evaluating" : "parsing"} " \
+        "`#{File.basename object_file.to_s}`: #{e.message}"
+
+      raise DSLError.new(message, object_file, e.backtrace, contents)
+    end
+
+    def obj(structure)
+      @obj = structure
+    end
+
+    # @return [Definition] the parsed object definition.
+    def to_definition
+      Definition.new(@obj)
+    end
+
+    def method_missing(name, *args)
+      raise Doggy::ObjectFileError, "Undefined local variable or method `#{name}' for object file"
+    end
+
+    private
+
+    class DSLError < Doggy::ObjectFileError
+      # @return [String] the message that should be presented to the user.
+      attr_reader :message
+
+      # @return [String] the path of the dsl file that raised the exception.
+      attr_reader :dsl_path
+
+      # @return [Exception] the backtrace of the exception raised by the evaluation of the dsl file.
+      attr_reader :backtrace
+
+      # @param [Exception] backtrace @see backtrace
+      # @param [String]    dsl_path  @see dsl_path
+      def initialize(message, dsl_path, backtrace, contents = nil)
+        @status_code = $!.respond_to?(:status_code) && $!.status_code
+
+        @message = message
+        @dsl_path    = dsl_path
+        @backtrace   = backtrace
+        @contents    = contents
+      end
+
+      def status_code
+        @status_code || super
+      end
+
+      # @return [String] the contents of the DSL that cause the exception to
+      #         be raised.
+      def contents
+        @contents ||= begin
+          dsl_path && File.exist?(dsl_path) && File.read(dsl_path)
+        end
+      end
+    end
+  end
+end

data/lib/doggy/errors.rb

@@ -0,0 +1,12 @@
+module Doggy
+  class DoggyError < StandardError
+    def self.status_code(code)
+      define_method(:status_code) { code }
+    end
+  end
+
+  class ObjectFileError < DoggyError; status_code(12); end
+  class ObjectFileEvalError < DoggyError; status_code(11); end
+  class InvalidOption < DoggyError; status_code(15); end
+  class InvalidItemType < DoggyError; status_code(10); end
+end

data/lib/doggy/friendly_errors.rb

@@ -0,0 +1,76 @@
+require 'cgi'
+require 'thor'
+require 'doggy'
+
+module Doggy
+  def self.with_friendly_errors
+    yield
+  rescue Doggy::Dsl::DSLError => e
+    puts e.message
+    exit e.status_code
+  rescue Doggy::DoggyError => e
+    puts e.message
+    puts e
+    exit e.status_code
+  rescue Thor::AmbiguousTaskError => e
+    puts e.message
+    exit 15
+  rescue Thor::UndefinedTaskError => e
+    puts e.message
+    exit 15
+  rescue Thor::Error => e
+    puts e.message
+    exit 1
+  rescue Interrupt => e
+    puts "\nQuitting..."
+    puts e
+    exit 1
+  rescue SystemExit => e
+    exit e.status
+  rescue Exception => e
+    request_issue_report_for(e)
+    exit 1
+  end
+
+  def self.request_issue_report_for(e)
+    puts <<-EOS.gsub(/^ {6}/, "")
+      --- ERROR REPORT TEMPLATE -------------------------------------------------------
+      - What did you do?
+
+        I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
+
+      - What did you expect to happen?
+
+        I expected Doggy to...
+
+      - What happened instead?
+
+        Instead, what actually happened was...
+
+
+      Error details
+
+          #{e.class}: #{e.message}
+            #{e.backtrace.join("\n            ")}
+
+      --- TEMPLATE END ----------------------------------------------------------------
+
+    EOS
+
+    puts "Unfortunately, an unexpected error occurred, and Doggy cannot continue."
+
+    puts <<-EOS.gsub(/^ {6}/, "")
+
+      First, try this link to see if there are any existing issue reports for this error:
+      #{issues_url(e)}
+
+      If there aren't any reports for this error yet, please create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
+      https://github.com/bai/doggy/issues/new
+    EOS
+  end
+
+  def self.issues_url(exception)
+    "https://github.com/bai/doggy/search?q=" \
+    "#{CGI.escape(exception.message.lines.first.chomp)}&type=Issues"
+  end
+end

data/lib/doggy/model/dash.rb

@@ -1,26 +1,9 @@
 module Doggy
   class Dash
-    def initialize(**options)
-      @id = options[:id]
-      @title = options[:title] || raw_local['title']
-      @description = options[:description] || raw_local['description']
-      @graphs = options[:graphs] || raw_local['graphs']
-      @template_variables = options[:template_variables] || raw_local['template_variables']
-    end
-
-    def self.download_all
-      ids = Doggy.client.dog.get_dashboards[1]['dashes'].map { |d| d['id'] }
-      puts "Downloading #{ids.size} dashboards..."
-      Doggy.clean_dir(Doggy.dashes_path)
-      download(ids)
-    rescue => e
-      puts "Exception: #{e.message}"
-    end
-
     def self.upload_all
-      ids = Dir[Doggy.dashes_path.join('*')].map { |f| File.basename(f, '.*') }
-      puts "Uploading #{ids.size} dashboards from #{Doggy.dashes_path}: #{ids.join(', ')}"
-      upload(ids)
+      objects = all_local_items.find_all { |(type, id), object| type == 'dash' }
+      puts "Uploading #{objects.size} dashboards"
+      upload(objects.map { |(type, id), object| id })
     rescue => e
       puts "Exception: #{e.message}"
     end
@@ -33,20 +16,23 @@ module Doggy
       Doggy::Worker.new(threads: Doggy::Worker::CONCURRENT_STREAMS) { |id| new(id: id).push }.call([*ids])
     end
 
-    def self.create(name)
-      # This graphs placeholder is required as you cannot create an empty dashboard via API
-      dash = new(title: name, description: '', graphs: [{
-        "definition" => {
-          "events" => [],
-          "requests" => [
-            {"q" => "avg:system.mem.free{*}"}
-          ],
-          "viz" => "timeseries"
-        },
-        "title" => "Average Memory Free"
-      }])
-      dash.push
-      dash.save
+    def self.edit(id)
+      system %{open "https://app.datadoghq.com/dash/#{id}"}
+      if SharedHelpers.agree("Are you done?")
+        puts 'Here is the output of your edit:'
+        puts Doggy::Serializer::Json.dump(new(id: id).raw)
+      else
+        puts "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"
+        edit(id)
+      end
+    end
+
+    def initialize(**options)
+      @id = options[:id]
+      @title = options[:title] || raw_local['title']
+      @description = options[:description] || raw_local['description']
+      @graphs = options[:graphs] || raw_local['graphs']
+      @template_variables = options[:template_variables] || raw_local['template_variables']
     end
 
     def raw
@@ -58,7 +44,10 @@ module Doggy
 
     def raw_local
       return {} unless File.exists?(path)
-      @raw_local ||= Doggy.serializer.load(File.read(path))
+      @raw_local ||= begin
+        object = Doggy.serializer.load(File.read(path))
+        object['dash'] ? object['dash'] : object
+      end
     end
 
     def save
@@ -72,12 +61,17 @@ module Doggy
     def push
       return unless File.exists?(path)
       return if @title =~ Doggy::DOG_SKIP_REGEX
+      return unless Doggy.determine_type(raw_local) == 'dash'
+
+      # Managed by doggy (TM)
+      @title = @title =~ MANAGED_BY_DOGGY_REGEX ? @title : @title + " 🐶"
+
       if @id
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           Doggy.client.dog.update_dashboard(@id, @title, @description, @graphs, @template_variables)
         end
       else
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           dash = Doggy.client.dog.create_dashboard(@title, @description, @graphs)
         end
         # FIXME: Remove duplication
@@ -88,13 +82,12 @@ module Doggy
 
     def delete
       Doggy.client.dog.delete_dashboard(@id)
-      File.unlink(path)
     end
 
     private
 
     def path
-      "#{Doggy.dashes_path}/#{@id}.json"
+      "#{Doggy.objects_path}/#{@id}.json"
     end
   end
 end

data/lib/doggy/model/monitor.rb

@@ -1,33 +1,9 @@
 module Doggy
   class Monitor
-    def initialize(**options)
-      @id = options[:id]
-      @query = options[:query]
-      @silenced = options[:silenced]
-      @name = options[:name]
-      @timeout_h = options[:timeout_h]
-      @message = options[:message]
-      @notify_audit = options[:notify_audit]
-      @notify_no_data = options[:notify_no_data]
-      @renotify_interval = options[:renotify_interval]
-      @escalation_message = options[:escalation_message]
-      @no_data_timeframe = options[:no_data_timeframe]
-      @silenced_timeout_ts = options[:silenced_timeout_ts]
-    end
-
-    def self.download_all
-      ids = Doggy.client.dog.get_all_alerts[1]['alerts'].map { |d| d['id'] }
-      puts "Downloading #{ids.size} alerts..."
-      Doggy.clean_dir(Doggy.alerts_path)
-      download(ids)
-    rescue => e
-      puts "Exception: #{e.message}"
-    end
-
     def self.upload_all
-      ids = Dir[Doggy.alerts_path.join('*')].map { |f| File.basename(f, '.*') }
-      puts "Uploading #{ids.size} alerts from #{Doggy.alerts_path}: #{ids.join(', ')}"
-      upload(ids)
+      objects = all_local_items.find_all { |(type, id), object| type == 'monitor' }
+      puts "Uploading #{objects.size} monitors"
+      upload(objects.map { |(type, id), object| id })
     rescue => e
       puts "Exception: #{e.message}"
     end
@@ -48,11 +24,30 @@ module Doggy
       Doggy::Worker.new(threads: Doggy::Worker::CONCURRENT_STREAMS) { |id| new(id: id).unmute }.call([*ids])
     end
 
-    def self.create(name)
-      # Adding a placeholder query as it's a mandatory parameter
-      item = new(name: name, query: 'avg(last_1m):avg:system.load.1{*} > 100')
-      item.push
-      item.save
+    def self.edit(id)
+      system %{open "https://app.datadoghq.com/monitors##{id}"}
+      if SharedHelpers.agree("Are you done?")
+        puts 'Here is the output of your edit:'
+        puts Doggy::Serializer::Json.dump(new(id: id).raw)
+      else
+        puts "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"
+        edit(id)
+      end
+    end
+
+    def initialize(**options)
+      @id = options[:id]
+      @query = options[:query]
+      @silenced = options[:silenced]
+      @name = options[:name]
+      @timeout_h = options[:timeout_h]
+      @message = options[:message]
+      @notify_audit = options[:notify_audit]
+      @notify_no_data = options[:notify_no_data]
+      @renotify_interval = options[:renotify_interval]
+      @escalation_message = options[:escalation_message]
+      @no_data_timeframe = options[:no_data_timeframe]
+      @silenced_timeout_ts = options[:silenced_timeout_ts]
     end
 
     def raw
@@ -94,10 +89,15 @@ module Doggy
 
     def push
       return if @name =~ Doggy::DOG_SKIP_REGEX
+      return unless Doggy.determine_type(raw_local) == 'monitor'
+
+      # Managed by doggy (TM)
+      @name = @name =~ MANAGED_BY_DOGGY_REGEX ? @name : @name + " 🐶"
+
       if @id
         return unless File.exists?(path)
 
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           Doggy.client.dog.update_monitor(@id, @query || raw_local['query'], {
             name: @name || raw_local['name'],
             timeout_h: @timeout_h || raw_local['timeout_h'],
@@ -114,7 +114,7 @@ module Doggy
           })
         end
       else
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           result = Doggy.client.dog.monitor('metric alert', @query, name: @name)
         end
         @id = result[1]['id']
@@ -123,13 +123,12 @@ module Doggy
 
     def delete
       Doggy.client.dog.delete_alert(@id)
-      File.unlink(path)
     end
 
     private
 
     def path
-      "#{Doggy.alerts_path}/#{@id}.json"
+      "#{Doggy.objects_path}/#{@id}.json"
     end
 
     def mute_state_for(id)

data/lib/doggy/model/screen.rb

@@ -1,23 +1,9 @@
 module Doggy
   class Screen
-    def initialize(**options)
-      @id = options[:id]
-      @description = options[:description] || raw_local
-    end
-
-    def self.download_all
-      ids = Doggy.client.dog.get_all_screenboards[1]['screenboards'].map { |d| d['id'] }
-      puts "Downloading #{ids.size} screenboards..."
-      Doggy.clean_dir(Doggy.screens_path)
-      download(ids)
-    rescue => e
-      puts "Exception: #{e.message}"
-    end
-
     def self.upload_all
-      ids = Dir[Doggy.screens_path.join('*')].map { |f| File.basename(f, '.*') }
-      puts "Uploading #{ids.size} screenboards from #{Doggy.screens_path}: #{ids.join(', ')}"
-      upload(ids)
+      objects = all_local_items.find_all { |(type, id), object| type == 'screen' }
+      puts "Uploading #{objects.size} screens"
+      upload(objects.map { |(type, id), object| id })
     rescue => e
       puts "Exception: #{e.message}"
     end
@@ -30,10 +16,20 @@ module Doggy
       Doggy::Worker.new(threads: Doggy::Worker::CONCURRENT_STREAMS) { |id| new(id: id).push }.call([*ids])
     end
 
-    def self.create(name)
-      item = new(description: { 'board_title' => name, 'widgets' => [] })
-      item.push
-      item.save
+    def self.edit(id)
+      system %{open "https://app.datadoghq.com/screen/#{id}"}
+      if SharedHelpers.agree("Are you done?")
+        puts 'Here is the output of your edit:'
+        puts Doggy::Serializer::Json.dump(new(id: id).raw)
+      else
+        puts "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"
+        edit(id)
+      end
+    end
+
+    def initialize(**options)
+      @id = options[:id]
+      @description = options[:description] || raw_local
     end
 
     def raw
@@ -57,12 +53,13 @@ module Doggy
 
     def push
       return if @description =~ Doggy::DOG_SKIP_REGEX
+      return unless Doggy.determine_type(raw_local) == 'screen'
       if @id
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           Doggy.client.dog.update_screenboard(@id, @description)
         end
       else
-        Doggy.with_retry do
+        SharedHelpers.with_retry do
           result = Doggy.client.dog.create_screenboard(@description)
         end
         @id = result[1]['id']
@@ -72,13 +69,12 @@ module Doggy
 
     def delete
       Doggy.client.dog.delete_screenboard(@id)
-      File.unlink(path)
     end
 
     private
 
     def path
-      "#{Doggy.screens_path}/#{@id}.json"
+      "#{Doggy.objects_path}/#{@id}.json"
     end
   end
 end

data/lib/doggy/shared_helpers.rb

@@ -0,0 +1,36 @@
+module Doggy
+  module SharedHelpers
+    MAX_TRIES = 5
+
+    def self.strip_heredoc(string)
+      indent = string.scan(/^[ \t]*(?=\S)/).min.try(:size) || 0
+      string.gsub(/^[ \t]{#{indent}}/, '')
+    end
+
+    def self.with_retry(times: MAX_TRIES, reraise: false)
+      tries = 0
+      while tries < times
+        begin
+          yield
+          break
+        rescue => e
+          error "Caught error! Attempt #{tries}..."
+          error "#{e.class.name}: #{e.message}"
+          error "#{e.backtrace.join("\n")}"
+          tries += 1
+
+          raise e if tries >= times && reraise
+        end
+      end
+    end
+
+    def self.agree(prompt)
+      raise Error, "Not a tty" unless $stdin.tty?
+
+      puts prompt + " (Y/N)"
+      line = $stdin.readline.chomp.upcase
+      puts
+      line == "Y"
+    end
+  end
+end

data/lib/doggy/version.rb

@@ -1,3 +1,3 @@
 module Doggy
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Vlad Gorodetsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,22 +111,29 @@ files:
 - bin/console
 - bin/setup
 - doggy.gemspec
+- examples/my-monitor.rb
 - exe/doggy
 - lib/doggy.rb
 - lib/doggy/cli.rb
-- lib/doggy/cli/create.rb
 - lib/doggy/cli/delete.rb
+- lib/doggy/cli/edit.rb
 - lib/doggy/cli/mute.rb
 - lib/doggy/cli/pull.rb
 - lib/doggy/cli/push.rb
+- lib/doggy/cli/sha.rb
 - lib/doggy/cli/unmute.rb
 - lib/doggy/cli/version.rb
 - lib/doggy/client.rb
+- lib/doggy/definition.rb
+- lib/doggy/dsl.rb
+- lib/doggy/errors.rb
+- lib/doggy/friendly_errors.rb
 - lib/doggy/model/dash.rb
 - lib/doggy/model/monitor.rb
 - lib/doggy/model/screen.rb
 - lib/doggy/serializer/json.rb
 - lib/doggy/serializer/yaml.rb
+- lib/doggy/shared_helpers.rb
 - lib/doggy/version.rb
 - lib/doggy/worker.rb
 homepage: http://github.com/bai/doggy

data/lib/doggy/cli/create.rb

@@ -1,25 +0,0 @@
-module Doggy
-  class CLI::Create
-    attr_reader :options, :kind, :name
-
-    def initialize(options, kind, name)
-      @options = options
-      @kind = kind
-      @name = name
-    end
-
-    def run
-      begin
-        case kind
-        when 'dash', 'dashboard'     then Doggy::Dash.create(name)
-        when 'alert', 'monitor'      then Doggy::Monitor.create(name)
-        when 'screen', 'screenboard' then Doggy::Screen.create(name)
-        else puts 'Unknown item type'
-        end
-      rescue DoggyError
-        puts "Create failed."
-        exit 1
-      end
-    end
-  end
-end