raystool 1.2.7 → 1.2.8

data/bin/__rays_exec.rb

@@ -30,5 +30,7 @@ begin
   end
   require 'rays/interface/commander'
   RaysCommand.run('rays', ARGV, {})
+rescue SystemExit, Interrupt
 rescue => e
+  $log.error e.message
 end

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

@@ -1 +1 @@
-version: 1.2.7
+version: 1.2.8

data/lib/rays/interface/commander.rb

@@ -159,17 +159,17 @@ class RaysCommand < Clamp::Command
 
     def execute
       modules = []
-      if !type.nil? and name.nil? and !'ear'.eql? type
-        $log.error "Please specify the name of #{type}"
-        return
+      module_name = name
+      if !type.nil? and module_name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify the name of #{type}")
       end
 
       if 'ear'.eql? type
-        name = 'application'
+        module_name = 'application'
       end
 
-      if !type.nil? and !name.nil?
-        module_instance = Rays::AppModule::Manager.instance.get(type, name)
+      if !type.nil? and !module_name.nil?
+        module_instance = Rays::AppModule::Manager.instance.get(type, module_name)
       else
         module_instance = Rays::AppModule::Manager.instance.get_from_path(Dir.pwd)
       end
@@ -194,17 +194,17 @@ class RaysCommand < Clamp::Command
 
     def execute
       modules = []
-      if !type.nil? and name.nil? and !'ear'.eql? type
-        $log.error "Please specify the name of #{type}"
-        return
+      module_name = name
+      if !type.nil? and module_name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify the name of #{type}")
       end
 
       if 'ear'.eql? type
-        name = 'application'
+        module_name = 'application'
       end
 
-      if !type.nil? and !name.nil?
-        module_instance = Rays::AppModule::Manager.instance.get(type, name)
+      if !type.nil? and !module_name.nil?
+        module_instance = Rays::AppModule::Manager.instance.get(type, module_name)
       else
         module_instance = Rays::AppModule::Manager.instance.get_from_path(Dir.pwd)
       end
@@ -232,17 +232,17 @@ class RaysCommand < Clamp::Command
 
     def execute
       modules = []
-      if type.nil? and !name.nil? and !'ear'.eql? type
-        raise RaysException.new("Please specify name for #{type}")
+      module_name = name
+      if !type.nil? and module_name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify the name of #{type}")
       end
 
       if 'ear'.eql? type
-        name = 'application'
+        module_name = 'application'
       end
 
-      module_instance = nil
-      if !type.nil? and !name.nil?
-        module_instance = Rays::AppModule::Manager.instance.get(type, name)
+      if !type.nil? and !module_name.nil?
+        module_instance = Rays::AppModule::Manager.instance.get(type, module_name)
       else
         module_instance = Rays::AppModule::Manager.instance.get_from_path(Dir.pwd)
       end

data/lib/rays/services/update_manager.rb

@@ -50,7 +50,8 @@ module Rays
         @updaters[Gem::Version.create('1.2.4')] = 'update_1_2_4'
         @updaters[Gem::Version.create('1.2.5')] = 'update_1_2_5'
         @updaters[Gem::Version.create('1.2.6')] = 'update_1_2_6'
-        @updaters[Gem::Version.create('1.2.6')] = 'update_1_2_7'
+        @updaters[Gem::Version.create('1.2.7')] = 'update_1_2_7'
+        @updaters[Gem::Version.create('1.2.8')] = 'update_1_2_8'
       end
 
       def check
@@ -63,7 +64,7 @@ module Rays
           end
           update
         elsif @current_version > @updaters.keys.max
-          $log.error "Your project version is higher than rays one.\nIt is highly recommended to upgrade your rays ('<!gem update raystool!>') before continue.\nPress 'Enter' to continue or 'ctrl+c' to abort."
+          $log.error "Your project version #{@current_version.to_s} is higher than the rays one #{@updaters.keys.max}.\nIt is highly recommended to upgrade your rays ('<!gem update raystool!>') before continue.\nPress 'Enter' to continue or 'ctrl+c' to abort."
           begin
             STDIN.gets.chomp
           rescue Interrupt
@@ -138,6 +139,10 @@ module Rays
         $log.info "Update info: fixed ear packaging bugs"
       end
 
+      def update_1_2_8
+        $log.info "Update info: improved errors log"
+      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.7
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &78910310 !ruby/object:Gem::Requirement
+  requirement: &71598290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78910310
+  version_requirements: *71598290
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &78910090 !ruby/object:Gem::Requirement
+  requirement: &71597820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78910090
+  version_requirements: *71597820
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &78909880 !ruby/object:Gem::Requirement
+  requirement: &71597340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78909880
+  version_requirements: *71597340
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &78909670 !ruby/object:Gem::Requirement
+  requirement: &71596800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78909670
+  version_requirements: *71596800
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &78909460 !ruby/object:Gem::Requirement
+  requirement: &71595920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78909460
+  version_requirements: *71595920
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &78909250 !ruby/object:Gem::Requirement
+  requirement: &71595450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78909250
+  version_requirements: *71595450
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &78909040 !ruby/object:Gem::Requirement
+  requirement: &71594830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78909040
+  version_requirements: *71594830
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables:
@@ -113,7 +113,6 @@ files:
 - lib/rays/config/backup.rb
 - lib/rays/config/configuration.rb
 - lib/rays/config/environment.rb
