engineyard 0.5.2 → 0.5.3
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.
- data/lib/engineyard.rb +1 -2
- data/lib/engineyard/model/instance.rb +6 -2
- data/lib/engineyard/version.rb +3 -0
- data/spec/ey/deploy_spec.rb +10 -1
- metadata +4 -3
data/lib/engineyard.rb
CHANGED
@@ -3,7 +3,7 @@ require 'escape'
|
|
3
3
|
module EY
|
4
4
|
module Model
|
5
5
|
class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
|
6
|
-
EYSD_VERSION = "~>0.
|
6
|
+
EYSD_VERSION = "~>0.6.0"
|
7
7
|
CHECK_SCRIPT = <<-SCRIPT
|
8
8
|
require "rubygems"
|
9
9
|
requirement = Gem::Requirement.new("#{EYSD_VERSION}")
|
@@ -31,7 +31,11 @@ exit(17) # required_version < current_version
|
|
31
31
|
|
32
32
|
|
33
33
|
def deploy(app, ref, migration_command=nil, extra_configuration=nil)
|
34
|
-
deploy_args = [
|
34
|
+
deploy_args = [
|
35
|
+
'--app', app.name,
|
36
|
+
'--repo', app.repository_uri,
|
37
|
+
'--branch', ref,
|
38
|
+
]
|
35
39
|
|
36
40
|
if extra_configuration
|
37
41
|
deploy_args << '--config' << extra_configuration.to_json
|
data/spec/ey/deploy_spec.rb
CHANGED
@@ -34,6 +34,7 @@ describe "ey deploy" do
|
|
34
34
|
|
35
35
|
def verify_ran(scenario)
|
36
36
|
@out.should match(/Running deploy for '#{scenario[:environment]}'/)
|
37
|
+
@ssh_commands.should have_command_like(/eysd deploy/)
|
37
38
|
end
|
38
39
|
|
39
40
|
# common behavior
|
@@ -201,7 +202,8 @@ describe "ey deploy" do
|
|
201
202
|
|
202
203
|
it "allows you to specify an app when not in a directory" do
|
203
204
|
ey "deploy --app rails232app --ref master"
|
204
|
-
@ssh_commands.last.should match(
|
205
|
+
@ssh_commands.last.should match(/--app rails232app/)
|
206
|
+
@ssh_commands.last.should match(/--branch master/)
|
205
207
|
end
|
206
208
|
|
207
209
|
it "requires that you specify a ref when specifying the application" do
|
@@ -209,4 +211,11 @@ describe "ey deploy" do
|
|
209
211
|
@err.should match(/you must also specify the ref to deploy/)
|
210
212
|
end
|
211
213
|
end
|
214
|
+
|
215
|
+
it "passes along the repository URL to eysd" do
|
216
|
+
api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
|
217
|
+
ey "deploy"
|
218
|
+
@ssh_commands.last.should =~ /--repo user@git.host:path\/to\/repo.git/
|
219
|
+
end
|
220
|
+
|
212
221
|
end
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 5
|
8
|
-
-
|
9
|
-
version: 0.5.
|
8
|
+
- 3
|
9
|
+
version: 0.5.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- EY Cloud Team
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-06-
|
17
|
+
date: 2010-06-18 00:00:00 -07:00
|
18
18
|
default_executable: ey
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
@@ -128,6 +128,7 @@ files:
|
|
128
128
|
- lib/engineyard/repo.rb
|
129
129
|
- lib/engineyard/ruby_ext.rb
|
130
130
|
- lib/engineyard/thor.rb
|
131
|
+
- lib/engineyard/version.rb
|
131
132
|
- lib/engineyard.rb
|
132
133
|
- LICENSE
|
133
134
|
- README.rdoc
|