lbrt 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b122a973c917adac9f07048a6e2da5c087c9695
-  data.tar.gz: e7045f54fdc6bde43c8fa883d822ab060457a3d9
+  metadata.gz: 92413afc876bd9b79a20ff955782b7caceda7ea7
+  data.tar.gz: d99af8d2a10eff05dde5cf0b31ed0790c61133e9
 SHA512:
-  metadata.gz: 787ce020528938c95397a1cab36b9a0aff497fea28826dbae6ce21a3d0491362e295191d172edffc5e47b1a7766586a5418693947711714aa690ffdfc084a877
-  data.tar.gz: 22a05b0628b4c4b5e02cecce5a55947a0a8be9ee953f9d46865cfb790f569b72feacf75dae08276827803488d2609b52eb34d3be28832a232c2d4e03f4ba3831
+  metadata.gz: 5cd2368c0a8c35c3067beeafdfb1a1529d87fedcaef2d09e305b09ef28ff82a48c9df938009f623e1aa53e763d72b5adc813ab1691c736bf9f546c0d63a0f4fb
+  data.tar.gz: e77e88e6aa1b0d043be2b2cb858e509d4d3f8eb815b65f64c093030732deced7d6aef6e74070b087d507488b218c5c37d79dbe9ccd32106621c962f8be5952e0

data/README.md

@@ -25,6 +25,7 @@ $ lbrt
 Commands:
   lbrt alert SUBCOMMAND    # Manage alerts
   lbrt help [COMMAND]      # Describe available commands or one specific command
+  lbrt metric SUBCOMMAND   # Manage metrics
   lbrt service SUBCOMMAND  # Manage services
   lbrt space SUBCOMMAND    # Manage spaces
 
@@ -36,7 +37,9 @@ Options:
   [--color], [--no-color]
                            # Default: true
   [--debug], [--no-debug]
+```
 
+```sh
 $ lbrt help alert
 Commands:
   lbrt alert apply FILE      # Apply alerts
@@ -45,7 +48,19 @@ Commands:
 
 Options:
   [--target=TARGET]
+```
+
+```sh
+$ brt help metric
+Commands:
+  lbrt metric help [COMMAND]  # Describe subcommands or one specific subcommand
+  lbrt metric peco REGRXP     # Show alert by peco
 
+Options:
+  [--target=TARGET]
+```
+
+```sh
 $ lbrt help service
 Commands:
   lbrt service apply FILE      # Apply services
@@ -54,12 +69,15 @@ Commands:
 
 Options:
   [--target=TARGET]
+```
 
+```sh
 $ lbrt help space
 Commands:
   lbrt space apply FILE      # Apply spaces
   lbrt space export [FILE]   # Export spaces
   lbrt space help [COMMAND]  # Describe subcommands or one specific subcommand
+  lbrt space peco            # Show space by peco
 
 Options:
   [--target=TARGET]
@@ -208,6 +226,18 @@ template "dstat" do
 end
 
 space "my-host-001" do
-  include_template("dstat")
+  include_template "dstat"
 end
 ```
+
+## Show metric/space by [peco](https://github.com/peco/peco)
+
+```sh
+lbrt metric peco
+```
+
+```sh
+lbrt space peco
+```
+
+![](https://raw.githubusercontent.com/winebarrel/lbrt/master/etc/peco.gif)

data/lbrt.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie'
   spec.add_dependency 'librato-client'
   spec.add_dependency 'parallel'
+  spec.add_dependency 'peco_selector'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'thor'
 

data/lib/lbrt/cli/app.rb

@@ -7,6 +7,9 @@ class Lbrt::CLI::App < Thor
   desc 'alert SUBCOMMAND', 'Manage alerts'
   subcommand :alert, Lbrt::CLI::Alert
 
+  desc 'metric SUBCOMMAND', 'Manage metrics'
+  subcommand :metric, Lbrt::CLI::Metric
+
   desc 'service SUBCOMMAND', 'Manage services'
   subcommand :service, Lbrt::CLI::Service
 

data/lib/lbrt/cli/metric.rb

@@ -0,0 +1,10 @@
+class Lbrt::CLI::Metric < Thor
+  include Lbrt::Utils::CLIHelper
+
+  class_option :target
+
+  desc 'peco', 'Show metric by peco'
+  def peco
+    client(Lbrt::Metric).peco
+  end
+end

data/lib/lbrt/cli/space.rb

@@ -4,6 +4,11 @@ class Lbrt::CLI::Space < Thor
   class_option :target
   class_option :'export-concurrency', :type => :numeric, :default => 32
 
+  desc 'peco', 'Show space by peco'
+  def peco
+    client(Lbrt::Space).peco
+  end
+
   desc 'apply FILE', 'Apply spaces'
   option :'dry-run', :type => :boolean, :default => false
   def apply(file)

data/lib/lbrt/metric.rb

@@ -0,0 +1,23 @@
+class Lbrt::Metric
+  include Lbrt::Logger::Helper
+
+  def initialize(client, options = {})
+    @client = client
+    @options = options
+  end
+
+  def peco
+    metric_names = @client.metrics.get.map {|mtrc|
+      mtrc['name']
+    }.select {|name|
+      Lbrt::Utils.matched?(name, @options[:target])
+    }
+
+    result = PecoSelector.select_from(metric_names)
+
+    result.each do |name|
+      url = "https://metrics.librato.com/s/metrics/#{name}"
+      Lbrt::Utils.open(url)
+    end
+  end
+end

data/lib/lbrt/space/dsl/context/space.rb

@@ -13,7 +13,7 @@ class Lbrt::Space::DSL::Context::Space
   private
 
   def include_template(template_name)
-    tmplt = @templates[template_name]
+    tmplt = @templates[template_name.to_s]
 
     unless tmplt
       raise "Space `#{@name_or_id}`: Template `#{template_name}` is not defined"

data/lib/lbrt/space/dsl/context.rb

@@ -20,7 +20,7 @@ class Lbrt::Space::DSL::Context
   private
 
   def template(name, &block)
-    @templates[name] = block
+    @templates[name.to_s] = block
   end
 
   def space(name_or_id, &block)

data/lib/lbrt/space/exporter.rb

@@ -26,6 +26,7 @@ class Lbrt::Space::Exporter
     Parallel.each(spaces, :in_threads => concurrency) do |spc|
       space_id = spc.fetch('id')
       name_or_id = spc.fetch('name') || space_id
+      next unless Lbrt::Utils.matched?(name_or_id, @options[:target])
       charts = @client.spaces(space_id).charts.get
 
       if space_by_name_or_id[name_or_id]

data/lib/lbrt/space.rb

@@ -7,6 +7,24 @@ class Lbrt::Space
     @driver = Lbrt::Driver.new(@client, @options)
   end
 
+  def peco
+    space_by_name_or_id = {}
+
+    metric_names = @client.spaces.get.each do |spc|
+      space_id = spc.fetch('id')
+      name_or_id = spc.fetch('name') || space_id
+      next unless Lbrt::Utils.matched?(name_or_id, @options[:target])
+      space_by_name_or_id[name_or_id] = space_id
+    end
+
+    result = PecoSelector.select_from(space_by_name_or_id)
+
+    result.each do |name|
+      url = "https://metrics.librato.com/s/spaces/#{name}"
+      Lbrt::Utils.open(url)
+    end
+  end
+
   def export(export_options = {})
     exported = Lbrt::Space::Exporter.export(@client, @options)
     Lbrt::Space::DSL.convert(exported, @options)
@@ -28,6 +46,7 @@ class Lbrt::Space
     updated = false
 
     expected.each do |name_or_id, expected_space|
+      next unless Lbrt::Utils.matched?(name_or_id, @options[:target])
       actual_space = actual.delete(name_or_id)
 
       if not actual_space and name_or_id.is_a?(Integer)

data/lib/lbrt/utils.rb

@@ -13,6 +13,12 @@ class Lbrt::Utils
         true
       end
     end
+
+    def open(url)
+      url = Shellwords.escape(url)
+      cmd = ENV['LIBRATO_OPEN'] || 'open'
+      system("#{cmd} #{url}")
+    end
   end # of class methods
 
   module ContextHelper

data/lib/lbrt/version.rb

@@ -1,3 +1,3 @@
 module Lbrt
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/lbrt.rb

@@ -3,6 +3,8 @@ require 'hashie'
 require 'librato/client'
 require 'logger'
 require 'parallel'
+require 'peco_selector'
+require 'shellwords'
 require 'singleton'
 require 'tempfile'
 require 'term/ansicolor'
@@ -16,12 +18,15 @@ require 'lbrt/utils'
 
 require 'lbrt/cli'
 require 'lbrt/cli/alert'
+require 'lbrt/cli/metric'
 require 'lbrt/cli/service'
 require 'lbrt/cli/space'
 require 'lbrt/cli/app'
 
 require 'lbrt/driver'
 
+require 'lbrt/metric'
+
 require 'lbrt/space'
 require 'lbrt/space/dsl'
 require 'lbrt/space/dsl/context'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbrt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,126 +14,140 @@ dependencies:
   name: diffy
   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: hashie
   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: librato-client
   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: 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: peco_selector
+  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: term-ansicolor
   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: thor
   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
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: A tool to manage Librato. It defines the state of Librato using DSL,
@@ -145,15 +159,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- etc/peco.gif
 - exe/lbrt
 - lbrt.gemspec
 - lib/lbrt.rb
@@ -167,11 +182,13 @@ files:
 - lib/lbrt/cli.rb
 - lib/lbrt/cli/alert.rb
 - lib/lbrt/cli/app.rb
+- lib/lbrt/cli/metric.rb
 - lib/lbrt/cli/service.rb
 - lib/lbrt/cli/space.rb
 - lib/lbrt/driver.rb
 - lib/lbrt/ext/string_ext.rb
 - lib/lbrt/logger.rb
+- lib/lbrt/metric.rb
 - lib/lbrt/service.rb
 - lib/lbrt/service/dsl.rb
 - lib/lbrt/service/dsl/context.rb
@@ -199,17 +216,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A tool to manage Librato. It defines the state of Librato using DSL, and