growthforecast-client 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cc49802fafcfffae9ab1ba873d15a4d5e7d2118a
+  data.tar.gz: 16c23fa49c8f1bf380d2adaa37b36a0cf3187329
+SHA512:
+  metadata.gz: 091ffcb68fff297f93bdf5c91bb506d41c4e9b16a5e55788518f5cf8f8f35735e2557312ed484e61e71fb39ea73f6d1271361eec256c77d05bc227cf28d3dcdc
+  data.tar.gz: 5464d4a3c35988b5f93502bc3c839de730c998f5a3ee2294a2651eb135139f818f378e4a7f7dca027bcaba88527f059afec3221f470d734d8900ca7b8e25d0e0

data/.gitignore

@@ -5,6 +5,7 @@
 .bundle
 Gemfile.lock
 .rbenv-version
+.ruby-version
 vendor
 doc/*
 tmp/*

data/.travis.yml

@@ -2,6 +2,6 @@ rvm:
 #  - 1.8.7
   - 1.9.2
   - 1.9.3
-#  - ruby-head
+  - 2.0.0
 gemfile:
   - Gemfile

data/Gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 gem 'growthforecast-client', path: '.'

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/growthforecast-client

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
+require 'growthforecast-client'
+CLI::GrowthforecastClient.start(ARGV)

data/growthforecast-client.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "httpclient"
+  gem.add_runtime_dependency "thor"
 
   # for testing
   gem.add_development_dependency "rake"
@@ -24,7 +25,5 @@ Gem::Specification.new do |gem|
 
   # for debug
   gem.add_development_dependency "pry"
-  gem.add_development_dependency "pry-debugger"
-  gem.add_development_dependency "rb-readline"
   gem.add_development_dependency "tapp"
 end

data/lib/cli/growthforecast-client.rb

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+require 'thor'
+
+module CLI
+class GrowthforecastClient < Thor
+  desc 'delete_graph <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., 
+    http://{hostname}:{port}/list/{service_name}/{section_name}?t=sh
+    or
+    http://{hostname}:{port}/view_graph/{service_name}/{section_name}/{graph_name}?t=sh
+  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}"
+      end
+    end
+  end
+
+  no_tasks do
+    def e(str)
+      URI.escape(str) if str
+    end
+
+    def split_path(path)
+      path = path.gsub(/.*list\//, '').gsub(/.*view_graph\//, '')
+      path.split('/').map {|p| URI.unescape(p) }
+    end
+
+    def client(uri)
+      GrowthForecast::Client.new("#{uri.scheme}://#{uri.host}:#{uri.port}")
+    end
+  end
+end
+end

data/lib/growthforecast-client.rb

@@ -1 +1,2 @@
 require 'growthforecast/client'
+require 'cli/growthforecast-client'

data/lib/growthforecast/client.rb

@@ -61,8 +61,12 @@ module GrowthForecast
     #    "section_name"=>"hostname",
     #    "id"=>3},
     # ]
-    def list_graph
-      get_json('/json/list/graph')
+    def list_graph(service_name = nil, section_name = nil, graph_name = nil)
+      graphs = get_json('/json/list/graph')
+      graphs = graphs.select {|g| g['service_name'] == service_name } if service_name
+      graphs = graphs.select {|g| g['section_name'] == section_name } if section_name
+      graphs = graphs.select {|g| g['graph_name']   == graph_name   } if graph_name
+      graphs
     end
 
     # A Helper: Get the list of section
@@ -137,7 +141,7 @@ module GrowthForecast
     #  "sllimit"=>-100000,
     #  "md5"=>"3c59dc048e8850243be8079a5c74d079"}
     def get_graph(service_name, section_name, graph_name)
-      get_json("/api/#{service_name}/#{section_name}/#{graph_name}")
+      get_json("/api/#{e service_name}/#{e section_name}/#{e graph_name}")
     end
 
     # Get the propety of a graph, /json/graph/:id
@@ -176,7 +180,7 @@ module GrowthForecast
     # @param [String] graph_name
     # @param [Hash] params The POST parameters. See #get_graph
     def post_graph(service_name, section_name, graph_name, params)
-      post_query("/api/#{service_name}/#{section_name}/#{graph_name}", params)
+      post_query("/api/#{e service_name}/#{e section_name}/#{e graph_name}", params)
     end
 
     # Delete a graph, POST /delete/:service_name/:section_name/:graph_name
@@ -184,7 +188,7 @@ module GrowthForecast
     # @param [String] section_name
     # @param [String] graph_name
     def delete_graph(service_name, section_name, graph_name)
-      post_query("/delete/#{service_name}/#{section_name}/#{graph_name}")
+      post_query("/delete/#{e service_name}/#{e section_name}/#{e graph_name}")
     end
 
     # Update the property of a graph, /json/edit/graph/:id
@@ -284,6 +288,10 @@ module GrowthForecast
 
     private
 
+    def e(str)
+      URI.escape(str) if str
+    end
+
     def client
       @client ||= HTTPClient.new
     end

data/spec/cli/growthforecast-client_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe CLI::GrowthforecastClient do
+  include_context "setup_growthforecast_client"
+  before(:all) { @cli = CLI::GrowthforecastClient.new }
+
+  context "#split_path" do
+    context 'list service url' do
+      before { @url = 'http://localhost/list/service_name?t=sh' }
+      before { @service_name, @section_name, @graph_name = @cli.split_path(URI.parse(@url).path) }
+      it { @service_name.should == 'service_name' }
+      it { @section_name.should be_nil }
+      it { @graph_name.should be_nil }
+    end
+
+    context 'list section url' do
+      before { @url = 'http://localhost/list/service_name/section_name?t=sh' }
+      before { @service_name, @section_name, @graph_name = @cli.split_path(URI.parse(@url).path) }
+      it { @service_name.should == 'service_name' }
+      it { @section_name.should == 'section_name' }
+      it { @graph_name.should be_nil }
+    end
+
+    context 'view_graph url' do
+      before { @url = 'http://localhost/view_graph/service_name/section_name/graph_name?t=sh' }
+      before { @service_name, @section_name, @graph_name = @cli.split_path(URI.parse(@url).path) }
+      it { @service_name.should == 'service_name' }
+      it { @section_name.should == 'section_name' }
+      it { @graph_name.should == 'graph_name' }
+    end
+  end
+
+  context "delete_graph" do
+    pending
+  end
+end
+

data/spec/growthforecast/client_spec.rb

@@ -10,14 +10,14 @@ shared_context "setup_growthforecast_client" do
   include_context "stub_post_graph" if ENV['MOCK'] == 'on'
   include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
   before(:all) {
-    @client.delete_graph("app_name", "hostname", "<1sec_count") rescue nil
-    @client.delete_graph("app_name", "hostname", "<2sec_count") rescue nil
-    @client.post_graph("app_name", "hostname", "<1sec_count", { 'number' => 0 }) rescue nil
-    @client.post_graph("app_name", "hostname", "<2sec_count", { 'number' => 0 }) rescue nil
+    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
+    @client.post_graph("app name", "host name", "<1sec count", { 'number' => 0 }) rescue nil
+    @client.post_graph("app name", "host name", "<2sec count", { 'number' => 0 }) rescue nil
   }
   after(:all) {
-    @client.delete_graph("app_name", "hostname", "<1sec_count") rescue nil
-    @client.delete_graph("app_name", "hostname", "<2sec_count") rescue nil
+    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
   }
 end
 
@@ -80,9 +80,9 @@ describe GrowthForecast::Client do
     include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
     let(:graph) {
       {
-        "service_name" => "app_name",
-        "section_name" => "hostname",
-        "graph_name"   => "<1sec_count",
+        "service_name" => "app name",
+        "section_name" => "host name",
+        "graph_name"   => "<1sec count",
       }
     }
     before  { @client.post_graph(graph['service_name'], graph['section_name'], graph['graph_name'], { 'number' => 0 }) }
@@ -143,7 +143,7 @@ describe GrowthForecast::Client do
         {
           "service_name" => graphs.first["service_name"],
           "section_name" => graphs.first["section_name"],
-          "graph_name"   => "complex_graph_test",
+          "graph_name"   => "complex graph test",
           "description"  => "complex graph test",
           "sort"         => 10
         }

data/spec/spec_helper.rb

@@ -3,8 +3,7 @@ require "bundler/setup"
 
 ENV['MOCK'] ||= 'on'
 require "pry"
-require 'debugger'
-require 'growthforecast/client'
+require 'growthforecast-client'
 require 'webmock/rspec' if ENV['MOCK'] == 'on'
 
 ROOT = File.dirname(__FILE__)

data/spec/support/mock.rb

@@ -5,13 +5,13 @@ base_uri = 'http://localhost:5125'
 shared_context "stub_list_graph" do
   let(:list_graph_example) {
     [
-      {"service_name"=>"app_name",
-       "section_name"=>"hostname",
-       "graph_name"=>"<1sec_count",
+      {"service_name"=>"app name",
+       "section_name"=>"host name",
+       "graph_name"=>"<1sec count",
        "id"=>1},
-       {"service_name"=>"app_name",
-        "section_name"=>"hostname",
-        "graph_name"=>"<2sec_count",
+       {"service_name"=>"app name",
+        "section_name"=>"host name",
+        "graph_name"=>"<2sec count",
         "id"=>2},
     ]
   }
@@ -33,14 +33,14 @@ shared_context "stub_get_graph" do
       "stype"=>"AREA",
       "adjustval"=>"1",
       "meta"=>"",
-      "service_name"=>"app_name",
+      "service_name"=>"app name",
       "gmode"=>"gauge",
       "color"=>"#cc6633",
       "created_at"=>"2013/02/02 00:41:11",
-      "section_name"=>"hostname",
+      "section_name"=>"host name",
       "ulimit"=>1000000000,
       "id"=>1,
-      "graph_name"=>"<1sec_count",
+      "graph_name"=>"<1sec count",
       "description"=>"",
       "sulimit"=>100000,
       "unit"=>"",
@@ -71,14 +71,14 @@ shared_context "stub_get_graph_by_id" do
       "stype"=>"AREA",
       "adjustval"=>"1",
       # "meta"=>"",
-      "service_name"=>"app_name",
+      "service_name"=>"app name",
       "gmode"=>"gauge",
       "color"=>"#cc6633",
       "created_at"=>"2013/02/02 00:41:11",
-      "section_name"=>"hostname",
+      "section_name"=>"host name",
       "ulimit"=>1000000000,
       "id"=>1,
-      "graph_name"=>"<1sec_count",
+      "graph_name"=>"<1sec count",
       "description"=>"",
       "sulimit"=>100000,
       "unit"=>"",
@@ -132,9 +132,9 @@ end
 shared_context "stub_list_complex" do
   let(:list_complex_example) {
     [
-      {"service_name"=>"app_name",
-       "section_name"=>"hostname",
-       "graph_name"=>"complex_graph_test",
+      {"service_name"=>"app name",
+       "section_name"=>"host name",
+       "graph_name"=>"complex graph test",
        "id"=>1},
     ]
   }

data/spec/support/setup.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+shared_context "setup_growthforecast_client" do
+  before(:all) { @client = GrowthForecast::Client.new('http://localhost:5125') }
+
+  include_context "stub_list_graph" if ENV['MOCK'] == 'on'
+  let(:graphs) { @client.list_graph }
+  let(:graph) { graphs.first }
+
+  include_context "stub_post_graph" if ENV['MOCK'] == 'on'
+  include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
+  before(:all) {
+    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
+    @client.post_graph("app name", "host name", "<1sec count", { 'number' => 0 }) rescue nil
+    @client.post_graph("app name", "host name", "<2sec count", { 'number' => 0 }) rescue nil
+  }
+  after(:all) {
+    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
+  }
+end

metadata

@@ -1,148 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tapp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby Client Library for GrowthForecast API
 email:
 - sonots@gmail.com
-executables: []
+executables:
+- growthforecast-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -155,45 +125,44 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/growthforecast-client
 - examples/create_complex.rb
 - examples/edit_graph.rb
 - growthforecast-client.gemspec
+- lib/cli/growthforecast-client.rb
 - lib/growthforecast-client.rb
 - lib/growthforecast/client.rb
+- spec/cli/growthforecast-client_spec.rb
 - spec/growthforecast/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock.rb
+- spec/support/setup.rb
 homepage: https://github.com/sonots/growthforecast-client
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 503186860326361050
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 503186860326361050
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby Client Library for GrowthForecast API
 test_files:
+- spec/cli/growthforecast-client_spec.rb
 - spec/growthforecast/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock.rb
+- spec/support/setup.rb