raystool 1.2.3 → 1.2.4

data/lib/rays/config/configuration.rb

@@ -312,6 +312,9 @@ module Rays
       remote = create_remote_for config
       unless application_service_config.nil?
         path = absolute_path(root, application_service_config['path'])
+        deploy = application_service_config['deploy']
+        deploy = absolute_path(path, deploy) unless deploy.nil?
+
         path = "" if path.nil?
         start_script = File.join(path, application_service_config['start_command'])
         debug_script = nil
@@ -326,7 +329,7 @@ module Rays
           application_remote = nil
         end
 
-        application_service = Service::ApplicationService.new name, host, port, start_script, debug_script, stop_script, log_file, application_remote, path
+        application_service = Service::ApplicationService.new name, host, port, start_script, debug_script, stop_script, log_file, application_remote, path, deploy
       end
       application_service
     end

data/lib/rays/config/templates/global/scripts/rays

@@ -48,15 +48,19 @@ _rays_dir () {
 	done
 }
 
-_rays_module_types="portlet hook theme layout ext"
+_rays_module_types="portlet hook theme servicebuilder layout ext ejb"
 
 _rays_module_find () {
 	local dir="$1/$2s" glob="*-$2"
+    if [ $2 = "ejb" ]; then
+      local dir="$1/ee/ejb"
+    fi
+
 
 	case "$2" in ext) dir="$1/$2" ;; esac
 
 	if [ -d "$dir" ]; then
-		find "$dir/" -maxdepth 1 -type d -name "$glob" -printf "%f "
+		find "$dir/" -maxdepth 2 -type d -name "$glob" -printf "%f "
 	fi
 }
 
@@ -67,7 +71,7 @@ _rays_module () {
 
 	while [[ $c -lt $COMP_CWORD ]] && [ -z "$module_dir" ]; do
 		case "${COMP_WORDS[c]}" in
-		portlet|hook|theme|layout|ext|servicebuilder)
+		portlet|hook|theme|layout|ext|servicebuilder|ejb)
 			_rays_module_find "$dir" "${COMP_WORDS[c]}"
 			return
 			;;

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

@@ -5,15 +5,13 @@ local:
         root: /opt/liferay-portal
         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 # 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
             log_file: logs/catalina.out
+            deploy: "" # use it for jee6 servers to deploy ejb
     database:
         host: localhost
         port: 3306
@@ -30,9 +28,6 @@ local:
             start_command: bin/startup.sh
             stop_command: bin/shutdown.sh
             log_file: logs/catalina.out
-    backup:
-        directory: /tmp/backup
-        stop: false
 test:
     liferay:
         host: 127.0.0.1
@@ -42,15 +37,13 @@ test:
         ssh:
           user: liferay
           port: 22
-        java:
-            home: /usr/lib/jvm/java-6-sun
-            bin: /usr/bin/java
         service:
             path: /opt/liferay-portal/tomcat
             start_command: bin/startup.sh
             debug_command: bin/catalina.sh jpda start
             stop_command: bin/shutdown.sh
             log_file: logs/catalina.out
+            deploy: ""
     database:
         host: localhost
         port: 3306
@@ -67,6 +60,3 @@ test:
             start_command: bin/startup.sh
             stop_command: bin/shutdown.sh
             log_file: logs/catalina.out
-    backup:
-        directory: /tmp/backup
-        stop: false

data/lib/rays/core.rb

@@ -101,6 +101,7 @@ module Rays
       require 'rays/models/appmodule/portlet'
       require 'rays/models/appmodule/servicebuilder'
       require 'rays/models/appmodule/ext'
+      require 'rays/models/appmodule/ejb'
       require 'rays/models/appmodule/hook'
       require 'rays/models/appmodule/theme'
       require 'rays/models/appmodule/layout'

data/lib/rays/interface/commander.rb

@@ -112,6 +112,15 @@ class RaysCommand < Clamp::Command
       end
     end
 
+    subcommand 'ejb', 'create an EJB' do
+      parameter 'name', 'a module name'
+      option '--generator', 'GENERATOR', 'Generator name, maven by default'
+
+      def execute
+        Rays::Controller.instance.create_module 'ejb', name, generator
+      end
+    end
+
     subcommand 'hook', 'create a hook' do
       parameter 'name', 'a module name'
       option '--generator', 'GENERATOR', 'Generator name, maven by default'
@@ -144,7 +153,7 @@ class RaysCommand < Clamp::Command
   # BUILDER
   #
   subcommand 'build', 'build module(s). build all modules if under project root or a specific module if under module\'s root' do
-    parameter '[type]', 'a module type [portlet | hook | theme | layout]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ejb]'
     parameter '[name]', 'a module name'
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
@@ -175,7 +184,7 @@ class RaysCommand < Clamp::Command
   # DEPLOYER
   #
   subcommand 'deploy', 'deploy module(s). deploy all modules if under project root or a specific module if under module\'s root' do
-    parameter '[type]', 'a module type [portlet | hook | theme | layout]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ejb]'
     parameter '[name]', 'a module name'
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
@@ -210,7 +219,7 @@ class RaysCommand < Clamp::Command
   # CLEANER
   #
   subcommand 'clean', 'clean module(s). clean all modules if under project root or a specific module if under module\'s root' do
-    parameter '[type]', 'a module type [portlet | hook | theme | layout]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ejb]'
     parameter '[name]', 'a module name'
 
     def execute

data/lib/rays/models/appmodule/ejb.rb

@@ -0,0 +1,35 @@
+=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 AppModule
+    class EJBModule < Module
+      register :ejb
+      directory 'ee/ejb'
+      generator Worker::Manager.instance.create :generator, :ejb_maven
+      builder Worker::Manager.instance.create :builder, :ejb_maven
+      deployer Worker::Manager.instance.create :deployer, :ejb
+      cleaner Worker::Manager.instance.create :cleaner, :maven
+    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, path)
+      def initialize(name, host, port, start_script, debug_script, stop_script, log_file, remote, path, deploy)
         @name = name
         @host = host
         @port = port
@@ -35,6 +35,7 @@ module Rays
         @log_file = log_file
         @remote = remote
         @path = path
+        @deploy = deploy
       end
 
       def host
@@ -52,6 +53,11 @@ module Rays
         @path
       end
 
+      def deploy
+        raise RaysException.new(missing_environment_option('service', 'deploy')) if @deploy.nil?
+        @deploy
+      end
+
       # Start service
       def start
         unless alive?

data/lib/rays/services/update_manager.rb

@@ -47,11 +47,12 @@ module Rays
         @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'
+        @updaters[Gem::Version.create('1.2.4')] = 'update_1_2_4'
       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."
+          $log.error "Your project version is #{@current_version.to_s}.\nYour rays version is #{@updaters.keys.max.to_s}.\nPress 'Enter' to upgrade or 'ctrl+c' to abort."
           begin
             STDIN.gets.chomp
           rescue Interrupt
@@ -59,7 +60,7 @@ module Rays
           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."
+          $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."
           begin
             STDIN.gets.chomp
           rescue Interrupt
@@ -115,6 +116,13 @@ module Rays
         $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 update_1_2_4
+        $log.info "Update info: added ejb support.
+\t<!rays g ejb <module name>!> will create ee/ejb/<module name> plugin.
+\t<!rays build ejb <module>!> will package and install ejb with it's client to the local maven repository.
+\t<!rays install ejb <module name>!> will deploy it on a jee6 server, see deploy parameter for service."
+      end
+
       def sync_version version
         @rays_content.properties['version'] = version.to_s
         @rays_content.write

data/lib/rays/workers/base.rb

@@ -66,6 +66,7 @@ module Rays
         def process_pom(module_pom)
           check_parent_pom
           add_parent_pom_to module_pom
+          enable_client_ejb module_pom
         end
 
         private
@@ -138,6 +139,36 @@ module Rays
           File.open(module_pom, 'w') { |file| file.write doc.to_xml }
         end
 
+        def enable_client_ejb(module_pom)
+          doc = Nokogiri::XML(open(module_pom), &:noblanks)
+
+          doc.css('project > build > plugins > plugin').each do |node|
+            group_id = node.css('groupId').text
+            artifact_id = node.css('artifactId').text
+
+            if group_id.eql?('org.apache.maven.plugins') and artifact_id.eql?('maven-ejb-plugin') and
+                node.css('configuration > generateClient').empty?
+
+              $log.info 'Enabling client generation for EJB module ...'
+              configuration_node = node.css('configuration')
+
+              if configuration_node.empty?
+                configuration_node = Nokogiri::XML::Node.new('configuration', doc)
+                node.add_child configuration_node
+              else
+                configuration_node = configuration_node[0]
+              end
+
+              generate_client_node = Nokogiri::XML::Node.new('generateClient', doc)
+              generate_client_node.content = 'true'
+
+              configuration_node.add_child generate_client_node
+
+              File.open(module_pom, 'w') { |file| file.write doc.to_xml }
+            end
+          end
+        end
+
         private
         def parent_group_id
           "#{Project.instance.package}.#{Project.instance.name}"

