rhcp_shell 0.2.11 → 0.2.12

data/lib/base_shell.rb

@@ -101,6 +101,7 @@ class BaseShell
           Kernel.exit
         else
           puts "got an error in @thread.join: #{error}"
+          puts error.backtrace.join("\n")
         end
         
       end

data/lib/display_types/hash.rb

@@ -0,0 +1,10 @@
+def format_hash_output(command, response)
+  output = []
+  
+  max_key_length = response.data.keys().sort { |a,b| a.length <=> b.length }.first.length
+  
+  response.data.each do |k,v|
+    output << sprintf("  %-#{max_key_length + 5}s\t%s", k, v)
+  end
+  output.join("\n")
+end

data/lib/local_commands/help.rb

@@ -44,7 +44,12 @@ def add_help_commands(broker)
         if command.params.size > 0 then
           puts "Parameters:"
           command.params.sort { |a,b| a.name <=> b.name }.each do |param|
-            puts sprintf("  %-20s %s\n", param.name, param.description)
+            default_value = param.default_value != nil ? " (default: #{param.default_value})" : ''
+            param_name = param.name
+            if param.is_default_param
+              param_name += " *"
+            end
+            puts sprintf("  %-20s %s%s\n", param_name, param.description, default_value)
           end
        end
        puts ""

data/lib/rhcp_shell_backend.rb

@@ -7,10 +7,11 @@ require 'local_commands/context'
 require 'local_commands/set_prompt'
 
 require 'display_types/table'
+require 'display_types/hash'
 
 require 'rubygems'
 require 'rhcp'
-require 'rhcp/memcached_broker'
+#require 'rhcp/memcached_broker'
 
 # This shell presents RHCP commands to the user and handles all the parameter
 # lookup, validation and command completion stuff
@@ -194,6 +195,9 @@ class RHCPShellBackend < ShellBackend
         if command.result_hints[:display_type] == "table"
           output = format_table_output(command, response)
           puts output
+        elsif command.result_hints[:display_type] == "hash"
+          output = format_hash_output(command, response)
+          puts output
         elsif command.result_hints[:display_type] == "list"
           output = ""
           response.data.each do |row|

data/lib/version.rb

@@ -5,7 +5,7 @@ module RhcpShell #:nodoc:
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 11
+    TINY  = 12
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp_shell
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Philipp Traeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 +00:00
+date: 2012-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,22 +43,22 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/rhcp_shell.log
 - bin/rhcp_shell
-- lib/util/colorize.rb
-- lib/shell_backend.rb
-- lib/version.rb
-- lib/rhcp_shell_backend.rb
 - lib/base_shell.rb
-- lib/display_types/table.rb
 - lib/test.log
-- lib/local_commands/context.rb
+- lib/shell_backend.rb
+- lib/rhcp_shell_backend.rb
 - lib/local_commands/set_prompt.rb
 - lib/local_commands/help.rb
-- lib/local_commands/exit.rb
+- lib/local_commands/context.rb
 - lib/local_commands/detail.rb
-- test/setup_test_registry.rb
+- lib/local_commands/exit.rb
+- lib/version.rb
+- lib/util/colorize.rb
+- lib/display_types/hash.rb
+- lib/display_types/table.rb
 - test/rhcp_shell_backend_test.rb
+- test/setup_test_registry.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/rhcp
 licenses: []

data/bin/rhcp_shell.log

@@ -1,11 +0,0 @@
-# Logfile created on Sat Jun 25 20:16:10 +0000 2011 by logger.rb/22285
-D, [2011-06-25T20:16:10.643948 #1686] DEBUG -- : now connecting to http://localhost:42000
-D, [2011-06-25T20:16:10.644097 #1686] DEBUG -- : connecting to http://localhost:42000
-D, [2011-06-25T20:16:31.881621 #1688] DEBUG -- : setting http://localhost for hostname
-D, [2011-06-25T20:16:31.881756 #1688] DEBUG -- : now connecting to http://localhost
-D, [2011-06-25T20:16:31.881865 #1688] DEBUG -- : connecting to http://localhost
-E, [2011-06-25T20:16:31.883273 #1688] ERROR -- : cannot connect to 'http://localhost' : got http status code 404
-D, [2011-06-25T20:16:45.728319 #1690] DEBUG -- : setting http://localhost/rhcp for hostname
-D, [2011-06-25T20:16:45.728460 #1690] DEBUG -- : now connecting to http://localhost/rhcp
-D, [2011-06-25T20:16:45.728582 #1690] DEBUG -- : connecting to http://localhost/rhcp
-E, [2011-06-25T20:16:45.730109 #1690] ERROR -- : cannot connect to 'http://localhost/rhcp' : got http status code 404