raystool 1.1.8 → 1.2.0

data/bin/__rays_exec.rb

@@ -23,9 +23,12 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
-require 'rays/interface/commander'
-
 begin
+  $command = ARGV[0]
+  if '--debug'.eql? $command
+    $command = ARGV[1]
+  end
+  require 'rays/interface/commander'
   RaysCommand.run('rays', ARGV, {})
 rescue => e
 end

data/lib/rays/config/configuration.rb

@@ -34,7 +34,13 @@ module Rays
       @silent = false
       $global_config_path ||= "#{ENV['HOME']}/.rays_config"
       @global_config_file = nil
-      load_config
+
+      init_global_config
+
+      init_project_root
+      unless @project_root.nil?
+        load_project_config
+      end
     end
 
     #
@@ -58,8 +64,9 @@ module Rays
     # Set environment
     #
     def environment=(environment_name)
+      project_root # check if it's inside a project dir
       if environments.include?(environment_name)
-        yaml_file = get_dot_rays_file
+        yaml_file = get_profile_file
         yaml_file.properties['environment'] = environment_name
         yaml_file.write
         Core.instance.reload
@@ -158,12 +165,12 @@ module Rays
     #
     # Initializes environments and project parameters.
     #
-    def load_config
-      log_block('process configuration file') do
-        init_global_config
-        init_project_root
-        return if @project_root.nil?
-
+    def load_project_config
+      log_block('load project configuration') do
+        skip_version_check_commands = %w(go point points version)
+        unless skip_version_check_commands.include? $command
+          version_check
+        end
         init_environments
       end
     end
@@ -178,6 +185,13 @@ module Rays
       @project_root = Rays::Utils::FileUtils.find_up('.rays')
     end
 
+    #
+    # Check version
+    #
+    def version_check
+      Rays::Service::UpdateManager.new(get_dot_rays_file).check
+    end
+
     #
     # Main initialization method.
     # Load environments and set the first declared environment as default.
@@ -276,7 +290,7 @@ module Rays
 
 
       # load current environment
-      yaml_file = get_dot_rays_file
+      yaml_file = get_profile_file
       env = yaml_file.properties['environment']
       if @environments.include?(env)
         @environment = @environments[env]
@@ -334,6 +348,12 @@ module Rays
       Utils::FileUtils::YamlFile.new dot_rays_file
     end
 
+    def get_profile_file
+      profile_file = File.join(project_root, 'config/.profile')
+      FileUtils.touch profile_file unless File.exists? profile_file
+      Utils::FileUtils::YamlFile.new profile_file
+    end
+
     #
     #  GLOBAL CONFIGURATION PROCESSING
     #

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

@@ -0,0 +1 @@
+version: 1.2.0

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

@@ -2,13 +2,14 @@ local:
     liferay:
         host: localhost
         port: 8080
-        deploy: /opt/liferay-portal/deploy
-        data: /opt/liferay-portal/data
+        root: /opt/liferay-portal
+        deploy: deploy
+        data: data
         java:
             home: /usr/lib/jvm/java-6-sun
             bin: /usr/bin/java
         service:
-            path: /opt/liferay-portal/tomcat
+            path: tomcat
             start_command: bin/startup.sh
             debug_command: bin/catalina.sh jpda start
             stop_command: bin/shutdown.sh

data/lib/rays/core.rb

@@ -84,6 +84,7 @@ module Rays
       require 'rays/services/application_service'
       require 'rays/services/scm'
       require 'rays/services/database'
+      require 'rays/services/update_manager'
     end
 
     def load_workers

data/lib/rays/interface/commander.rb

@@ -307,9 +307,18 @@ class RaysCommand < Clamp::Command
   #
   # SYNC
   #
-  subcommand 'sync', 'synchronize local environment with the current one' do
+  #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
     def execute
-      Rays::Controller.instance.sync
+      Rays::Controller.instance.update
     end
   end
 

data/lib/rays/interface/controller.rb

@@ -209,13 +209,19 @@ 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
+    #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
       end
     end
 

data/lib/rays/services/update_manager.rb

@@ -0,0 +1,110 @@
+=begin
+Copyright (c) 2012 Dmitri Carpov
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+module Rays
+  module Service
+    class UpdateManager
+
+      def initialize(rays_content)
+        @current_version = nil
+        @rays_content = rays_content
+
+        unless rays_content.nil?
+          version_string = rays_content.properties['version']
+          if !version_string.nil? and !version_string.strip.empty?
+            @current_version = Gem::Version.create version_string
+          end
+        end
+
+        if @current_version.nil?
+          @current_version ||= Gem::Version.create '1.1.9'
+          rays_content.properties['version'] = @current_version.to_s
+          rays_content.write
+        end
+
+        @updaters = Hash.new
+        @updaters[Gem::Version.create('1.2.0')] = 'update_1_2_0'
+      end
+
+      def check
+        if @current_version < @updaters.keys.max
+          $log.error "Your project version is #{@current_version.to_s}. Your rays version is #{@updaters.keys.max.to_s}. Press 'Enter' to update or 'ctrl+c' to abort."
+          begin
+            STDIN.gets.chomp
+          rescue Interrupt
+            exit
+          end
+          update
+        elsif @current_version > @updaters.keys.max
+          $log.error "Your project version is higher than rays one. It is highly recommended to upgrade your rays ('gem update raystool') before continue. Press 'Enter' to continue or 'ctrl+c' to abort."
+          begin
+            STDIN.gets.chomp
+          rescue Interrupt
+            exit
+          end
+        end
+
+      end
+
+      def update
+        @updaters.keys.sort.each do |version|
+          if @current_version < version
+            $log.info "Updating project to version #{version.to_s}"
+            begin
+              self.send @updaters[version]
+              sync_version version
+            rescue => e
+              $log.warn "Failed to update to version #{version.to_s}. Please report on http://github.com/dmitri-carpov/rays/issues"
+              $log.error "\n\n#{e}.\nBacktrace:\r\n#{e.backtrace.join("\r\n")}"
+              exit
+            end
+          end
+        end
+      end
+
+      private
+
+      def update_1_2_0
+        environment = @rays_content.properties['environment']
+        if !environment.nil? && !environment.empty?
+          project_dir = Utils::FileUtils::find_up '.rays'
+          config_dir = File.join(project_dir, 'config')
+          profile_file = File.join(config_dir, '.profile')
+          FileUtils.touch profile_file
+          profile = Utils::FileUtils::YamlFile.new profile_file
+          profile.properties['environment'] = environment
+          profile.write
+
+          $log.warn("Please add #{profile_file.sub(project_dir + '/', '')} to your scm ignore file.")
+        end
+        @rays_content.properties.delete('environment')
+      end
+
+      def sync_version version
+        @rays_content.properties['version'] = version.to_s
+        @rays_content.write
+        @current_version = version
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &73584570 !ruby/object:Gem::Requirement
+  requirement: &85607120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73584570
+  version_requirements: *85607120
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &73584290 !ruby/object:Gem::Requirement
+  requirement: &85606900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73584290
+  version_requirements: *85606900
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &73583820 !ruby/object:Gem::Requirement
+  requirement: &85606690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73583820
+  version_requirements: *85606690
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &73583370 !ruby/object:Gem::Requirement
+  requirement: &85606480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73583370
+  version_requirements: *85606480
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &73583140 !ruby/object:Gem::Requirement
+  requirement: &85606270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73583140
+  version_requirements: *85606270
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &73582910 !ruby/object:Gem::Requirement
+  requirement: &85606060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73582910
+  version_requirements: *85606060
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &73582620 !ruby/object:Gem::Requirement
+  requirement: &85605850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73582620
+  version_requirements: *85605850
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables:
@@ -121,6 +121,7 @@ files:
 - lib/rays/servers/solr.rb
 - lib/rays/servers/base.rb
 - lib/rays/services/application_service.rb
+- lib/rays/services/update_manager.rb
 - lib/rays/services/remote.rb
 - lib/rays/services/database.rb
 - lib/rays/services/sync.rb