rboss 0.9.1 → 0.9.3

data/lib/rboss/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module RBoss
-  VERSION = "0.9.1"
+  VERSION = '0.9.3'
 end

data/lib/rboss/view/colorizers.rb

@@ -6,14 +6,16 @@ module RBoss
   # A module that holds the colorizers
   #
   module Colorizers
-    
+
+    module_function
+
     #
     # A colorizer for the types returned by invocations in jboss-cli.
     #
     # Parameter:
     #   The type to use the color
     #
-    def self.type type
+    def type type
       Yummi::to_colorize do |ctx|
         case type
           when RBoss::Cli::ResultParser::STRING then

data/lib/rboss/view/formatters.rb

@@ -6,5 +6,42 @@ module RBoss
   #
   module Formatters
 
+    module_function
+
+    def date(format = '%d-%m-%Y %H:%M:%S %z')
+      Yummi::to_format do |ctx|
+        value = ctx.value
+        Time.at(value / 1000).strftime(format)
+      end
+    end
+
+    def time
+      Yummi::to_format do |ctx|
+        value = ctx.value / 1000
+        seconds = value % 60
+        minutes = (value / 60) % 60
+        hours = (value / 60 / 60) % 24
+        days = (value / 60 / 60 / 24)
+        "#{days}d #{hours}h #{minutes}m #{seconds}s"
+      end
+    end
+
+    def trim(max)
+      Yummi::to_format do |ctx|
+        value = ctx.value.to_s
+        if value.size > max
+          value[0..max] << '...'
+        else
+          value
+        end
+      end
+    end
+
+    def array(separator = ', ')
+      Yummi::to_format do |ctx|
+        ctx.value.join separator
+      end
+    end
+
   end
 end

data/lib/rboss/view/table_builder.rb

@@ -24,7 +24,7 @@ module RBoss
   class TableBuilder
 
     def initialize(config)
-      @config = config
+      @config = config.dup
       add_name_column if config[:scan]
     end
 
@@ -60,7 +60,7 @@ module RBoss
       table.format_null :with => 'undefined'
       table.colorize_null :with => :red
 
-      table.colorize :name, :with => "bold.white" if @name_column
+      table.colorize :name, :with => 'bold.white' if @name_column
 
       table
     end

data/rboss-cli-bash-completion

@@ -0,0 +1,82 @@
+#!/bin/sh
+#                            The MIT License
+#
+#        Copyright (c) 2014 Marcelo Guimaraes <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.
+
+_rboss_cli () {
+  COMPREPLY=()
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prev="${COMP_WORDS[COMP_CWORD-1]}"
+  local args="${COMP_WORDS[@]:1}"
+  local prev_args="${COMP_WORDS[@]:1:COMP_CWORD-1}"
+
+  case "$cur" in
+    - | --*)
+      COMPREPLY=( $( compgen -W '$(rboss-cli options)' -- $cur ) )
+    ;;
+    *)
+    case "$prev" in
+      --connect)
+        COMPREPLY=( $( compgen -W '$(rboss-cli --list-servers)' -- $cur ) )
+      ;;
+      -o | --operation | \
+      -d | --detail)
+        COMPREPLY=( $( compgen -W '$(rboss-cli $prev_args read-operation-names)' -- $cur ) )
+      ;;
+      -j | --jboss-home | --script)
+        _longopt
+      ;;
+      --domain-host)
+        COMPREPLY=( $( compgen -W '$(rboss-cli ${prev_args/--domain-host//} --hosts)' -- $cur ) )
+      ;;
+      --domain-server)
+        COMPREPLY=( $( compgen -W '$(rboss-cli ${prev_args/--domain-server//} --servers)' -- $cur ) )
+      ;;
+      -v | -s | -u | -p | -l | -n | -r | \
+      --list-operations | \
+      --list-resource-names | \
+      --verbose | \
+      --host | \
+      --port | \
+      --save | \
+      --list-servers | \
+      --start-cli | \
+      --native | \
+      --no-colors | \
+      --attribute | \
+      --all)
+      ;;
+      --*)
+        if [[ "$cur" =~ .*,.* ]]; then
+          COMPREPLY=( $( compgen -W '$(rboss-cli $args --list-resource-names)' \
+            -P "${cur%,*}," -- ${cur##*,} ) )
+        else
+          COMPREPLY=( $( compgen -W '$(rboss-cli $args --list-resource-names)' -- $cur ) )
+        fi
+      ;;
+    esac
+    ;;
+  esac
+  return 0
+}
+
+complete -F _rboss_cli -o nospace rboss-cli

data/rboss.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rboss/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'rboss/version'
 
 Gem::Specification.new do |gem|
-  gem.name        = "rboss"
+  gem.name        = 'rboss'
   gem.version     = RBoss::VERSION
-  gem.authors     = ["Ataxexe"]
-  gem.email       = ["ataxexe@gmail.com"]
-  gem.homepage    = "https://github.com/ataxexe/rboss"
-  gem.summary     = %q{Manage your JBoss from your command line.}
-  gem.description = %q{Rboss gives you a set of command line tools to configure a JBoss instance
-  and use jboss-cli and twiddle wrapped by an elegant interface}
+  gem.authors     = %w(Ataxexe)
+  gem.email       = %w(ataxexe@gmail.com)
+  gem.homepage    = 'https://github.com/ataxexe/rboss'
+  gem.summary     = %q{Manage your JBoss from your command line}
+  gem.description = %q{Rboss gives you a set of command line tools to use
+jboss-cli wrapped by an elegant interface}
 
-  gem.rubyforge_project = "rboss"
+  gem.rubyforge_project = 'rboss'
 
-  gem.add_dependency 'yummi', '>=0.9.0'
+  gem.add_dependency 'yummi', '>= 0.9.3'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ["lib"]
+  gem.require_paths = %w(lib)
 end

data/rboss.iml

@@ -8,12 +8,12 @@
       <sourceFolder url="file://$MODULE_DIR$/bin" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/pkg" />
     </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.0.0-p247" jdkType="RUBY_SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.5, RVM: ruby-2.0.0-p247) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="term-ansicolor (v1.2.2, RVM: ruby-2.0.0-p247) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tins (v0.12.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="yummi (v0.9.2, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.6, RVM: ruby-2.1-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="term-ansicolor (v1.3.0, RVM: ruby-2.1-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tins (v1.3.2, RVM: ruby-2.1-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="yummi (v0.9.4, RVM: ruby-2.1-head) [gem]" level="application" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
@@ -204,5 +204,4 @@
       </map>
     </option>
   </component>
-</module>
-
+</module>

data/rboss.ipr

@@ -4,9 +4,6 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
   <component name="BuildJarProjectSettings">
     <option name="BUILD_JARS_ON_MAKE" value="false" />
   </component>
@@ -100,7 +97,6 @@
       <option name="myName" value="MIT" />
       <option name="myLocal" value="true" />
     </copyright>
-    <module2copyright />
   </component>
   <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
   <component name="DependencyValidationManager">
@@ -114,9 +110,6 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="GradleSettings">
-    <option name="gradleHome" value="$USER_HOME$/build/gradle" />
-  </component>
   <component name="GradleUISettings">
     <setting name="root" />
   </component>
@@ -132,7 +125,6 @@
       <profile version="1.0" is_locked="false">
         <option name="myName" value="Project Default" />
         <option name="myLocal" value="false" />
-        <inspection_tool class="Fix shebang" enabled="true" level="WARNING" enabled_by_default="true">/bin/sh#/bin/bash</inspection_tool>
         <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
           <option name="processCode" value="true" />
           <option name="processLiterals" value="true" />
@@ -323,7 +315,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="RVM: ruby-1.9.3-p374" project-jdk-type="RUBY_SDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="RVM: ruby-2.1-head" project-jdk-type="RUBY_SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ResourceManagerContainer">
@@ -586,5 +578,4 @@
       </map>
     </option>
   </component>
-</project>
-
+</project>

metadata

@@ -1,101 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rboss
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Ataxexe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yummi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
 description: |-
-  Rboss gives you a set of command line tools to configure a JBoss instance
-    and use jboss-cli and twiddle wrapped by an elegant interface
+  Rboss gives you a set of command line tools to use
+  jboss-cli wrapped by an elegant interface
 email:
 - ataxexe@gmail.com
 executables:
 - rboss-cli
-- rboss-profile
-- rboss-twiddle
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".idea/encodings.xml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/rboss.iml"
+- ".idea/scopes/scope_settings.xml"
+- ".idea/vcs.xml"
 - Gemfile
 - README.md
 - Rakefile
 - bin/rboss-cli
-- bin/rboss-profile
-- bin/rboss-twiddle
 - lib/rboss.rb
-- lib/rboss/bin/command_actions.rb
 - lib/rboss/cli/invoker.rb
 - lib/rboss/cli/mappings.rb
 - lib/rboss/cli/mappings/resources/connector.yaml
 - lib/rboss/cli/mappings/resources/datasource.yaml
 - lib/rboss/cli/mappings/resources/deployment-scanner.yaml
 - lib/rboss/cli/mappings/resources/interface.yaml
-- lib/rboss/cli/mappings/resources/jdbc_driver.yaml
+- lib/rboss/cli/mappings/resources/jdbc-driver.yaml
+- lib/rboss/cli/mappings/resources/jms-queue.yaml
+- lib/rboss/cli/mappings/resources/runtime.yaml
 - lib/rboss/cli/mappings/resources/server.yaml
 - lib/rboss/cli/resource.rb
 - lib/rboss/cli/result_parser.rb
-- lib/rboss/component_processor.rb
-- lib/rboss/components/component.rb
-- lib/rboss/components/datasource.rb
-- lib/rboss/components/deploy_folder.rb
-- lib/rboss/components/hypersonic_replacer.rb
-- lib/rboss/components/jbossweb.rb
-- lib/rboss/components/jmx.rb
-- lib/rboss/components/mod_cluster.rb
-- lib/rboss/components/org/6.0/deploy_folder.rb
-- lib/rboss/components/org/jmx.rb
-- lib/rboss/components/profile_folder.rb
-- lib/rboss/components/resource.rb
-- lib/rboss/components/restore_slimming.rb
-- lib/rboss/components/run_conf.rb
-- lib/rboss/components/run_conf.yaml
-- lib/rboss/components/service_script.rb
-- lib/rboss/components/slimming.rb
-- lib/rboss/components/slimming.yaml
-- lib/rboss/components/soa-p/hypersonic_replacer.rb
-- lib/rboss/components/soa-p/jmx.rb
-- lib/rboss/components/xadatasource.rb
-- lib/rboss/file_processor.rb
-- lib/rboss/jboss_path.rb
-- lib/rboss/jboss_profile.rb
 - lib/rboss/plaftorm.rb
-- lib/rboss/resources/jboss_init_redhat.sh.erb
-- lib/rboss/resources/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
-- lib/rboss/resources/mod_cluster.sar/mod_cluster-1.1.2.Final.jar
-- lib/rboss/resources/run.conf.bat.erb
-- lib/rboss/resources/run.conf.erb
-- lib/rboss/twiddle.rb
-- lib/rboss/twiddle/base_monitor.rb
-- lib/rboss/twiddle/mbean.rb
-- lib/rboss/twiddle/monitor.rb
-- lib/rboss/twiddle/twiddle.rb
 - lib/rboss/utils.rb
 - lib/rboss/version.rb
 - lib/rboss/view/colorizers.rb
 - lib/rboss/view/formatters.rb
 - lib/rboss/view/health_checkers.rb
 - lib/rboss/view/table_builder.rb
+- rboss-cli-bash-completion
 - rboss.gemspec
 - rboss.iml
 - rboss.ipr
@@ -108,18 +78,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rboss
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Manage your JBoss from your command line.
+summary: Manage your JBoss from your command line
 test_files: []

data/bin/rboss-profile

@@ -1,125 +0,0 @@
-#!/usr/bin/env ruby
-
-#                         The MIT License
-#
-# Copyright (c) 2011-2012 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.
-
-require_relative '../lib/rboss'
-require 'optparse'
-require 'yaml'
-require 'logger'
-
-params = {}
-config = nil
-create = true
-
-opts = OptionParser::new
-opts.on('-j', '--jboss-home PATH', 'Defines the JBOSS_HOME variable') do |home|
-  params[:jboss_home] = home
-end
-opts.on('-t', '--type TYPE', 'Defines the JBoss Type (org, eap, soa_p, epp)') do |type|
-  params[:type] = type.to_sym
-end
-opts.on('-n', '--version VERSION', 'Defines the JBoss version (5, 6, 5.1, ...)') do |version|
-  params[:version] = version
-end
-opts.on('-b', '--base-profile PROFILE', 'Defines the base profile') do |profile|
-  params[:base_profile] = profile
-end
-opts.on('-p', '--profile PROFILE', 'Defines the custom profile') do |profile|
-  params[:profile] = profile
-end
-opts.on('-u', '--update', 'Just update the profile folder') do
-  create = false
-end
-opts.on('-c', '--config-file FILE', 'Defines the configuration file for the instance') do |yaml|
-  config_file = File.expand_path(yaml)
-  config = YAML::load File.open(config_file)
-  config.each do |c|
-    if c.is_a? Hash and c[:params]
-      c.delete(:params).each do |key, value|
-        params[key] = value
-      end
-    end
-  end
-end
-opts.on("--encrypt PASSWORD", "Encrypts the given password for using with a SecureIdentityLoginModule") do |password|
-  params[:encrypt] = password
-end
-opts.on("--slim SERVICES", "--slimming SERVICES", Array, "Slim the desired JBoss profile") do |services|
-  params[:slimming] = services
-end
-opts.on("--restore SERVICES", Array, "Restores slimmed services in the desired JBoss profile") do |services|
-  params[:restore] = services
-  create = false
-end
-opts.on("--this", "Defines the current dir as the profile folder and update mode") do
-  params[:jboss_home] = File.dirname(File.dirname(Dir.pwd))
-  params[:profile] = Dir.pwd.split('/')[-1]
-  create = false
-end
-opts.on('-v', '--verbose', 'Displays shell commands') do
-  include FileUtils::Verbose
-  params[:log_level] = Logger::DEBUG
-end
-opts.on("-h", "--help", "Shows this help message") { puts opts; exit }
-opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.'
-
-unless $stdout.isatty
-  require 'yummi/no_colors'
-end
-
-if params.empty?
-  puts opts
-  exit
-end
-
-params[:jboss_home] ||= Dir.pwd unless ENV["JBOSS_HOME"]
-profile = RBoss::Profile::new params
-
-if params[:slimming]
-  profile.slim *params[:slimming]
-end
-
-if params[:restore]
-  profile.add :restore, params[:restore]
-end
-
-if params[:encrypt]
-  puts "Encrypted password: " + profile.jboss.encrypt(params[:encrypt])
-  exit
-end
-
-if config
-  config.each do |var|
-    if var.is_a? Hash
-      var.each do |key, value|
-        key = key.gsub(/-/, '_').to_sym if key.is_a? String
-        profile.add key, value
-      end
-    else
-      profile.add var.to_sym
-    end
-  end
-end
-
-profile.create if create
-profile.update unless create