rboss 0.6.0 → 0.6.1

data/lib/rboss/cli/resource.rb

@@ -20,11 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'formatters'
-require_relative 'colorizers'
-require_relative 'health_checkers'
-
-module JBoss
+module RBoss
   module Cli
     class Resource
 
@@ -32,7 +28,8 @@ module JBoss
         @config = config
         @invoker = invoker
         @context = {
-          :name => ''
+          :name => '',
+          :read_resource => 'read-resource(include-runtime=true)'
         }
         @context[:path] = parse(@config[:path])
         @tables = []
@@ -40,13 +37,13 @@ module JBoss
       end
 
       def content(resources)
-        if :all == resources
+        if :all == resources and scannable?
           resources = scan
         end
         resources = [resources] unless resources.is_a? Array
         params = @config[:print]
         params.each do |p|
-          table_builder = TableBuilder::new p
+          table_builder = RBoss::TableBuilder::new p
           table_builder.add_name_column if scannable?
           @tables << table_builder.build_table
         end
@@ -61,6 +58,7 @@ module JBoss
         result = ""
         @tables.each do |table|
           result << table.to_s
+          result << $/
         end
         result
       end
@@ -93,17 +91,27 @@ module JBoss
       end
 
       def get_data(config)
-        result = @invoker.execute(parse config[:command])
+        command = (config[:command] or '${PATH}:${READ_RESOURCE}')
+        result = @invoker.execute(parse command)
         result = eval_result(result)
         data = []
         config[:properties].each do |prop|
-          data << result["result"][prop]
+          data << get_property(prop, result)
         end
         data
       end
 
+      def get_property(prop, result)
+        value = result["result"]
+        prop.split(/\s*->\s*/).each do |p|
+          value = value[p]
+        end
+        value
+      end
+
       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
         eval(result)
       end
 

data/lib/rboss/component_processor.rb

@@ -67,111 +67,113 @@
 # it will be passed to the block for processing.
 #
 # author: Marcelo Guimarães <ataxexe@gmail.com>
-class ComponentProcessor
+module RBoss
+  class ComponentProcessor
 
-  def initialize &block
-    @process = block
-    @process ||= lambda { |type, config| type.new(config).process }
-  end
+    def initialize &block
+      @process = block
+      @process ||= lambda { |type, config| type.new(config).process }
+    end
 
-  # Register a component using the given id (which must be used for adding it to process) and parameters
-  def register component_id, params
-    params = {
-      :type => nil,
-      :multiple_instances => false,
-      :priority => 0,
-      :enabled => false,
-      :defaults => {}
-    }.merge! params
-    @components ||= {}
-    params[:configs] ||= [] if params[:multiple_instances]
-    @components[component_id] = params unless @components.has_key? component_id
-  end
+    # Register a component using the given id (which must be used for adding it to process) and parameters
+    def register component_id, params
+      params = {
+        :type => nil,
+        :multiple_instances => false,
+        :priority => 0,
+        :enabled => false,
+        :defaults => {}
+      }.merge! params
+      @components ||= {}
+      params[:configs] ||= [] if params[:multiple_instances]
+      @components[component_id] = params unless @components.has_key? component_id
+    end
 
-  def add component_id, config = {}
-    registered_component = @components[component_id]
-    return unless registered_component
-    defaults = registered_component[:defaults]
-    registered_component[:enabled] = true
-    config = defaults.merge config if config.is_a? Hash
-    if registered_component[:multiple_instances]
-      registered_component[:configs] << config
-    else
-      registered_component[:config] = config
+    def add component_id, config = {}
+      registered_component = @components[component_id]
+      return unless registered_component
+      defaults = registered_component[:defaults]
+      registered_component[:enabled] = true
+      config = defaults.merge config if config.is_a? Hash
+      if registered_component[:multiple_instances]
+        registered_component[:configs] << config
+      else
+        registered_component[:config] = config
+      end
+      propagate_configs registered_component
     end
-    propagate_configs registered_component
-  end
 
-  def defaults component_id, defaults
-    registered_component = @components[component_id]
-    registered_component[:defaults] = defaults if registered_component
-  end
+    def defaults component_id, defaults
+      registered_component = @components[component_id]
+      registered_component[:defaults] = defaults if registered_component
+    end
 
-  def process_components
-    enabled_components = @components.find_all {|component_id, params| params[:enabled]}
-    (enabled_components.sort_by { |key, value| value[:priority] }).each do |key, component|
-      process_component component
+    def process_components
+      enabled_components = @components.find_all { |component_id, params| params[:enabled] }
+      (enabled_components.sort_by { |key, value| value[:priority] }).each do |key, component|
+        process_component component
+      end
     end
-  end
 
-  private
+    private
 
-  def process_component component
-    return unless component[:type]
-    if component[:multiple_instances]
-      component[:configs].each do |config|
+    def process_component component
+      return unless component[:type]
+      if component[:multiple_instances]
+        component[:configs].each do |config|
+          @process.call component[:type], config
+        end
+      else
+        config = component[:config]
+        config ||= component[:defaults]
         @process.call component[:type], config
       end
-    else
-      config = component[:config]
-      config ||= component[:defaults]
-      @process.call component[:type], config
     end
-  end
 
-  def propagate_configs component
-    #TODO refactor this -----------------------------------
-    if component[:send_config] and component[:config].is_a? Hash
-      component[:send_config].each do |to, keys|
-        destination = to.to_s.gsub(/^to_/, '').to_sym
-        config = {}
-        if keys.is_a? Array
-          keys.each do |key|
-            config[key] = component[:config][key] if component[:config].has_key? key
-          end
-        elsif keys.is_a? Hash
-          keys.each do |k, v|
-            config[v] = component[:config][k] if component[:config].has_key? k
+    def propagate_configs component
+      #TODO refactor this -----------------------------------
+      if component[:send_config] and component[:config].is_a? Hash
+        component[:send_config].each do |to, keys|
+          destination = to.to_s.gsub(/^to_/, '').to_sym
+          config = {}
+          if keys.is_a? Array
+            keys.each do |key|
+              config[key] = component[:config][key] if component[:config].has_key? key
+            end
+          elsif keys.is_a? Hash
+            keys.each do |k, v|
+              config[v] = component[:config][k] if component[:config].has_key? k
+            end
           end
+          send_config destination, config
         end
-        send_config destination, config
       end
-    end
-    if component[:move_config] and component[:config].is_a? Hash
-      component[:move_config].each do |to, keys|
-        destination = to.to_s.gsub(/^to_/, '').to_sym
-        config = {}
-        if keys.is_a? Array
-          keys.each do |key|
-            config[key] = component[:config].delete key if component[:config].has_key? key
-          end
-        elsif keys.is_a? Hash
-          keys.each do |k, v|
-            config[v] = component[:config].delete k if component[:config].has_key? k
+      if component[:move_config] and component[:config].is_a? Hash
+        component[:move_config].each do |to, keys|
+          destination = to.to_s.gsub(/^to_/, '').to_sym
+          config = {}
+          if keys.is_a? Array
+            keys.each do |key|
+              config[key] = component[:config].delete key if component[:config].has_key? key
+            end
+          elsif keys.is_a? Hash
+            keys.each do |k, v|
+              config[v] = component[:config].delete k if component[:config].has_key? k
+            end
           end
+          send_config destination, config, :enable_component => true
         end
-        send_config destination, config, :enable_component => true
       end
+      #------------------------------------------------------
     end
-    #------------------------------------------------------
-  end
 
-  def send_config component_id, config, opts = {}
-    component = @components[component_id]
-    component[:defaults] ||= {}
-    component_config = @components[component_id][:defaults]
-    component_config.merge! config
-    component[:enabled] = true if opts[:enable_component]
-  end
+    def send_config component_id, config, opts = {}
+      component = @components[component_id]
+      component[:defaults] ||= {}
+      component_config = @components[component_id][:defaults]
+      component_config.merge! config
+      component[:enabled] = true if opts[:enable_component]
+    end
 
+  end
 end

data/lib/rboss/components/component.rb

@@ -26,7 +26,7 @@ require_relative "../utils"
 
 require 'yaml'
 
-module JBoss
+module RBoss
 
   # A base helper module for JBoss Components
   #
@@ -47,7 +47,7 @@ module JBoss
     # Creates a FileProcessor using the same logger and
     # jboss path as the variable
     def new_file_processor
-      FileProcessor::new :logger => @logger, :var => @jboss
+      RBoss::FileProcessor::new :logger => @logger, :var => @jboss
     end
 
     def load_yaml resource

data/lib/rboss/components/datasource.rb

@@ -27,7 +27,7 @@ require "rexml/document"
 
 include REXML
 
-module JBoss
+module RBoss
 
   # A class to configure a JBoss Datasource.
   #

data/lib/rboss/components/deploy_folder.rb

@@ -26,7 +26,7 @@ require "rexml/document"
 
 include REXML
 
-module JBoss
+module RBoss
 
   # A class to add deploy folders to a JBoss Profile.
   #

data/lib/rboss/components/hypersonic_replacer.rb

@@ -23,7 +23,7 @@
 require_relative "datasource"
 require_relative "component"
 
-module JBoss
+module RBoss
   # A class to replace the shipped Hypersonic datasource for a JBoss profile.
   #
   # Configuration:

data/lib/rboss/components/jbossweb.rb

@@ -26,7 +26,7 @@ require "rexml/document"
 
 include REXML
 
-module JBoss
+module RBoss
   class JBossWeb
     include Component
 

data/lib/rboss/components/jmx.rb

@@ -22,7 +22,7 @@
 
 require_relative "component"
 
-module JBoss
+module RBoss
   # This class configures the JXM user for a JBoss profile.
   #
   # Configuration:

data/lib/rboss/components/mod_cluster.rb

@@ -28,7 +28,7 @@ require "rexml/document"
 
 include REXML
 
-module JBoss
+module RBoss
   # A class to install and configure a mod_cluster service in a JBoss profile
   #
   # Configuration:

data/lib/rboss/components/org/6.0/deploy_folder.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module JBoss
+module RBoss
 
   class DeployFolder
 

data/lib/rboss/components/org/jmx.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module JBoss
+module RBoss
 
   # An extension to the base JXM class that secures the jmx-console
   # for the JBoss.org servers.

data/lib/rboss/components/profile_folder.rb

@@ -22,7 +22,7 @@
 
 require_relative "component"
 
-module JBoss
+module RBoss
   class ProfileFolder
     include Component, FileUtils
 

data/lib/rboss/components/resource.rb

@@ -22,7 +22,7 @@
 
 require_relative "component"
 
-module JBoss
+module RBoss
 
   # A class to add resources to a JBoss Profile
   #

data/lib/rboss/components/restore_slimming.rb

@@ -22,15 +22,15 @@
 
 require_relative 'slimming'
 
-module JBoss
+module RBoss
   # A class for restore slimmed services in a JBoss profile
   #
   # Configuration:
   #
-  # See the JBoss::Slimming class for supported services
+  # See the RBoss::Slimming class for supported services
   #
   # author: Marcelo Guimarães <ataxexe@gmail.com>
-  class Restore < JBoss::Slimming
+  class Restore < RBoss::Slimming
 
     def log service
       @logger.info "Enabling #{service}"

data/lib/rboss/components/run_conf.rb

@@ -25,7 +25,7 @@ require_relative "component"
 require 'yaml'
 require 'erb'
 
-module JBoss
+module RBoss
   # A class to create a custom run.conf file to a JBoss Profile
   #
   # The configuration is based on a erb template, variables and jvm args:
@@ -39,7 +39,7 @@ module JBoss
   #
   # author: Marcelo Guimarães <ataxexe@gmail.com>
   class RunConf
-    include Component
+    include Component, RBoss::Platform
 
     def defaults
       {:jvm_args => []}
@@ -61,11 +61,11 @@ module JBoss
           action.to_process do |content|
             process_template content
           end
-          processor.copy_to "#{@jboss.profile}/run.conf"
+          processor.copy_to run_conf
         end
         processor.process
       else
-        File.open("#{@jboss.profile}/run.conf", "w+") { |f| f.write process_template @template }
+        File.open(run_conf, "w+") { |f| f.write process_template @template }
       end
     end
 

data/lib/rboss/components/service_script.rb

@@ -22,7 +22,7 @@
 
 require_relative "component"
 
-module JBoss
+module RBoss
 
   class ServiceScript
     include Component