engineyard 0.8.1 → 0.8.2

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 (5) hide show
  1. data/lib/engineyard/cli/api.rb +3 -5
  2. data/lib/engineyard/model/instance.rb +2 -2
  3. data/lib/engineyard/version.rb +1 -1
  4. data/spec/ey/deploy_spec.rb +1 -1
  5. metadata +14 -14
data/lib/engineyard/cli/api.rb CHANGED
@@ -13,7 +13,7 @@ module EY
13
13
  begin
14
14
  super
15
15
  rescue EY::API::InvalidCredentials
16
- EY.ui.warn "Credentials rejected, please authenticate again"
16
+ EY.ui.warn "Credentials rejected; please authenticate again."
17
17
  refresh
18
18
  retry
19
19
  end
@@ -24,15 +24,13 @@ module EY
24
24
  end
25
25
 
26
26
  def self.fetch_token
27
- EY.ui.warn("The engineyard gem is prerelease software. Please do not use")
28
- EY.ui.warn("this tool to deploy to mission-critical environments, yet.")
29
- EY.ui.info("We need to fetch your API token, please login")
27
+ EY.ui.info("We need to fetch your API token; please log in.")
30
28
  begin
31
29
  email = EY.ui.ask("Email: ")
32
30
  password = EY.ui.ask("Password: ", true)
33
31
  super(email, password)
34
32
  rescue EY::API::InvalidCredentials
35
- EY.ui.warn "Invalid username or password, please try again"
33
+ EY.ui.warn "Invalid username or password; please try again."
36
34
  retry
37
35
  end
38
36
  end
data/lib/engineyard/model/instance.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 = ENV["EY_DEPLOY_VERSION"] || "0.8.1"
6
+ EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.8.2"
7
7
  EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
8
8
  EXIT_STATUS.merge!({
9
9
  255 => :ssh_failed,
@@ -119,7 +119,7 @@ module EY
119
119
 
120
120
  framework_arg = ['--framework-env', environment.framework_env]
121
121
 
122
- verbose_arg = verbose ? ['--verbose'] : []
122
+ verbose_arg = (verbose || ENV['DEBUG']) ? ['--verbose'] : []
123
123
 
124
124
  cmd = Escape.shell_command(start + deploy_args + framework_arg + instance_args + verbose_arg)
125
125
  puts cmd if verbose
data/lib/engineyard/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EY
2
- VERSION = '0.8.1'
2
+ VERSION = '0.8.2'
3
3
  end
data/spec/ey/deploy_spec.rb CHANGED
@@ -15,7 +15,7 @@ describe "ey deploy without an eyrc file" do
15
15
  input.puts("test")
16
16
  end
17
17
 
18
- @out.should include("We need to fetch your API token, please login")
18
+ @out.should include("We need to fetch your API token; please log in.")
19
19
  @out.should include("Email:")
20
20
  @out.should include("Password:")
21
21
  @ssh_commands.should_not be_empty
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 8
8
- - 1
9
- version: 0.8.1
8
+ - 2
9
+ version: 0.8.2
10
10
  platform: ruby
11
11
  authors:
12
12
  - EY Cloud Team
@@ -18,6 +18,8 @@ date: 2010-06-30 00:00:00 -07:00
18
18
  default_executable: ey
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
+ prerelease: false
22
+ name: termios
21
23
  requirement: &id001 !ruby/object:Gem::Requirement
22
24
  requirements:
23
25
  - - ">="
@@ -25,11 +27,11 @@ dependencies:
25
27
  segments:
26
28
  - 0
27
29
  version: "0"
28
- name: termios
29
- prerelease: false
30
30
  type: :runtime
31
31
  version_requirements: *id001
32
32
  - !ruby/object:Gem::Dependency
33
+ prerelease: false
34
+ name: highline
33
35
  requirement: &id002 !ruby/object:Gem::Requirement
34
36
  requirements:
35
37
  - - ~>
@@ -39,11 +41,11 @@ dependencies:
39
41
  - 5
40
42
  - 2
41
43
  version: 1.5.2
42
- name: highline
43
- prerelease: false
44
44
  type: :runtime
45
45
  version_requirements: *id002
46
46
  - !ruby/object:Gem::Dependency
47
+ prerelease: false
48
+ name: thor
47
49
  requirement: &id003 !ruby/object:Gem::Requirement
48
50
  requirements:
49
51
  - - ~>
@@ -53,11 +55,11 @@ dependencies:
53
55
  - 13
54
56
  - 6
55
57
  version: 0.13.6
56
- name: thor
57
- prerelease: false
58
58
  type: :runtime
59
59
  version_requirements: *id003
60
60
  - !ruby/object:Gem::Dependency
61
+ prerelease: false
62
+ name: escape
61
63
  requirement: &id004 !ruby/object:Gem::Requirement
62
64
  requirements:
63
65
  - - ~>
@@ -67,11 +69,11 @@ dependencies:
67
69
  - 0
68
70
  - 4
69
71
  version: 0.0.4
70
- name: escape
71
- prerelease: false
72
72
  type: :runtime
73
73
  version_requirements: *id004
74
74
  - !ruby/object:Gem::Dependency
75
+ prerelease: false
76
+ name: rest-client
75
77
  requirement: &id005 !ruby/object:Gem::Requirement
76
78
  requirements:
77
79
  - - ~>
@@ -80,11 +82,11 @@ dependencies:
80
82
  - 1
81
83
  - 4
82
84
  version: "1.4"
83
- name: rest-client
84
- prerelease: false
85
85
  type: :runtime
86
86
  version_requirements: *id005
87
87
  - !ruby/object:Gem::Dependency
88
+ prerelease: false
89
+ name: json
88
90
  requirement: &id006 !ruby/object:Gem::Requirement
89
91
  requirements:
90
92
  - - ~>
@@ -94,8 +96,6 @@ dependencies:
94
96
  - 4
95
97
  - 0
96
98
  version: 1.4.0
97
- name: json
98
- prerelease: false
99
99
  type: :runtime
100
100
  version_requirements: *id006
101
101
  description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.