octopusci 0.3.8 → 0.3.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/bin/octopusci-post-build-request +1 -1
  2. data/bin/octopusci-skel +1 -0
  3. data/lib/octopusci/job.rb +2 -2
  4. data/lib/octopusci/version.rb +1 -1
  5. data/spec/lib/octopusci/job_spec.rb +9 -0
  6. metadata +32 -32
data/bin/octopusci-post-build-request CHANGED
@@ -25,7 +25,7 @@ http = Net::HTTP.new(opts[:hostname], opts[:port])
25
25
  path = '/github-build'
26
26
 
27
27
  # POST request -> logging in
28
- params = { 'payload' => "{\"base_ref\":null,\"ref\":\"refs/heads/#{opts[:branch_name]}\",\"commits\":[{\"message\":\"shit son\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T22:01:12-07:00\",\"id\":\"8573e06a3cb511babd9d19d33be637b661232011\",\"url\":\"https://github.com/cyphactor/octopusci/commit/8573e06a3cb511babd9d19d33be637b661232011\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:01:07-07:00\",\"id\":\"771adb4b75694804f256e7e61704648a14d52afc\",\"url\":\"https://github.com/cyphactor/octopusci/commit/771adb4b75694804f256e7e61704648a14d52afc\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:03:16-07:00\",\"id\":\"dadf8446b2037960cc6223d60a7d57c5d264fa48\",\"url\":\"https://github.com/cyphactor/octopusci/commit/dadf8446b2037960cc6223d60a7d57c5d264fa48\"}],\"created\":false,\"before\":\"e5a1385fd8654c46d2b52d90c1ba31c865493602\",\"repository\":{\"created_at\":\"2011/09/02 12:40:14 -0700\",\"open_issues\":0,\"forks\":1,\"description\":\"Temp repo for testing pusci as I dev it\",\"has_wiki\":true,\"fork\":false,\"watchers\":1,\"has_downloads\":true,\"homepage\":\"\",\"has_issues\":true,\"private\":false,\"size\":116,\"owner\":{\"email\":\"#{opts[:owner_email]}\",\"name\":\"#{opts[:owner_name]}\"},\"name\":\"#{opts[:repo_name]}\",\"pushed_at\":\"2011/09/06 23:03:21 -0700\",\"url\":\"https://github.com/cyphactor/octopusci\"},\"pusher\":{\"email\":\"#{opts[:pusher_email]}\",\"name\":\"#{opts[:pusher_name]}\"},\"forced\":false,\"after\":\"dd6e7913cc12937db88e469684e8698f8eee8c14\",\"deleted\":false,\"compare\":\"https://github.com/cyphactor/octopusci/compare/e5a1385...dd6e791\"}" }
28
+ params = { 'payload' => "{\"base_ref\":null,\"ref\":\"refs/heads/#{opts[:branch_name]}\",\"commits\":[{\"message\":\"shit son\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T22:01:12-07:00\",\"id\":\"8573e06a3cb511babd9d19d33be637b661232011\",\"url\":\"https://github.com/cyphactor/octopusci/commit/8573e06a3cb511babd9d19d33be637b661232011\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:01:07-07:00\",\"id\":\"771adb4b75694804f256e7e61704648a14d52afc\",\"url\":\"https://github.com/cyphactor/octopusci/commit/771adb4b75694804f256e7e61704648a14d52afc\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:03:16-07:00\",\"id\":\"dadf8446b2037960cc6223d60a7d57c5d264fa48\",\"url\":\"https://github.com/cyphactor/octopusci/commit/dadf8446b2037960cc6223d60a7d57c5d264fa48\"}],\"created\":false,\"before\":\"c47c0ec4cf88291e6120fbd4fafe03910cde1d4e\",\"repository\":{\"created_at\":\"2011/09/02 12:40:14 -0700\",\"open_issues\":0,\"forks\":1,\"description\":\"Temp repo for testing pusci as I dev it\",\"has_wiki\":true,\"fork\":false,\"watchers\":1,\"has_downloads\":true,\"homepage\":\"\",\"has_issues\":true,\"private\":false,\"size\":116,\"owner\":{\"email\":\"#{opts[:owner_email]}\",\"name\":\"#{opts[:owner_name]}\"},\"name\":\"#{opts[:repo_name]}\",\"pushed_at\":\"2011/09/06 23:03:21 -0700\",\"url\":\"https://github.com/cyphactor/octopusci\"},\"pusher\":{\"email\":\"#{opts[:pusher_email]}\",\"name\":\"#{opts[:pusher_name]}\"},\"forced\":false,\"after\":\"fdb7494a00961f19d58566f8146b3643c0e14492\",\"deleted\":false,\"compare\":\"https://github.com/cyphactor/octopusci/compare/c47c0ec...fdb7494\"}" }
29
29
 
30
30
  data = URI.encode_www_form(params)
31
31
  headers = {
data/bin/octopusci-skel CHANGED
@@ -30,6 +30,7 @@ general:
30
30
  jobs_path: "/etc/octopusci/jobs"
31
31
  workspace_base_path: "#{WORKSPACE_BASE_PATH}"
32
32
  base_url: "http://localhost:9998"
33
+ tentactles_user: "octopusci"
33
34
 
34
35
  http_basic:
35
36
  username: admin
data/lib/octopusci/job.rb CHANGED
@@ -103,7 +103,7 @@ module Octopusci
103
103
  end
104
104
 
105
105
  def self.repository_path
106
- return "#{workspace_path}/#{@job['repo_name']}"
106
+ return "#{workspace_path}/#{@job['repo_name']}-#{@job['repo_owner_name']}"
107
107
  end
108
108
 
109
109
  def self.clone_code(job_conf)
@@ -113,7 +113,7 @@ module Octopusci
113
113
  if !Dir.exists?(workspace_path)
114
114
  FileUtils.mkdir_p(workspace_path)
115
115
  end
116
- return run_shell_cmd("cd #{workspace_path} 2>&1 && git clone #{job_conf['repo_uri']} #{@job['repo_name']} 2>&1", true, false)
116
+ return run_shell_cmd("cd #{workspace_path} 2>&1 && git clone #{job_conf['repo_uri']} #{@job['repo_name']}-#{job_conf['owner']} 2>&1", true, false)
117
117
  end
118
118
  end
119
119
 
data/lib/octopusci/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Octopusci
2
- Version = VERSION = '0.3.8'
2
+ Version = VERSION = '0.3.9'
3
3
  end
data/spec/lib/octopusci/job_spec.rb CHANGED
@@ -108,6 +108,15 @@ describe Octopusci::Job do
108
108
  end
109
109
  end
110
110
 
111
+ describe "self.repository_path" do
112
+ it "should concatenate the project owner and repo name" do
113
+ class SomeJob < Octopusci::Job; end
114
+ SomeJob.instance_variable_set(:@job, {'repo_name' => 'repo', 'repo_owner_name' => 'owner'})
115
+ SomeJob.stub(:workspace_path).and_return('/foo')
116
+ SomeJob.repository_path.should == "/foo/repo-owner"
117
+ end
118
+ end
119
+
111
120
  describe "self.run_shell_cmd" do
112
121
 
113
122
  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.8
4
+ version: 0.3.9
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: 2012-01-05 00:00:00.000000000 Z
13
+ date: 2012-01-12 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sinatra
17
- requirement: &70109385481100 !ruby/object:Gem::Requirement
17
+ requirement: &70103769308040 !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: *70109385481100
25
+ version_requirements: *70103769308040
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: json
28
- requirement: &70109385480200 !ruby/object:Gem::Requirement
28
+ requirement: &70103769307160 !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: *70109385480200
36
+ version_requirements: *70103769307160
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: resque
39
- requirement: &70109385479340 !ruby/object:Gem::Requirement
39
+ requirement: &70103769306160 !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: *70109385479340
47
+ version_requirements: *70103769306160
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: actionmailer
50
- requirement: &70109385477620 !ruby/object:Gem::Requirement
50
+ requirement: &70103769304560 !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: *70109385477620
58
+ version_requirements: *70103769304560
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: multi_json
61
- requirement: &70109385475860 !ruby/object:Gem::Requirement
61
+ requirement: &70103769302820 !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: *70109385475860
69
+ version_requirements: *70103769302820
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: time-ago-in-words
72
- requirement: &70109385473700 !ruby/object:Gem::Requirement
72
+ requirement: &70103769300560 !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: *70109385473700
80
+ version_requirements: *70103769300560
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: ansi2html
83
- requirement: &70109385471960 !ruby/object:Gem::Requirement
83
+ requirement: &70103769298980 !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: *70109385471960
91
+ version_requirements: *70103769298980
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: trollop
94
- requirement: &70109385470380 !ruby/object:Gem::Requirement
94
+ requirement: &70103769297340 !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: :runtime
101
101
  prerelease: false
102
- version_requirements: *70109385470380
102
+ version_requirements: *70103769297340
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rake
105
- requirement: &70109385469020 !ruby/object:Gem::Requirement
105
+ requirement: &70103769295980 !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: *70109385469020
113
+ version_requirements: *70103769295980
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: rspec
116
- requirement: &70109385468140 !ruby/object:Gem::Requirement
116
+ requirement: &70103769295080 !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: *70109385468140
124
+ version_requirements: *70103769295080
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rack-test
127
- requirement: &70109385467380 !ruby/object:Gem::Requirement
127
+ requirement: &70103769294380 !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: *70109385467380
135
+ version_requirements: *70103769294380
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: guard
138
- requirement: &70109385466440 !ruby/object:Gem::Requirement
138
+ requirement: &70103769293380 !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: *70109385466440
146
+ version_requirements: *70103769293380
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: rb-fsevent
149
- requirement: &70109385465300 !ruby/object:Gem::Requirement
149
+ requirement: &70103769292340 !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: *70109385465300
157
+ version_requirements: *70103769292340
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: growl_notify
160
- requirement: &70109385464760 !ruby/object:Gem::Requirement
160
+ requirement: &70103769291760 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: '0'
166
166
  type: :development
167
167
  prerelease: false
168
- version_requirements: *70109385464760
168
+ version_requirements: *70103769291760
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: guard-rspec
171
- requirement: &70109385464220 !ruby/object:Gem::Requirement
171
+ requirement: &70103769291240 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
176
176
  version: '0'
177
177
  type: :development
178
178
  prerelease: false
179
- version_requirements: *70109385464220
179
+ version_requirements: *70103769291240
180
180
  description: A multi-branch Continuous Integration server that integrates with GitHub
181
181
  email:
182
182
  - cyphactor@gmail.com