rboss 0.8.0 → 0.8.1

data/bin/rboss-cli

@@ -35,7 +35,6 @@ servers_file = "#@conf_dir/jboss-cli-servers.yaml"
 @resources = {}
 @parameters = {}
 @servers_file = File.expand_path(servers_file)
-@operation = :read_resource
 save = false
 params[:jboss_home] = (ENV["RBOSS_CLI_JBOSS_HOME"] or Dir.pwd)
 params[:host] = '127.0.0.1'
@@ -112,13 +111,15 @@ opts.on('-a', '--args PARAMETERS', Array,
 end
 
 RBoss::Cli::Mappings.resource_mappings.each do |name, config|
-  if config[:scan]
-    opts.on("--#{name} [NAMES]", Array, config[:description]) do |resources|
-      @resources[name] = resources
-    end
-  else
-    opts.on("--#{name}", config[:description]) do
-      @resources[name] = true
+  if config[:description]
+    if config[:scan]
+      opts.on("--#{name} [NAMES]", Array, config[:description]) do |resources|
+        @resources[name] = resources
+      end
+    else
+      opts.on("--#{name}", config[:description]) do
+        @resources[name] = true
+      end
     end
   end
 end
@@ -152,7 +153,13 @@ if save
   puts "Configuration saved!"
 end
 
-puts opts if @resources.empty?
+if @resources.empty? and not @operation
+  puts opts
+elsif @resources.empty?
+  @resources[''] = true
+elsif not @operation
+  @operation = :read_resource
+end
 
 def execute_actions
   begin

data/lib/rboss/cli/invoker.rb

@@ -131,7 +131,7 @@ module RBoss
           end
         end
         result = result("#{path}:#{builder}")
-        puts Yummi::colorize("Result:", :yellow)
+        puts Yummi::colorize("Result:", :intense_yellow)
         #TODO print a table using the returned parameters
         puts YAML::dump(result)
       end

data/lib/rboss/cli/mappings.rb

@@ -36,18 +36,20 @@ module RBoss
         name = File.basename(file, '.yaml').gsub('_', '-')
         mapping = YAML::load_file(file).symbolize_keys
         @resource_mappings[name] = mapping
-        mapping[:print].each do |table|
-          if table[:id]
-            new_mapping = mapping.dup
-            new_mapping[:print] = [table]
-            new_mapping[:description] = table[:title]
-            new_mapping[:derived] = true
-            if table[:path]
-              new_mapping[:path] = table[:path].gsub '${PATH}', mapping[:path]
-              table[:path] = new_mapping[:path]
+        if mapping[:print]
+          mapping[:print].each do |table|
+            if table[:id]
+              new_mapping = mapping.dup
+              new_mapping[:print] = [table]
+              new_mapping[:description] = table[:title]
+              new_mapping[:derived] = true
+              if table[:path]
+                new_mapping[:path] = table[:path].gsub '${PATH}', mapping[:path]
+                table[:path] = new_mapping[:path]
+              end
+              new_key = "#{name}-#{table[:id]}"
+              @resource_mappings[new_key] = new_mapping
             end
-            new_key = "#{name}-#{table[:id]}"
-            @resource_mappings[new_key] = new_mapping
           end
         end
       end
@@ -65,6 +67,9 @@ module RBoss
         if File.exist? file
           load_resources file
         end
+        @resource_mappings[''] = {
+          :path => ''
+        }
       end
 
       module_function :load_resources,

data/lib/rboss/cli/resource.rb

@@ -30,7 +30,7 @@ module RBoss
         @invoker = invoker
         @context = {
           :name => '',
-          :read_resource => 'read-resource(include-runtime=true)'
+          :read_resource => 'read-resource(include-runtime=true,recursive=true)'
         }
         @context[:path] = parse(@config[:path])
         @tables = []
@@ -49,6 +49,7 @@ module RBoss
       def read_resource(resources, arguments)
         resources ||= scan
         params = @config[:print]
+        return unless params
         params.each do |p|
           table_builder = RBoss::TableBuilder::new p
           table_builder.add_name_column if scannable?
@@ -70,7 +71,7 @@ module RBoss
       end
 
       def read_operation_names(resource_name, arguments)
-        operations = Yummi::colorize('Operations:', :yellow)
+        operations = Yummi::colorize('Operations:', :intense_yellow)
         operations << $/
         with resource_name do
           result = @invoker.result("#{@context[:path]}:read-operation-names")
@@ -197,7 +198,7 @@ module RBoss
       end
 
       def get_data(config)
-        command = parse((config[:command] or '${PATH}:read-resource(include-runtime=true)'))
+        command = parse((config[:command] or "${PATH}:#{@context[:read_resource]}"))
         begin
           result = @invoker.result(command)
           data = []

data/lib/rboss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rboss
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies: []
 description: ! "Rboss gives you a set of command line tools to configure a JBoss instance\n
   \ and use jboss-cli and twiddle wrapped by an elegant interface"