raystool 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/rays/config/templates/project/config/environment.yml +4 -1
  2. data/lib/rays/services/application_service.rb +8 -8
  3. metadata +16 -16
data/lib/rays/config/templates/project/config/environment.yml CHANGED
@@ -38,6 +38,9 @@ test:
38
38
  port: 8080
39
39
  deploy: /opt/liferay-portal/deploy
40
40
  data: /opt/liferay-portal/data
41
+ ssh:
42
+ user: liferay
43
+ port: 22
41
44
  java:
42
45
  home: /usr/lib/jvm/java-6-sun
43
46
  bin: /usr/bin/java
@@ -65,4 +68,4 @@ test:
65
68
  log_file: logs/catalina.out
66
69
  backup:
67
70
  directory: /tmp/backup
68
- stop: false
71
+ stop: false
data/lib/rays/services/application_service.rb CHANGED
@@ -56,7 +56,7 @@ module Rays
56
56
  def start
57
57
  unless alive?
58
58
  execute @start_script
59
- log
59
+ log unless remote?
60
60
  else
61
61
  raise RaysException.new('service is already running')
62
62
  end
@@ -70,7 +70,7 @@ module Rays
70
70
  end
71
71
  unless alive?
72
72
  execute @debug_script
73
- log
73
+ log unless remote?
74
74
  else
75
75
  raise RaysException.new('service is already running')
76
76
  end
@@ -86,10 +86,10 @@ module Rays
86
86
  sleep(1)
87
87
  end
88
88
 
89
- if alive?
90
- rays_exec("kill -9 `lsof -t -i tcp:#{@port}`")
89
+ if alive?
90
+ execute ("kill -9 `lsof -t -i tcp:#{@port}`")
91
91
  sleep(2)
92
- end
92
+ end
93
93
  end
94
94
 
95
95
  # normal restart
@@ -109,13 +109,13 @@ module Rays
109
109
  # Show logs (live)
110
110
  def log
111
111
  if remote?
112
- remote.exec(command)
112
+ $log.info("Cannot show log of a remote host")
113
113
  else
114
114
  Thread.new do
115
115
  exec("tail -f #{@log_file}")
116
116
  end
117
+ $log.info("Following logs of #{@name} service on #{@host}.\nUse ctrl+c to interrupt.")
117
118
  end
118
- $log.info("Following logs of #{@name} service on #{@host}.\nUse ctrl+c to interrupt.")
119
119
  end
120
120
 
121
121
  # Is the service resides on a remote service?
@@ -135,7 +135,7 @@ module Rays
135
135
  # Executing command on local or a remote server depending on the service configuration.
136
136
  def execute(command)
137
137
  if remote?
138
- remote.exec(command)
138
+ @remote.exec(command)
139
139
  else
140
140
  rays_exec(command)
141
141
  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.1.5
4
+ version: 1.1.6
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-21 00:00:00.000000000 Z
12
+ date: 2012-03-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: clamp
16
- requirement: &70997120 !ruby/object:Gem::Requirement
16
+ requirement: &84643110 !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: *70997120
24
+ version_requirements: *84643110
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rsolr
27
- requirement: &70995680 !ruby/object:Gem::Requirement
27
+ requirement: &84642700 !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: *70995680
35
+ version_requirements: *84642700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: colorize
38
- requirement: &70994860 !ruby/object:Gem::Requirement
38
+ requirement: &84642370 !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: *70994860
46
+ version_requirements: *84642370
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: net-ssh
49
- requirement: &70994370 !ruby/object:Gem::Requirement
49
+ requirement: &84641960 !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: *70994370
57
+ version_requirements: *84641960
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: highline
60
- requirement: &70993100 !ruby/object:Gem::Requirement
60
+ requirement: &84641460 !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: *70993100
68
+ version_requirements: *84641460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: safe_shell
71
- requirement: &70992660 !ruby/object:Gem::Requirement
71
+ requirement: &84640760 !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: *70992660
79
+ version_requirements: *84640760
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: nokogiri
82
- requirement: &70991930 !ruby/object:Gem::Requirement
82
+ requirement: &84640180 !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: *70991930
90
+ version_requirements: *84640180
91
91
  description: Command line tool to create and manage liferay projects
92
92
  email: dmitri.carpov@gmail.com
93
93
  executables: