rhcp_shell 0.2.12 → 0.2.13

data/bin/rhcp_shell

@@ -7,10 +7,7 @@ require "getoptlong"
 require 'rubygems'
 
 require 'rhcp'
-
-require 'base_shell'
-require 'rhcp_shell_backend'
-require 'version'
+require 'rhcp_shell'
 
 require 'uri'
 

data/lib/rhcp_shell/display_types/hash.rb

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

data/lib/{display_types → rhcp_shell/display_types}/table.rb

@@ -21,9 +21,19 @@ def format_table_output(command, response)
     $logger.debug "column title list : #{column_title_list}"
     
     # TODO the sorting column should be configurable
-    first_column = columns_to_display[0]
-    $logger.debug "sorting by #{first_column}"
-    response.data = response.data.sort { |a,b| a[first_column] <=> b[first_column] }          
+    if response.data.size > 0
+      begin
+        first_column = columns_to_display[0]
+        $logger.debug "sorting by #{first_column}"      
+        if response.data.first.has_key? first_column
+          response.data = response.data.sort { |a,b| a[first_column] <=> b[first_column] }          
+        else
+          $logger.info "not sorting output because first defined column '#{first_column}' is missing in response data"      
+        end
+      rescue => detail
+        $logger.warn "got a problem while sorting the output : #{detail.message}"
+      end
+    end
     
     # add the index column
     columns_to_display.unshift "__idx"

data/lib/{rhcp_shell_backend.rb → rhcp_shell/rhcp_shell_backend.rb}

@@ -184,15 +184,19 @@ class RHCPShellBackend < ShellBackend
       request = RHCP::Request.new(command, @collected_values)
       response = @command_broker.execute(request)
 
-      # we might want to access this response in further commands
-      @last_response = response
-
       if (response.status == RHCP::Response::Status::OK)
-        
         $logger.debug "raw result : #{response.data}"
         $logger.debug "result hints: #{command.result_hints}"
         $logger.debug "display_type : #{command.result_hints[:display_type]}"
+        
+        #if not command.result_hints.has_key? :display_type
+        #  puts response.data.class
+        #end
+        
+        @last_response = response
         if command.result_hints[:display_type] == "table"
+          # we might want to access this response in further commands
+          
           output = format_table_output(command, response)
           puts output
         elsif command.result_hints[:display_type] == "hash"
@@ -206,8 +210,14 @@ class RHCPShellBackend < ShellBackend
           puts output
         elsif command.result_hints[:display_type] == "hidden"
           $logger.debug "suppressing output due to display_type 'hidden'"
+        elsif command.result_hints[:display_type] == "raw"
+          p output
         else
-          puts "executed '#{@command_selected.name}' successfully : #{@prompt_color_enabled ? green(response.data) : response.data}"
+          if @prompt_color_enabled
+            puts "#{green(@command_selected.name)} : #{response.data}"
+          else
+            puts "executed '#{@command_selected.name}' successfully : #{response.data}"
+          end
         end
         
         # if the command has been executed successfully, we might have to update the prompt
@@ -221,8 +231,12 @@ class RHCPShellBackend < ShellBackend
           Kernel.exit(0)
         end
         
-        puts "could not execute '#{@command_selected.name}' : #{@prompt_color_enabled ? red(response.error_text) : response.error_text}"
-        $logger.error "#{response.error_text} : #{response.error_detail}"
+        if @prompt_color_enabled
+          puts "#{red(@command_selected.name)} : #{response.error_text}"
+        else
+          puts "could not execute '#{@command_selected.name}' : #{response.error_text}"
+        end
+        $logger.error "[#{@command_selected.name}] #{response.error_text} : #{response.error_detail}"
         
         set_prompt nil
       end
@@ -310,7 +324,14 @@ class RHCPShellBackend < ShellBackend
                   @current_param = @command_selected.get_param(key)
                   add_parameter_value(value)
                 rescue RHCP::RhcpException => ex
-                  puts "ignoring parameter value '#{value}' for param '#{key}' : " + ex.to_s
+                  if @command_selected.accepts_extra_params
+                    puts "collecting value for extra param : #{key} => #{value}"
+                    @collected_values["extra_params"] = {} unless @collected_values.has_key?("extra_params")
+                    @collected_values["extra_params"][key] = Array.new if @collected_values["extra_params"][key] == nil
+                    @collected_values["extra_params"][key] << [ value ]
+                  else
+                    puts "ignoring parameter value '#{value}' for param '#{key}' : " + ex.to_s
+                  end
                 end
               end
             end

data/lib/{version.rb → rhcp_shell/version.rb}

@@ -1,3 +1,5 @@
+require 'singleton'
+
 module RhcpShell #:nodoc:
 
   class Version
@@ -5,7 +7,7 @@ module RhcpShell #:nodoc:
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 12
+    TINY  = 13
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")

data/lib/rhcp_shell.rb

@@ -0,0 +1,5 @@
+require 'rhcp'
+
+require 'rhcp_shell/version'
+require 'rhcp_shell/base_shell'
+require 'rhcp_shell/rhcp_shell_backend'

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp_shell
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
-- Philipp Traeder
+- Philipp T.
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 +01:00
-default_executable: 
+date: 2013-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rhcp
@@ -35,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: 
-email: philipp at hitchhackers.net
+email: philipp at virtualop dot org
 executables: 
 - rhcp_shell
 extensions: []
@@ -44,22 +43,22 @@ extra_rdoc_files: []
 
 files: 
 - bin/rhcp_shell
-- lib/base_shell.rb
+- lib/rhcp_shell.rb
+- lib/rhcp_shell/util/colorize.rb
+- lib/rhcp_shell/rhcp_shell_backend.rb
+- lib/rhcp_shell/local_commands/set_prompt.rb
+- lib/rhcp_shell/local_commands/context.rb
+- lib/rhcp_shell/local_commands/detail.rb
+- lib/rhcp_shell/local_commands/help.rb
+- lib/rhcp_shell/local_commands/exit.rb
+- lib/rhcp_shell/version.rb
+- lib/rhcp_shell/display_types/hash.rb
+- lib/rhcp_shell/display_types/table.rb
+- lib/rhcp_shell/base_shell.rb
+- lib/rhcp_shell/shell_backend.rb
 - lib/test.log
-- lib/shell_backend.rb
-- lib/rhcp_shell_backend.rb
-- lib/local_commands/set_prompt.rb
-- lib/local_commands/help.rb
-- lib/local_commands/context.rb
-- lib/local_commands/detail.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: []
 
@@ -88,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: rhcp
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: RHCP is a protocol designed for building up a command-metadata-based communication infrastructure making it easier for application developers to export commands in applications to generic clients - this is the generic shell for it.
+summary: command line shell for RHCP
 test_files: []
 

data/lib/display_types/hash.rb

@@ -1,10 +0,0 @@
-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