growthforecast-client 0.62.0 → 0.62.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e380347aae163347f8aff0e1cfa188113cc3350
-  data.tar.gz: 4a82887db1bd53783f3132ad1fbf50d86a491296
+  metadata.gz: 2aa8e954466d6a600a54404856ea29e0acf5a1cb
+  data.tar.gz: 613aef8e40914d64cac2dfba25734435dea1d6d3
 SHA512:
-  metadata.gz: 98882b9370b43b92a4ec1045a3f27f8d2c2b0a3a9408e0f0d2f45551d9336e2a98c616509dbf1be1c791dcfba69bc7bea58b20235829753e5bc307b310ae97fd
-  data.tar.gz: 5217464da3ac661d186abe1e615cdcf16fe5aa1849e4226053bdf572f07a67276182b6359fc04b182645a4058457be7b772017e84f43fa918414043fefc804b3
+  metadata.gz: 0c1a97d6d60df53dcae6e2d34954d985799295269148fdc6d8da5e1cc37c6756989741477c41b1b6ef4d2c8b1c9f295d6478f64e9cbe651c5f04e997b860c76e
+  data.tar.gz: 36bfaf46fc2fe603f4df520cd1d5b7aee52792212be118c9cd63e48215b9509b3df9e3fa0c9cb997097faabbb7903d86879c17608486fd171b00218f4372495a

data/.gitignore

@@ -10,3 +10,4 @@ vendor
 doc/*
 tmp/*
 .yardoc
+pkg

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+# 0.62.3 (2013/09/20)
+
+Features:
+
+  - Add -g and -s options to `delete` command
+
+# 0.62.2 (2013/09/19)
+
+Changes:
+
+  - Change option -u to an argument of `color`, `create_complex` command
+
+# 0.62.1 (2013/09/19)
+
+Features:
+
+  - Add `growthforecast-client color` command
+  - Add `growthforecast-client create_complex` command
+
+Changes:
+
+  - Change `growthforecast-client delete_graph` to `delete` command
+
+# 0.62.0 (2013/07/02)
+
+Changes:
+
+  - Version up!
+
 # 0.0.6 (2013/05/17)
 
 Features:

data/README.md

@@ -14,6 +14,28 @@ With growthforecast-client, for example, you can edit properties of a graph such
 
 See [examples](examples) directory.
 
+### CLI
+
+GrowthForecast Client also provides a CLI named `growthforecast-client`.
+
+Delete a graph or graphs under a path (copy and paste the URL from your GrowthForecast): 
+
+```
+$ growthforecast-client delete 'http://fqdn.to.growthforecast:5125/list/service_name'
+```
+
+Change the colors of graphs
+
+```
+$ growthforecast-client color 'http://fqdn.to.growthforecast:5125/list/service_name' -c 'graph_name:#1111cc' ...
+```
+
+See help for more:
+
+```
+$ growthforecast-client help
+```
+
 ## Contributing
 
 1. Fork it

data/VERSION

@@ -1 +1 @@
-0.62.0
+0.62.3

data/lib/growthforecast/cli.rb

@@ -2,49 +2,140 @@
 require 'thor'
 
 class GrowthForecast::CLI < Thor
-  desc 'delete_graph <url>', 'delete a graph or graphs under a url'
+  class_option :silent, :aliases => ["-S"], :type => :boolean
+
+  def initialize(args = [], opts = [], config = {})
+    super(args, opts, config)
+  end
+
+  desc 'delete <url>', 'delete a graph or graphs under a url'
   long_desc <<-LONGDESC
-    Delete a graph or graphs under a <url> where <url> is the one obtained from the view, e.g., 
+    Delete a graph or graphs under a <url> where <url> is the one obtained from the GrowthForecast URI, e.g., 
     http://{hostname}:{port}/list/{service_name}/{section_name}?t=sh
     or
     http://{hostname}:{port}/view_graph/{service_name}/{section_name}/{graph_name}?t=sh
+
+    ex) growthforecast-client delete 'http://{hostname}:{port}/list/{service_name}/{section_name}'
   LONGDESC
-  def delete_graph(url)
-    uri = URI.parse(url)
-    client = client(uri)
-    service_name, section_name, graph_name = split_path(uri.path)
-    graphs = client.list_graph(service_name, section_name, graph_name)
-    graphs.each do |graph|
-      begin
-        client.delete_graph(graph['service_name'], graph['section_name'], graph['graph_name'])
-        puts "Deleted #{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}"
-      rescue => e
-        puts "\tclass:#{e.class}\t#{e.message}"
+  option :graph_names,   :type => :array, :aliases => '-g'
+  option :section_names, :type => :array, :aliases => '-s'
+  def delete(url)
+    section_names, graph_names = options[:section_names], options[:graph_names]
+
+    base_uri, service_name, section_name, graph_name = split_url(url)
+    @client = client(base_uri)
+
+    graphs = @client.list_graph(service_name, section_name, graph_name)
+    delete_graphs(graphs, graph_names, section_names)
+
+    complexes = @client.list_complex(service_name, section_name, graph_name)
+    delete_complexes(complexes, graph_names, section_names)
+  end
+
+  desc 'color <url>', 'change the color of graphs'
+  long_desc <<-LONGDESC
+    Change the color of graphs
+
+    ex) growthforecast-client color 'http://{hostname}:{port}/list/{service_name}/{section_name}' -c '2xx_count:#1111cc' '3xx_count:#11cc11'
+  LONGDESC
+  option :colors, :type => :hash,   :aliases => '-c', :required => true, :banner => 'GRAPH_NAME:COLOR ...'
+  def color(url)
+    colors = options[:colors]
+
+    base_uri, service_name, section_name, graph_name = split_url(url)
+    @client = client(base_uri)
+
+    graphs = @client.list_graph(service_name, section_name, graph_name)
+    setup_colors(colors, graphs)
+  end
+
+  desc 'create_complex <url>', 'create complex graphs'
+  long_desc <<-LONGDESC
+    Create complex graphs under a url
+
+    ex) growthforecast-client create_complex 'http://{hostname}:{port}/list/{service_name}' -f 2xx_count 3xx_count -t status_count
+  LONGDESC
+  option :from_graphs, :type => :array,  :aliases => '-f', :required => true, :banner => 'GRAPH_NAMES ...'
+  option :to_complex,  :type => :string, :aliases => '-t', :required => true
+  def create_complex(url)
+    from_graphs, to_complex = options[:from_graphs], options[:to_complex]
+    base_uri, service_name, section_name, graph_name = split_url(url)
+    @client = client(base_uri)
+
+    graphs = @client.list_graph(service_name, section_name, graph_name)
+    setup_complex(from_graphs, to_complex, graphs)
+  end
+
+  no_tasks do
+    def delete_graphs(graphs, graph_names = nil, section_names = nil)
+      graphs.each do |graph|
+        service_name, section_name, graph_name = graph['service_name'], graph['section_name'], graph['graph_name']
+        next if section_names and !section_names.include?(section_name)
+        next if graph_names   and !graph_names.include?(graph_name)
+
+        puts "Delete #{service_name}/#{section_name}/#{graph_name}" unless @options[:silent]
+        exec { @client.delete_graph(service_name, section_name, graph_name) }
+      end
+    end
+
+    def delete_complexes(complexes, graph_names = nil, section_names = nil)
+      complexes.each do |graph|
+        service_name, section_name, graph_name = graph['service_name'], graph['section_name'], graph['graph_name']
+        next if section_names and !section_names.include?(section_name)
+        next if graph_names   and !graph_names.include?(graph_name)
+
+        puts "Delete #{service_name}/#{section_name}/#{graph_name}" unless @options[:silent]
+        exec { @client.delete_complex(service_name, section_name, graph_name) }
+      end
+    end
+
+    def setup_colors(colors, graphs)
+      graphs.each do |graph|
+        service_name, section_name, graph_name = graph['service_name'], graph['section_name'], graph['graph_name']
+        next unless color = colors[graph_name]
+
+        params = { 'color'  => color }
+        puts "Setup #{service_name}/#{section_name}/#{graph_name} with #{color}" unless @options[:silent]
+        exec { @client.edit_graph(service_name, section_name, graph_name, params) }
       end
     end
-    graphs = client.list_complex(service_name, section_name, graph_name)
-    graphs.each do |graph|
+
+    def setup_complex(from_graphs, to_complex, graphs)
+      from_graph_first = from_graphs.first
+      graphs.each do |graph|
+        service_name, section_name, graph_name = graph['service_name'], graph['section_name'], graph['graph_name']
+        next unless graph_name == from_graph_first
+
+        base = { "service_name" => service_name, "section_name" => section_name, "gmode" => 'gauge', "stack" => true, "type" => 'AREA' }
+        from_graphs_params = from_graphs.map {|graph_name| base.merge('graph_name' => graph_name) }
+        to_complex_params = { "service_name" => service_name, "section_name" => section_name, "graph_name" => to_complex, "sort" => 0 }
+
+        puts "Setup #{service_name}/#{section_name}/#{to_complex} with #{from_graphs}" unless @options[:silent]
+        exec { @client.create_complex(from_graphs_params, to_complex_params) }
+      end
+    end
+
+    def exec(&blk)
       begin
-        client.delete_complex(graph['service_name'], graph['section_name'], graph['graph_name'])
-        puts "Deleted #{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}"
+        yield
       rescue => e
-        puts "\tclass:#{e.class}\t#{e.message}"
+        $stderr.puts "\tclass:#{e.class}\t#{e.message}"
       end
     end
-  end
 
-  no_tasks do
-    def e(str)
-      CGI.escape(str).gsub('+', '%20') if str
+    def client(base_uri)
+      GrowthForecast::Client.new(base_uri)
     end
 
-    def split_path(path)
-      path = path.gsub(/.*list\//, '').gsub(/.*view_graph\//, '')
-      path.split('/').map {|p| CGI.unescape(p.gsub('%20', '+')) }
+    def split_url(url)
+      uri = URI.parse(url)
+      base_uri = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      [base_uri] + split_path(uri.path)
     end
 
-    def client(uri)
-      GrowthForecast::Client.new("#{uri.scheme}://#{uri.host}:#{uri.port}")
+    def split_path(path)
+      path = path.gsub(/.*list\/?/, '').gsub(/.*view_graph\/?/, '')
+      path.split('/').map {|p| CGI.unescape(p.gsub('%20', '+')) }
     end
   end
 end

data/lib/growthforecast/client.rb

@@ -100,8 +100,8 @@ module GrowthForecast
     #     "section_name2",
     #   ],
     # }
-    def list_section
-      graphs = list_graph
+    def list_section(service_name = nil, section_name = nil, graph_name = nil)
+      graphs = list_graph(service_name, section_name, graph_name)
       services = {}
       graphs.each do |graph|
         service_name, section_name = graph['service_name'], graph['section_name']
@@ -118,8 +118,8 @@ module GrowthForecast
     #   "service_name1",
     #   "service_name2",
     # ]
-    def list_service
-      graphs = list_graph
+    def list_service(service_name = nil, section_name = nil, graph_name = nil)
+      graphs = list_graph(service_name, section_name, graph_name)
       services = {}
       graphs.each do |graph|
         service_name = graph['service_name']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.62.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby Client Library for GrowthForecast API