dashdog 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1eefccd09176d0addebdde251de690ca71b65d9
-  data.tar.gz: f24304db6a985c943ecb73adf359c415593b20d8
+  metadata.gz: 5bd9f5b8483bb4fc4ab8b73b881f6dcb61e4044a
+  data.tar.gz: bbda047cb690cb840671b4a67f3609f7ebb49cab
 SHA512:
-  metadata.gz: 9a259f0e6f87135a4034508a08277c2929c371d911e4820d433af8ec4cda8441f29513b078e8690fcf3f3768a3138af2d304d658d701a7db9bf08b7d164a7d21
-  data.tar.gz: 24febc08fc6944bfbfd7864d50be38377c4546e562b93d57e66f7bd86092064bd7842af28397505ef253331b43668f5ed7f56c2ee69eb85475547f24082b708f
+  metadata.gz: ec7c47d5d7cee288898c25d011fe61a5dab41a21182693bef17bbf5fd229aab910b4833d056b182120044b49a1ba31a746a0c6ded30955d71615d04b043356a2
+  data.tar.gz: 5595e13d9e51c71daf046e80e26c22363a86516e193a62a13c67b29ab8f9d15d956d1d1c374c2ed445b008f8589c1389bc3937bdafbb83168cf6990f14a9bd84

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+## 0.1.1
+
+- Add color option / check stdout tty [#3][] ([@winebarrel][])
+- Use parallel for speeding up [#2][] ([@winebarrel][])
+- Bugfix: Error occurs when widgets is nil. [#1][] ([@winebarrel][])
+- Fix strange diff colorize
+
+## 0.1.0
+
+- Initial release
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#1]: https://github.com/serverworks/dashdog/issues/1
+[#2]: https://github.com/serverworks/dashdog/issues/2
+[#3]: https://github.com/serverworks/dashdog/issues/3
+[@winebarrel]: https://github.com/winebarrel

data/README.md

@@ -1,5 +1,7 @@
 # Dashdog
 
+[![Gem Version](https://badge.fury.io/rb/dashdog.svg)](https://badge.fury.io/rb/dashdog)
+
 Datadog dashboards management tool with Ruby DSL.
 
 ## Installation
@@ -38,6 +40,8 @@ Commands:
 Options:
   -f, [--file=FILE]  # Configuration file
                      # Default: Boardfile
+      [--color], [--no-color]  # Disable colorize
+                               # Default: true
 ```
 
 ## Commands
@@ -53,6 +57,8 @@ Options:
   -w, [--write], [--no-write]  # Write the configuration to the file
   -f, [--file=FILE]            # Configuration file
                                # Default: Boardfile
+      [--color], [--no-color]  # Disable colorize
+                               # Default: true
 ```
 
 ### apply

data/dashdog.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.19.1"
   spec.add_dependency "coderay"
   spec.add_dependency "diffy"
+  spec.add_dependency "parallel"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dashdog/actions.rb

@@ -13,7 +13,7 @@ module Dashdog
     def export(options)
       dsl = @converter.timeboards_to_dsl(@client.get_timeboards)
       dsl << @converter.screenboards_to_dsl(@client.get_screenboards)
-      Dashdog::Utils.print_ruby(dsl)
+      Dashdog::Utils.print_ruby(dsl, color: options[:color])
       File.write(options['file'], dsl) if options['write']
     end
 
@@ -38,7 +38,8 @@ module Dashdog
           if l == r
             info("#{dry_run}No changes '#{l['title']}'")
           else
-            warn("#{dry_run}Update the timeboard\n#{Dashdog::Utils.diff(r, l)}")
+            warn("#{dry_run}Update the timeboard '#{l['title']}'")
+            STDERR.puts Dashdog::Utils.diff(r, l)
             @client.update_timeboard(l) if dry_run.empty?
           end
         end
@@ -71,7 +72,8 @@ module Dashdog
           if l == r
             info("#{dry_run}No changes '#{l['board_title']}'")
           else
-            warn("#{dry_run}Update the screenboard '#{l['board_title']}'\n#{Dashdog::Utils.diff(r, l)}")
+            warn("#{dry_run}Update the screenboard '#{l['board_title']}'")
+            STDERR.puts Dashdog::Utils.diff(r, l)
             @client.update_screenboard(l) if dry_run.empty?
           end
         end

data/lib/dashdog/cli.rb

@@ -3,6 +3,7 @@ require 'thor'
 module Dashdog
   class Cli < Thor
     class_option :file, aliases: '-f', desc: 'Configuration file', type: :string, default: 'Boardfile'
+    class_option :color, desc: 'Disable colorize', type: :boolean, default: $stdout.tty?
 
     def initialize(*args)
       @actions = Dashdog::Actions.new

data/lib/dashdog/client.rb

@@ -1,4 +1,5 @@
 require 'dogapi'
+require 'parallel'
 
 module Dashdog
   class Client
@@ -9,7 +10,7 @@ module Dashdog
 
     def get_timeboards
       ret = []
-      @api.get_dashboards[1]['dashes'].each do |bd|
+      Parallel.each(@api.get_dashboards[1]['dashes'], in_threads: 8)  do |bd|
         ret << @api.get_dashboard(bd['id'])[1]['dash']
       end
       return ret
@@ -17,7 +18,7 @@ module Dashdog
 
     def get_screenboards
       ret = []
-      @api.get_all_screenboards[1]['screenboards'].each do |bd|
+      Parallel.each(@api.get_all_screenboards[1]['screenboards'], in_threads: 8) do |bd|
         ret << @api.get_screenboard(bd['id'])[1]
       end
       return ret

data/lib/dashdog/converter.rb

@@ -40,7 +40,7 @@ EOS
       screenboards.each do |sb|
         title = sb['board_title']
         DELETE_KEYS.each {|k| sb.delete(k) }
-        widgets = sb['widgets']
+        widgets = sb['widgets'] || []
         sb['widgets'] = []
         widgets.each do |wd|
           wd.delete('board_id')

data/lib/dashdog/utils.rb

@@ -20,8 +20,12 @@ module Dashdog
       puts CodeRay.scan(yaml, :yaml).terminal
     end
 
-    def self.print_ruby(ruby)
-      puts CodeRay.scan(ruby, :ruby).terminal
+    def self.print_ruby(ruby, options = {})
+      if options[:color]
+        puts CodeRay.scan(ruby, :ruby).terminal
+      else
+        puts ruby
+      end
     end
 
     def self.print_json(json)

data/lib/dashdog/version.rb

@@ -1,3 +1,3 @@
 module Dashdog
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dashdog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +147,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Boardfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md

data/Boardfile

@@ -1,117 +0,0 @@
-timeboard "terui's TimeBoard 5 Aug 2016 11:46" do
-  read_only false
-  description "created by terui@serverworks.co.jp"
-  title "terui's TimeBoard 5 Aug 2016 11:46"
-  graphs do |*|
-    definition do
-      viz "timeseries"
-      requests do |*|
-        q "avg:system.load.1{*}"
-        aggregator "avg"
-        conditional_formats []
-        type "line"
-      end
-    end
-    title "Avg of system.load.1 over *"
-  end
-  graphs do |*|
-    definition do
-      style do
-        palette "green_to_orange"
-        paletteFlip false
-      end
-      group nil
-      noMetricHosts true
-      viz "hostmap"
-      scope nil
-      requests do |*|
-        q "avg:collection_timestamp{*} by {host}"
-        type "fill"
-      end
-      noGroupHosts true
-    end
-    title "Avg of collection_timestamp over * by host"
-  end
-  graphs do |*|
-    definition do
-      viz "query_value"
-      requests do |*|
-        q "avg:system.cpu.user{*}"
-        conditional_formats do |*|
-          palette "white_on_green"
-          comparator "<="
-          value "50"
-        end
-        conditional_formats do |*|
-          palette "white_on_yellow"
-          comparator ">"
-          value "50"
-        end
-        conditional_formats do |*|
-          palette "white_on_red"
-          comparator ">"
-          value "80"
-        end
-      end
-    end
-    title "Avg of system.cpu.user over *"
-  end
-  graphs do |*|
-    definition do
-      viz "timeseries"
-      requests do |*|
-        q "avg:aws.ebs.volume_write_ops{host:default-amazon-linux}"
-      end
-      events []
-    end
-    title "aws.ebs.volume_write_ops"
-  end
-end
-
-screenboard "terui's ScreenBoard 15 Aug 2016 15:39 test" do
-  read_only false
-  board_bgtype "board_graph"
-  original_title ""
-  height 80
-  width "100%"
-  template_variables []
-  widgets do |*|
-    title_size 16
-    title true
-    color "#4d4d4d"
-    text "Text Widget 2"
-    title_align "left"
-    text_align "left"
-    title_text ""
-    height 6
-    width 24
-    y 4
-    x 8
-    font_size "auto"
-    type "free_text"
-  end
-  widgets do |*|
-    title_size 16
-    title true
-    title_align "left"
-    title_text ""
-    height 13
-    tile_def do
-      viz "timeseries"
-      requests do |*|
-        q "avg:system.cpu.user{*}"
-        conditional_formats []
-        type "line"
-      end
-    end
-    width 47
-    timeframe "1h"
-    y 4
-    x 52
-    legend_size "0"
-    type "timeseries"
-    legend false
-  end
-  shared false
-  title_edited false
-end