raystool 1.2.2 → 1.2.3

data/lib/rays/config/configuration.rb

@@ -211,8 +211,9 @@ module Rays
         unless liferay_config.nil?
           host = liferay_config['host']
           port = liferay_config['port']
-          deploy = liferay_config['deploy']
-          data_directory = liferay_config['data']
+          liferay_root = liferay_config['root']
+          deploy = absolute_path(liferay_root, liferay_config['deploy'])
+          data_directory = absolute_path(liferay_root, liferay_config['data'])
           remote = create_remote_for liferay_config
           java_home = nil
           java_bin = nil
@@ -307,9 +308,10 @@ module Rays
       application_service_config = config['service']
       host = config['host']
       port = config['port']
+      root = config['root']
       remote = create_remote_for config
       unless application_service_config.nil?
-        path = application_service_config['path']
+        path = absolute_path(root, application_service_config['path'])
         path = "" if path.nil?
         start_script = File.join(path, application_service_config['start_command'])
         debug_script = nil
@@ -393,5 +395,11 @@ module Rays
       true
     end
 
+    def absolute_path(root, path)
+      return "" if path.nil? or path.empty?
+      return path if root.nil? or root.strip.empty? or path.start_with? "/"
+      "#{root}/#{path}"
+    end
+
   end
 end

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

@@ -3,13 +3,13 @@ local:
         host: localhost
         port: 8080
         root: /opt/liferay-portal
-        deploy: deploy
-        data: data
+        deploy: deploy # will be added to the root
+        data: data # will be added to the root
         java:
             home: /usr/lib/jvm/java-6-sun
             bin: /usr/bin/java
         service:
-            path: tomcat
+            path: tomcat # will be added to the root
             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

data/lib/rays/interface/commander.rb

@@ -307,18 +307,9 @@ class RaysCommand < Clamp::Command
   #
   # SYNC
   #
-  #subcommand 'sync', 'synchronize local environment with the current one' do
-  #  def execute
-  #    Rays::Controller.instance.sync
-  #  end
-  #end
-
-  #
-  # UPDATE
-  #
-  subcommand 'update', 'update project configuration to the current version of rays' do
+  subcommand 'sync', 'synchronize local environment with the current one' do
     def execute
-      Rays::Controller.instance.update
+      Rays::Controller.instance.sync
     end
   end
 

data/lib/rays/interface/controller.rb

@@ -209,19 +209,13 @@ module Rays
       end
     end
 
-    #def sync
-    #  if 'local'.eql?($rays_config.environment.name)
-    #    $log.warn("Select not local environment to import to local.")
-    #    return
-    #  end
-    #  log_block("synchronize environments") do
-    #    Rays::Service::Sync.new.sync
-    #  end
-    #end
-
-    def update
-      log_block('update') do
-        Rays::Service::Updater.instance.update
+    def sync
+      if 'local'.eql?($rays_config.environment.name)
+        $log.warn("Select not local environment to import to local.")
+        return
+      end
+      log_block("synchronize environments") do
+        Rays::Service::Sync.new.sync
       end
     end
 

data/lib/rays/services/update_manager.rb

@@ -46,6 +46,7 @@ module Rays
         @updaters[Gem::Version.create('1.2.0')] = 'update_1_2_0'
         @updaters[Gem::Version.create('1.2.1')] = 'update_1_2_1'
         @updaters[Gem::Version.create('1.2.2')] = 'update_1_2_2'
+        @updaters[Gem::Version.create('1.2.3')] = 'update_1_2_3'
       end
 
       def check
@@ -110,6 +111,10 @@ module Rays
         $log.info "Update info: now you can add skip_mass_deploy: true parameter to .module file to ignore this module for mass deploy"
       end
 
+      def update_1_2_3
+        $log.info "Update info: now you can root option in your environment.yml to get rid of absolute paths for data, deploy and service/path. Create a new project to see an example."
+      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.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &72499490 !ruby/object:Gem::Requirement
+  requirement: &71272460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72499490
+  version_requirements: *71272460
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &72499270 !ruby/object:Gem::Requirement
+  requirement: &71272240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72499270
+  version_requirements: *71272240
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &72499060 !ruby/object:Gem::Requirement
+  requirement: &71272030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72499060
+  version_requirements: *71272030
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &72498850 !ruby/object:Gem::Requirement
+  requirement: &71271820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72498850
+  version_requirements: *71271820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &72498640 !ruby/object:Gem::Requirement
+  requirement: &71271610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72498640
+  version_requirements: *71271610
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &72498430 !ruby/object:Gem::Requirement
+  requirement: &71271400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72498430
+  version_requirements: *71271400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &72498220 !ruby/object:Gem::Requirement
+  requirement: &71271190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72498220
+  version_requirements: *71271190
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: