rboss 0.9.1 → 0.9.3

data/bin/rboss-cli

@@ -32,13 +32,14 @@ require 'yummi'
 include RBoss::Platform
 
 params = {}
-@conf_dir = File.expand_path "~/.rboss"
-servers_file = "#@conf_dir/jboss-cli-servers.yaml"
+@conf_dir = File.expand_path '~/.rboss'
+servers_file = "#{@conf_dir}/jboss-cli-servers.yaml"
 @resources = {}
+@last_resource = nil
 @parameters = {}
 @servers_file = File.expand_path(servers_file)
 save = false
-params[:jboss_home] = (ENV["RBOSS_CLI_HOME"] or Dir.pwd)
+params[:jboss_home] = (ENV['RBOSS_CLI_HOME'] or Dir.pwd)
 params[:host] = '127.0.0.1'
 params[:port] = '9999'
 
@@ -49,15 +50,15 @@ end
 
 opts = OptionParser::new
 
-opts.separator "Environment Options".bold.white
+opts.separator 'Environment Options'.bold.white
 
-opts.on('-j', '--jboss-home PATH', 'Defines the JBOSS_HOME variable') do |home|
+opts.on('-j', '--jboss-home PATH', 'Defines the JBoss to use jboss-cli') do |home|
   params[:jboss_home] = home
 end
 
 opts.separator "\nServer Options".bold.white
 
-opts.on('-s URL', 'Defines the JBoss server') do |server|
+opts.on('-s URL', 'Defines the JBoss server url') do |server|
   params[:server] = server
 end
 opts.on('--host HOST', 'Defines the JBoss host') do |host|
@@ -75,13 +76,24 @@ end
 opts.on('--save SERVER_NAME', "Saves the server configuration in #{servers_file}") do |server|
   save = server
 end
+opts.on('--list-servers', 'List configured servers') do
+  load_yaml.each_key { |name| puts name }
+  exit
+end
+opts.on('--hosts', 'Shows the Domain Hosts available') do
+  @native = 'ls host'
+end
+opts.on('--servers', 'Shows the Domain Servers available') do
+  @native = "ls /host=#{@domain_host}/server"
+end
 
 opts.separator "\nCLI Options".bold.white
 
-opts.on('--start-cli', 'Starts the JBoss Management CLI connected to the configured server in interactive mode') do 
+opts.on('--start-cli', 'Starts the JBoss Management CLI connected to the
+ configured server in interactive mode') do
   @start = true
 end
-opts.on('-c', '--connect SERVER_NAME',
+opts.on('--connect SERVER_NAME',
         "Uses a configured server in #{servers_file}") do |server|
   config = load_yaml[server]
   abort "No configuration for #{server}" unless config
@@ -89,13 +101,16 @@ opts.on('-c', '--connect SERVER_NAME',
     params[key.to_sym] = value
   end
 end
-opts.on('--native COMMANDS', Array, 'Executes the given commands using cli interface (each command must be comma separated)') do |commands|
+opts.on('--native COMMANDS', Array, 'Executes the given commands (comma
+ separated) using cli interface') do |commands|
   @native = commands
 end
-opts.on('--domain-host DOMAIN_HOST', 'Sets the domain host (for using in domain mode)') do |host|
+opts.on('--domain-host DOMAIN_HOST',
+        'Sets the domain host (for using in domain mode)') do |host|
   @domain_host = host
 end
-opts.on('--domain-server DOMAIN_HOST', 'Sets the domain server (for using in domain mode)') do |server|
+opts.on('--domain-server DOMAIN_HOST',
+        'Sets the domain server (for using in domain mode)') do |server|
   @domain_server = server
 end
 opts.on('--script FILE', 'Executes the script in the cli interface') do |file|
@@ -108,6 +123,7 @@ RBoss::Cli::Mappings.resource_mappings.each do |name, config|
   if config[:description]
     if config[:scan]
       opts.on("--#{name} [NAMES]", Array, config[:description]) do |resources|
+        @last_resource = name
         @resources[name] = resources
       end
     else
@@ -118,7 +134,7 @@ RBoss::Cli::Mappings.resource_mappings.each do |name, config|
   end
 end
 
-opts.separator ""
+opts.separator ''
 
 opts.on('--all', 'Display all available info') do
   RBoss::Cli::Mappings.resource_mappings.each do |name, config|
@@ -128,22 +144,37 @@ end
 
 opts.separator "\nResource Options".bold.white
 
-opts.on('-l', '--list-operations', 'Lists the available operations for a resource') do
+opts.on('-l', '--list-operations', 'Lists the available operations
+ for a resource') do
   @operation = 'read-operation-names'
 end
-opts.on('-d', '--detail-operation NAME', 'Shows the operation details') do |operation_name|
+opts.on('-n', '--list-resource-names', 'Lists the available names for a resource') do
+  @operation = 'list-resource-names'
+  @resources = {
+    @last_resource => nil
+  }
+end
+opts.on('-d', '--detail NAME', 'Shows the operation details') do |operation_name|
   @operation = 'read-operation-description'
   @parameters = {'name' => operation_name}
 end
-opts.on('-a', '--args PARAMETERS', Array,
-        'Specifies parameters in form of (name=value) for use with operation') do |parameters|
-  @parameters = Hash[(parameters.collect { |p| p.split( /=/, 2) })]
+opts.on('-r', '--attribute NAME', 'Reads the attribute') do |name|
+  @operation = 'read-attribute'
+  @parameters = {
+    'name' => name,
+    'include-defaults' => true
+  }
+end
+opts.on('-a', '--args PARAMETERS', Array, 'Specifies parameters in form of
+ (name=value) for use with operation') do |parameters|
+  @parameters = Hash[(parameters.collect { |p| p.split(/=/, 2) })]
 end
 opts.on('-o', '--operation NAME',
         'Sets the operation to invoke (Defaults to "read-resource")') do |name|
   @operation = name
 end
-opts.on('--skip-optional', 'Skips optional parameters while invoking a command ') do
+opts.on('--skip-optional', 'Skips optional parameters while invoking
+ a command ') do
   params[:skip_optional] = true
 end
 
@@ -153,15 +184,31 @@ opts.on('--loop INTERVAL', Float, 'Run inside a loop') do |interval|
   @loop = true
   @interval = interval
 end
-opts.on('--no-color', 'Do not colorize output') do
-  require 'yummi/no_colors'
+opts.on('--no-colors', 'Do not colorize output') do
+  Yummi.no_colors
 end
-opts.on('-v', '--verbose', 'Displays jboss-cli commands before execution') do
+opts.on('--verbose', 'Displays jboss-cli commands and results') do
   params[:log_level] = Logger::DEBUG
 end
-opts.on("-h", "--help", "Shows this help message") do
+opts.on('-v', '--version', 'Shows rboss version') do
+  puts RBoss::VERSION; exit
+end
+opts.on('-h', '--help', 'Shows this help message') do
   puts opts; exit
 end
+
+# Autocomplete options
+case ARGV[0]
+  when 'options'
+    opts.top.short.each do |o|
+      puts "-#{o[0]}"
+    end
+    opts.top.long.each do |o|
+      puts "--#{o[0]}"
+    end
+    exit
+end
+
 opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.'.red
 
 @jboss_home = params[:jboss_home]
@@ -183,24 +230,24 @@ if save
   f = File.open(@servers_file, 'w')
   YAML::dump(config, f)
   f.close
-  puts "Configuration saved!".green
+  puts 'Configuration saved!'.green
   exit 0
 end
 
 if @start
-  puts "Starting JBoss Management CLI connecting to ".bold.white << "#{@jboss_cli.server}".bold.green
+  puts 'Starting JBoss Management CLI connecting to '.bold.white << "#{@jboss_cli.server}".bold.green
   system "#{@jboss_cli.command} --connect"
   exit 0
 end
 
 if @native
   result = @jboss_cli.execute(@native)
-  puts result.on_box
+  puts result
   exit 0
 end
 
 if @script
-  system "#{@jboss_cli.command} --connect --file #{@script}"
+  system "#{@jboss_cli.command} --connect --file='#{@script}'"
   exit 0
 end
 
@@ -216,10 +263,11 @@ def execute_actions
   begin
     content = @jboss_cli.invoke(@operation, @resources, @parameters)
     system clear if @loop
-    puts Yummi.colorize(Time.now.strftime("At %H:%M:%S%n"), :white) if @loop
     puts content.chomp
+    puts Time.now.strftime('%nAt %d-%m-%Y %H:%M:%S').bold.white if @loop
   rescue RBoss::Cli::InvocationFailed => e
     puts e.message.red
+    exit 1
   end
 end
 
@@ -234,4 +282,5 @@ begin
 
 rescue Interrupt
   puts "\nAborted!".colorize(:red)
-end
+  exit 1
+end

data/lib/rboss.rb

@@ -20,17 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative "rboss/version"
-require_relative "rboss/plaftorm"
-require_relative "rboss/view/colorizers"
-require_relative "rboss/view/formatters"
-require_relative "rboss/view/health_checkers"
-require_relative "rboss/view/table_builder"
-require_relative "rboss/jboss_profile"
-require_relative "rboss/twiddle"
-require_relative "rboss/cli/invoker"
-require_relative "rboss/bin/command_actions"
+require_relative 'rboss/version'
+require_relative 'rboss/utils'
+require_relative 'rboss/plaftorm'
+require_relative 'rboss/view/colorizers'
+require_relative 'rboss/view/formatters'
+require_relative 'rboss/view/health_checkers'
+require_relative 'rboss/view/table_builder'
+require_relative 'rboss/cli/invoker'
 
-file = File.expand_path("~/.rboss/rboss.rb")
+file = File.expand_path('~/.rboss/rboss.rb')
 
-eval File.read(file), binding, file if File.exist? file
+eval File.read(file), binding, file if File.exist? file

data/lib/rboss/cli/invoker.rb

@@ -25,6 +25,7 @@ require_relative 'resource'
 require_relative 'mappings'
 
 require 'logger'
+require 'io/console'
 
 require 'yummi'
 require 'yaml'
@@ -71,15 +72,26 @@ module RBoss
         @domain_host = "/host=#{host}"
       end
 
-      def domain_server=(host)
-        @domain_server = "/server=#{host}"
+      def domain_server=(server)
+        @domain_server = "/server=#{server}"
+      end
+
+      def server
+        "#{@domain_host}#{@domain_server}"
       end
 
       def command
         command = "#{jboss_cli} --connect"
         command << " --controller=#@server" if @server
-        command << " --user='#@user'" if @user
-        command << " --password='#@password'" if @password
+        if @user
+          command << " --user='#@user'"
+          unless @password
+            puts 'Input server password: '.blue.bold
+            @password = STDIN.noecho(&:gets).chomp
+            puts 'Password saved for this session!'.green
+          end
+          command << " --password='#@password'"
+        end
         command
       end
 
@@ -104,7 +116,7 @@ module RBoss
         props ||= {}
         builder = CommandBuilder::new operation
         help_printed = false
-        info = Yummi::colorize('Please input the requested parameters', :yellow)
+        info = 'Please input the requested parameters'.yellow
         props.each do |name, detail|
           next if (@skip_optional and (not detail['required'] or detail['default']))
           parameter_type = detail['type']
@@ -112,45 +124,46 @@ module RBoss
           unless input
             puts info unless help_printed
             help_printed = true
-            input_message = Yummi::colorize(name, :intense_blue)
+            input_message = name.bold.blue
             required = detail['required']
             default_value = detail['default']
             input_message << ' | ' << RBoss::Colorizers.type(parameter_type).colorize(parameter_type)
-            input_message << ' | ' << Yummi::colorize('Required', :red) if required
-            input_message << ' | ' << Yummi::colorize('Optional', :cyan) unless required
-            input_message << ' | ' << Yummi::colorize("[#{default_value}]", :blue) if default_value
-            input_message << "\n" << Yummi::colorize(detail['description'], 'bold.black')
+            input_message << ' | ' << 'Required'.red if required
+            input_message << ' | ' << 'Optional'.cyan unless required
+            input_message << ' | ' << "[#{default_value}]".blue if default_value
+            input_message << "\n" << detail['description'].bold
             puts input_message
             input = get_input
             while required and input.empty?
-              puts Yummi::colorize('Required parameter!', :red)
+              puts 'Required parameter!'.red
               input = get_input
             end
           end
           if input.empty?
-            puts Yummi::colorize('Parameter skipped!', :yellow)
+            puts 'Parameter skipped!'.yellow
             next
           end
           begin
             builder << {:name => name, :value => parameter_type.convert(input)}
           rescue Exception => e
-            puts Yummi::colorize('Your input could not be converted:', :yellow)
-            puts Yummi::colorize(e.message, :red)
-            puts Yummi::colorize('This will not affect other inputs, you can continue to input other values.', :yellow)
+            puts 'Your input could not be converted:'.yellow
+            puts e.message.red
+            puts 'This will not affect other inputs, you can continue to input other values.'.yellow
             puts 'Press ENTER to continue'
             gets
           end
         end
         result = result("#{path}:#{builder}")
-        #TODO print a table using the returned parameters
-        YAML::dump(result).on_box
+        format result
       end
 
       def execute(commands)
         commands = [commands] if commands.is_a? String
         exec = "#{command} --command#{commands.size > 1 ? 's' : ''}=\"#{commands.join ','}\""
         @logger.debug exec
-        `#{exec}`.chomp
+        result = `#{exec}`.chomp
+        @logger.debug result
+        result
       end
 
       def result(commands)

data/lib/rboss/cli/mappings.rb

@@ -37,17 +37,18 @@ module RBoss
         mapping = YAML::load_file(file).symbolize_keys
         @resource_mappings[name] = mapping
         if mapping[:print]
-          mapping[:print].each do |table|
-            if table[:id]
+          mapping[:print].each do |print|
+            print[:command] ||= '${path}:${read_resource}'
+            if print[:id]
               new_mapping = mapping.dup
-              new_mapping[:print] = [table]
-              new_mapping[:description] = table[:title]
+              new_mapping[:print] = [print]
+              new_mapping[:description] = print[:title]
               new_mapping[:derived] = true
-              if table[:path]
-                new_mapping[:path] = table[:path].gsub '${PATH}', mapping[:path]
-                table[:path] = new_mapping[:path]
+              if print[:path]
+                new_mapping[:path] = print[:path].gsub '${path}', mapping[:path]
+                print[:path] = new_mapping[:path]
               end
-              new_key = "#{name}-#{table[:id]}"
+              new_key = "#{name}-#{print[:id]}"
               @resource_mappings[new_key] = new_mapping
             end
           end
@@ -63,12 +64,12 @@ module RBoss
 
       def load_default_resources
         load_resources File.join(File.dirname(__FILE__), 'mappings/resources')
-        file = File.expand_path("~/.rboss/rboss-cli/resources")
+        file = File.expand_path('~/.rboss/rboss-cli/resources')
         if File.exist? file
           load_resources file
         end
         @resource_mappings[''] = {
-          :path => ''
+            :path => ''
         }
       end
 

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

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

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

@@ -1,7 +1,7 @@
 ---
-description: Datasource Information
-path: ${DOMAIN_HOST}${DOMAIN_SERVER}/subsystem=datasources/data-source=${NAME}
-scan: ls ${DOMAIN_HOST}${DOMAIN_SERVER}/subsystem=datasources/data-source
+description: Details Datasource Information
+path: ${server}/subsystem=datasources/data-source=${name}
+scan: ls ${server}/subsystem=datasources/data-source
 print:
 - id: config
   title: Datasource Details
@@ -40,7 +40,7 @@ print:
 
 - id: pool
   title: Datasource Pool Statistics
-  path: ${PATH}/statistics=pool
+  path: ${path}/statistics=pool
   layout: vertical
   properties:
     - ActiveCount
@@ -77,7 +77,7 @@ print:
 
 - id: jdbc
   title: Datasource JDBC Statistics
-  path: ${PATH}/statistics=jdbc
+  path: ${path}/statistics=jdbc
   properties:
     - PreparedStatementCacheCurrentSize
     - PreparedStatementCacheAccessCount

data/lib/rboss/cli/mappings/resources/deployment-scanner.yaml

@@ -1,7 +1,7 @@
 ---
 description: Details Deployment Scanner
-path: ${DOMAIN_HOST}${DOMAIN_SERVER}/subsystem=deployment-scanner/scanner=${NAME}
-scan: ls ${DOMAIN_HOST}${DOMAIN_SERVER}/subsystem=deployment-scanner/scanner
+path: ${server}/subsystem=deployment-scanner/scanner=${name}
+scan: ls ${server}/subsystem=deployment-scanner/scanner
 print:
   - title: Scanner
     layout: vertical
@@ -13,7 +13,7 @@ print:
     - path
     - relative-to
     - scan-enabled
-    - scan-interv
+    - scan-interval
     header:
     - Auto Deploy Exploded
     - Auto Deploy XML