-- lib/rays/config/templates/project/Rakefile
 - lib/rays/config/templates/project/config/project.yml
 - lib/rays/config/templates/project/config/environment.yml
 - lib/rays/config/templates/global/global.yml

data/lib/rays/config/templates/project/Rakefile

@@ -1,150 +0,0 @@
-require 'yaml'
-require 'open-uri'
-require 'pathname'
-require 'rays/core'
-
-task :default => [:create]
-
-task :create do
-  server = RaysServerUtil.new
-  server.create_server
-  server.init_database
-end
-
-task :refresh do
-  server = RaysServerUtil.new
-  server.init_database
-  server.recreate_server
-end
-
-task :update do
-  server = RaysServerUtil.new
-  server.configure_liferay
-end
-
-class RaysServerUtil
-  def initialize
-    @liferay_archive = 'liferay-portal-tomcat-6.1.0-ce-ga1-20120106155615760.zip'
-    @liferay_archive_path = File.join(ENV['HOME'], 'Downloads', @liferay_archive)
-    @extracted_name = 'liferay-portal-6.1.0-ce-ga1'
-    @url = 'http://downloads.sourceforge.net/project/lportal/Liferay%20Portal/6.1.0%20GA1/liferay-portal-tomcat-6.1.0-ce-ga1-20120106155615760.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flportal%2Ffiles%2FLiferay%2520Portal%2F6.1.0%2520GA1%2F&ts=1332039099&use_mirror=superb-sea2'
-    init_liferay_archive
-  end
-
-  def refresh
-    init_database
-    recreate_server
-  end
-
-  def init_database
-    log_block("(re)create database") do
-      db_type = environment.database.type
-      rays_exec('psql -U postgres < support-files/init.sql')  if 'postgres'.eql? db_type
-      rays_exec('mysql -uroot -p < support-files/init.sql')  if 'mysql'.eql? db_type
-    end
-  end
-
-  def recreate_server
-    remove_server_directory
-    create_server
-  end
-
-  def create_server
-    if Dir.exist? server_root
-      $log.error 'server has already been created'
-      exit 1
-    else
-      copy_liferay_archive_to_server_base
-      extract_liferay_archive
-      configure_liferay
-      cleanup_portlets
-    end
-  end
-
-
-  def configure_liferay
-    $log.info 'copy server configuration files'
-    FileUtils.cp(File.join(Dir.pwd, 'support-files/portal-ext.properties'), liferay_root)
-    FileUtils.cp(File.join(Dir.pwd, 'support-files/ROOT.xml'), File.join(server_root, 'conf/Catalina/localhost/ROOT.xml'))
-  end
-
-  private
-  def in_directory(directory)
-    if Dir.exist? directory
-      original_directory = Dir.pwd
-      Dir.chdir directory
-      begin
-        yield
-      ensure
-        Dir.chdir original_directory
-      end
-    end
-  end
-
-  def remove_server_directory
-    $log.info "remove server directory"
-    FileUtils.rm_rf liferay_root
-  end
-
-  def server_root
-    environment.liferay.service.path
-  end
-
-  def liferay_root
-    File.dirname server_root
-  end
-
-  def liferay_base
-    File.dirname liferay_root
-  end
-
-  def copy_liferay_archive_to_server_base
-    $log.info 'copy liferay archive to destination directory'
-    FileUtils.cp @liferay_archive_path, liferay_base
-  end
-
-  def extract_liferay_archive
-    in_directory liferay_base do
-      $log.info 'extracting liferay'
-      rays_exec "unzip #{@liferay_archive}"
-
-      $log.info 'removing archive'
-      FileUtils.rm_f(@liferay_archive)
-      FileUtils.mv(@extracted_name, File.basename(liferay_root))
-    end
-  end
-
-  def cleanup_portlets
-    in_directory File.join(server_root, 'webapps') do
-      task 'cleaning portlets', 'done', 'failed' do
-        portlets_to_remove = %w(chat-portlet knowledge-base-portlet mail-portlet opensocial-portlet sevencogs-hook sevencogs-theme wsrp-portlet)
-
-        portlets_to_remove.each do |portlet|
-          portlet_path = File.join(Dir.pwd, portlet)
-          if Dir.exist? portlet_path
-            $log.info "removing #{portlet}"
-            FileUtils.rm_rf portlet_path
-          end
-        end
-      end
-    end
-  end
-
-  def init_liferay_archive
-    unless File.exist? @liferay_archive_path
-      $log.info 'Downloading liferay ...'
-      write_out = open(@liferay_archive_path, "wb")
-      write_out.write(open(@url).read)
-      write_out.close
-    end
-
-    unless File.exist? @liferay_archive_path
-      $log.error "cannot neither find #{@liferay_archive_path} nor download liferay zip from #{@url}."
-      exit 1
-    end
-  end
-
-  def environment
-    $rays_config.environments['local']
-  end
-end