rboss 0.6.2 → 0.7.0

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

@@ -26,12 +26,13 @@ print:
         threshold:
           0.8: intense_red
           0.7: red
-          0.5: brown
+          0.5: yellow
           0: green
 
 - id: env
   title: Server Environment Information
   path: ${PATH}server-environment
+  layout: vertical
   properties:
   - server-name
   - node-name
@@ -48,18 +49,6 @@ print:
     server_name:
       with: white
 
-    node_name:
-      with: blue
-
-    host_name:
-      with: brown
-
-    initial_running_mode:
-      with: purple
-
-    launch_type:
-      with: cyan
-
 - id: memory
   title: Server Memory Usage
   layout: vertical
@@ -73,17 +62,24 @@ print:
   - non-heap-memory-usage -> used
   - non-heap-memory-usage -> committed
   - non-heap-memory-usage -> max
-  - object-pending-finalization-count
   header:
-  - Initial Heap
-  - Used Heap
-  - Committed Heap
-  - Max Heap
-  - Initial Non Heap
-  - Used Non Heap
-  - Committed Non Heap
-  - Max Non Heap
-  - Objects Pending Finalization
+  - "(Heap)\nInitial"
+  - "\nUsed"
+  - "\nCommitted"
+  - "\nMax"
+  - "(Non Heap)\nInitial"
+  - "\nUsed"
+  - "\nCommitted"
+  - "\nMax"
+  aliases:
+  - initial_heap
+  - used_heap
+  - committed_heap
+  - max_heap
+  - initial_non_heap
+  - used_non_heap
+  - committed_non_heap
+  - max_non_heap
   format:
     initial_heap: byte
     used_heap: byte
@@ -96,16 +92,10 @@ print:
 
   color:
     max_heap:
-      with: intense_purple
+      with: white
 
     max_non_heap:
-      with: intense_purple
-
-    committed_heap:
-      with: purple
-
-    committed_non_heap:
-      with: purple
+      with: white
 
   health:
     used_heap:
@@ -152,13 +142,13 @@ print:
   - CUrrent Thread User Time
 
   format:
-    thread_contention_monitoring_supported: yes_or_no
-    thread_cpu_time_supported: yes_or_no
-    current_thread_cpu_time_supported: yes_or_no
-    object_monitor_usage_supported: yes_or_no
-    synchronizer_usage_supported: yes_or_no
-    thread_contention_monitoring_enabled: yes_or_no
-    thread_cpu_time_enabled: yes_or_no
+    thread_contention_monitoring_supported: boolean
+    thread_cpu_time_supported: boolean
+    current_thread_cpu_time_supported: boolean
+    object_monitor_usage_supported: boolean
+    synchronizer_usage_supported: boolean
+    thread_contention_monitoring_enabled: boolean
+    thread_cpu_time_enabled: boolean
 
   color:
     thread_contention_monitoring_supported: boolean

data/lib/rboss/cli/resource.rb

@@ -103,8 +103,8 @@ module RBoss
             end
           end
 
-          table.format 'required', :using => RBoss::Formatters.yes_or_no
-          table.colorize 'required', :using => RBoss::Colorizers.boolean
+          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|
@@ -127,8 +127,8 @@ module RBoss
             end
           end
 
-          table.format 'nilable', :using => RBoss::Formatters.yes_or_no
-          table.colorize 'nilable', :using => RBoss::Colorizers.boolean
+          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"]
@@ -143,9 +143,6 @@ module RBoss
         buff
       end
 
-      alias_method :list_operations, :read_operation_names
-      alias_method :detail_operation, :read_operation_description
-
       private
 
       def build_nested(detail, parent_name = '', result = [])
@@ -185,7 +182,7 @@ module RBoss
 
       def parse(value)
         return nil unless value
-        result = value.scan /\$\{\w+\}/
+        result = value.scan(/\$\{\w+\}/)
         result.each do |matched|
           key = matched[2...-1].downcase.to_sym
           value = value.gsub(matched, @context[key].to_s)

data/lib/rboss/cli/result_parser.rb

@@ -69,7 +69,7 @@ module RBoss
 
       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(/(\d+)L/, '\1') #removes the long type mark
         result = eval(result)
         raise InvocationFailed::new(result["failure-description"]) if result["outcome"] == "failed"
         result["result"]

data/lib/rboss/twiddle.rb

@@ -23,8 +23,3 @@
 require_relative 'twiddle/base_monitor'
 require_relative 'twiddle/mbean'
 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/mbean.rb

@@ -107,7 +107,7 @@ module RBoss
       result = @twiddle.execute(:get, query, property)
 
       def result.value
-        self.split(/=/, 2)[1]
+        self.split( /=/, 2)[1]
       end
 
       result

data/lib/rboss/version.rb

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

data/lib/rboss/view/colorizers.rb

@@ -1,23 +1,18 @@
 require 'yummi'
 
 module RBoss
-  module Colorizers
-
-    def self.boolean params = {}
-      Yummi::to_colorize do |value|
-        value ? (params[:if_true] or :green) : (params[:if_false] or :brown)
-      end
-    end
-
-    def self.threshold params
-      colorize = lambda do |value|
-        params.sort.reverse_each do |limit, color|
-          return color if value > limit
-        end
-      end
-      Yummi::to_colorize &colorize
-    end
 
+  #
+  # A module that holds the builtin colorizers
+  #
+  module Colorizers
+    
+    #
+    # A colorizer for the types returned by invocations in jboss-cli.
+    #
+    # Parameter:
+    #   The type to use the color
+    #
     def self.type type
       Yummi::to_colorize do |value|
         case type
@@ -34,11 +29,5 @@ module RBoss
       end
     end
 
-    def self.with color
-      Yummi::to_colorize do |value|
-        color
-      end
-    end
-
   end
 end

data/lib/rboss/view/formatters.rb

@@ -1,21 +1,10 @@
 require 'yummi'
 
 module RBoss
+  #
+  # A module that holds the builtin formatters
+  #
   module Formatters
 
-    def self.yes_or_no
-      Yummi::Formatters.yes_or_no
-    end
-
-    def self.byte params = {}
-      Yummi::Formatters.byte params
-    end
-
-    def self.percentage
-      Yummi::to_format do |value|
-        "%.2f%%" % (value * 100)
-      end
-    end
-
   end
 end

data/lib/rboss/view/health_checkers.rb

@@ -1,41 +1,10 @@
 require 'yummi'
 
 module RBoss
+  #
+  # A module that holds the builtin health checkers
+  #
   module HealthCheckers
 
-    def self.percentage params
-      PercentageColorizer::new params
-    end
-
-    class PercentageColorizer
-
-      def initialize(params)
-        @max = params[:max]
-        @free = params[:free]
-        @using = params[:using]
-        @color = params[:color] || {
-          :bad => :red,
-          :warn => :brown,
-          :good => :green
-        }
-        @threshold = params[:threshold] || {
-          :warn => 0.30,
-          :bad => 0.15
-        }
-      end
-
-      def call(data)
-        max = data[@max.to_sym].to_f
-        free = @using ? max - data[@using.to_sym].to_f : data[@free.to_sym].to_f
-
-        percentage = free / max
-
-        return @color[:bad] if percentage <= @threshold[:bad]
-        return @color[:warn] if percentage <= @threshold[:warn]
-        @color[:good]
-      end
-
-    end
-
   end
 end

data/lib/rboss/view/table_builder.rb

@@ -37,31 +37,24 @@ module RBoss
     end
 
     def build_table
-      table = Yummi::Table::new
-      table.title = (@config[:title] or @config[:description])
-      header = @config[:header]
-      header = [@name_column] + header if @name_column
+      if @name_column
+        @config[:header] = [] if @only_name
+        @config[:header] = [@name_column] + @config[:header]
+      end
+
       if @config[:aliases]
         aliases = @config[:aliases]
         aliases = [:name] + aliases if @name_column
-        table.aliases = aliases
+        @config[:aliases] = aliases
       end
-      table.header = header if header
-      table.layout = @config[:layout].to_sym if @config[:layout]
 
-      parse_component @config[:format], RBoss::Formatters do |column, params|
-        table.format column, params
-      end
-      parse_component @config[:color], RBoss::Colorizers do |column, params|
-        table.colorize column, params
-      end
-      parse_component @config[:health], RBoss::HealthCheckers do |column, params|
-        table.using_row do
-          table.colorize column, params
-        end
-      end
+      builder = Yummi::TableBuilder::new(@config).defaults
+      
+      builder.repositories[:using_row_colorizers] << RBoss::HealthCheckers
+      builder.repositories[:colorizers] << RBoss::Colorizers
+      builder.repositories[:formatters] << RBoss::Formatters
 
-      table.header = [@name_column] if @only_name
+      table = builder.build_table
 
       table.format_null :with => 'undefined'
       table.colorize_null :with => :red
@@ -70,24 +63,7 @@ module RBoss
 
       table
     end
-
-    def parse_component(config, repository)
-      if config
-        config.each do |column, component_config|
-          component = nil
-          if component_config.is_a? Hash
-            component = Yummi::GroupedComponent::new
-            component_config.each do |component_name, params|
-              component << repository.send(component_name, params)
-            end
-          else
-            component = repository.send(component_config)
-          end
-          yield(column, :using => component)
-        end
-      end
-    end
-
+    
   end
 
 end

data/rboss.iml

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/bin" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/pkg" />
+    </content>
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p194" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="yummi (v0.4.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+  </component>
+  <component name="org.twodividedbyzero.idea.findbugs">
+    <option name="_basePreferences">
+      <map>
+        <entry key="property.analysisEffortLevel" value="default" />
+        <entry key="property.analyzeAfterCompile" value="false" />
+        <entry key="property.exportAsHtml" value="true" />
+        <entry key="property.exportAsXml" value="true" />
+        <entry key="property.exportBaseDir" value="" />
+        <entry key="property.exportCreateArchiveDir" value="false" />
+        <entry key="property.exportOpenBrowser" value="true" />
+        <entry key="property.minPriorityToReport" value="Medium" />
+        <entry key="property.runAnalysisInBackground" value="false" />
+        <entry key="property.showHiddenDetectors" value="false" />
+        <entry key="property.toolWindowToFront" value="true" />
+      </map>
+    </option>
+    <option name="_detectors">
+      <map>
+        <entry key="AppendingToAnObjectOutputStream" value="true" />
+        <entry key="BCPMethodReturnCheck" value="false" />
+        <entry key="BadAppletConstructor" value="false" />
+        <entry key="BadResultSetAccess" value="true" />
+        <entry key="BadSyntaxForRegularExpression" value="true" />
+        <entry key="BadUseOfReturnValue" value="true" />
+        <entry key="BadlyOverriddenAdapter" value="true" />
+        <entry key="BooleanReturnNull" value="true" />
+        <entry key="BuildInterproceduralCallGraph" value="false" />
+        <entry key="BuildObligationPolicyDatabase" value="true" />
+        <entry key="CallToUnsupportedMethod" value="false" />
+        <entry key="CalledMethods" value="true" />
+        <entry key="CheckCalls" value="false" />
+        <entry key="CheckExpectedWarnings" value="false" />
+        <entry key="CheckImmutableAnnotation" value="true" />
+        <entry key="CheckTypeQualifiers" value="true" />
+        <entry key="CloneIdiom" value="true" />
+        <entry key="ComparatorIdiom" value="true" />
+        <entry key="ConfusedInheritance" value="true" />
+        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
+        <entry key="CrossSiteScripting" value="true" />
+        <entry key="DoInsideDoPrivileged" value="true" />
+        <entry key="DontCatchIllegalMonitorStateException" value="true" />
+        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
+        <entry key="DontUseEnum" value="true" />
+        <entry key="DroppedException" value="true" />
+        <entry key="DumbMethodInvocations" value="true" />
+        <entry key="DumbMethods" value="true" />
+        <entry key="DuplicateBranches" value="true" />
+        <entry key="EmptyZipFileEntry" value="true" />
+        <entry key="EqStringTest" value="false" />
+        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
+        <entry key="FieldItemSummary" value="true" />
+        <entry key="FinalizerNullsFields" value="true" />
+        <entry key="FindBadCast" value="false" />
+        <entry key="FindBadCast2" value="true" />
+        <entry key="FindBadEqualsImplementation" value="false" />
+        <entry key="FindBadForLoop" value="true" />
+        <entry key="FindBugsSummaryStats" value="true" />
+        <entry key="FindCircularDependencies" value="false" />
+        <entry key="FindDeadLocalStores" value="true" />
+        <entry key="FindDoubleCheck" value="true" />
+        <entry key="FindEmptySynchronizedBlock" value="true" />
+        <entry key="FindFieldSelfAssignment" value="true" />
+        <entry key="FindFinalizeInvocations" value="true" />
+        <entry key="FindFloatEquality" value="true" />
+        <entry key="FindFloatMath" value="false" />
+        <entry key="FindHEmismatch" value="true" />
+        <entry key="FindInconsistentSync2" value="true" />
+        <entry key="FindJSR166LockMonitorenter" value="true" />
+        <entry key="FindLocalSelfAssignment2" value="true" />
+        <entry key="FindMaskedFields" value="true" />
+        <entry key="FindMismatchedWaitOrNotify" value="true" />
+        <entry key="FindNakedNotify" value="true" />
+        <entry key="FindNonSerializableStoreIntoSession" value="true" />
+        <entry key="FindNonSerializableValuePassedToWriteObject" value="true" />
+        <entry key="FindNonShortCircuit" value="true" />
+        <entry key="FindNullDeref" value="true" />
+        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
+        <entry key="FindOpenStream" value="true" />
+        <entry key="FindPuzzlers" value="true" />
+        <entry key="FindRefComparison" value="true" />
+        <entry key="FindReturnRef" value="true" />
+        <entry key="FindRunInvocations" value="true" />
+        <entry key="FindSelfComparison" value="true" />
+        <entry key="FindSelfComparison2" value="true" />
+        <entry key="FindSleepWithLockHeld" value="true" />
+        <entry key="FindSpinLoop" value="true" />
+        <entry key="FindSqlInjection" value="true" />
+        <entry key="FindTwoLockWait" value="true" />
+        <entry key="FindUncalledPrivateMethods" value="true" />
+        <entry key="FindUnconditionalWait" value="true" />
+        <entry key="FindUninitializedGet" value="true" />
+        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
+        <entry key="FindUnreleasedLock" value="true" />
+        <entry key="FindUnsatisfiedObligation" value="true" />
+        <entry key="FindUnsyncGet" value="true" />
+        <entry key="FindUselessControlFlow" value="true" />
+        <entry key="FormatStringChecker" value="true" />
+        <entry key="HugeSharedStringConstants" value="true" />
+        <entry key="IDivResultCastToDouble" value="true" />
+        <entry key="IncompatMask" value="true" />
+        <entry key="InconsistentAnnotations" value="true" />
+        <entry key="InefficientMemberAccess" value="false" />
+        <entry key="InefficientToArray" value="true" />
+        <entry key="InfiniteLoop" value="true" />
+        <entry key="InfiniteRecursiveLoop" value="true" />
+        <entry key="InfiniteRecursiveLoop2" value="false" />
+        <entry key="InheritanceUnsafeGetResource" value="true" />
+        <entry key="InitializationChain" value="true" />
+        <entry key="InstantiateStaticClass" value="true" />
+        <entry key="InvalidJUnitTest" value="true" />
+        <entry key="IteratorIdioms" value="true" />
+        <entry key="LazyInit" value="true" />
+        <entry key="LoadOfKnownNullValue" value="true" />
+        <entry key="LockedFields" value="false" />
+        <entry key="LostLoggerDueToWeakReference" value="true" />
+        <entry key="MethodReturnCheck" value="true" />
+        <entry key="Methods" value="true" />
+        <entry key="MultithreadedInstanceAccess" value="true" />
+        <entry key="MutableLock" value="true" />
+        <entry key="MutableStaticFields" value="true" />
+        <entry key="Naming" value="true" />
+        <entry key="Noise" value="false" />
+        <entry key="NoiseNullDeref" value="false" />
+        <entry key="NoteAnnotationRetention" value="true" />
+        <entry key="NoteCheckReturnValue" value="true" />
+        <entry key="NoteCheckReturnValueAnnotations" value="true" />
+        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
+        <entry key="NoteJCIPAnnotation" value="true" />
+        <entry key="NoteNonNullAnnotations" value="true" />
+        <entry key="NoteNonnullReturnValues" value="true" />
+        <entry key="NoteSuppressedWarnings" value="true" />
+        <entry key="NoteUnconditionalParamDerefs" value="true" />
+        <entry key="NumberConstructor" value="true" />
+        <entry key="OverridingEqualsNotSymmetrical" value="true" />
+        <entry key="PreferZeroLengthArrays" value="true" />
+        <entry key="PublicSemaphores" value="false" />
+        <entry key="QuestionableBooleanAssignment" value="true" />
+        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
+        <entry key="ReadReturnShouldBeChecked" value="true" />
+        <entry key="RedundantInterfaces" value="true" />
+        <entry key="ReflectiveClasses" value="true" />
+        <entry key="RepeatedConditionals" value="true" />
+        <entry key="ResolveAllReferences" value="false" />
+        <entry key="RuntimeExceptionCapture" value="true" />
+        <entry key="SerializableIdiom" value="true" />
+        <entry key="StartInConstructor" value="true" />
+        <entry key="StaticCalendarDetector" value="true" />
+        <entry key="StringConcatenation" value="true" />
+        <entry key="SuperfluousInstanceOf" value="true" />
+        <entry key="SuspiciousThreadInterrupted" value="true" />
+        <entry key="SwitchFallthrough" value="true" />
+        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
+        <entry key="SynchronizeAndNullCheckField" value="true" />
+        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
+        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
+        <entry key="TestASM" value="false" />
+        <entry key="TestDataflowAnalysis" value="false" />
+        <entry key="TestingGround" value="false" />
+        <entry key="TrainFieldStoreTypes" value="true" />
+        <entry key="TrainNonNullAnnotations" value="true" />
+        <entry key="TrainUnconditionalDerefParams" value="true" />
+        <entry key="URLProblems" value="true" />
+        <entry key="UncallableMethodOfAnonymousClass" value="true" />
+        <entry key="UnnecessaryMath" value="true" />
+        <entry key="UnreadFields" value="true" />
+        <entry key="UseObjectEquals" value="false" />
+        <entry key="UselessSubclassMethod" value="false" />
+        <entry key="VarArgsProblems" value="true" />
+        <entry key="VolatileUsage" value="true" />
+        <entry key="WaitInLoop" value="true" />
+        <entry key="WrongMapIterator" value="true" />
+        <entry key="XMLFactoryBypass" value="true" />
+      </map>
+    </option>
+    <option name="_reportCategories">
+      <map>
+        <entry key="BAD_PRACTICE" value="true" />
+        <entry key="CORRECTNESS" value="true" />
+        <entry key="EXPERIMENTAL" value="true" />
+        <entry key="I18N" value="true" />
+        <entry key="MALICIOUS_CODE" value="true" />
+        <entry key="MT_CORRECTNESS" value="true" />
+        <entry key="NOISE" value="false" />
+        <entry key="PERFORMANCE" value="true" />
+        <entry key="SECURITY" value="true" />
+        <entry key="STYLE" value="true" />
+      </map>
+    </option>
+  </component>
+</module>
+