trisulrp 1.4.6 → 1.5.0

data/Gemfile

@@ -5,8 +5,8 @@ gem "ruby-protocol-buffers"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "shoulda" 
+  gem "bundler"
+  gem "jeweler"
+  gem "simplecov" 
 end

data/Rakefile

@@ -27,23 +27,7 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.4.6
+1.5.0

data/lib/trisulrp/trp.pb.rb

@@ -310,9 +310,10 @@ module TRP
   class CounterItemRequest < ::ProtocolBuffers::Message
     optional :int64, :context, 1, :default => 0
     required :string, :counter_group, 2
-    required :int64, :meter, 3, :default => 0
+    optional :int64, :meter, 3
     required :string, :key, 4
     required ::TRP::TimeInterval, :time_interval, 5
+    optional :int64, :volumes_only, 6, :default => 0
 
     gen_methods! # new fields ignored after this point
   end

data/lib/trisulrp/trp.proto

@@ -1,7 +1,7 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
 // (c) 2010-11, Unleash Networks (http://www.unleashnetworks.com)
-// $Rev: 4886 $
+// $Rev: 4914 $
 package TRP;
 
 message Timestamp  {
@@ -219,9 +219,10 @@ message ReleaseContextRequest{
 message CounterItemRequest{
     optional int64          context=1 [default=0];
     required string         counter_group=2;
-    required int64          meter=3 [default=0];
+    optional int64          meter=3;
     required string         key=4;
     required TimeInterval   time_interval=5;
+	optional int64			volumes_only=6 [default=0];
 }
 
 ///////////////////////////////

data/test/test_http_volume.rb

@@ -0,0 +1,23 @@
+require 'trisulrp'
+
+
+# usage
+raise "Usage: test_http_vol.rb TRP-SERVER TRP-PORT" unless ARGV.size==2
+
+# open a connection to Trisul server from command line args
+conn  = connect(ARGV[0],ARGV[1],"Demo_Client.crt","Demo_Client.key")
+tmarr = get_available_time(conn)
+
+# send request for http ( cg=APPS, key=p-0050) 
+req = TrisulRP::Protocol.mk_request(TRP::Message::Command::COUNTER_ITEM_REQUEST,
+                                    :counter_group=> CG_APP,
+                                    :key=> 'p-0050',
+                                    :time_interval => mk_time_interval(tmarr) )
+
+# print totals 
+get_response(conn,req) do |resp|
+	volume = resp.stats.meters.each do | meter|
+	  	print "Meter #{meter.meter} = #{meter.values[0].val}  \n"
+	end 
+end
+

data/trisulrp.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{trisulrp}
-  s.version = "1.4.6"
+  s.name = "trisulrp"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2012-05-24}
-  s.description = %q{This gem deals about the trisul remote protocol}
-  s.email = %q{vivek_rajagopal@yahoo.com}
+  s.date = "2013-02-11"
+  s.description = "This gem deals about the trisul remote protocol"
+  s.email = "vivek_rajagopal@yahoo.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -39,56 +39,43 @@ Gem::Specification.new do |s|
     "test/test_cap.rb",
     "test/test_cg.rb",
     "test/test_grep.rb",
+    "test/test_http_volume.rb",
     "test/test_key.rb",
     "test/test_key_flows.rb",
     "test/test_resources.rb",
     "test/test_trisulrp.rb",
     "trisulrp.gemspec"
   ]
-  s.homepage = %q{http://github.com/vivekrajan/trisulrp}
+  s.homepage = "http://github.com/vivekrajan/trisulrp"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{trisul trp}
-  s.test_files = [
-    "examples/strp.rb",
-    "test/cginfo.rb",
-    "test/helper.rb",
-    "test/test_alerts.rb",
-    "test/test_cap.rb",
-    "test/test_cg.rb",
-    "test/test_grep.rb",
-    "test/test_key.rb",
-    "test/test_key_flows.rb",
-    "test/test_resources.rb",
-    "test/test_trisulrp.rb"
-  ]
+  s.rubygems_version = "1.8.23"
+  s.summary = "trisul trp"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-protocol-buffers>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-protocol-buffers>, [">= 0.8.5"])
     else
       s.add_dependency(%q<ruby-protocol-buffers>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<ruby-protocol-buffers>, [">= 0.8.5"])
     end
   else
     s.add_dependency(%q<ruby-protocol-buffers>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<ruby-protocol-buffers>, [">= 0.8.5"])
   end
 end

metadata

@@ -1,116 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trisulrp
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 6
-  version: 1.4.6
+version: !ruby/object:Gem::Version
+  version: 1.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-24 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.5
 description: This gem deals about the trisul remote protocol
 email: vivek_rajagopal@yahoo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - LICENSE.txt
@@ -133,53 +137,38 @@ files:
 - test/test_cap.rb
 - test/test_cg.rb
 - test/test_grep.rb
+- test/test_http_volume.rb
 - test/test_key.rb
 - test/test_key_flows.rb
 - test/test_resources.rb
 - test/test_trisulrp.rb
 - trisulrp.gemspec
-has_rdoc: true
 homepage: http://github.com/vivekrajan/trisulrp
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -859807789
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3119419478202042163
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: trisul trp
-test_files: 
-- examples/strp.rb
-- test/cginfo.rb
-- test/helper.rb
-- test/test_alerts.rb
-- test/test_cap.rb
-- test/test_cg.rb
-- test/test_grep.rb
-- test/test_key.rb
-- test/test_key_flows.rb
-- test/test_resources.rb
-- test/test_trisulrp.rb
+test_files: []