rhcp_shell 0.0.1 → 0.0.2

data/Manifest.txt

@@ -7,6 +7,6 @@ lib/base_shell.rb
 lib/rhcp_shell.rb
 lib/rhcp_shell_backend.rb
 lib/shell_backend.rb
-start_shell.sh
+rhcp_shell.sh
 test/rhcp_shell_backend_test.rb
 test/setup_test_registry.rb

data/Rakefile

@@ -4,8 +4,11 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
+$LOAD_PATH.push('lib')
+require File.join(File.dirname(__FILE__), 'lib', 'rhcp_shell.rb')
+
 PKG_NAME = 'rhcp_shell'
-PKG_VERSION = '0.0.1'
+PKG_VERSION = RhcpShell::Version.to_s
 
 desc "Default Task"
 task :default => [ :test ]
@@ -55,10 +58,12 @@ task :lines do
   puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
 end
 
-#rcov -I lib/ -I test/ -x rcov.rb -x var/lib -x lib/shell_backend.rb  test/*test.rb
+task :coverage do
+  system "rcov -I lib/ -I test/ -x rcov.rb -x var/lib -x lib/shell_backend.rb  test/*test.rb"
+end
 
 task :update_manifest do
-  system "rake check_manifest 2>/dev/null | grep -vE 'qooxdoo|nbproject|coverage' | grep -E '^\+' | grep -vE '^$' | grep -v '(in ' | grep -vE '^\+\+\+' | cut -b 2-200 | patch"
+  system "rake check_manifest 2>/dev/null | grep -vE 'qooxdoo|nbproject|coverage' | grep -E '^\+' | grep -vE '^$' | grep -v '(in ' | grep -vE '^\+\+\+' | cut -b 2-200 >> Manifest.txt"
 end
 
 require 'rubygems'

data/lib/rhcp_shell.rb

@@ -11,14 +11,26 @@ require 'rhcp'
 require 'base_shell'
 require 'rhcp_shell_backend'
 
-# TODO version number
-SHELL_VERSION = "0.1"
-
 class RhcpShell
+  
+  class Version
+
+    include Singleton
+
+    MAJOR = 0
+    MINOR = 0
+    TINY  = 2
+
+    def Version.to_s
+      [ MAJOR, MINOR, TINY ].join(".")
+    end
+
+
+  end
 
 HELP_STRING = <<EOF
 
-RHCP Command Shell v #{SHELL_VERSION} (using RHCP library v #{RHCP::Version.to_s})
+RHCP Command Shell v #{RhcpShell::Version.to_s} (using RHCP library v #{RHCP::Version.to_s})
 
 Usage:
   rhcp_shell.rb [--hostname=<hostname>] [--username=<username> --password=<password>] 
@@ -82,7 +94,7 @@ EOF
       
       backend = RHCPShellBackend.new(@http_broker)
       backend.banner = <<EOF
-Good morning, this is the generic RHCP Shell.
+Good morning, this is the generic RHCP Shell (v #{RhcpShell::Version.to_s}, using RHCP library v #{RHCP::Version.to_s})
 Press <tab> for command completion or type "help" for a list of commands.
 If you want to exit this shell, please press Ctrl+C or type "exit".
 
@@ -92,7 +104,7 @@ EOF
       shell = BaseShell.new(backend)
       shell.run
     rescue => ex
-      puts "There occurred an HTTP error while connecting to the RHCP: #{ex}"
+      puts "There occurred an HTTP error while connecting to the RHCP server: #{ex}"
       puts "Please connect against another server or fix the connection problem."
       puts ex.backtrace.join("\n")
     end
@@ -100,9 +112,11 @@ EOF
 end  
   
   
-# TODO introduce something like the RAILS_ENVs
-$logger = Logger.new("rhcp_shell.log")
-RHCP::ModuleHelper.instance().logger = $logger
+if $0 == __FILE__
+  # TODO introduce something like the RAILS_ENVs
+  $logger = Logger.new("rhcp_shell.log")
+  RHCP::ModuleHelper.instance().logger = $logger
 
-shell = RhcpShell.new
-shell.run
+  shell = RhcpShell.new
+  shell.run
+end

data/rhcp_shell.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+dir=`dirname $0`
+ruby -I$dir/lib $dir/lib/rhcp_shell.rb $*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp_shell
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Philipp T.
@@ -43,7 +43,7 @@ files:
 - lib/rhcp_shell.rb
 - lib/rhcp_shell_backend.rb
 - lib/shell_backend.rb
-- start_shell.sh
+- rhcp_shell.sh
 - test/rhcp_shell_backend_test.rb
 - test/setup_test_registry.rb
 has_rdoc: true

data/start_shell.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-ruby -Ilib lib/rhcp_shell.rb