multiforecast-client 0.62.0.5 → 0.62.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1da64cc1b3b63ef49933d1f4ebf864a3cb4af295
-  data.tar.gz: 7aaf9779934ec727c02a61696b37b2004d332554
+  metadata.gz: 0b9877d259aaf94156087bbac8bb9aa66694db1c
+  data.tar.gz: 187c70b320517e6df23d68877d9bd881b5f55c08
 SHA512:
-  metadata.gz: d7faed48ecf007ddc67ea66dbf3919a35382ac3663d9fdf2e1f5a3443e068f1b1c8ffe4a16f05ef3abc7e4552c29703cfd18ba0c0d0a5ef71307182b8a6a36ed
-  data.tar.gz: f3d947e1a93f8901e2edcc01dd650aa386b9f8704916a443afa39e5160bff0783d8d685a510732a5ffa2cfa9fe2d87a992359e18453831db6738e37f4fd9fd17
+  metadata.gz: ddc753bd90d278f704fc8aa87ee2e04fe4ce8e1b9aed7d11a21ed94912f17a47df6c98a7999d314261015d84d02f11cda1977341e760d866d8920c8e3ee036ca
+  data.tar.gz: 0cce09b837eb7a5cd5a1a04dbca59fe69a7cecd58da04d45129e202bca6c5d3cd0f3644fc4e1e315ceb84280697da59013b40f76b1c2b152200f1ec76d9b9e09

data/.gitignore

@@ -12,3 +12,4 @@ tags
 tmp/*
 .yardoc
 multiforecast.yml
+pkg

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 0.62.0.8 (2013/09/20)
+
+Enhancements:
+
+* Add `--graph-names` options to `delete` sub command
+
+# 0.62.0.7 (2013/09/19)
+
+Enhancements:
+
+* Add `color` and `create_complex` sub command
+
+# 0.62.0.6 (2013/09/18)
+
+CHANGES
+
+* Change the github repositry from sonots to yohoushi
+
+# 0.62.0.5 (2013/07/27)
+
+Fix
+
+* Fix the `lstrip`
+
 # 0.62.0.4 (2013/07/25)
 
 CHANGES
@@ -8,7 +32,7 @@ CHANGES
 
 Fix
 
-* Escape a white space to %20, not + to avoid GF (Kossy?) bug
+* Escape a white space to %20, not +.
 
 # 0.62.0.2 (2013/07/07)
 

data/README.md

@@ -59,12 +59,24 @@ Post a number and create a graph:
 $ multiforecast post '{"number":0}' 'foo/a/b/c' -c multiforecast.yml
 ```
 
-Delete a graph or graphs under a path:
+Delete a graph or graphs under a base path:
 
 ```
 $ multiforecast delete 'foo/' -c multiforecast.yml
 ```
 
+Change the color of graphs under a base path:
+
+```
+$ multiforecast color -k '2xx_count:#1111cc' '3xx_count:#11cc11' -b 'foo/' -c multiforecast.yml
+```
+
+Create complex graphs under a base path:
+
+```
+$ multiforecast create_complex -f 2xx_count 3xx_count -t status_count -b 'foo/' -c multiforecast.yml
+```
+
 See help for more:
 
 ```

data/VERSION

@@ -1 +1 @@
-0.62.0.5
+0.62.0.8

data/lib/multiforecast/cli.rb

@@ -4,12 +4,14 @@ require 'yaml'
 require 'multiforecast-client'
 
 class MultiForecast::CLI < Thor
+  include ::MultiForecast::ConversionRule
   class_option :config,    :aliases => ["-c"], :type => :string
   class_option :silent,    :aliases => ["-S"], :type => :boolean
 
   def initialize(args = [], opts = [], config = {})
     super(args, opts, config)
 
+    # NOTE: Please note that @options receives only strings, no symbols anymore
     if options['config'] && File.exists?(options['config'])
       @options = YAML.load_file(options['config']).merge(@options)
     end
@@ -31,39 +33,114 @@ class MultiForecast::CLI < Thor
   long_desc <<-LONGDESC
     Post a parameter to a path
 
-    ex)
-    $ multiforecast post '{"number":0}' 'test/test' -c multiforecast.yml
+    ex) multiforecast post '{"number":0}' 'test/test' -c multiforecast.yml
   LONGDESC
   def post(json, path)
-    begin
+    path = lstrip(path, '/')
+    exec do
       res = @client.post_graph(path, JSON.parse(json))
       $stdout.puts res unless @options['silent']
-    rescue => e
-      $stderr.puts "\tclass:#{e.class}\t#{e.message}"
     end
   end
 
+  # NOTE: base_path argument should be a requirement for foolproof
   desc 'delete <base_path>', 'Delete a graph or graphs under a path'
+  long_desc <<-LONGDESC
+    Delete a graph or graphs under a path
+
+    ex) multiforecast delete 'test/test' -c multiforecast.yml
+  LONGDESC
+  option :graph_names,   :type => :array, :aliases => '-g'
   def delete(base_path)
+    base_path = lstrip(base_path, '/')
+
+    graphs = @client.list_graph(base_path)
+    delete_graphs(graphs, @options['graph_names'])
+
+    complexes = @client.list_complex(base_path)
+    delete_complexes(complexes, @options['graph_names'])
+    $stderr.puts "Not found" if graphs.empty? and complexes.empty? unless @options['silent']
+  end
+
+  desc 'color', 'change the color of graphs'
+  long_desc <<-LONGDESC
+    Change the color of graphs
+
+    ex) multiforecast color -k '2xx_count:#1111cc' '3xx_count:#11cc11' -c multiforecast.yml
+  LONGDESC
+  option :colors,    :type => :hash,   :aliases => '-k', :required => true, :banner => 'GRAPH_NAME:COLOR ...'
+  option :base_path, :type => :string, :aliases => '-b'
+  def color
+    base_path = lstrip(@options['base_path'], '/') if @options['base_path']
+    graphs = @client.list_graph(base_path)
+    setup_colors(@options['colors'], graphs)
+  end
+
+  desc 'create_complex', 'create complex graphs'
+  long_desc <<-LONGDESC
+    Create complex graphs under a url
+
+    ex) multiforecast create_complex -f 2xx_count 3xx_count -t status_count -c multiforecast.yml
+  LONGDESC
+  option :from_graphs, :type => :array,  :aliases => '-f', :required => true, :banner => 'GRAPH_NAMES ...'
+  option :to_complex,  :type => :string, :aliases => '-t', :required => true
+  option :base_path,   :type => :string, :aliases => '-b'
+  def create_complex
+    base_path = lstrip(@options['base_path'], '/') if @options['base_path']
     graphs = @client.list_graph(base_path)
+    setup_complex(options['from_graphs'], options['to_complex'], graphs)
+  end
+
+  private
+
+  def delete_graphs(graphs, graph_names = nil)
     graphs.each do |graph|
-      begin
-        @client.delete_graph(graph['path'])
-        $stdout.puts "Deleted #{graph['path']}" unless @options['silent']
-      rescue => e
-        $stderr.puts "\tclass:#{e.class}\t#{e.message}"
-      end
+      path = graph['path']
+      next if graph_names and !graph_names.include?(File.basename(path))
+      puts "Delete #{path}" unless @options['silent']
+      exec { @client.delete_graph(path) }
     end
-    complexes = @client.list_complex(base_path)
+  end
+
+  def delete_complexes(complexes, graph_names = nil)
     complexes.each do |graph|
-      begin
-        @client.delete_complex(graph['path'])
-        $stdout.puts "Deleted #{graph['path']}" unless @options['silent']
-      rescue => e
-        puts "\tclass:#{e.class}\t#{e.message}"
-      end
+      path = graph['path']
+      next if graph_names and !graph_names.include?(File.basename(path))
+      puts "Delete #{path}" unless @options['silent']
+      exec { @client.delete_complex(path) }
+    end
+  end
+
+  def setup_colors(colors, graphs)
+    graphs.each do |graph|
+      path = graph['path']
+      next unless color = colors[File.basename(path)]
+      data = { 'color' => color }
+      puts "Setup #{path} with #{color}" unless @options['silent']
+      exec { @client.edit_graph(path, data) }
+    end
+  end
+
+  def setup_complex(from_graphs, to_complex, graphs)
+    from_graph_first = from_graphs.first
+    graphs.each do |graph|
+      next unless File.basename(graph['path']) == from_graph_first
+      dirname = File.dirname(graph['path'])
+
+      base = {'gmode' => 'gauge', 'stack' => true, 'type' => 'AREA'}
+      from_graphs_params = from_graphs.map {|name| base.merge('path' => "#{dirname}/#{name}") }
+      to_complex_params = { 'path' => "#{dirname}/#{to_complex}", 'sort' => 0 }
+      puts "Setup #{dirname}/#{to_complex} with #{from_graphs}" unless @options['silent']
+      exec { @client.create_complex(from_graphs_params, to_complex_params) }
+    end
+  end
+
+  def exec(&blk)
+    begin
+      yield
+    rescue => e
+      $stderr.puts "\tclass:#{e.class}\t#{e.message}"
     end
-    $stderr.puts "Not found" if graphs.empty? and complexes.empty? unless @options['silent']
   end
 end
 

data/lib/multiforecast/client.rb

@@ -15,7 +15,10 @@ module MultiForecast
     # @param [Hash] opts
     #   [Hash] mapping: Mapping rules from `path` to GrowthForecast's `base_uri`.
     def initialize(opts = {})
-      @mapping = opts['mapping'] || { '' => 'http://localhost:5125' }
+      @mapping = {}
+      mapping = opts['mapping'] || { '' => 'http://localhost:5125' }
+      # remove heading / of path
+      mapping.each {|key, val| @mapping[lstrip(key, '/')] = val }
       @short_metrics = opts['short_metrics'] || true
 
       @clients = {}
@@ -77,6 +80,7 @@ module MultiForecast
     end
 
     # Get the list of graphs, /json/list/graph
+    # @param [String] base_path
     # @return [Hash] list of graphs
     # @example
     # [
@@ -273,9 +277,10 @@ module MultiForecast
     #   height [String] the height of image to show
     # @return [Hash]  error response
     # @example
-    def get_graph_uri(path, params = {})
-      params = preprocess_time_params(params) if params
-      "#{@base_uris[id(path)]}/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}?#{query_string(params)}"
+    def get_graph_uri(path, params = nil)
+      params ||= {}
+      params = preprocess_time_params(params) unless params.empty?
+      "#{@base_uris[id(path)]}/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}#{'?' unless params.empty?}#{query_string(params)}"
     end
 
     # Get complex graph image uri
@@ -291,9 +296,10 @@ module MultiForecast
     #   height [String] the height of image to show
     # @return [Hash]  error response
     # @example
-    def get_complex_uri(path, params = {})
-      params = preprocess_time_params(params) if params
-      "#{@base_uris[id(path)]}/complex/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}?#{query_string(params)}"
+    def get_complex_uri(path, params = nil)
+      params ||= {}
+      params = preprocess_time_params(params) unless params.empty?
+      "#{@base_uris[id(path)]}/complex/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}#{'?' unless params.empty?}#{query_string(params)}"
     end
 
     # process the time params (from and to)

data/lib/multiforecast/conversion_rule.rb

@@ -4,8 +4,10 @@ require 'cgi'
 module MultiForecast
   module ConversionRule
     def uri_escape(string)
-      # + => '%20' is to avoid GF (Kossy?) bug
-      # . => '%2E' because a/./b is recognized as a/b as URL
+      # Here, we want to do CGI.escape to encode '/', but GF (Plack?) does URI.unescape when it receives.
+      # Major Difference: In URI.escape, ' ' => '%20'. In CGI.escape, ' ' => '+'.
+      # Thus, we need to convert as ' ' => '+', and then, '+' => '%20' so that GF can unescape '%20' => ' '.
+      # '.' => '%2E' because a/./b is recognized as a/b as URL
       CGI.escape(string).gsub('+', '%20').gsub('.', '%2E') if string
     end
 

data/lib/multiforecast/shared_examples.rb

@@ -28,3 +28,7 @@ shared_examples_for 'graph_uri_params_fromto' do
   it { subject.should match(/(\?|&)from=#{Regexp.escape(URI.escape(params['from'].to_s))}(&|$)/) }
   it { subject.should match(/(\?|&)to=#{Regexp.escape(URI.escape(params['to'].to_s))}(&|$)/) }
 end
+
+shared_examples_for 'graph_uri_empty_params' do
+  it { subject.should_not match(/(\?|&)/) }
+end

data/multiforecast-client.gemspec

@@ -6,9 +6,10 @@ Gem::Specification.new do |gem|
   gem.version       = File.read(File.expand_path('VERSION', File.dirname(__FILE__))).chomp
   gem.authors       = ["Naotoshi Seo"]
   gem.email         = ["sonots@gmail.com"]
-  gem.homepage      = "https://github.com/sonots/multiforecast-client"
+  gem.homepage      = "https://github.com/yohoushi/multiforecast-client"
   gem.summary       = "Multiple GrowthForecast Client"
   gem.description   = gem.summary
+  gem.licenses      = ['MIT']
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/multiforecast/client_spec.rb

@@ -8,6 +8,18 @@ describe MultiForecast::Client do
   complex_keys = %w[number complex created_at service_name section_name id graph_name data sumup
                    description sort updated_at]
 
+  context "#initialize" do
+    context "typical" do
+      subject { MultiForecast::Client.new('mapping' => {'app1/' => 'http://localhost:5125'}) }
+      it { subject.instance_variable_get(:@mapping).keys.first.should == 'app1/' }
+    end
+
+    context "leading / of mapping path should be stripped" do
+      subject { MultiForecast::Client.new('mapping' => {'/app1/' => 'http://localhost:5125'}) }
+      it { subject.instance_variable_get(:@mapping).keys.first.should == 'app1/' }
+    end
+  end
+
   context "#list_graph" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
     subject { graphs }
@@ -86,7 +98,7 @@ describe MultiForecast::Client do
     end
   end
 
-  describe "graph_uri" do
+  describe "graph_uri_term" do
     let(:params) do
       {
         't' => 'h',
@@ -104,6 +116,30 @@ describe MultiForecast::Client do
     end
   end
 
+  describe "graph_uri_empty" do
+    let(:params) { {} }
+    context "#get_graph_uri" do
+      subject { multiforecast.get_graph_uri(graph["path"], params) }
+      it_should_behave_like 'graph_uri_empty_params'
+    end
+    context "#get_complex_uri" do
+      subject { multiforecast.get_complex_uri(graph["path"], params) }
+      it_should_behave_like 'graph_uri_empty_params'
+    end
+  end
+
+  describe "graph_uri_nil" do
+    let(:params) { nil }
+    context "#get_graph_uri" do
+      subject { multiforecast.get_graph_uri(graph["path"], params) }
+      it_should_behave_like 'graph_uri_empty_params'
+    end
+    context "#get_complex_uri" do
+      subject { multiforecast.get_complex_uri(graph["path"], params) }
+      it_should_behave_like 'graph_uri_empty_params'
+    end
+  end
+
   describe "graph_uri_fromto" do
     shared_context "short_period" do
       before { now = Time.now; Time.stub(:now) { now } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.62.0.5
+  version: 0.62.0.8
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: growthforecast-client
@@ -141,8 +141,9 @@ files:
 - spec/multiforecast/client_spec.rb
 - spec/multiforecast/conversion_rule_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/sonots/multiforecast-client
-licenses: []
+homepage: https://github.com/yohoushi/multiforecast-client
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -168,4 +169,3 @@ test_files:
 - spec/multiforecast/client_spec.rb
 - spec/multiforecast/conversion_rule_spec.rb
 - spec/spec_helper.rb
-has_rdoc: