raystool 1.1.1 → 1.1.2

data/lib/rays/interface/commander.rb

@@ -27,9 +27,29 @@ require 'rays/interface/controller'
 class RaysCommand < Clamp::Command
   option '--silent', :flag, 'no output information'
   option '--debug', :flag, 'debug information'
+  option %w(-v --version), :flag, 'version'
 
   usage '[option] command [sub-command] [command option]'
 
+  def parse(arguments)
+    begin
+      super
+      show_version
+    rescue => e
+      show_version
+      raise e
+    end
+  end
+
+  def execute
+    if debug?
+      $log.debug_on
+    elsif silent?
+      $log.silent_on
+    end
+    super
+  end
+
   #
   # CREATE A NEW PROJECT
   #
@@ -37,7 +57,6 @@ class RaysCommand < Clamp::Command
     parameter 'project_name', 'project name'
 
     def execute
-      process_global_options
       Rays::Controller.instance.create_project project_name
     end
   end
@@ -47,7 +66,6 @@ class RaysCommand < Clamp::Command
   #
   subcommand 'init', 'init a project on the current directory' do
     def execute
-      process_global_options
       Rays::Controller.instance.init_project
     end
   end
@@ -58,7 +76,6 @@ class RaysCommand < Clamp::Command
   #
   subcommand 'modules', 'show all modules' do
     def execute
-      process_global_options
       Rays::Controller.instance.show_modules
     end
   end
@@ -74,7 +91,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'portlet', name, generator
       end
     end
@@ -84,7 +100,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'servicebuilder', name, generator
       end
     end
@@ -94,7 +109,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'ext', name, generator
       end
     end
@@ -104,7 +118,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'hook', name, generator
       end
     end
@@ -114,7 +127,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'theme', name, generator
       end
     end
@@ -124,7 +136,6 @@ class RaysCommand < Clamp::Command
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
 
       def execute
-        process_global_options
         Rays::Controller.instance.create_module 'layout', name, generator
       end
     end
@@ -139,7 +150,6 @@ class RaysCommand < Clamp::Command
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
     def execute
-      process_global_options
       modules = []
       if type.nil? and !name.nil?
         raise RaysException.new("Cannot build type w/o name.")
@@ -171,7 +181,6 @@ class RaysCommand < Clamp::Command
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
     def execute
-      process_global_options
       modules = []
       if type.nil? and !name.nil?
         raise RaysException.new("Cannot build type w/o name.")
@@ -202,7 +211,6 @@ class RaysCommand < Clamp::Command
     parameter '[name]', 'a module name'
 
     def execute
-      process_global_options
       modules = []
       if type.nil? and !name.nil?
         raise RaysException.new("Cannot build type w/o name.")
@@ -233,7 +241,6 @@ class RaysCommand < Clamp::Command
     option '--list', :flag, 'list environments'
 
     def execute
-      process_global_options
 
       if list?
         Rays::Controller.instance.list_environments
@@ -262,7 +269,6 @@ class RaysCommand < Clamp::Command
     option '--remove', :flag, 'remove a point. if no name is specified the point will be considered as default.'
 
     def execute
-      process_global_options
       if remove?
         Rays::Controller.instance.remove_point name
       else
@@ -273,7 +279,6 @@ class RaysCommand < Clamp::Command
 
   subcommand 'points', 'show all points' do
     def execute
-      process_global_options
       Rays::Controller.instance.points
     end
   end
@@ -283,7 +288,6 @@ class RaysCommand < Clamp::Command
     parameter '[name]', 'point name. if no name is specified the point will be considered as default.'
 
     def execute
-      process_global_options
       Rays::Controller.instance.go name
     end
   end
@@ -293,7 +297,6 @@ class RaysCommand < Clamp::Command
   #
   subcommand 'backup', 'backup current environment' do
     def execute
-      process_global_options
       Rays::Controller.instance.backup
     end
   end
@@ -303,7 +306,6 @@ class RaysCommand < Clamp::Command
   #
   subcommand 'sync', 'synchronize local environment with the current one' do
     def execute
-      process_global_options
       Rays::Controller.instance.sync
     end
   end
@@ -317,7 +319,6 @@ class RaysCommand < Clamp::Command
     option '--force', :flag, 'use it only to [start | stop] remote servers. be careful!'
 
     def execute
-      process_global_options
       if action.eql? 'start'
         Rays::Controller.instance.liferay_start(force?)
       elsif action.eql? 'debug'
@@ -344,7 +345,6 @@ class RaysCommand < Clamp::Command
   subcommand 'solr', 'manage solr server of the current environment' do
     subcommand 'clean', 'delete all records from the solr index' do
       def execute
-        process_global_options
         Rays::Controller.instance.clean_solr_index
       end
     end
@@ -353,7 +353,6 @@ class RaysCommand < Clamp::Command
       option '--force', :flag, 'use it only to start a remote server. be careful!'
 
       def execute
-        process_global_options
         Rays::Controller.instance.solr_start(force?)
       end
     end
@@ -362,37 +361,29 @@ class RaysCommand < Clamp::Command
       option '--force', :flag, 'use it only to stop a remote server. be careful!'
 
       def execute
-        process_global_options
         Rays::Controller.instance.solr_stop(force?)
       end
     end
 
     subcommand 'log', 'show solr server log' do
       def execute
-        process_global_options
         Rays::Controller.instance.solr_log
       end
     end
 
     subcommand 'status', 'show solr server status' do
       def execute
-        process_global_options
         Rays::Controller.instance.solr_status
       end
     end
   end
 
-
   private
 
-  #
-  # OPTIONS PROCESSOR
-  #
-  def process_global_options
-    if debug?
-      $log.debug_on
-    elsif silent?
-      $log.silent_on
+  def show_version
+    if version?
+      $log.info Gem.loaded_specs['raystool'].version
+      exit 0
     end
   end
 end

data/lib/rays/services/application_service.rb

@@ -78,11 +78,18 @@ module Rays
 
       # Stop service
       def stop
-        if alive?
-          execute @stop_script
-        else
-          raise RaysException.new('service is not running')
+        raise RaysException.new('service is not running') if not alive?
+
+        execute @stop_script
+        10.times do
+          break if not alive?
+          sleep(1)
         end
+
+	if alive?
+          rays_exec("kill -9 `lsof -t -i tcp:#{@port}`")
+          sleep(2)
+	end
       end
 
       # normal restart
@@ -139,23 +146,13 @@ module Rays
         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
+        if alive?
           raise RaysException.new('service is stopping too long.')
         end
+
+        yield
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &78039190 !ruby/object:Gem::Requirement
+  requirement: &75825080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78039190
+  version_requirements: *75825080
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &78038700 !ruby/object:Gem::Requirement
+  requirement: &75824300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78038700
+  version_requirements: *75824300
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &78038370 !ruby/object:Gem::Requirement
+  requirement: &75824060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78038370
+  version_requirements: *75824060
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &78037960 !ruby/object:Gem::Requirement
+  requirement: &75823740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78037960
+  version_requirements: *75823740
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &78037320 !ruby/object:Gem::Requirement
+  requirement: &75823320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78037320
+  version_requirements: *75823320
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &78036340 !ruby/object:Gem::Requirement
+  requirement: &75822920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78036340
+  version_requirements: *75822920
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &78035560 !ruby/object:Gem::Requirement
+  requirement: &75822570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78035560
+  version_requirements: *75822570
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: