multiforecast-client 0.80.0.2 → 0.80.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05fb5d0476e998fd94384fcada44dad95b49c90
-  data.tar.gz: e2c8e233d42d092ebcc31e4fe417c912607202fa
+  metadata.gz: 96f83be23b81f12918dbe3cf40c7576fe3b6022b
+  data.tar.gz: 32f6ee8e8916fbf64b987b416dbe3c2e72384c9d
 SHA512:
-  metadata.gz: 6dec979c161addb240c65b1b687d0c4c7d9b2adb1b7a4f3daf33342b3832de4cff128dac61297b456c699d3b568efd0b61028b7b60362a66de134cb35c5583b2
-  data.tar.gz: c02f71a74c95572b54bfd1a73a002ba5a7efd10daa98e6af0226e0fe6671bfc71e6808a502289983010ca10cc82efd9b632bd6a800d985bee30f91a6d317bcca
+  metadata.gz: b7db46a9fc0bec24f355d5c2438be9e8877b3d1480a7517827624736660196e85f7b57155d8f73aab48d1cabd79f463a6c69f908b77786ca5ca958339a4e6565
+  data.tar.gz: 1f15dbda185edb03c315e91be151a2159bc3f5d89f1f3c4f822d495e55dc0303d8b02ee0036065bfc5c85eca21e07bbc0a5fd927f80ea21e29eee9b04e7eb98d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.80.0.3 (2014/03/20)
+
+Enhancement
+
+* Add regexp option for delete command
+
 # 0.80.0.2 (2014/03/04)
 
 Fixes

data/VERSION

@@ -1 +1 @@
-0.80.0.2
+0.80.0.3

data/lib/multiforecast/cli.rb

@@ -51,13 +51,15 @@ class MultiForecast::CLI < Thor
     ex) multiforecast delete 'test/test' -c multiforecast.yml
   LONGDESC
   option :graph_names,   :type => :array, :aliases => '-g'
+  option :regexp,        :type => :string, :aliases => '-r'
   def delete(base_path)
     base_path = lstrip(base_path, '/')
+    regexp = Regexp.new(@options['regexp']) if @options['regexp']
 
-    graphs = @client.list_graph(base_path)
+    graphs = @client.list_graph(base_path, regexp)
     delete_graphs(graphs, @options['graph_names'])
 
-    complexes = @client.list_complex(base_path)
+    complexes = @client.list_complex(base_path, regexp)
     delete_complexes(complexes, @options['graph_names'])
     $stderr.puts "Not found" if graphs.empty? and complexes.empty? unless @options['silent']
   end

data/lib/multiforecast/client.rb

@@ -82,6 +82,7 @@ module MultiForecast
 
     # Get the list of graphs, /json/list/graph
     # @param [String] base_path
+    # @param [Regexp] regexp list only matched graphs
     # @return [Hash] list of graphs
     # @example
     # [
@@ -98,13 +99,15 @@ module MultiForecast
     #    "path"=>"test/hostname/<1sec_count",
     #    "id"=>3},
     # ]
-    def list_graph(base_path = nil)
+    def list_graph(base_path = nil, regexp = nil)
       clients(base_path).inject([]) do |ret, client|
         graphs = []
         client.list_graph.each do |graph|
           graph['base_uri'] = client.base_uri
           graph['path']  = path(graph['service_name'], graph['section_name'], graph['graph_name'])
-          graphs << graph if base_path.nil? or graph['path'].index(base_path) == 0
+          if base_path.nil? or graph['path'].index(base_path) == 0
+            graphs << graph if !regexp or regexp.match(graph['path'])
+          end
         end
         ret = ret + graphs
       end
@@ -173,6 +176,8 @@ module MultiForecast
     end
 
     # Get the list of complex graphs, /json/list/complex
+    # @param [String] base_path
+    # @param [Regexp] regexp list only matched graphs
     # @return [Hash] list of complex graphs
     # @example
     # [
@@ -189,13 +194,15 @@ module MultiForecast
     #    "graph_name"=>"test%2Fhostname%2F%3C1sec_count",
     #    "id"=>3},
     # ]
-    def list_complex(base_path = nil)
+    def list_complex(base_path = nil, regexp = nil)
       clients(base_path).inject([]) do |ret, client|
         graphs = []
         client.list_complex.each do |graph|
           graph['base_uri'] = client.base_uri
           graph['path']  = path(graph['service_name'], graph['section_name'], graph['graph_name'])
-          graphs << graph if base_path.nil? or graph['path'].index(base_path) == 0
+          if base_path.nil? or graph['path'].index(base_path) == 0
+            graphs << graph if !regexp or regexp.match(graph['path'])
+          end
         end
         ret = ret + graphs
       end

data/spec/multiforecast/client_spec.rb

@@ -51,7 +51,15 @@ describe MultiForecast::Client do
 
   context "#list_graph" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
-    subject { graphs }
+    subject { multiforecast.list_graph }
+    its(:size) { should > 0 }
+    id_keys.each {|key| its(:first) { should have_key(key) } }
+  end
+
+  context "#list_graph(regexp)" do
+    include_context "stub_list_graph" if ENV['MOCK'] == 'on'
+    let(:graph) { multiforecast.list_graph.first }
+    subject { multiforecast.list_graph('', Regexp.new(graph['graph_name'])) }
     its(:size) { should > 0 }
     id_keys.each {|key| its(:first) { should have_key(key) } }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.80.0.2
+  version: 0.80.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: growthforecast-client