raykit 0.0.294 → 0.0.298
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.
- checksums.yaml +4 -4
- data/lib/raykit/command.rb +22 -4
- data/lib/raykit/git/directory.rb +1 -1
- data/lib/raykit/project.rb +3 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b78d9ebf9c0898c8dfdbde045fc9b57abfb4c38128ab92a7c19ab83ac4ec4e0a
|
4
|
+
data.tar.gz: 689e4f7db49736ccfb2a7e93568d03c079f468658be1a26726ffa1d0a9b56337
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e74da864cd2f30e13a977a810cdc08a2106348c3d98b335c40444eb4070faccb145498688fdce333bc79d29d2bc8bbc42d09a3ca4c0c3b3e574aa71840c9eec5
|
7
|
+
data.tar.gz: 54967aa4e31ff0e904d1e00fbab96228bf96c50326d688d7973ca538c645ce916e1e4d42f44054c55697d7bfaf9860eaaf80e45fd5ab44a9b670e5280ab4c805
|
data/lib/raykit/command.rb
CHANGED
@@ -20,6 +20,8 @@ module Raykit
|
|
20
20
|
attr_accessor :elapsed
|
21
21
|
attr_accessor :command,:output,:error,:exitstatus
|
22
22
|
attr_accessor :user,:machine
|
23
|
+
attr_accessor :logging_enabled
|
24
|
+
attr_accessor :success_log_level
|
23
25
|
|
24
26
|
def init_defaults
|
25
27
|
@timeout=0
|
@@ -29,11 +31,14 @@ module Raykit
|
|
29
31
|
@exitstatus = 0
|
30
32
|
@user = Environment.user
|
31
33
|
@machine=Environment.machine
|
34
|
+
@logging_enabled = true
|
32
35
|
end
|
33
36
|
|
34
|
-
def initialize(command,timeout=0)
|
37
|
+
def initialize(command,timeout=0,success_log_level=nil,logging_enabled=true)
|
35
38
|
@@commands=Array.new
|
36
39
|
init_defaults
|
40
|
+
@success_log_level=success_log_level
|
41
|
+
@logging_enabled=logging_enabled
|
37
42
|
@command=command
|
38
43
|
@timeout=timeout
|
39
44
|
if(@command.length > 0)
|
@@ -54,7 +59,7 @@ module Raykit
|
|
54
59
|
pid = thread.pid
|
55
60
|
start = Time.now
|
56
61
|
elapsed = Time.now-start
|
57
|
-
while (elapsed) < @timeout and thread.alive?
|
62
|
+
while ((elapsed) < @timeout) and thread.alive?
|
58
63
|
Kernel.select([stdout,stderr], nil, nil, tick)
|
59
64
|
begin
|
60
65
|
@output << stdout.read_nonblock(BUFFER_SIZE)
|
@@ -73,14 +78,27 @@ module Raykit
|
|
73
78
|
Process.kill("TERM", pid)
|
74
79
|
end
|
75
80
|
@exitstatus=5
|
81
|
+
@error="timed out"
|
76
82
|
else
|
77
83
|
@exitstatus=thread.value.exitstatus
|
78
84
|
end
|
79
85
|
}
|
80
86
|
end
|
81
87
|
@elapsed = timer.elapsed
|
82
|
-
|
83
|
-
|
88
|
+
if @logging_enabled
|
89
|
+
log
|
90
|
+
if @exitstatus != 0
|
91
|
+
to_log_event.to_seq
|
92
|
+
else
|
93
|
+
if !@success_log_level.nil?
|
94
|
+
e = to_log_event
|
95
|
+
e.level = "Verbose" if @success_log_level = Logger::VERBOSE
|
96
|
+
e.level = "Debug" if @success_log_level = Logger::DEBUG
|
97
|
+
e.level = "Information" if @success_log_level = Logger::INFO
|
98
|
+
e.to_seq
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
84
102
|
end
|
85
103
|
|
86
104
|
def to_log_event
|
data/lib/raykit/git/directory.rb
CHANGED
@@ -89,7 +89,7 @@ module Raykit
|
|
89
89
|
end
|
90
90
|
|
91
91
|
def get_tag_commit_id(name)
|
92
|
-
cmd = Raykit::Command.new("git rev-parse \"#{name}\"")
|
92
|
+
cmd = Raykit::Command.new("git rev-parse \"#{name}\"",0,nil,false)
|
93
93
|
if !cmd.output.include?('fatal') && !cmd.error.include?('fatal')
|
94
94
|
cmd.output.strip()
|
95
95
|
else
|
data/lib/raykit/project.rb
CHANGED
@@ -282,11 +282,11 @@ module Raykit
|
|
282
282
|
self
|
283
283
|
end
|
284
284
|
|
285
|
-
def run(command,quit_on_failure=true)
|
285
|
+
def run(command,quit_on_failure=true,success_log_level=nil)
|
286
286
|
if(command.kind_of?(Array))
|
287
|
-
command.each{|subcommand| run(subcommand,quit_on_failure)}
|
287
|
+
command.each{|subcommand| run(subcommand,quit_on_failure,success_log_level)}
|
288
288
|
else
|
289
|
-
cmd = Command.new(command)
|
289
|
+
cmd = Command.new(command,0,success_log_level)
|
290
290
|
cmd.summary
|
291
291
|
cmd.save
|
292
292
|
elapsed_str = Timer.get_elapsed_str(cmd.elapsed,0)
|