data/lib/rays/workers/builder.rb

@@ -24,7 +24,7 @@ module Rays
   module Worker
     module Builder
 
-      # Maven builder
+      # Liferay Maven builder
       class Maven < BaseWorker
         register :builder, :maven
         include Singleton
@@ -39,7 +39,25 @@ module Rays
         end
       end
 
+      # EJB Maven builder
+      class EJBMaven < BaseWorker
+        register :builder, :ejb_maven
+        include Singleton
+
+        def build(app_module, skip_test = false)
+          execute('build', app_module) do
+            test_args = ''
+            test_args = '-Dmaven.skip.tests=true' if skip_test
+
+            rays_exec("#{$rays_config.mvn} clean")
+            $log.info("Installing EJB with it's client to the local maven repository")
+            rays_exec("#{$rays_config.mvn} install #{test_args}")
+          end
+        end
+      end
+
       # Content builder
+      # deprecated
       class Content < BaseWorker
         register :builder, :content_sync
         include Singleton

data/lib/rays/workers/deployer.rb

@@ -26,7 +26,7 @@ module Rays
   module Worker
     module Deployer
 
-      # Maven deployer
+      # Liferay Maven deployer
       class Maven < BaseWorker
         register :deployer, :maven
 
@@ -46,7 +46,27 @@ module Rays
         end
       end
 
+      # EJB deployer
+      class EJBDeploy < BaseWorker
+        register :deployer, :ejb
+
+        include Singleton
+
+        def deploy(app_module)
+          execute('deploy', app_module) do
+            env = $rays_config.environment
+            file_to_deploy = File.expand_path("./target/#{app_module.name}-#{Project.instance.version}.jar")
+            if env.liferay.remote?
+              env.liferay.remote.copy_to(file_to_deploy, env.liferay.service.deploy)
+            else
+              FileUtils.cp(file_to_deploy, env.liferay.service.deploy)
+            end
+          end
+        end
+      end
+
       # Content deployer
+      # deprecated
       class Content < BaseWorker
         register :deployer, :content_sync
 

data/lib/rays/workers/generator.rb

@@ -24,7 +24,7 @@ module Rays
   module Worker
     module Generator
 
-      # Maven generator
+      # Liferay Maven generator
       class Maven < BaseWorker
         register :generator, :maven
 
@@ -46,6 +46,28 @@ module Rays
           end
         end
       end
+
+      # EJB Maven generator
+      class EJBMaven < BaseWorker
+        register :generator, :ejb_maven
+
+        include Singleton
+
+        def create(app_module)
+          create_cmd = "#{$rays_config.mvn} archetype:generate" <<
+              " -DarchetypeGroupId=org.codehaus.mojo.archetypes" <<
+              " -DarchetypeArtifactId=ejb-javaee6" <<
+              " -DarchetypeVersion=1.5" <<
+              " -DgroupId=#{Project.instance.package}.#{app_module.type}" <<
+              " -DartifactId=#{app_module.name}" <<
+              " -Dversion=#{Project.instance.version}" <<
+              " -Dpackaging=war -B"
+          rays_exec(create_cmd)
+          Utils::FileUtils.find_down(app_module.path, 'pom\.xml').each do |pom_file|
+            MavenUtil.process_pom pom_file
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &71272460 !ruby/object:Gem::Requirement
+  requirement: &72689490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71272460
+  version_requirements: *72689490
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &71272240 !ruby/object:Gem::Requirement
+  requirement: &72689270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71272240
+  version_requirements: *72689270
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &71272030 !ruby/object:Gem::Requirement
+  requirement: &72689060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71272030
+  version_requirements: *72689060
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &71271820 !ruby/object:Gem::Requirement
+  requirement: &72688850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71271820
+  version_requirements: *72688850
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &71271610 !ruby/object:Gem::Requirement
+  requirement: &72688640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71271610
+  version_requirements: *72688640
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &71271400 !ruby/object:Gem::Requirement
+  requirement: &72688430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71271400
+  version_requirements: *72688430
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &71271190 !ruby/object:Gem::Requirement
+  requirement: &72688220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71271190
+  version_requirements: *72688220
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables:
@@ -100,6 +100,7 @@ files:
 - lib/rays/loaders/highline.rb
 - lib/rays/models/project.rb
 - lib/rays/models/appmodule/content.rb
+- lib/rays/models/appmodule/ejb.rb
 - lib/rays/models/appmodule/ext.rb
 - lib/rays/models/appmodule/manager.rb
 - lib/rays/models/appmodule/base.rb