raystool 1.2.6 → 1.2.7

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

@@ -1 +1 @@
-version: 1.2.6
+version: 1.2.7

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/ear'
       require 'rays/models/appmodule/ejb'
       require 'rays/models/appmodule/hook'
       require 'rays/models/appmodule/theme'

data/lib/rays/interface/commander.rb

@@ -159,8 +159,9 @@ 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}")
+      if !type.nil? and name.nil? and !'ear'.eql? type
+        $log.error "Please specify the name of #{type}"
+        return
       end
 
       if 'ear'.eql? type
@@ -193,8 +194,9 @@ 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}")
+      if !type.nil? and name.nil? and !'ear'.eql? type
+        $log.error "Please specify the name of #{type}"
+        return
       end
 
       if 'ear'.eql? type

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

@@ -164,6 +164,9 @@ module Rays
       end
 
       def path
+        if 'ear'.eql? type
+          return self.class.base_path
+        end
         File.join(self.class.base_path, @name)
       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")) or 'ee-container'.eql? name
+            if File.exists?(File.join(base_path, "#{name}/.module")) or 'application'.eql? name
               app_module = module_class.new(name)
             end
           end

data/lib/rays/services/update_manager.rb

@@ -50,6 +50,7 @@ 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'
       end
 
       def check
@@ -133,6 +134,10 @@ module Rays
         $log.info "Update info: added ear packaging"
       end
 
+      def update_1_2_7
+        $log.info "Update info: fixed ear packaging bugs"
+      end
+
       def sync_version version
         @rays_content.properties['version'] = version.to_s
         @rays_content.write

data/lib/rays/workers/deployer.rb

@@ -47,7 +47,7 @@ module Rays
       end
 
       # EAR deployer
-      class EJBDeploy < BaseWorker
+      class EARDeploy < BaseWorker
         register :deployer, :ear
 
         include Singleton

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raystool
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &85713630 !ruby/object:Gem::Requirement
+  requirement: &78910310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85713630
+  version_requirements: *78910310
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &85713410 !ruby/object:Gem::Requirement
+  requirement: &78910090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85713410
+  version_requirements: *78910090
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &85713200 !ruby/object:Gem::Requirement
+  requirement: &78909880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85713200
+  version_requirements: *78909880
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &85712990 !ruby/object:Gem::Requirement
+  requirement: &78909670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85712990
+  version_requirements: *78909670
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &85712780 !ruby/object:Gem::Requirement
+  requirement: &78909460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85712780
+  version_requirements: *78909460
 - !ruby/object:Gem::Dependency
   name: safe_shell
-  requirement: &85712570 !ruby/object:Gem::Requirement
+  requirement: &78909250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85712570
+  version_requirements: *78909250
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &85712360 !ruby/object:Gem::Requirement
+  requirement: &78909040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85712360
+  version_requirements: *78909040
 description: Command line tool to create and manage liferay projects
 email: dmitri.carpov@gmail.com
 executables: