raystool 1.0.11 → 1.1.0

data/lib/rays/config/templates/global/scripts/rays

@@ -171,7 +171,7 @@ _rays_complete () {
 
 		liferay)
 			_rayscomp "
-				start debug stop status log
+				start debug stop status log restart restart-debug
 				--force $default_args
 			"
 			;;

data/lib/rays/interface/commander.rb

@@ -313,7 +313,7 @@ class RaysCommand < Clamp::Command
   # LIFERAY
   #
   subcommand 'liferay', 'manage liferay application server' do
-    parameter 'action', 'start | debug | stop | status | log'
+    parameter 'action', 'start | debug | stop | status | log | restart | restart-debug'
     option '--force', :flag, 'use it only to [start | stop] remote servers. be careful!'
 
     def execute
@@ -322,6 +322,10 @@ class RaysCommand < Clamp::Command
         Rays::Controller.instance.liferay_start(force?)
       elsif action.eql? 'debug'
         Rays::Controller.instance.liferay_debug(force?)
+      elsif action.eql? 'restart'
+        Rays::Controller.instance.liferay_restart(force?)
+      elsif action.eql? 'restart-debug'
+        Rays::Controller.instance.liferay_restart_debug(force?)
       elsif action.eql? 'stop'
         Rays::Controller.instance.liferay_stop(force?)
       elsif action.eql? 'status'

data/lib/rays/interface/controller.rb

@@ -227,6 +227,40 @@ module Rays
       end
     end
 
+    #
+    # Restart liferay's application server
+    #
+    def liferay_restart(force=false)
+      show_environment_info
+      task('restarting server', 'stop and start command has been sent', 'failed to start the server') do
+        service = $rays_config.environment.liferay.service
+        if service.remote? and !force
+          $log.warn("WARNING: you are trying to start a remote server.")
+          $log.warn("Your current environment is <!#{$rays_config.environment.name}!>.")
+          $log.warn("Use <!--force!> option if you really want to start remote liferay server.")
+          return
+        end
+        service.restart_normal
+      end
+    end
+
+    #
+    # Restart liferay's application server in debug mode
+    #
+    def liferay_restart_debug(force=false)
+      show_environment_info
+      task('restarting server in debug mode', 'stop and debug command has been sent', 'failed to start the server') do
+        service = $rays_config.environment.liferay.service
+        if service.remote? and !force
+          $log.warn("WARNING: you are trying to start a remote server.")
+          $log.warn("Your current environment is <!#{$rays_config.environment.name}!>.")
+          $log.warn("Use <!--force!> option if you really want to start remote liferay server.")
+          return
+        end
+        service.restart_debug
+      end
+    end
+
     #
     # Start liferay's application server in debug mode
     #

data/lib/rays/services/application_service.rb

@@ -50,6 +50,7 @@ module Rays
       def start
         unless alive?
           execute @start_script
+          log
         else
           raise RaysException.new('service is already running')
         end
@@ -63,6 +64,7 @@ module Rays
         end
         unless alive?
           execute @debug_script
+          log
         else
           raise RaysException.new('service is already running')
         end
@@ -77,6 +79,20 @@ module Rays
         end
       end
 
+      # normal restart
+      def restart_normal
+        restart do
+          start
+        end
+      end
+
+      # restart in debug mode
+      def restart_debug
+        restart do
+          debug
+        end
+      end
+
       # Show logs (live)
       def log
         if remote?
@@ -111,6 +127,29 @@ module Rays
           rays_exec(command)
         end
       end
+
+      # restart service
+      def restart
+        if alive?
+          stop
+        end
+        started = false
+        tries_limit = 30
+        try = 0
+        while try < tries_limit do
+          unless alive?
+            yield
+            started = true
+            break
+          end
+          try += 1
+          sleep(1)
+        end
+
+        unless started
+          raise RaysException.new('service is stopping too long.')
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &80850390 !ruby/object:Gem::Requirement
+  requirement: &75293680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80850390
+  version_requirements: *75293680
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &80850170 !ruby/object:Gem::Requirement
+  requirement: &75292650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80850170
+  version_requirements: *75292650
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &80849960 !ruby/object:Gem::Requirement
+  requirement: &75290990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80849960
+  version_requirements: *75290990
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &80849750 !ruby/object:Gem::Requirement
+  requirement: &75290380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80849750
+  version_requirements: *75290380
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &80849540 !ruby/object:Gem::Requirement
+  requirement: &75274850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80849540
+  version_requirements: *75274850
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &80849330 !ruby/object:Gem::Requirement
+  requirement: &75273970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80849330
+  version_requirements: *75273970
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &80849120 !ruby/object:Gem::Requirement
+  requirement: &75272840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80849120
+  version_requirements: *75272840
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: