heroku_san 4.0.1 → 4.0.2

Sign up to get free protection for your applications and to get access to all the features.
data/.gitignore CHANGED
@@ -5,3 +5,4 @@ Thumbs.db
5
5
  tmp
6
6
  .idea/**
7
7
  *.swp
8
+ .rspec
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Change log (curated)
2
2
 
3
+ ## v4.0.2
4
+
5
+ * Closes #110
6
+
3
7
  ## v4.0.0
4
8
 
5
9
  * Remove dependency on sunsetted 'heroku' gem. Add external dependency
@@ -10,6 +14,8 @@
10
14
  * Closes #108
11
15
  * Thanks to sworbel for the pull request (#104)
12
16
 
17
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
18
+
13
19
  ## v3.0.4
14
20
 
15
21
  * Documentation syntax highlighting and formatting.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- heroku_san (4.0.1)
4
+ heroku_san (4.0.2)
5
5
  activesupport
6
6
  heroku-api (>= 0.1.2)
7
7
  rake
@@ -60,8 +60,8 @@ GEM
60
60
  git-smart (0.1.9)
61
61
  colorize
62
62
  godot (0.1.0)
63
- heroku-api (0.3.5)
64
- excon (~> 0.16.1)
63
+ heroku-api (0.3.6)
64
+ excon (~> 0.16.7)
65
65
  hike (1.2.1)
66
66
  i18n (0.6.0)
67
67
  journey (1.0.3)
data/Rakefile CHANGED
@@ -10,5 +10,4 @@ task :default => :spec
10
10
  desc "Run all specs"
11
11
  RSpec::Core::RakeTask.new do |t|
12
12
  t.pattern = 'spec/**/*_spec.rb'
13
- t.rspec_opts = ["-c", "-f progress"]
14
13
  end
@@ -48,11 +48,7 @@ module HerokuSan
48
48
  end
49
49
 
50
50
  def run(command, args = nil)
51
- if stack !~ /aspen|bamboo/
52
- sh_heroku "run", command, *args
53
- else
54
- sh_heroku "run:#{command}", *args
55
- end
51
+ sh_heroku "run", command, *args
56
52
  end
57
53
 
58
54
  def push(sha = nil, force = false)
@@ -143,6 +139,7 @@ module HerokuSan
143
139
  end
144
140
 
145
141
  def sh_heroku(*command)
142
+ preflight_check_for_cli
146
143
  cmd = (command + ['--app', app]).compact
147
144
  show_command = cmd.join(' ')
148
145
  $stderr.puts show_command if @debug
@@ -150,5 +147,9 @@ module HerokuSan
150
147
  status = $?
151
148
  ok or fail "Command failed with status (#{status.exitstatus}): [heroku #{show_command}]"
152
149
  end
150
+
151
+ def preflight_check_for_cli
152
+ raise "The Heroku Toolbelt is required for this action. http://toolbelt.heroku.com" if system('heroku version') == nil
153
+ end
153
154
  end
154
155
  end
@@ -1,3 +1,3 @@
1
1
  module HerokuSan
2
- VERSION = "4.0.1"
2
+ VERSION = "4.0.2"
3
3
  end
@@ -4,6 +4,9 @@ describe HerokuSan::Stage do
4
4
  include Git
5
5
  subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})}
6
6
  STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
7
+ before do
8
+ HerokuSan::Stage.any_instance.stub(:preflight_check_for_cli)
9
+ end
7
10
 
8
11
  context "initializes" do
9
12
  subject { HerokuSan::Stage.new('production',
@@ -68,11 +71,6 @@ describe HerokuSan::Stage do
68
71
  end
69
72
 
70
73
  describe "#run" do
71
- it "runs commands using the pre-cedar format" do
72
- subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "aspen"})
73
- subject.should_receive(:system).with("heroku", "run:rake foo bar bleh", "--app", "awesomeapp") { true }
74
- subject.run 'rake foo bar bleh'
75
- end
76
74
  it "runs commands using the new cedar format" do
77
75
  subject.should_receive(:system).with("heroku", "run", "worker foo bar bleh", "--app", "awesomeapp") { true }
