raystool 1.1.0 → 1.1.1

data/lib/rays/config/configuration.rb

@@ -207,7 +207,7 @@ module Rays
             java_home = java_config['home']
             java_bin = java_config['bin']
           end
-          application_service = create_application_service_for(code, liferay_config)
+          application_service = create_application_service_for('liferay', code, liferay_config)
 
           liferay_server = Server::LiferayServer.new 'liferay server', host, remote, java_home, java_bin, port, deploy, data_directory, application_service
         end
@@ -252,7 +252,7 @@ module Rays
             java_home = java_config['home']
             java_bin = java_config['bin']
           end
-          application_service = create_application_service_for(code, solr_config)
+          application_service = create_application_service_for('solr', code, solr_config)
 
           solr_server = Server::SolrServer.new 'solr server', host, remote, java_home, java_bin, port, url, application_service
         end
@@ -288,7 +288,7 @@ module Rays
     #
     # Create application service for.
     #
-    def create_application_service_for(code, config)
+    def create_application_service_for(name, code, config)
       application_service = nil
       application_service_config = config['service']
       host = config['host']
@@ -310,7 +310,7 @@ module Rays
           application_remote = nil
         end
 
-        application_service = Service::ApplicationService.new 'liferay', host, port, start_script, debug_script, stop_script, log_file, application_remote
+        application_service = Service::ApplicationService.new name, host, port, start_script, debug_script, stop_script, log_file, application_remote, path
       end
       application_service
     end

data/lib/rays/interface/controller.rb

@@ -152,6 +152,10 @@ module Rays
     # Point methods
     #
     def point(path, name)
+      if 'appserver'.eql?(name)
+        $log.error('reserved point name')
+        return
+      end
       log_block("remember a point") do
         $rays_config.point(path, name)
       end
@@ -180,16 +184,21 @@ module Rays
         points = $rays_config.points
         point_name = name
         point_name ||= 'default'
-        if !points.nil? and points.include?(point_name)
+        dir = ''
+        if "appserver".eql? name
+          dir = $rays_config.environments['local'].liferay.service.path
+        elsif !points.nil? and points.include?(point_name)
           dir = points[point_name]
-          if Dir.exists?(dir)
-            $log.info("<!#{dir}!>") # tricky part. it logs to shell the directory name which will be switch by a bash script.
-          else
-            raise RaysException
-          end
         else
           raise RaysException.new("no point #{name}. use <!rays point!> to create points")
         end
+
+        if Dir.exists?(dir)
+          $log.info("<!#{dir}!>") # tricky part. it logs to shell the directory name which will be switch by a bash script.
+        else
+          raise RaysException
+        end
+
       end
     end
 

data/lib/rays/services/application_service.rb

@@ -25,7 +25,7 @@ module Rays
   module Service
     class ApplicationService
 
-      def initialize(name, host, port, start_script, debug_script, stop_script, log_file, remote)
+      def initialize(name, host, port, start_script, debug_script, stop_script, log_file, remote, path)
         @name = name
         @host = host
         @port = port
@@ -34,18 +34,24 @@ module Rays
         @stop_script = stop_script
         @log_file = log_file
         @remote = remote
+        @path = path
       end
 
       def host
-        raise RaysException.new(missing_environment_option('Service', 'host')) if @host.nil?
+        raise RaysException.new(missing_environment_option('service', 'host')) if @host.nil?
         @host
       end
 
       def port
-        raise RaysException.new(missing_environment_option('Service', 'port')) if @port.nil?
+        raise RaysException.new(missing_environment_option('service', 'port')) if @port.nil?
         @port
       end
 
+      def path
+        raise RaysException.new(missing_environment_option('service', 'path')) if @path.nil?
+        @path
+      end
+
       # Start service
       def start
         unless alive?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &75293680 !ruby/object:Gem::Requirement
+  requirement: &78039190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75293680
+  version_requirements: *78039190
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &75292650 !ruby/object:Gem::Requirement
+  requirement: &78038700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75292650
+  version_requirements: *78038700
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &75290990 !ruby/object:Gem::Requirement
+  requirement: &78038370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75290990
+  version_requirements: *78038370
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &75290380 !ruby/object:Gem::Requirement
+  requirement: &78037960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75290380
+  version_requirements: *78037960
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &75274850 !ruby/object:Gem::Requirement
+  requirement: &78037320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75274850
+  version_requirements: *78037320
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &75273970 !ruby/object:Gem::Requirement
+  requirement: &78036340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75273970
+  version_requirements: *78036340
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &75272840 !ruby/object:Gem::Requirement
+  requirement: &78035560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75272840
+  version_requirements: *78035560
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: