shelly 0.0.21.pre3 → 0.0.21.pre5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/shelly/cli/main.rb +7 -4
- data/lib/shelly/client.rb +2 -2
- data/lib/shelly/user.rb +2 -2
- data/lib/shelly/version.rb +1 -1
- data/spec/shelly/cli/main_spec.rb +8 -0
- data/spec/shelly/client_spec.rb +3 -3
- data/spec/shelly/user_spec.rb +1 -1
- metadata +26 -26
data/lib/shelly/cli/main.rb
CHANGED
@@ -47,8 +47,12 @@ module Shelly
|
|
47
47
|
user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
|
48
48
|
user.login
|
49
49
|
say "Login successful"
|
50
|
-
|
51
|
-
|
50
|
+
begin user.upload_ssh_key
|
51
|
+
conflict = false
|
52
|
+
rescue RestClient::Conflict
|
53
|
+
conflict = true
|
54
|
+
end
|
55
|
+
say "Uploading your public SSH key" if conflict == false
|
52
56
|
say "You have following clouds available:", :green
|
53
57
|
user.apps.each do |app|
|
54
58
|
say " #{app["code_name"]}"
|
@@ -56,14 +60,13 @@ module Shelly
|
|
56
60
|
rescue Client::APIError => e
|
57
61
|
if e.validation?
|
58
62
|
e.each_error { |error| say_error "#{error}", :with_exit => false }
|
59
|
-
exit 1
|
60
63
|
end
|
61
64
|
if e.unauthorized?
|
62
65
|
say_error "Wrong email or password", :with_exit => false
|
63
66
|
say_error "You can reset password by using link:", :with_exit => false
|
64
67
|
say_error "#{e.url}", :with_exit => false
|
65
|
-
exit 1
|
66
68
|
end
|
69
|
+
exit 1
|
67
70
|
end
|
68
71
|
|
69
72
|
method_option "code-name", :type => :string, :aliases => "-c",
|
data/lib/shelly/client.rb
CHANGED
data/lib/shelly/user.rb
CHANGED
data/lib/shelly/version.rb
CHANGED
@@ -191,6 +191,14 @@ OUT
|
|
191
191
|
end
|
192
192
|
end
|
193
193
|
|
194
|
+
it "should upload user's public SSH key and raise HTTP status 409 Conflict when SSH key exists in database" do
|
195
|
+
@user.should_receive(:upload_ssh_key).and_raise(RestClient::Conflict)
|
196
|
+
$stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
|
197
|
+
fake_stdin(["megan@example.com", "secret"]) do
|
198
|
+
@main.login
|
199
|
+
end
|
200
|
+
end
|
201
|
+
|
194
202
|
it "should display list of applications to which user has access" do
|
195
203
|
$stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
|
196
204
|
$stdout.should_receive(:puts).with(" abc")
|
data/spec/shelly/client_spec.rb
CHANGED
@@ -125,10 +125,10 @@ describe Shelly::Client do
|
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
128
|
-
describe "#
|
128
|
+
describe "#add_ssh_key" do
|
129
129
|
it "should send put with give SSH key" do
|
130
|
-
@client.should_receive(:
|
131
|
-
@client.
|
130
|
+
@client.should_receive(:post).with("/ssh_key", {:ssh_key => "abc"})
|
131
|
+
@client.add_ssh_key("abc")
|
132
132
|
end
|
133
133
|
end
|
134
134
|
|
data/spec/shelly/user_spec.rb
CHANGED
@@ -122,7 +122,7 @@ describe Shelly::User do
|
|
122
122
|
|
123
123
|
describe "#upload_ssh_key" do
|
124
124
|
it "should read and upload user's public SSH key" do
|
125
|
-
@client.should_receive(:
|
125
|
+
@client.should_receive(:add_ssh_key).with("ssh-key AAbbcc")
|
126
126
|
@user.upload_ssh_key
|
127
127
|
end
|
128
128
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shelly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.21.
|
4
|
+
version: 0.0.21.pre5
|
5
5
|
prerelease: 7
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-11-
|
12
|
+
date: 2011-11-25 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
16
|
-
requirement: &
|
16
|
+
requirement: &2161001720 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2161001720
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rake
|
27
|
-
requirement: &
|
27
|
+
requirement: &2161001240 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2161001240
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: guard
|
38
|
-
requirement: &
|
38
|
+
requirement: &2161000780 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2161000780
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: guard-rspec
|
49
|
-
requirement: &
|
49
|
+
requirement: &2161000260 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2161000260
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: growl_notify
|
60
|
-
requirement: &
|
60
|
+
requirement: &2160999740 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2160999740
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rb-fsevent
|
71
|
-
requirement: &
|
71
|
+
requirement: &2160999320 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2160999320
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: fakefs
|
82
|
-
requirement: &
|
82
|
+
requirement: &2160998820 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2160998820
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: fakeweb
|
93
|
-
requirement: &
|
93
|
+
requirement: &2160998100 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2160998100
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: wijet-thor
|
104
|
-
requirement: &
|
104
|
+
requirement: &2160997460 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ~>
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: 0.14.7
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2160997460
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: rest-client
|
115
|
-
requirement: &
|
115
|
+
requirement: &2160997040 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '0'
|
121
121
|
type: :runtime
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *2160997040
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: json
|
126
|
-
requirement: &
|
126
|
+
requirement: &2160996580 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *2160996580
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: wijet-launchy
|
137
|
-
requirement: &
|
137
|
+
requirement: &2160996140 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,7 +142,7 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :runtime
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *2160996140
|
146
146
|
description: Tool for managing applications and clouds at shellycloud.com
|
147
147
|
email:
|
148
148
|
- support@shellycloud.com
|