raystool 1.1.5 → 1.1.6

data/lib/rays/config/templates/project/config/environment.yml

@@ -38,6 +38,9 @@ test:
         port: 8080
         deploy: /opt/liferay-portal/deploy
         data: /opt/liferay-portal/data
+        ssh:
+          user: liferay
+          port: 22
         java:
             home: /usr/lib/jvm/java-6-sun
             bin: /usr/bin/java
@@ -65,4 +68,4 @@ test:
             log_file: logs/catalina.out
     backup:
         directory: /tmp/backup
-        stop: false
+        stop: false

data/lib/rays/services/application_service.rb

@@ -56,7 +56,7 @@ module Rays
       def start
         unless alive?
           execute @start_script
-          log
+          log unless remote?
         else
           raise RaysException.new('service is already running')
         end
@@ -70,7 +70,7 @@ module Rays
         end
         unless alive?
           execute @debug_script
-          log
+          log unless remote?
         else
           raise RaysException.new('service is already running')
         end
@@ -86,10 +86,10 @@ module Rays
           sleep(1)
         end
 
-	if alive?
-          rays_exec("kill -9 `lsof -t -i tcp:#{@port}`")
+        if alive?
+          execute ("kill -9 `lsof -t -i tcp:#{@port}`")
           sleep(2)
-	end
+        end
       end
 
       # normal restart
@@ -109,13 +109,13 @@ module Rays
       # Show logs (live)
       def log
         if remote?
-          remote.exec(command)
+          $log.info("Cannot show log of a remote host")
         else
           Thread.new do
             exec("tail -f #{@log_file}")
           end
+          $log.info("Following logs of #{@name} service on #{@host}.\nUse ctrl+c to interrupt.")
         end
-        $log.info("Following logs of #{@name} service on #{@host}.\nUse ctrl+c to interrupt.")
       end
 
       # Is the service resides on a remote service?
@@ -135,7 +135,7 @@ module Rays
       # Executing command on local or a remote server depending on the service configuration.
       def execute(command)
         if remote?
-          remote.exec(command)
+          @remote.exec(command)
         else
           rays_exec(command)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &70997120 !ruby/object:Gem::Requirement
+  requirement: &84643110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70997120
+  version_requirements: *84643110
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &70995680 !ruby/object:Gem::Requirement
+  requirement: &84642700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70995680
+  version_requirements: *84642700
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70994860 !ruby/object:Gem::Requirement
+  requirement: &84642370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70994860
+  version_requirements: *84642370
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70994370 !ruby/object:Gem::Requirement
+  requirement: &84641960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70994370
+  version_requirements: *84641960
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70993100 !ruby/object:Gem::Requirement
+  requirement: &84641460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70993100
+  version_requirements: *84641460
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &70992660 !ruby/object:Gem::Requirement
+  requirement: &84640760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70992660
+  version_requirements: *84640760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70991930 !ruby/object:Gem::Requirement
+  requirement: &84640180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70991930
+  version_requirements: *84640180
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: