raystool 1.2.5 → 1.2.6

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

@@ -19,6 +19,7 @@ _rayscomp () {
 	if [ $# -gt 2 ]; then
 		cur="$3"
 	fi
+
 	for c in $1; do
 		case "$c$4" in
 		--*=*) all="$all$c$4$s" ;;
@@ -48,13 +49,10 @@ _rays_dir () {
 	done
 }
 
-_rays_module_types="portlet hook theme servicebuilder layout ext ejb"
+_rays_module_types="portlet hook theme servicebuilder layout ext"
 
 _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
@@ -71,7 +69,7 @@ _rays_module () {
 
 	while [[ $c -lt $COMP_CWORD ]] && [ -z "$module_dir" ]; do
 		case "${COMP_WORDS[c]}" in
-		portlet|hook|theme|layout|ext|servicebuilder|ejb)
+		portlet|hook|theme|layout|ext|servicebuilder)
 			_rays_module_find "$dir" "${COMP_WORDS[c]}"
 			return
 			;;
@@ -134,24 +132,28 @@ _rays_complete () {
 		g)
 			_rayscomp "
 				$_rays_module_types
+				ejb
 				$default_args
 			"
 			;;
 		build)
 			_rayscomp "
 				$(_rays_module "$c")
+				ear
 				$default_args
 			"
 			;;
 		deploy)
 			_rayscomp "
 				$(_rays_module "$c")
+				ear
 				--skip-test $default_args
 			"
 			;;
 		clean)
 			_rayscomp "
 				$(_rays_module "$c")
+				ear
 				$default_args
 			"
 			;;

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

@@ -1 +1 @@
-version: 1.2.2
+version: 1.2.6

data/lib/rays/core.rb

@@ -111,6 +111,7 @@ module Rays
 
     def load_third_party_dependencies
       require 'fileutils'
+      require 'pathname'
       require 'find'
       require 'yaml'
       require 'logger'

data/lib/rays/interface/commander.rb

@@ -153,17 +153,20 @@ 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 | ext | ejb]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ear]'
     parameter '[name]', 'a module name'
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
     def execute
       modules = []
-      if type.nil? and !name.nil?
-        raise RaysException.new("Cannot build type w/o name.")
+      if type.nil? and !name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify name for #{type}")
+      end
+
+      if 'ear'.eql? type
+        name = 'application'
       end
 
-      module_instance = nil
       if !type.nil? and !name.nil?
         module_instance = Rays::AppModule::Manager.instance.get(type, name)
       else
@@ -184,17 +187,20 @@ 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 | ext | ejb]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ejb | ear]'
     parameter '[name]', 'a module name'
     option '--skip-test', :flag, 'use this option if you want to skip module tests'
 
     def execute
       modules = []
-      if type.nil? and !name.nil?
-        raise RaysException.new("Cannot build type w/o name.")
+      if type.nil? and !name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify name for #{type}")
+      end
+
+      if 'ear'.eql? type
+        name = 'application'
       end
 
-      module_instance = nil
       if !type.nil? and !name.nil?
         module_instance = Rays::AppModule::Manager.instance.get(type, name)
       else
@@ -219,13 +225,17 @@ 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 | ext | ejb]'
+    parameter '[type]', 'a module type [portlet | hook | theme | layout | ext | ear]'
     parameter '[name]', 'a module name'
 
     def execute
       modules = []
-      if type.nil? and !name.nil?
-        raise RaysException.new("Cannot build type w/o name.")
+      if type.nil? and !name.nil? and !'ear'.eql? type
+        raise RaysException.new("Please specify name for #{type}")
+      end
+
+      if 'ear'.eql? type
+        name = 'application'
       end
 
       module_instance = nil

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

@@ -156,6 +156,13 @@ module Rays
         end
       end
 
+      #
+      # Group ID
+      #
+      def group_id
+        "#{Project.instance.package}.#{type}"
+      end
+
       def path
         File.join(self.class.base_path, @name)
       end

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

@@ -0,0 +1,34 @@
+=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 EARModule < Module
+      register :ear
+      directory 'ee'
+      builder Worker::Manager.instance.create :builder, :ear_maven
+      deployer Worker::Manager.instance.create :deployer, :ear
+      cleaner Worker::Manager.instance.create :cleaner, :maven
+    end
+  end
+end

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

@@ -68,7 +68,7 @@ module Rays
         unless module_class.nil?
           base_path = module_class.base_path
           in_directory(base_path) do
-            if File.exists?(File.join(base_path, "#{name}/.module"))
+            if File.exists?(File.join(base_path, "#{name}/.module")) or 'ee-container'.eql? name
               app_module = module_class.new(name)
             end
           end

data/lib/rays/services/update_manager.rb

@@ -49,6 +49,7 @@ module Rays
         @updaters[Gem::Version.create('1.2.3')] = 'update_1_2_3'
         @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'
       end
 
       def check
@@ -128,6 +129,10 @@ module Rays
         $log.info "Update info: fixed ejb jar file path bug"
       end
 
+      def update_1_2_6
+        $log.info "Update info: added ear packaging"
+      end
+
       def sync_version version
         @rays_content.properties['version'] = version.to_s
         @rays_content.write

data/lib/rays/workers/base.rb

@@ -66,7 +66,13 @@ module Rays
         def process_pom(module_pom)
           check_parent_pom
           add_parent_pom_to module_pom
-          enable_client_ejb module_pom
+        end
+
+        def process_ejb(app_module)
+          check_parent_pom
+          register_ee_module app_module
+          register_ear_module app_module
+          enable_client_ejb app_module
         end
 
         private
@@ -139,7 +145,76 @@ module Rays
           File.open(module_pom, 'w') { |file| file.write doc.to_xml }
         end
 
-        def enable_client_ejb(module_pom)
+        #
+        #   ========= EE
+        #
+        def register_ee_module(app_module)
+          ee_pom = get_ee_pom
+          module_root = app_module.path
+          ee_root = File.dirname ee_pom
+          relative_path = Pathname.new(module_root).relative_path_from(Pathname.new(ee_root)).to_s
+
+          doc = Nokogiri::XML(open(ee_pom), &:noblanks)
+
+          module_node = Nokogiri::XML::Node.new('module', doc)
+          module_node.content = relative_path
+
+          doc.css('project > modules > module').first.add_previous_sibling module_node
+
+          File.open(ee_pom, 'w') { |file| file.write doc.to_xml }
+        end
+
+        def register_ear_module(app_module)
+          ear_pom = get_ear_pom
+
+          doc = Nokogiri::XML(open(ear_pom), &:noblanks)
+
+
+          # add to dependencies
+          dependency_node = Nokogiri::XML::Node.new('dependency', doc)
+          group_id_node = Nokogiri::XML::Node.new('groupId', doc)
+          group_id_node.content = app_module.group_id
+          artifact_id_node = Nokogiri::XML::Node.new('artifactId', doc)
+          artifact_id_node.content = app_module.name
+          version_node = Nokogiri::XML::Node.new('version', doc)
+          version_node.content = Project.instance.version
+          type_node = Nokogiri::XML::Node.new('type', doc)
+          type_node.content = app_module.type
+          dependency_node.add_child group_id_node
+          dependency_node.add_child artifact_id_node
+          dependency_node.add_child version_node
+          dependency_node.add_child type_node
+
+          doc.css('project > dependencies').first.add_child dependency_node
+
+          # add to modules
+          if app_module.type.eql? 'ejb'
+            module_node = Nokogiri::XML::Node.new('ejbModule', doc)
+            group_id_node = Nokogiri::XML::Node.new('groupId', doc)
+            group_id_node.content = app_module.group_id
+            artifact_id_node = Nokogiri::XML::Node.new('artifactId', doc)
+            artifact_id_node.content = app_module.name
+            module_id_node = Nokogiri::XML::Node.new('moduleId', doc)
+            module_id_node.content = app_module.name
+            bundle_file_name_node = Nokogiri::XML::Node.new('bundleFileName', doc)
+            bundle_file_name_node.content = "#{app_module.name}.jar"
+            module_node.add_child group_id_node
+            module_node.add_child artifact_id_node
+            module_node.add_child module_id_node
+            module_node.add_child bundle_file_name_node
+
+            doc.css('project > build > plugins > plugin').each do |node|
+              next unless node.css('artifactId').first.content.eql? 'maven-ear-plugin'
+              node.css('configuration > modules').first.add_child module_node
+            end
+
+          end
+
+          File.open(ear_pom, 'w') { |file| file.write doc.to_xml }
+        end
+
+        def enable_client_ejb(app_module)
+          module_pom = File.join app_module.path, '/pom.xml'
           doc = Nokogiri::XML(open(module_pom), &:noblanks)
 
           doc.css('project > build > plugins > plugin').each do |node|
@@ -169,7 +244,88 @@ module Rays
           end
         end
 
