rboss 0.2.1 → 0.2.2

data/README.md

@@ -46,6 +46,24 @@ Execute commands with --invoke:
     twiddle --invoke server,shutdown
     twiddle --invoke web_deployment:jmx-console,stop
 
+Extending mbeans
+
+You can use a file in ~/.rboss.twiddle for mapping new mbeans or overriding the defaults
+
+    JBoss::Twiddle::Monitor.defaults[:http_request] = {
+      :description => 'Request for http protocol',
+      :pattern => 'jboss.web:type=GlobalRequestProcessor,name=http-127.0.0.1-8080',
+      :properties => %W(requestCount errorCount maxTime)
+    }
+
+And use it normally
+
+    twiddle --http-request
+
+You can do every action using custom mbeans
+
+    twiddle --invoke http_request,resetCounters
+
 Using jboss-profile
 -----------
 

data/bin/twiddle

@@ -30,7 +30,7 @@ params = {}
 mbeans = {}
 commands = {}
 no_details = false
-params[:jboss_home] = Dir.pwd unless ENV["JBOSS_HOME"]
+params[:jboss_home] = (ENV["JBOSS_HOME"] or ENV["TWIDDLE_HOME"] or Dir.pwd)
 exec_file = nil
 defaults = JBoss::Twiddle::Monitor::defaults
 
@@ -56,21 +56,21 @@ opts.on('--all', "Detail all mapped mbeans") do
   defaults.each do |mbean_id, mbean|
     if mbean[:scan]
       mbeans[mbean_id] = :all
-    elsif mbean[:detail]
+    elsif mbean[:properties]
       mbeans[mbean_id] = true
     end
   end
 end
 
-defaults.each do |mbean_id, mbean|
+(defaults.sort_by {|k,v| k}).each do |mbean_id, mbean|
   command = mbean_id.to_s.gsub /_/, '-'
   if mbean[:scan]
     opts.on("--#{command} [name_a,name_b,...]", Array,
-            "Detail this mbeam based on the given names (no names for scan)") do |names|
+            "Detail \"#{mbean[:description]}\" based on the given names (no names for scan)") do |names|
       mbeans[mbean_id] = names || :all
     end
-  elsif mbean[:detail]
-    opts.on("--#{command}", "Detail this mbeam") do
+  elsif mbean[:properties]
+    opts.on("--#{command}", "Detail \"#{mbean[:description]}\"") do
       mbeans[mbean_id] = true
     end
   end
@@ -89,7 +89,7 @@ opts.on('--invoke mbean_id[:resource_name],method,[,args...]', Array,
   commands[:invoke] = invoke
 end
 opts.on("-l", "--list", "List the mbeans mappings") do
-  defaults.each do |mbean_id, mbean|
+  (defaults.sort_by {|k,v| k}).each do |mbean_id, mbean|
     puts " - #{mbean_id}"
     [:description, :pattern].each do |detail|
       puts "   - #{detail} : #{mbean[detail]}"
@@ -156,8 +156,7 @@ end
 mbeans.each do |mbean_id, resources|
   puts "  - #{defaults[mbean_id][:description]}"
   if resources.is_a? TrueClass
-    details = monitor.mbean(mbean_id).detail
-    details.each do |name, value|
+    monitor.mbean(mbean_id).detail do |name, value|
       puts "    - #{name}=#{value}"
     end
   elsif no_details
@@ -165,8 +164,7 @@ mbeans.each do |mbean_id, resources|
       puts "    - #{name}"
     end
   else
-    details = monitor.mbean(mbean_id).detail resources
-    details.each do |resource, detail|
+    monitor.mbean(mbean_id).detail resources do |resource, detail|
       puts "    - #{resource}"
       detail.each do |name, value|
         puts "      - #{name}=#{value}"

data/lib/rboss/twiddle.rb

@@ -23,3 +23,7 @@
 require_relative 'twiddle/base_monitor'
 require_relative 'twiddle/mbean'
 require_relative 'twiddle/monitor'
+
+file = ENV["RBOSS_TWIDDLE"] || File.expand_path("~/.rboss.twiddle")
+
+eval File.read(file), binding, file

data/lib/rboss/twiddle/mbean.rb

@@ -28,7 +28,7 @@ module JBoss
     attr_reader :pattern
     attr_accessor :resource, :twiddle, :description
 
-    @@__default__detail__resource__ = proc do |resources|
+    @@__default__detail__resource__ = proc do |resources, &block|
       resouces = _parse_resource_ resources
       details = {}
       resouces.each do |resource|
@@ -39,14 +39,16 @@ module JBoss
           end
         end
       end
+      details.each &block if block
       details
     end
 
-    @@__default__detail__ = proc do
+    @@__default__detail__ = proc do |&block|
       details = {}
       @properties.each do |property|
         details[property] = self[property].value
       end
+      details.each &block if block
       details
     end
 
@@ -59,16 +61,19 @@ module JBoss
         (class << self
           self
         end).send :define_method, :scan, &params[:scan]
+        (class << self
+          self
+        end).send :define_method, :each do |&block|
+          scan.each &block
+        end
       end
-      if params[:detail]
+      if params[:properties]
         (class << self
           self
         end).send :define_method,
                   :detail,
-                  &(params[:detail].is_a?(TrueClass) ?
-                    (params[:scan] ?
+                  &(params[:scan] ?
                       @@__default__detail__resource__ : @@__default__detail__)
-                  : params[:detail])
       end
     end
 
@@ -81,10 +86,6 @@ module JBoss
       self
     end
 
-    def resourced?
-      @pattern['#{resource}']
-    end
-
     def [] property
       resource = @resource
       query = eval("\"#{pattern}\"")

data/lib/rboss/twiddle/monitor.rb

@@ -28,7 +28,7 @@ module JBoss
     module Monitor
 
       def defaults
-        @defaults ||= {
+        @@defaults ||= {
           :webapp => {
             :description => 'Deployed webapps',
             :pattern => 'jboss.web:type=Manager,host=localhost,path=/#{resource}',
@@ -39,8 +39,7 @@ module JBoss
                 path.gsub! /,host=.+/, ''
                 path
               end
-            end,
-            :detail => true
+            end
           },
           :web_deployment => {
             :description => 'Deployed webapp control',
@@ -54,27 +53,23 @@ module JBoss
               _query_ "jboss.web:type=ThreadPool,*" do |path|
                 path.gsub "jboss.web:type=ThreadPool,name=", ""
               end
-            end,
-            :detail => true
+            end
           },
           :engine => {
             :description => 'JBossWeb engine',
             :pattern => 'jboss.web:type=Engine',
-            :properties => %W(jvmRoute name defaultHost),
-            :detail => true
+            :properties => %W(jvmRoute name defaultHost)
           },
           :server_info => {
             :description => 'JBoss running info',
             :pattern => 'jboss.system:type=ServerInfo',
             :properties => %W(ActiveThreadCount MaxMemory FreeMemory AvailableProcessors
-                              HostAddress JavaVendor JavaVersion OSName OSArch),
-            :detail => true
+                              HostAddress JavaVendor JavaVersion OSName OSArch)
           },
           :server => {
             :description => 'JBoss specifications',
             :pattern => 'jboss.system:type=Server',
-            :properties => %W(VersionNumber StartDate),
-            :detail => true
+            :properties => %W(VersionNumber StartDate)
           },
           :system_properties => {
             :description => 'System properties',
@@ -88,8 +83,7 @@ module JBoss
               _query_ "jboss.web:type=ThreadPool,*" do |path|
                 path.gsub "jboss.web:type=ThreadPool,name=", ""
               end
-            end,
-            :detail => true
+            end
           },
           :datasource => {
             :description => 'Datasource',
@@ -100,8 +94,7 @@ module JBoss
               _query_ "jboss.jca:service=ManagedConnectionPool,*" do |path|
                 path.gsub "jboss.jca:service=ManagedConnectionPool,name=", ""
               end
-            end,
-            :detail => true
+            end
           },
           :queue => {
             :description => 'JMS Queue',
@@ -112,8 +105,7 @@ module JBoss
               _query_ "jboss.messaging.destination:service=Queue,*" do |path|
                 path.gsub "jboss.messaging.destination:service=Queue,name=", ""
               end
-            end,
-            :detail => true
+            end
           },
           :ejb => {
             :description => 'EJB',
@@ -126,21 +118,14 @@ module JBoss
               end).collect do |path|
                 path.gsub("jboss.j2ee:", '').gsub(/,?service=EJB3/, '')
               end
-            end,
-            :detail => true
+            end
           }
         }
-        @defaults
+        @@defaults
       end
 
       module_function :defaults
 
-      def properties mbean_id = nil
-        @properties ||= {}
-        return properties[mbean_id] if mbean_id
-        @properties
-      end
-
       def mbeans
         @mbeans ||= {}
         @mbeans

data/lib/rboss/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module RBoss
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: rboss
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ataxexe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-08-23 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -35,7 +35,6 @@ files:
 - examples/jboss_profile/jbb_profile_1.yaml
 - examples/jboss_profile/jbb_profile_2.yaml
 - examples/jboss_profile/jboss_profile.yaml
-- examples/monitor/simple_monitor.rb
 - lib/rboss.rb
 - lib/rboss/component_processor.rb
 - lib/rboss/components/component.rb

data/examples/monitor/simple_monitor.rb

@@ -1,61 +0,0 @@
-#                         The MIT License
-#
-# Copyright (c) 2011 Marcelo Guimarães <ataxexe@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-puts "Server Info:"
-monitor.properties[:server_info].each do |property|
-  puts "  |--> #{monitor.server_info[property]}"
-end
-
-puts "Connectors:"
-monitor.with :connectors do |connector|
-  puts "  |--> #{connector}"
-  monitor.properties[:connector].each do |property|
-    puts "    |--> #{monitor.connector[property]}"
-  end
-  monitor.properties[:request].each do |property|
-    puts "    |--> #{monitor.request[property]}"
-  end
-end
-
-puts "Datasources:"
-monitor.with :datasources do |datasource|
-  puts "  |--> #{datasource}"
-  monitor.properties[:datasource].each do |property|
-    puts "    |--> #{monitor.datasource[property]}"
-  end
-end
-
-puts "Webapps:"
-monitor.with :webapps do |webapp|
-  puts "  |--> #{webapp}"
-  monitor.properties[:webapp].each do |property|
-    puts "    |--> #{monitor.webapp[property]}"
-  end
-end
-
-puts "Queues:"
-monitor.with :queues do |queue|
-  puts "  |--> #{queue}"
-  monitor.properties[:queue].each do |property|
-    puts "    |--> #{monitor.queue[property]}"
-  end
-end