rboss 0.3.1 → 0.4.1

data/bin/twiddle

@@ -32,7 +32,8 @@ params = {}
 mbeans = {}
 commands = {}
 no_details = false
-servers_file = "~/.rboss/twiddle.yaml"
+@conf_dir = File.expand_path "~/.rboss"
+servers_file = "#{@conf_dir}/twiddle.yaml"
 @servers_file = File.expand_path(servers_file)
 save = false
 params[:jboss_home] = (ENV["JBOSS_HOME"] or ENV["TWIDDLE_HOME"] or Dir.pwd)
@@ -132,16 +133,18 @@ end
 opts.on('-p', '--password PASSWORD', 'Defines the JMX Password') do |password|
   params[:password] = password
 end
+opts.on('-n COMMAND', '--native COMMAND', 'Executes the given command as is') do |command|
+  commands[:native] = command
+end
 opts.on('-v', '--verbose', 'Shows the twiddle commands before execution') do
   params[:log_level] = Logger::DEBUG
 end
 opts.on("-h", "--help", "Shows this help message") do
   puts opts; exit
 end
-opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.'
+opts.parse!(ARGV) #rescue abort 'Invalid Option! Use --help or -h for usage help.'
 
-twiddle = JBoss::Twiddle::Invoker::new params
-monitor = twiddle.monitor
+@twiddle = JBoss::Twiddle::Invoker::new params
 
 if save
   config = load_yaml
@@ -151,7 +154,7 @@ if save
   params.each do |key, value|
     server_config[key.to_s] = value
   end
-  FileUtils::mkdir_p File.expand_path("~/.rboss")
+  FileUtils::mkdir_p File.expand_path(@conf_dir)
   FileUtils::touch @servers_file
   f = File.open(@servers_file, 'w')
   YAML::dump(config, f)
@@ -173,65 +176,11 @@ end
 
 puts opts if mbeans.empty? and commands.empty?
 
-if commands[:set]
-  array = commands[:set]
-  raise "Wrong number of arguments" if array.size != 3
-  mbean, name = extract array[0]
-  puts twiddle.set :mbean => mbean.to_sym,
-                   :name => name,
-                   :property => array[1],
-                   :value => array[2]
-end
-if commands[:get]
-  array = commands[:get]
-  raise "Wrong number of arguments" if array.size != 2
-  mbean, name = extract array[0]
-  puts twiddle.get :mbean => mbean.to_sym,
-                   :name => name,
-                   :property => array[1]
-end
-if commands[:invoke]
-  array = commands[:invoke]
-  raise "Wrong number of arguments" if array.size < 2
-  mbean, name = extract array[0]
-  puts twiddle.invoke :mbean => mbean.to_sym,
-                      :name => name,
-                      :method => array[1],
-                      :args => normalize(array[2..-1])
-end
-if commands[:query]
-  array = commands[:query]
-  mbean, name = extract array[0]
-  puts twiddle.query :mbean => mbean.to_sym,
-                     :name => name,
-                     :args => normalize(array[1..-1])
-end
-
-if commands[:info]
-  array = commands[:info]
-  mbean, name = extract array[0]
-  puts twiddle.info :mbean => mbean.to_sym,
-                    :name => name,
-                    :args => normalize(array[1..-1])
-end
-
-mbeans.each do |mbean_id, resources|
-  puts "  - #{defaults[mbean_id][:description]}"
-  if resources.is_a? TrueClass
-    monitor.mbean(mbean_id).detail do |name, value|
-      puts "    - #{name}=#{value}"
-    end
-  elsif no_details
-    monitor.mbean(mbean_id).scan.each do |name|
-      puts "    - #{name}"
-    end
-  else
-    monitor.mbean(mbean_id).detail resources do |resource, detail|
-      puts "    - #{resource}"
-      detail.each do |name, value|
-        puts "      - #{name}=#{value}"
-      end
-    end
-  end
-end
+actions = JBoss::CommandActions::Twiddle::new @twiddle,
+  :no_details => no_details,
+  :mbeans => defaults
+
+actions.parse_and_execute commands
+
+actions.detail mbeans
 

data/lib/rboss.rb

@@ -23,3 +23,5 @@
 require_relative "rboss/version"
 require_relative "rboss/jboss_profile"
 require_relative "rboss/twiddle"
+require_relative "rboss/bin/command_actions"
+

data/lib/rboss/bin/command_actions.rb

@@ -0,0 +1,107 @@
+#                         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.
+
+module JBoss
+  module CommandActions
+    class Twiddle
+
+      def initialize twiddle, opts = {}
+        @monitor = twiddle.monitor
+        @twiddle = twiddle
+        @opts = opts
+      end
+
+      def parse_and_execute commands
+        commands.each do |method, args|
+          send method, *args
+        end
+      end
+
+      def native command
+        puts @twiddle.execute(command)
+      end
+
+      def set id, property, value
+        mbean, name = extract id
+        puts @twiddle.set :mbean => mbean.to_sym,
+                         :name => name,
+                         :property => property,
+                         :value => value
+      end
+
+      def get id, property
+        mbean, name = extract id
+        puts @twiddle.get :mbean => mbean.to_sym,
+                         :name => name,
+                         :property => property
+      end
+
+      def invoke id, method, *args
+        mbean, name = extract id
+        puts @twiddle.invoke :mbean => mbean.to_sym,
+                            :name => name,
+                            :method => method,
+                            :args => normalize(args)
+      end
+
+      def query id, *args
+        mbean, name = extract id
+        puts @twiddle.query :mbean => mbean.to_sym,
+                           :name => name,
+                           :args => normalize(args)
+      end
+
+      def info id, *args
+        mbean, name = extract id
+        puts @twiddle.info :mbean => mbean.to_sym,
+                          :name => name,
+                          :args => normalize(args)
+      end
+
+      def detail mbeans
+        mbeans.each do |mbean_id, resources|
+          puts "  - #{@opts[:mbeans][mbean_id][:description]}"
+          if resources.is_a? TrueClass
+            @monitor.mbean(mbean_id).detail do |name, value|
+              puts "    - #{name}=#{value}"
+            end
+          elsif @opts[:no_details]
+            @monitor.mbean(mbean_id).scan.each do |name|
+              puts "    - #{name}"
+            end
+          else
+            @monitor.mbean(mbean_id).detail resources do |resource, detail|
+              puts "    - #{resource}"
+              detail.each do |name, value|
+                puts "      - #{name}=#{value}"
+              end
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+
+end
+

data/lib/rboss/twiddle.rb

@@ -27,3 +27,4 @@ require_relative 'twiddle/monitor'
 file = ENV["RBOSS_TWIDDLE"] || File.expand_path("~/.rboss/twiddle.rb")
 
 eval File.read(file), binding, file if File.exist? file
+

data/lib/rboss/twiddle/monitor.rb

@@ -32,7 +32,8 @@ module JBoss
           :webapp => {
             :description => 'Deployed webapps',
             :pattern => 'jboss.web:type=Manager,host=localhost,path=/#{resource}',
-            :properties => %W(activeSessions maxActive),
+            :properties => %W(activeSessions maxActive distributable maxActiveSessions
+                              expiredSessions rejectedSessions),
             :scan => proc do
               query "jboss.web:type=Manager,*" do |path|
                 path.gsub! "jboss.web:type=Manager,path=/", ""
@@ -127,6 +128,10 @@ module JBoss
               end
             end
           },
+          :jndi => {
+            :description => 'JNDI View',
+            :pattern => 'jboss:service=JNDIView'
+          },
           :ejb => {
             :description => 'EJB',
             :pattern => 'jboss.j2ee:#{resource},service=EJB3',
@@ -157,6 +162,7 @@ module JBoss
 
       def mbean mbean_id
         mbean = mbeans[mbean_id]
+        return JBoss::MBean::new :pattern => mbean_id.to_s, :twiddle => @twiddle unless mbean
         if @current_resource
           mbean.with @current_resource
         end
@@ -168,3 +174,4 @@ module JBoss
   end
 
 end
+

data/lib/rboss/version.rb

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

data/rboss.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/ataxexe/rboss"
   s.summary     = %q{A Ruby way to do a JBoss work!}
   s.description = %q{A tool to create profiles for JBoss Application Server and use
- twiddle to scan a running JBoss AS or execute scripts.}
+ twiddle to manage a running JBoss AS.}
 
   s.rubyforge_project = "rboss"
 

metadata

@@ -1,31 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rboss
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Ataxexe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-29 00:00:00 Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies: []
-
-description: |-
-  A tool to create profiles for JBoss Application Server and use
-   twiddle to scan a running JBoss AS or execute scripts.
-email: 
+description: ! "A tool to create profiles for JBoss Application Server and use\n twiddle
+  to manage a running JBoss AS."
+email:
 - ataxexe@gmail.com
-executables: 
+executables:
 - jboss-profile
 - twiddle
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -33,6 +28,7 @@ files:
 - bin/jboss-profile
 - bin/twiddle
 - lib/rboss.rb
+- lib/rboss/bin/command_actions.rb
 - lib/rboss/component_processor.rb
 - lib/rboss/components/component.rb
 - lib/rboss/components/datasource.rb
@@ -77,32 +73,29 @@ files:
 - test/test_suite.rb
 homepage: https://github.com/ataxexe/rboss
 licenses: []
-
 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 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rboss
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby way to do a JBoss work!
-test_files: 
+test_files:
 - test/datasource_test.rb
 - test/deploy_folder_test.rb
 - test/jbossweb_test.rb