78
76
  subject.run 'worker foo bar bleh'
metadata CHANGED
@@ -1,15 +1,10 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: heroku_san
3
- version: !ruby/object:Gem::Version
4
- hash: 61
3
+ version: !ruby/object:Gem::Version
4
+ version: 4.0.2
5
5
  prerelease:
6
- segments:
7
- - 4
8
- - 0
9
- - 1
10
- version: 4.0.1
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Elijah Miller
14
9
  - Glenn Roberts
15
10
  - Ryan Ahearn
@@ -17,175 +12,191 @@ authors:
17
12
  autorequire:
18
13
  bindir: bin
19
14
  cert_chain: []
20
-
21
- date: 2012-11-10 00:00:00 Z
22
- dependencies:
23
- - !ruby/object:Gem::Dependency
24
- version_requirements: &id001 !ruby/object:Gem::Requirement
15
+ date: 2012-11-13 00:00:00.000000000 Z
16
+ dependencies:
17
+ - !ruby/object:Gem::Dependency
18
+ name: heroku-api
19
+ requirement: !ruby/object:Gem::Requirement
25
20
  none: false
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- hash: 31
30
- segments:
31
- - 0
32
- - 1
33
- - 2
21
+ requirements:
22
+ - - ! '>='
23
+ - !ruby/object:Gem::Version
34
24
  version: 0.1.2
35
- prerelease: false
36
25
  type: :runtime
37
- name: heroku-api
38
- requirement: *id001
39
- - !ruby/object:Gem::Dependency
40
- version_requirements: &id002 !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ">="
44
- - !ruby/object:Gem::Version
45
- hash: 3
46
- segments:
47
- - 0
48
- version: "0"
49
26
  prerelease: false
50
- type: :runtime
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: 0.1.2
33
+ - !ruby/object:Gem::Dependency
51
34
  name: rake
52
- requirement: *id002
53
- - !ruby/object:Gem::Dependency
54
- version_requirements: &id003 !ruby/object:Gem::Requirement
35
+ requirement: !ruby/object:Gem::Requirement
55
36
  none: false
56
- requirements:
57
- - - ">="
58
- - !ruby/object:Gem::Version
59
- hash: 3
60
- segments:
61
- - 0
62
- version: "0"
63
- prerelease: false
37
+ requirements:
38
+ - - ! '>='
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
64
41
  type: :runtime
42
+ prerelease: false
43
+ version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
45
+ requirements:
46
+ - - ! '>='
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
49
+ - !ruby/object:Gem::Dependency
65
50
  name: activesupport
66
- requirement: *id003
67
- - !ruby/object:Gem::Dependency
68
- version_requirements: &id004 !ruby/object:Gem::Requirement
51
+ requirement: !ruby/object:Gem::Requirement
69
52
  none: false
70
- requirements:
71
- - - ">="
72
- - !ruby/object:Gem::Version
73
- hash: 7
74
- segments:
75
- - 2
76
- version: "2"
53
+ requirements:
54
+ - - ! '>='
55
+ - !ruby/object:Gem::Version
56
+ version: '0'
57
+ type: :runtime
77
58
  prerelease: false
78
- type: :development
59
+ version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
61
+ requirements:
62
+ - - ! '>='
63
+ - !ruby/object:Gem::Version
64
+ version: '0'
65
+ - !ruby/object:Gem::Dependency
79
66
  name: rails
80
- requirement: *id004
81
- - !ruby/object:Gem::Dependency
82
- version_requirements: &id005 !ruby/object:Gem::Requirement
67
+ requirement: !ruby/object:Gem::Requirement
83
68
  none: false
84
- requirements:
85
- - - ">="
86
- - !ruby/object:Gem::Version
87
- hash: 3
88
- segments:
89
- - 0
90
- version: "0"
91
- prerelease: false
69
+ requirements:
70
+ - - ! '>='
71
+ - !ruby/object:Gem::Version
72
+ version: '2'
92
73
  type: :development
74
+ prerelease: false
75
+ version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
77
+ requirements:
78
+ - - ! '>='
79
+ - !ruby/object:Gem::Version
80
+ version: '2'
81
+ - !ruby/object:Gem::Dependency
93
82
  name: rspec
94
- requirement: *id005
95
- - !ruby/object:Gem::Dependency
96
- version_requirements: &id006 !ruby/object:Gem::Requirement
83
+ requirement: !ruby/object:Gem::Requirement
97
84
  none: false
98
- requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- hash: 3
102
- segments:
103
- - 0
104
- version: "0"
105
- prerelease: false
85
+ requirements:
86
+ - - ! '>='
87
+ - !ruby/object:Gem::Version
88
+ version: '0'
106
89
  type: :development
90
+ prerelease: false
91
+ version_requirements: !ruby/object:Gem::Requirement
92
+ none: false
93
+ requirements:
94
+ - - ! '>='
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
107
98
  name: aruba
108
- requirement: *id006
109
- - !ruby/object:Gem::Dependency
110
- version_requirements: &id007 !ruby/object:Gem::Requirement
99
+ requirement: !ruby/object:Gem::Requirement
111
100
  none: false
112
- requirements:
113
- - - ">="
114
- - !ruby/object:Gem::Version
115
- hash: 3
116
- segments:
117
- - 0
118
- version: "0"
119
- prerelease: false
101
+ requirements:
102
+ - - ! '>='
103
+ - !ruby/object:Gem::Version
104
+ version: '0'
120
105
  type: :development
106
+ prerelease: false
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ none: false
109
+ requirements:
110
+ - - ! '>='
111
+ - !ruby/object:Gem::Version
112
+ version: '0'
113
+ - !ruby/object:Gem::Dependency
121
114
  name: cucumber
122
- requirement: *id007
123
- - !ruby/object:Gem::Dependency
124
- version_requirements: &id008 !ruby/object:Gem::Requirement
115
+ requirement: !ruby/object:Gem::Requirement
125
116
  none: false
126
- requirements:
127
- - - ">="
128
- - !ruby/object:Gem::Version
129
- hash: 3
130
- segments:
131
- - 0
132
- version: "0"
133
- prerelease: false
117
+ requirements:
118
+ - - ! '>='
119
+ - !ruby/object:Gem::Version
120
+ version: '0'
134
121
  type: :development
122
+ prerelease: false
123
+ version_requirements: !ruby/object:Gem::Requirement
124
+ none: false
125
+ requirements:
126
+ - - ! '>='
127
+ - !ruby/object:Gem::Version
128
+ version: '0'
129
+ - !ruby/object:Gem::Dependency
135
130
  name: rake
136
- requirement: *id008
137
- - !ruby/object:Gem::Dependency
138
- version_requirements: &id009 !ruby/object:Gem::Requirement
131
+ requirement: !ruby/object:Gem::Requirement
139
132
  none: false
140
- requirements:
141
- - - ~>
142
- - !ruby/object:Gem::Version
143
- hash: 13
144
- segments:
145
- - 1
146
- - 1
147
- version: "1.1"
148
- prerelease: false
133
+ requirements:
134
+ - - ! '>='
135
+ - !ruby/object:Gem::Version
136
+ version: '0'
149
137
  type: :development
138
+ prerelease: false
139
+ version_requirements: !ruby/object:Gem::Requirement
140
+ none: false
141
+ requirements:
142
+ - - ! '>='
143
+ - !ruby/object:Gem::Version
144
+ version: '0'
145
+ - !ruby/object:Gem::Dependency
150
146
  name: bundler
151
- requirement: *id009
152
- - !ruby/object:Gem::Dependency
153
- version_requirements: &id010 !ruby/object:Gem::Requirement
147
+ requirement: !ruby/object:Gem::Requirement
154
148
  none: false
155
- requirements:
156
- - - ">="
157
- - !ruby/object:Gem::Version
158
- hash: 3
159
- segments:
160
- - 0
161
- version: "0"
162
- prerelease: false
149
+ requirements:
150
+ - - ~>
151
+ - !ruby/object:Gem::Version
152
+ version: '1.1'
163
153
  type: :development
154
+ prerelease: false
155
+ version_requirements: !ruby/object:Gem::Requirement
156
+ none: false
157
+ requirements:
158
+ - - ~>
159
+ - !ruby/object:Gem::Version
160
+ version: '1.1'
161
+ - !ruby/object:Gem::Dependency
164
162
  name: git-smart
165
- requirement: *id010
166
- - !ruby/object:Gem::Dependency
167
- version_requirements: &id011 !ruby/object:Gem::Requirement
163
+ requirement: !ruby/object:Gem::Requirement
168
164
  none: false
169
- requirements:
170
- - - ">="
171
- - !ruby/object:Gem::Version
172
- hash: 3
173
- segments:
174
- - 0
175
- version: "0"
176
- prerelease: false
165
+ requirements:
166
+ - - ! '>='
167
+ - !ruby/object:Gem::Version
168
+ version: '0'
177
169
  type: :development
170
+ prerelease: false
171
+ version_requirements: !ruby/object:Gem::Requirement
172
+ none: false
173
+ requirements:
174
+ - - ! '>='
175
+ - !ruby/object:Gem::Version
176
+ version: '0'
177
+ - !ruby/object:Gem::Dependency
178
178
  name: godot
179
- requirement: *id011
179
+ requirement: !ruby/object:Gem::Requirement
180
+ none: false
181
+ requirements:
182
+ - - ! '>='
183
+ - !ruby/object:Gem::Version
184
+ version: '0'
185
+ type: :development
186
+ prerelease: false
187
+ version_requirements: !ruby/object:Gem::Requirement
188
+ none: false
189
+ requirements:
190
+ - - ! '>='
191
+ - !ruby/object:Gem::Version
192
+ version: '0'
180
193
  description: Manage multiple Heroku instances/apps for a single Rails app using Rake
181
194
  email: elijah.miller@gmail.com
182
195
  executables: []
183
-
184
196
  extensions: []
185
-
186
- extra_rdoc_files:
197
+ extra_rdoc_files:
187
198
  - README.md
188
- files:
199
+ files:
189
200
  - .gitignore
190
201
  - .travis.yml
191
202
  - CHANGELOG.md
@@ -231,39 +242,35 @@ files:
231
242
  - spec/spec_helper.rb
232
243
  - spec/support/heroku.rb
233
244
  homepage: http://github.com/fastestforward/heroku_san
234
- licenses:
245
+ licenses:
235
246
  - MIT
236
247
  post_install_message:
237
248
  rdoc_options: []
238
-
239
- require_paths:
249
+ require_paths:
240
250
  - lib
241
- required_ruby_version: !ruby/object:Gem::Requirement
251
+ required_ruby_version: !ruby/object:Gem::Requirement
242
252
  none: false
243
- requirements:
244
- - - ">="
245
- - !ruby/object:Gem::Version
246
- hash: 3
247
- segments:
253
+ requirements:
254
+ - - ! '>='
255
+ - !ruby/object:Gem::Version
256
+ version: '0'
257
+ segments:
248
258
  - 0
249
- version: "0"
250
- required_rubygems_version: !ruby/object:Gem::Requirement
259
+ hash: 1445282462279237950
260
+ required_rubygems_version: !ruby/object:Gem::Requirement
251
261
  none: false
252
- requirements:
253
- - - ">="
254
- - !ruby/object:Gem::Version
255
- hash: 3
256
- segments:
257
- - 0
258
- version: "0"
262
+ requirements:
263
+ - - ! '>='
264
+ - !ruby/object:Gem::Version
265
+ version: '0'
259
266
  requirements: []
260
-
261
267
  rubyforge_project:
262
268
  rubygems_version: 1.8.24
263
269
  signing_key:
264
270
  specification_version: 3
265
- summary: "A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The Heroku Toolbelt must be installed to use this gem. https://toolbelt.heroku.com/"
266
- test_files:
271
+ summary: ! 'A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The
272
+ Heroku Toolbelt must be installed to use this gem. https://toolbelt.heroku.com/'
273
+ test_files:
267
274
  - features/config.feature
268
275
  - features/extended-config.feature
269
276
  - features/remote.feature