raystool 1.0.9 → 1.0.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/rays/interface/controller.rb +1 -1
  2. data/lib/rays/workers/base.rb +19 -15
  3. data/lib/rays/workers/generator.rb +4 -2
  4. metadata +16 -16
data/lib/rays/interface/controller.rb CHANGED
@@ -63,7 +63,7 @@ module Rays
63
63
  # Create a module
64
64
  #
65
65
  def create_module(type, name, generator)
66
- name = "#{name}-#{type}"
66
+ name = "#{name}-#{type}" unless type.eql? 'ext'
67
67
  log_block("create #{type} #{name}") do
68
68
  AppModule::Manager.instance.create type, name, generator
69
69
  end
data/lib/rays/workers/base.rb CHANGED
@@ -63,7 +63,7 @@ module Rays
63
63
 
64
64
  class MavenUtil
65
65
  class << self
66
- def link_to_parent(module_pom)
66
+ def process_pom(module_pom)
67
67
  check_parent_pom
68
68
  add_parent_pom_to module_pom
69
69
  end
@@ -90,6 +90,8 @@ module Rays
90
90
  file.write(builder.to_xml)
91
91
  end
92
92
 
93
+ # install parent
94
+ rays_exec('mvn clean install')
93
95
  end
94
96
  end
95
97
  end
@@ -107,25 +109,27 @@ module Rays
107
109
  end
108
110
  end
109
111
 
110
- parent_node = Nokogiri::XML::Node.new('parent',doc)
112
+ if doc.css('project > parent').empty?
113
+ parent_node = Nokogiri::XML::Node.new('parent', doc)
111
114
 
112
- group_id_node = Nokogiri::XML::Node.new('groupId',doc)
113
- group_id_node.content = parent_group_id
114
- parent_node.add_child group_id_node
115
+ group_id_node = Nokogiri::XML::Node.new('groupId', doc)
116
+ group_id_node.content = parent_group_id
117
+ parent_node.add_child group_id_node
115
118
 
116
- artifact_id_node = Nokogiri::XML::Node.new('artifactId',doc)
117
- artifact_id_node.content = parent_artifact_id
118
- parent_node.add_child artifact_id_node
119
+ artifact_id_node = Nokogiri::XML::Node.new('artifactId', doc)
120
+ artifact_id_node.content = parent_artifact_id
121
+ parent_node.add_child artifact_id_node
119
122
 
120
- version_node = Nokogiri::XML::Node.new('version',doc)
121
- version_node.content = Project.instance.version
122
- parent_node.add_child version_node
123
+ version_node = Nokogiri::XML::Node.new('version', doc)
124
+ version_node.content = Project.instance.version
125
+ parent_node.add_child version_node
123
126
 
124
- relative_path_node = Nokogiri::XML::Node.new('relativePath',doc)
125
- relative_path_node.content = '../../pom.xml'
126
- parent_node.add_child relative_path_node
127
+ #relative_path_node = Nokogiri::XML::Node.new('relativePath', doc)
128
+ #relative_path_node.content = '../../pom.xml'
129
+ #parent_node.add_child relative_path_node
127
130
 
128
- doc.root.children.first.add_previous_sibling parent_node
131
+ doc.root.children.first.add_previous_sibling parent_node
132
+ end
129
133
 
130
134
  doc.css('project > version').each do |node|
131
135
  node.remove
data/lib/rays/workers/generator.rb CHANGED
@@ -38,10 +38,12 @@ module Rays
38
38
  " -DarchetypeVersion=#{Project.instance.liferay}" <<
39
39
  " -DgroupId=#{Project.instance.package}.#{app_module.type}" <<
40
40
  " -DartifactId=#{app_module.name}" <<
41
- " -Dversion=1.0-SNAPSHOT" <<
41
+ " -Dversion=#{Project.instance.version}" <<
42
42
  " -Dpackaging=war -B"
43
43
  rays_exec(create_cmd)
44
- MavenUtil.link_to_parent File.join(app_module.path, 'pom.xml')
44
+ Utils::FileUtils.find_down(app_module.path, 'pom\.xml').each do |pom_file|
45
+ MavenUtil.process_pom pom_file
46
+ end
45
47
  end
46
48
  end
47
49
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: raystool
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9
4
+ version: 1.0.11
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-01 00:00:00.000000000 Z
12
+ date: 2012-03-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: clamp
16
- requirement: &77366270 !ruby/object:Gem::Requirement
16
+ requirement: &80850390 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *77366270
24
+ version_requirements: *80850390
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rsolr
27
- requirement: &77366050 !ruby/object:Gem::Requirement
27
+ requirement: &80850170 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *77366050
35
+ version_requirements: *80850170
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: colorize
38
- requirement: &77365840 !ruby/object:Gem::Requirement
38
+ requirement: &80849960 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *77365840
46
+ version_requirements: *80849960
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: net-ssh
49
- requirement: &77365630 !ruby/object:Gem::Requirement
49
+ requirement: &80849750 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *77365630
57
+ version_requirements: *80849750
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: highline
60
- requirement: &77365420 !ruby/object:Gem::Requirement
60
+ requirement: &80849540 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *77365420
68
+ version_requirements: *80849540
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: safe_shell
71
- requirement: &77365210 !ruby/object:Gem::Requirement
71
+ requirement: &80849330 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *77365210
79
+ version_requirements: *80849330
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: nokogiri
82
- requirement: &77365000 !ruby/object:Gem::Requirement
82
+ requirement: &80849120 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *77365000
90
+ version_requirements: *80849120
91
91
  description: Command line tool to create and manage liferay projects
92
92
  email: dmitri.carpov@gmail.com
93
93
  executables: