kennel 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d04df6004bdc388dbb4ceed94c05e013cfee900
-  data.tar.gz: 160234c0a44f19c710fd498ffcd1a457a0526b07
+SHA256:
+  metadata.gz: 7f7cba17e46fe78338b0f7dea6acb87e245953879f215bf3f3186e55fddaf6af
+  data.tar.gz: 5b5320d4a392c264be866e053f3acf6bffc092a3067e17c906a547063ecae747
 SHA512:
-  metadata.gz: e728b8ed2c4e9d2e3a4acc1c524c473cc12daadda8864f29ab48e6a8df1a1a67db2ab38c62c1e05b1312ebd20af230b6e3f2dffb17294917f6029d0019a329ad
-  data.tar.gz: dc95e835d9fff8aecbcf15042449ab84d921e970f55cbe36875d4055180cb78f7d78b1f5537d6a9c5c45308f6c293d7d6e8de3972097ce9ef682f8f7578db216
+  metadata.gz: 450193433fd81c3fb283a976dfa5a6dd283561dede4db4f3bc0c1b2d84800d631ef26c7e6c7a5dd8aeacb1a73d4e6f876d65225bc38fa860b2e2803d485facae
+  data.tar.gz: 44a48ca74e20669d61b2b7a5b38e4d2b36c8f556f33bb624ebba3cdbb9df507d5b6b14345c422004295aa7962e35fcbf3a18b105bf1e91430277cc62f205b93d

data/lib/kennel.rb

@@ -44,11 +44,6 @@ module Kennel
       syncer.update if syncer.confirm
     end
 
-    def report_plan_to_github
-      reporter = GithubReporter.new(ENV.fetch("GITHUB_TOKEN"))
-      reporter.report { plan }
-    end
-
     private
 
     def syncer
@@ -63,9 +58,13 @@ module Kennel
       @generated ||= begin
         Progress.progress "Generating" do
           load_all
-          Models::Project.recursive_subclasses.flat_map do |project_class|
+          parts = Models::Project.recursive_subclasses.flat_map do |project_class|
             project_class.new.parts
           end
+          parts.map(&:tracking_id).group_by { |id| id }.select do |id, same|
+            raise "#{id} is defined #{same.size} times" if same.size != 1
+          end
+          parts
         end
       end
     end

data/lib/kennel/api.rb

@@ -32,12 +32,28 @@ module Kennel
     def request(method, path, body: nil, params: {})
       params = params.merge(application_key: @app_key, api_key: @api_key)
       query = Faraday::FlatParamsEncoder.encode(params)
-      response = @client.send(method, "#{path}?#{query}") do |request|
-        request.body = JSON.generate(body) if body
-        request.headers["Content-type"] = "application/json"
+      response = nil
+
+      2.times do |i|
+        response = @client.send(method, "#{path}?#{query}") do |request|
+          request.body = JSON.generate(body) if body
+          request.headers["Content-type"] = "application/json"
+        end
+        break if i == 1 || method != :get || response.status != 500
+      end
+
+      unless response.success?
+        message = +"Error #{response.status} during #{method.upcase} #{path}\n"
+        message << "request:\n#{JSON.pretty_generate(body)}\nresponse:\n" if body
+        message << response.body
+        raise message
+      end
+
+      if response.body.empty?
+        {}
+      else
+        JSON.parse(response.body, symbolize_names: true)
       end
-      raise "Error #{method} #{path} -> #{response.status}:\n#{response.body}" unless response.success?
-      JSON.parse(response.body, symbolize_names: true)
     end
   end
 end

data/lib/kennel/github_reporter.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 module Kennel
   class GithubReporter
+    class << self
+      def report(token, &block)
+        return yield unless token
+        new(token).report(&block)
+      end
+    end
+
     def initialize(token)
       @token = token
       @git_sha = Utils.capture_sh("git rev-parse HEAD").strip
@@ -8,8 +15,8 @@ module Kennel
       @repo_part = origin[%r{github\.com[:/](.+?)(\.git|$)}, 1] || raise("no origin found")
     end
 
-    def report
-      output = Utils.strip_shell_control(Utils.capture_stdout { yield }.strip)
+    def report(&block)
+      output = Utils.strip_shell_control(Utils.tee_stdout(&block).strip)
     ensure
       comment "```\n#{output || "Error"}\n```"
     end

data/lib/kennel/models/screen.rb

@@ -66,7 +66,7 @@ module Kennel
         widgets.map do |widget|
           widget = widget_defaults(widget[:type]).merge(widget)
           if tile = widget[:tile_def]
-            tile[:requests].each { |r| r[:conditional_formats] ||= [] }
+            tile.fetch(:requests).each { |r| r[:conditional_formats] ||= [] }
             tile[:autoscale] = true unless widget[:tile_def].key?(:autoscale)
           end
           widget

data/lib/kennel/tasks.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "English"
+require "kennel"
 
 namespace :kennel do
   desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
@@ -25,24 +26,20 @@ namespace :kennel do
     Kennel.update
   end
 
-  desc "comment on github commit with planned datadog changes"
-  task report_plan_to_github: :environment do
-    Kennel.report_plan_to_github
-  end
-
-  desc "update if this is a push to the default branch, otherwise report plan"
+  desc "update if this is a push to the default branch, otherwise plan (report to github with GITHUB_TOKEN)"
   task :travis do
     on_default_branch = (ENV["TRAVIS_BRANCH"] == (ENV["DEFAULT_BRANCH"] || "master"))
     is_push = (ENV["TRAVIS_PULL_REQUEST"] == "false")
     task_name =
       if on_default_branch && is_push
         "kennel:update_datadog"
-      elsif ENV["GITHUB_TOKEN"]
-        "kennel:report_plan_to_github"
       else
-        "kennel:plan"
+        "kennel:plan" # show plan in travis logs
       end
-    Rake::Task[task_name].invoke
+
+    Kennel::GithubReporter.report(ENV["GITHUB_TOKEN"]) do
+      Rake::Task[task_name].invoke
+    end
   end
 
   task :environment do

data/lib/kennel/utils.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 module Kennel
   module Utils
+    class TeeIO < IO
+      def initialize(ios)
+        @ios = ios
+      end
+
+      def write(string)
+        @ios.each { |io| io.write string }
+      end
+    end
+
     class << self
       def snake_case(string)
         string.gsub(/::/, "_") # Foo::Bar -> foo_bar
@@ -33,11 +43,22 @@ module Kennel
       end
 
       def capture_stdout
+        old = $stdout
         $stdout = StringIO.new
         yield
         $stdout.string
       ensure
-        $stdout = STDOUT
+        $stdout = old
+      end
+
+      def tee_stdout
+        old = $stdout
+        string = StringIO.new
+        $stdout = TeeIO.new([$stdout, string])
+        yield
+        string.string
+      ensure
+        $stdout = old
       end
 
       def capture_sh(command)
@@ -57,11 +78,9 @@ module Kennel
       def parallel(items)
         items.map do |item|
           Thread.new do
-            begin
-              yield item
-            rescue StandardError => e
-              e
-            end
+            yield item
+          rescue StandardError => e
+            e
           end
         end.map(&:value).each { |i| raise i if i.is_a?(StandardError) }
       end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management