raystool 1.2.0 → 1.2.1

data/lib/rays/config/configuration.rb

@@ -335,7 +335,8 @@ module Rays
     def create_remote_for(config)
       remote = nil
       if !config.nil? and !config['ssh'].nil? and !config['ssh']['user'].nil?
-        host = config['host']
+        host = config['ssh']['host']
+        host ||= config['host']
         port = config['ssh']['port']
         user = config['ssh']['user']
         remote = Service::Remote::SSH.new host, port, user

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

@@ -1 +1 @@
-version: 1.2.0
+version: 1.2.1

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

@@ -10,7 +10,7 @@ local:
             bin: /usr/bin/java
         service:
             path: tomcat
-            start_command: bin/startup.sh
+            start_command: "JAVA_OPTS=\"$JAVA_OPTS -Dexternal-properties=portal-developer.properties\" && bin/startup.sh"
             debug_command: bin/catalina.sh jpda start
             stop_command: bin/shutdown.sh
             log_file: logs/catalina.out

data/lib/rays/services/update_manager.rb

@@ -44,6 +44,7 @@ module Rays
 
         @updaters = Hash.new
         @updaters[Gem::Version.create('1.2.0')] = 'update_1_2_0'
+        @updaters[Gem::Version.create('1.2.1')] = 'update_1_2_1'
       end
 
       def check
@@ -100,6 +101,10 @@ module Rays
         @rays_content.properties.delete('environment')
       end
 
+      def update_1_2_1
+        $log.info "Update info: now you can specify ssh hostname for liferay server if it is not the same as liferay's (web) hostname"
+      end
+
       def sync_version version
         @rays_content.properties['version'] = version.to_s
         @rays_content.write

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &85607120 !ruby/object:Gem::Requirement
+  requirement: &75212110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85607120
+  version_requirements: *75212110
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &85606900 !ruby/object:Gem::Requirement
+  requirement: &75211890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85606900
+  version_requirements: *75211890
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &85606690 !ruby/object:Gem::Requirement
+  requirement: &75211680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85606690
+  version_requirements: *75211680
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &85606480 !ruby/object:Gem::Requirement
+  requirement: &75211470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85606480
+  version_requirements: *75211470
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &85606270 !ruby/object:Gem::Requirement
+  requirement: &75211260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85606270
+  version_requirements: *75211260
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &85606060 !ruby/object:Gem::Requirement
+  requirement: &75211050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85606060
+  version_requirements: *75211050
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &85605850 !ruby/object:Gem::Requirement
+  requirement: &75210840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85605850
+  version_requirements: *75210840
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: