rboss 0.9.1 → 0.9.3

data/lib/rboss/cli/mappings/resources/interface.yaml

@@ -1,7 +1,7 @@
 ---
 description: Details Interfaces
-path: ${DOMAIN_HOST}${DOMAIN_SERVER}/interface=${NAME}
-scan: ls ${DOMAIN_HOST}${DOMAIN_SERVER}/interface
+path: ${server}/interface=${name}
+scan: ls ${server}/interface
 print:
   - title: Interfaces
     layout: vertical

data/lib/rboss/cli/mappings/resources/jdbc-driver.yaml

@@ -0,0 +1,12 @@
+---
+description: Details JDBC Drivers
+path: ${server}/subsystem=datasources/jdbc-driver=${name}
+scan: ls ${server}/subsystem=datasources/jdbc-driver
+print:
+- title: JDBC Drivers
+  properties:
+  - driver-module-name
+  - driver-xa-datasource-class-name
+  header:
+  - Module Name
+  - XA Datasource Class

data/lib/rboss/cli/mappings/resources/jms-queue.yaml

@@ -0,0 +1,44 @@
+---
+description: Details JMS Queue Information
+path: ${server}/subsystem=messaging/hornetq-server=default/jms-queue=${name}
+scan: ls ${server}/subsystem=messaging/hornetq-server=default/jms-queue
+print:
+  - title: Queues
+    layout: vertical
+    properties:
+    - entries
+    - messages-added
+    - message-count
+    - delivering-count
+    - scheduled-count
+    - consumer-count
+    - selector
+    - durable
+    - paused
+    - temporary
+    - queue-address
+    - dead-letter-address
+    - expirity-address
+    header:
+    - JNDI Names
+    - Total
+    - Currently
+    - Delivering
+    - Scheduled
+    - Consumers
+    - Selector
+    - Durable
+    - Paused
+    - Temporary
+    - Queue Address
+    - Dead Letter Address
+    - Expirity Address
+    format:
+      jndi_names: array
+      durable: boolean
+      paused: boolean
+      temporary: boolean
+    color:
+      durable: boolean
+      paused: boolean
+      temporary: boolean

data/lib/rboss/cli/mappings/resources/runtime.yaml

@@ -0,0 +1,34 @@
+---
+description: Details Runtime Information
+path: ${server}/core-service=platform-mbean/type=runtime
+print:
+  - title: Runtime Information
+    layout: vertical
+    properties:
+      - name
+      - vm-name
+      - vm-vendor
+      - vm-version
+      - spec-vendor
+      - spec-version
+      - start-time
+      - uptime
+    header:
+      - Name
+      - VM Name
+      - VM Vendor
+      - VM Version
+      - Spec Vendor
+      - Spec Version
+      - Start Time
+      - Uptime
+    format:
+      start_time: date
+      uptime: time
+    color:
+      name:
+        with: bold.white
+      start_time:
+        with: green
+      uptime:
+        with: yellow

data/lib/rboss/cli/mappings/resources/server.yaml

@@ -1,10 +1,10 @@
 ---
-description: Detail Server Information
-path: ${DOMAIN_HOST}${DOMAIN_SERVER}/core-service=
+description: Details Server Information
+path: ${server}/core-service=
 print:
 - id: platform
   title: Operating System Information
-  path: ${PATH}platform-mbean/type=operating-system
+  path: ${path}platform-mbean/type=operating-system
   properties:
   - name
   - arch
@@ -31,7 +31,7 @@ print:
 
 - id: env
   title: Server Environment Information
-  path: ${PATH}server-environment
+  path: ${path}server-environment
   layout: vertical
   properties:
   - server-name
@@ -52,7 +52,7 @@ print:
 - id: memory
   title: Server Memory Usage
   layout: vertical
-  path: ${PATH}platform-mbean/type=memory
+  path: ${path}platform-mbean/type=memory
   properties:
   - heap-memory-usage -> init
   - heap-memory-usage -> used
@@ -110,7 +110,7 @@ print:
 
 - id: thread
   title: Server Thread Info
-  path: ${PATH}platform-mbean/type=threading
+  path: ${path}platform-mbean/type=threading
   layout: vertical
   properties:
   - thread-contention-monitoring-supported
@@ -139,7 +139,7 @@ print:
   - Total Started Thread Count
   - Daemon Thread Count
   - Current Thread CPU Time
-  - CUrrent Thread User Time
+  - Current Thread User Time
 
   format:
     thread_contention_monitoring_supported: boolean
@@ -161,7 +161,7 @@ print:
 
 - id: config
   title: Server Configuration Resources
-  path: ${PATH}server-environment
+  path: ${path}server-environment
   layout: vertical
   properties:
   - server-name

data/lib/rboss/cli/resource.rb

@@ -31,8 +31,8 @@ module RBoss
         @config = config
         @invoker = invoker
         @context = {
-          :name => '',
-          :read_resource => 'read-resource(include-runtime=true,recursive=true,include-defaults=true,proxies=true)'
+            :name => '',
+            :read_resource => 'read-resource(include-runtime=true,recursive=true,include-defaults=true,proxies=true)'
         }
         @context[:path] = parse(@config[:path])
         @tables = []
@@ -47,6 +47,14 @@ module RBoss
         end
       end
 
+      def list_resource_names(resources, arguments)
+        result = ''
+        scan.each do |resource|
+          result << resource << $/
+        end
+        result
+      end
+
       def read_resource(resources, arguments)
         resources ||= scan
         params = @config[:print]
@@ -63,29 +71,22 @@ module RBoss
             add_row(p)
           end
         end
-        box = Yummi::TextBox::new
-        box.style.border[:color] = "bold.black"
-        width = 0
+        result = ''
         @tables.each do |table|
-          width = [width, table.width].max
+          result << table.to_s << $/
         end
-        @tables.each do |table|
-          box << table.to_s
-          box.add("-" * width, :color => "bold.black") unless table == @tables.last
-        end
-        box.to_s
+        result
       end
 
       def read_operation_names(resource_name, arguments)
-        operations = ""
+        operations = ''
         with resource_name do
           result = @invoker.result("#{@context[:path]}:read-operation-names")
           result.each do |operation|
-            operations << '- '.bold.magenta
-            operations << operation.bold.blue << $/
+            operations << operation << $/
           end
         end
-        operations.on_box
+        operations
       end
 
       def read_operation_description (resource_name, arguments)
@@ -95,23 +96,26 @@ module RBoss
           table = Yummi::Table::new
           buff << operation_name.bold.green << $/
           result = @invoker.result(
-            "#{@context[:path]}:read-operation-description(name=#{operation_name})"
+              "#{@context[:path]}:read-operation-description(name=#{operation_name})"
           )
-          buff << result['description'].bold.black << $/ * 2
+          buff << result['description'].yellow << $/ * 2
           table.title = 'Request'
-          table.header = %w(Parameter Type Required Default)
-          table.aliases = %w(name type required default)
-          table.colorize('name', :with => :white)
+          table.header = %w(Parameter Type Required Expression Default)
+          table.aliases = %w(name type required expressions-allowed default)
+          table.colorize('name', :with => 'bold.white')
 
           table.colorize %w(type default) do |value|
             RBoss::Colorizers.type(value['type']).color_for(value)
           end
-
-          table.format 'required', :using => Yummi::Formatters.boolean
-          table.colorize 'required', :using => Yummi::Colorizers.boolean
-          result["request-properties"] ||= {}
-          unless result["request-properties"].empty?
-            result["request-properties"].each do |name, detail|
+          table.format %w(required expressions-allowed), :using => Yummi::Formatters.boolean
+          table.colorize 'required', :using => Yummi::Colorizers.boolean(
+            :if_true => 'bold.red',
+            :if_false => 'white'
+          )
+          table.colorize 'expressions-allowed', :using => Yummi::Colorizers.boolean
+          result['request-properties'] ||= {}
+          unless result['request-properties'].empty?
+            result['request-properties'].sort.each do |name, detail|
               detail['name'] = name
               table << detail
             end
@@ -123,7 +127,7 @@ module RBoss
           table.header = %w(Parameter Type Nilable Unit)
           table.aliases = %w(name type nilable unit)
 
-          table.colorize 'name', :with => :white
+          table.colorize 'name', :with => 'bold.white'
 
           table.colorize 'type' do |value|
             RBoss::Colorizers.type(value['type']).color_for(value)
@@ -131,9 +135,9 @@ module RBoss
 
           table.format 'nilable', :using => Yummi::Formatters.boolean
           table.colorize 'nilable', :using => Yummi::Colorizers.boolean
-          result["reply-properties"] ||= {}
-          unless result["reply-properties"].empty?
-            result = result["reply-properties"]
+          result['reply-properties'] ||= {}
+          unless result['reply-properties'].empty?
+            result = result['reply-properties']
             table.description = result['description']
             table << result
             build_nested(result).each do |nested|
@@ -142,7 +146,7 @@ module RBoss
             buff << table.to_s << $/
           end
         end
-        buff.chomp.on_box
+        buff.chomp
       end
 
       private
@@ -178,7 +182,12 @@ module RBoss
         data = get_data(params)
         return unless data
         data = [@context[:name]] + data if scannable?
-        @tables[@count % @tables.size].add data
+        table = @tables[@count % @tables.size]
+        if data.first.is_a? Array
+          data.each {|d| table.add d}
+        else
+          table.add data
+        end
         @count += 1
       end
 
@@ -194,8 +203,11 @@ module RBoss
 
       def scan
         return '' unless scannable?
-        result = @invoker.execute(parse @config[:scan])
-        result.split "\n"
+        unless @resources
+          result = @invoker.execute(parse @config[:scan])
+          @resources = result.split "\n"
+        end
+        @resources
       end
 
       def scannable?
@@ -203,12 +215,23 @@ module RBoss
       end
 
       def get_data(config)
-        command = parse((config[:command] or "${PATH}:#{@context[:read_resource]}"))
+        command = parse(config[:command])
         begin
           result = @invoker.result(command)
           data = []
-          config[:properties].each do |prop|
-            data << get_property(prop, result)
+          if config[:properties]
+            config[:properties].each do |prop|
+              data << get_property(prop, result)
+            end
+          else
+            result.each do |name, value|
+              if config[:header].size == 1
+                data << [name]
+                data << [value]
+              else
+                data << [name, value]
+              end
+            end
           end
           data
         rescue

data/lib/rboss/cli/result_parser.rb

@@ -68,14 +68,38 @@ module RBoss
       OBJECT = Type::new 'OBJECT'
 
       def eval_result(result)
-        undefined = nil #prevents error because undefined means nil in result object
-        result = result.gsub(/(\d+)L/, '\1') #removes the long type mark
-        result = result.gsub(/expression\s/, '') #removes the expression indicator
+        # prevents error because undefined means nil in result object
+        undefined = nil
+        # removes the long type mark
+        result = result.gsub(/(\d+)L/, '\1')
+        # removes the expression indicator
+        result = result.gsub(/expression\s/, '')
+        # Check if the operation has failed
+        return if result.to_s.start_with? 'Failed'
+        # eval the result to a hash
         result = eval(result)
-        raise InvocationFailed::new(result["failure-description"]) if result["outcome"] == "failed"
-        result["result"]
+        raise InvocationFailed::new(result['failure-description']) if result['outcome'] == 'failed'
+        result['result']
+      end
+
+      def format(result, offset = 0)
+        str = ''
+        mod = (' ' * offset)
+        if result.is_a? Hash
+          result.each do |key, value|
+            str << mod << "#{key.to_s.bold.blue} : #{format value, offset + 2}" << $/
+          end
+        elsif result.is_a? Array
+          result.each do |row|
+            str << $/ << mod << "#{format row, offset + 2}"
+          end
+        else
+          str << result.to_s
+        end
+        str.strip.chomp
       end
 
     end
+
   end
 end

data/lib/rboss/plaftorm.rb

@@ -25,46 +25,23 @@ module RBoss
 
   if RUBY_PLATFORM['mingw'] #Windows
     module Platform
-      def twiddle
-        "#@jboss_home/bin/twiddle.bat"
-      end
 
       def jboss_cli
         "#@jboss_home/bin/jboss-cli.bat"
       end
 
-      def run_conf_template
-        "#@base_dir/resources/run.conf.bat.erb"
-      end
-
-      def run_conf
-        "#{@jboss.profile}/run.conf.bat"
-      end
-
       def clear
-        "cls"
+        'cls'
       end
     end
   else
     module Platform
-      def twiddle
-        "#@jboss_home/bin/twiddle.sh"
-      end
-
       def jboss_cli
         "#@jboss_home/bin/jboss-cli.sh"
       end
 
-      def run_conf_template
-        "#@base_dir/resources/run.conf.erb"
-      end
-
-      def run_conf
-        "#{@jboss.profile}/run.conf"
-      end
-
       def clear
-        "clear"
+        'clear'
       end
     end
   end

data/lib/rboss/utils.rb

@@ -22,14 +22,7 @@
 
 class String
 
-  def camelize
-    (self.split(/_/).collect { |n| n.capitalize }).join
-  end
-
-  def uncapitalize
-    self[0, 1].downcase + self[1..-1]
-  end
-
+  # Converter contract. Replaces '-' to '_' and converts do a Symbol.
   def to_key
     self.gsub('-', '_').to_sym
   end
@@ -38,6 +31,7 @@ end
 
 class Symbol
 
+  # Converter contract. Returns +self+.
   def to_key
     self
   end