-        private
+        def get_ee_pom
+          ee_dir = File.join $rays_config.project_root, "ee"
+          FileUtils.mkdir_p ee_dir unless Dir.exists? ee_dir
+          ee_pom_file = File.join ee_dir, "pom.xml"
+
+          unless File.exist? ee_pom_file
+            builder = Nokogiri::XML::Builder.new do |xml|
+              xml.project(:xmlns => 'http://maven.apache.org/POM/4.0.0', :'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                :'xsi:schemaLocation' => 'http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd') {
+
+                xml.modelVersion '4.0.0'
+                xml.name "#{Project.instance.name} EE Parent"
+                xml.groupId "#{Project.instance.package}"
+                xml.artifactId "ee-parent"
+                xml.packaging 'pom'
+
+                xml.modules {
+                  xml.module 'ear'
+                }
+              }
+            end
+
+            File.open(ee_pom_file, 'w') { |file|  file.write builder.to_xml }
+            add_parent_pom_to ee_pom_file
+          end
+
+          ee_pom_file
+        end
+
+        def get_ear_pom
+          ear_dir = File.join $rays_config.project_root, "ee/ear"
+          FileUtils.mkdir_p ear_dir unless Dir.exists? ear_dir
+          ear_pom_file = File.join ear_dir, 'pom.xml'
+
+          unless File.exist? ear_pom_file
+            builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+              xml.project(:xmlns => 'http://maven.apache.org/POM/4.0.0', :'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                          :'xsi:schemaLocation' => 'http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd') {
+
+                xml.modelVersion '4.0.0'
+
+                xml._parent do
+                  xml.groupId "#{Project.instance.package}"
+                  xml.artifactId 'ee-parent'
+                  xml.version "#{Project.instance.version}"
+                  xml.relativePath '../pom.xml'
+                end
+
+                xml.name "#{Project.instance.name} EE Container"
+                xml.groupId "#{Project.instance.package}.ear"
+                xml.artifactId 'application'
+                xml.packaging 'ear'
+
+                xml.dependencies
+
+                xml.build {
+                  xml.plugins {
+                    xml.plugin {
+                      xml.groupId 'org.apache.maven.plugins'
+                      xml.artifactId 'maven-ear-plugin'
+
+                      xml.configuration {
+                        xml.defaultJavaBundleDir 'APP-INF/lib'
+                        xml.modules
+                      }
+                    }
+                  }
+                }
+              }
+            end
+
+            doc = Nokogiri::XML(builder.to_xml, &:noblanks)
+            doc.css('project > _parent').first.name = 'parent'
+
+            File.open(ear_pom_file, 'w') { |file|  file.write doc.to_xml }
+
+          end
+
+          ear_pom_file
+        end
+
+
         def parent_group_id
           "#{Project.instance.package}.#{Project.instance.name}"
         end

data/lib/rays/workers/builder.rb

@@ -39,6 +39,23 @@ module Rays
         end
       end
 
+      # EAR Maven builder
+      class EARMaven < BaseWorker
+        register :builder, :ear_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 EE modules to the local repository")
+            rays_exec("#{$rays_config.mvn} install #{test_args}")
+          end
+        end
+      end
+
       # EJB Maven builder
       class EJBMaven < BaseWorker
         register :builder, :ejb_maven

data/lib/rays/workers/deployer.rb

@@ -46,6 +46,26 @@ module Rays
         end
       end
 
+      # EAR deployer
+      class EJBDeploy < BaseWorker
+        register :deployer, :ear
+
+        include Singleton
+
+        def deploy(app_module)
+          execute('deploy', app_module) do
+            env = $rays_config.environment
+            file_to_deploy = File.expand_path("./ear/target/#{app_module.name}-#{Project.instance.version}.ear")
+            file_to_deploy = File.expand_path("./ear/target/#{app_module.name}.ear") unless File.exists? file_to_deploy
+            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
+
       # EJB deployer
       class EJBDeploy < BaseWorker
         register :deployer, :ejb

data/lib/rays/workers/generator.rb

@@ -58,14 +58,12 @@ module Rays
               " -DarchetypeGroupId=org.codehaus.mojo.archetypes" <<
               " -DarchetypeArtifactId=ejb-javaee6" <<
               " -DarchetypeVersion=1.5" <<
-              " -DgroupId=#{Project.instance.package}.#{app_module.type}" <<
+              " -DgroupId=#{app_module.group_id}" <<
               " -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
+          MavenUtil.process_ejb app_module
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &83529160 !ruby/object:Gem::Requirement
+  requirement: &85713630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83529160
+  version_requirements: *85713630
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &83528940 !ruby/object:Gem::Requirement
+  requirement: &85713410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83528940
+  version_requirements: *85713410
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &83528730 !ruby/object:Gem::Requirement
+  requirement: &85713200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83528730
+  version_requirements: *85713200
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &83528520 !ruby/object:Gem::Requirement
+  requirement: &85712990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83528520
+  version_requirements: *85712990
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &83528310 !ruby/object:Gem::Requirement
+  requirement: &85712780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83528310
+  version_requirements: *85712780
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &83528100 !ruby/object:Gem::Requirement
+  requirement: &85712570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83528100
+  version_requirements: *85712570
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &83527890 !ruby/object:Gem::Requirement
+  requirement: &85712360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83527890
+  version_requirements: *85712360
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables:
@@ -103,6 +103,7 @@ files:
 - lib/rays/models/appmodule/ejb.rb
 - lib/rays/models/appmodule/ext.rb
 - lib/rays/models/appmodule/manager.rb
+- lib/rays/models/appmodule/ear.rb
 - lib/rays/models/appmodule/base.rb
 - lib/rays/models/appmodule/servicebuilder.rb
 - lib/rays/models/appmodule/hook.rb