octopusci 0.3.3 → 0.3.4

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/octopusci/job.rb +12 -6
  2. data/lib/octopusci/version.rb +1 -1
  3. metadata +30 -30
data/lib/octopusci/job.rb CHANGED
@@ -33,7 +33,7 @@ module Octopusci
33
33
  end
34
34
  end
35
35
 
36
- def self.run_shell_cmd(cmd_str, output_to_log=false)
36
+ def self.run_shell_cmd(cmd_str, output_to_log=false, go_to_repo=true)
37
37
  horiz_line = "-"*30
38
38
  @io.write_raw_output(output_to_log) do |out_f|
39
39
  out_f << "\n\n#{@output_lead_in}Running: #{cmd_str}\n"
@@ -41,7 +41,13 @@ module Octopusci
41
41
  out_f << "\n"
42
42
  out_f.flush
43
43
 
44
- in_f = ::IO.popen("cd #{repository_path} && #{cmd_str}")
44
+
45
+ real_cmd_str = ""
46
+ if (go_to_repo)
47
+ real_cmd_str += "cd #{repository_path} 2&>1 && "
48
+ end
49
+ real_cmd_str += cmd_str
50
+ in_f = ::IO.popen(real_cmd_str)
45
51
  while(cur_line = in_f.gets) do
46
52
  out_f << "#{@output_lead_in}#{cur_line}"
47
53
  out_f.flush
@@ -53,8 +59,8 @@ module Octopusci
53
59
  return $?.exitstatus.to_i
54
60
  end
55
61
 
56
- def self.run_shell_cmd!(cmd_str, output_to_log=false)
57
- r = self.run_shell_cmd(cmd_str, output_to_log)
62
+ def self.run_shell_cmd!(cmd_str, output_to_log=false, go_to_repo=true)
63
+ r = self.run_shell_cmd(cmd_str, output_to_log, go_to_repo)
58
64
  if (r != 0)
59
65
  raise Octopusci::JobRunFailed.new("#{cmd_str} exited with non-zero return value (#{r})")
60
66
  else
@@ -107,12 +113,12 @@ module Octopusci
107
113
  if !Dir.exists?(workspace_path)
108
114
  FileUtils.mkdir_p(workspace_path)
109
115
  end
110
- return run_shell_cmd("cd #{workspace_path} 2>&1 && git clone #{job_conf['repo_uri']} #{@job['repo_name']} 2>&1", true)
116
+ return run_shell_cmd("cd #{workspace_path} 2>&1 && git clone #{job_conf['repo_uri']} #{@job['repo_name']} 2>&1", true, false)
111
117
  end
112
118
  end
113
119
 
114
120
  def self.checkout_branch(job_conf)
115
- return run_shell_cmd("cd #{repository_path} 2>&1 && git fetch --all -p 2>&1 && git checkout #{@job['branch_name']} 2>&1 && git pull -f origin #{@job['branch_name']}:#{@job['branch_name']} 2>&1", true)
121
+ return run_shell_cmd("cd #{repository_path} 2>&1 && git fetch --all -p 2>&1 && git checkout #{@job['branch_name']} 2>&1 && git pull -f origin #{@job['branch_name']}:#{@job['branch_name']} 2>&1", true, false)
116
122
  end
117
123
 
118
124
  def self.get_recip_email
data/lib/octopusci/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Octopusci
2
- Version = VERSION = '0.3.3'
2
+ Version = VERSION = '0.3.4'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopusci
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.3.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-11-09 00:00:00.000000000 Z
13
+ date: 2011-11-10 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sinatra
17
- requirement: &70290331962300 !ruby/object:Gem::Requirement
17
+ requirement: &70137445719860 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70290331962300
25
+ version_requirements: *70137445719860
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: json
28
- requirement: &70290331959400 !ruby/object:Gem::Requirement
28
+ requirement: &70137445717540 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *70290331959400
36
+ version_requirements: *70137445717540
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: resque
39
- requirement: &70290331958800 !ruby/object:Gem::Requirement
39
+ requirement: &70137445716860 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *70290331958800
47
+ version_requirements: *70137445716860
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: actionmailer
50
- requirement: &70290331955700 !ruby/object:Gem::Requirement
50
+ requirement: &70137445713000 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *70290331955700
58
+ version_requirements: *70137445713000
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: multi_json
61
- requirement: &70290331953600 !ruby/object:Gem::Requirement
61
+ requirement: &70137445711460 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *70290331953600
69
+ version_requirements: *70137445711460
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: time-ago-in-words
72
- requirement: &70290331952540 !ruby/object:Gem::Requirement
72
+ requirement: &70137445710300 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :runtime
79
79
  prerelease: false
80
- version_requirements: *70290331952540
80
+ version_requirements: *70137445710300
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: ansi2html
83
- requirement: &70290331950640 !ruby/object:Gem::Requirement
83
+ requirement: &70137445708480 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *70290331950640
91
+ version_requirements: *70137445708480
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: rake
94
- requirement: &70290331948960 !ruby/object:Gem::Requirement
94
+ requirement: &70137445706840 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *70290331948960
102
+ version_requirements: *70137445706840
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rspec
105
- requirement: &70290331947720 !ruby/object:Gem::Requirement
105
+ requirement: &70137445705820 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *70290331947720
113
+ version_requirements: *70137445705820
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: rack-test
116
- requirement: &70290331947100 !ruby/object:Gem::Requirement
116
+ requirement: &70137445705240 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *70290331947100
124
+ version_requirements: *70137445705240
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: guard
127
- requirement: &70290331946360 !ruby/object:Gem::Requirement
127
+ requirement: &70137445704480 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *70290331946360
135
+ version_requirements: *70137445704480
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rb-fsevent
138
- requirement: &70290331945440 !ruby/object:Gem::Requirement
138
+ requirement: &70137445703600 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :development
145
145
  prerelease: false
146
- version_requirements: *70290331945440
146
+ version_requirements: *70137445703600
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: growl_notify
149
- requirement: &70290331945000 !ruby/object:Gem::Requirement
149
+ requirement: &70137445703160 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :development
156
156
  prerelease: false
157
- version_requirements: *70290331945000
157
+ version_requirements: *70137445703160
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: guard-rspec
160
- requirement: &70290331944540 !ruby/object:Gem::Requirement
160
+ requirement: &70137445702700 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
165
165
  version: '0'
166
166
  type: :development
167
167
  prerelease: false
168
- version_requirements: *70290331944540
168
+ version_requirements: *70137445702700
169
169
  description: A multi-branch Continous Integration server that integrates with GitHub
170
170
  email:
171
171
  - cyphactor@gmail.com