shelly 0.0.15 → 0.0.16
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/shelly/cli/main.rb +4 -4
- data/lib/shelly/helpers.rb +2 -2
- data/lib/shelly/version.rb +1 -1
- data/spec/shelly/cli/main_spec.rb +9 -10
- data/spec/shelly/cli/users_spec.rb +1 -1
- metadata +25 -25
data/lib/shelly/cli/main.rb
CHANGED
@@ -35,10 +35,10 @@ module Shelly
|
|
35
35
|
end
|
36
36
|
exit 1
|
37
37
|
end
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
38
|
+
rescue RestClient::Conflict
|
39
|
+
say_error "User with your ssh key already exists.", :with_exit => false
|
40
|
+
say_error "You can login using: shelly login [EMAIL]", :with_exit => false
|
41
|
+
exit 1
|
42
42
|
end
|
43
43
|
|
44
44
|
desc "login [EMAIL]", "Logins user to Shelly Cloud"
|
data/lib/shelly/helpers.rb
CHANGED
@@ -13,8 +13,8 @@ module Shelly
|
|
13
13
|
|
14
14
|
def say_error(message, options = {})
|
15
15
|
options = {:with_exit => true}.merge(options)
|
16
|
-
say
|
17
|
-
|
16
|
+
say message, :red
|
17
|
+
exit 1 if options[:with_exit]
|
18
18
|
end
|
19
19
|
end
|
20
20
|
end
|
data/lib/shelly/version.rb
CHANGED
@@ -47,8 +47,8 @@ OUT
|
|
47
47
|
|
48
48
|
it "should check ssh key in database" do
|
49
49
|
@user.stub(:ssh_key_registered?).and_raise(RestClient::Conflict)
|
50
|
-
$stdout.should_receive(:puts).with("\e[
|
51
|
-
$stdout.should_receive(:puts).with("\e[
|
50
|
+
$stdout.should_receive(:puts).with("\e[31mUser with your ssh key already exists.\e[0m")
|
51
|
+
$stdout.should_receive(:puts).with("\e[31mYou can login using: shelly login [EMAIL]\e[0m")
|
52
52
|
lambda {
|
53
53
|
@main.register
|
54
54
|
}.should raise_error(SystemExit)
|
@@ -89,7 +89,7 @@ OUT
|
|
89
89
|
context "when user enters blank email" do
|
90
90
|
it "should show error message and exit with 1" do
|
91
91
|
Shelly::User.stub(:guess_email).and_return("")
|
92
|
-
$stdout.should_receive(:puts).with("\e[
|
92
|
+
$stdout.should_receive(:puts).with("\e[31mEmail can't be blank, please try again\e[0m")
|
93
93
|
lambda {
|
94
94
|
fake_stdin(["", "bob@example.com", "only-pass", "only-pass"]) do
|
95
95
|
@main.register
|
@@ -134,7 +134,7 @@ OUT
|
|
134
134
|
response = {"message" => "Validation Failed", "errors" => [["email", "has been already taken"]]}
|
135
135
|
exception = Shelly::Client::APIError.new(response.to_json)
|
136
136
|
@client.stub(:register_user).and_raise(exception)
|
137
|
-
$stdout.should_receive(:puts).with("\e[
|
137
|
+
$stdout.should_receive(:puts).with("\e[31memail has been already taken\e[0m")
|
138
138
|
lambda {
|
139
139
|
fake_stdin(["kate@example.com", "pass", "pass"]) do
|
140
140
|
@main.register
|
@@ -189,10 +189,9 @@ OUT
|
|
189
189
|
it "should exit with 1 and display error message" do
|
190
190
|
exception = RestClient::Unauthorized.new
|
191
191
|
@client.stub(:token).and_raise(exception)
|
192
|
-
$stdout.should_receive(:puts).with("\e[
|
193
|
-
$stdout.should_receive(:puts).with("\e[
|
194
|
-
$stdout.should_receive(:puts).with("\e[
|
195
|
-
|
192
|
+
$stdout.should_receive(:puts).with("\e[31mWrong email or password\e[0m")
|
193
|
+
$stdout.should_receive(:puts).with("\e[31mYou can reset password by using link:\e[0m")
|
194
|
+
$stdout.should_receive(:puts).with("\e[31mhttps://admin.winniecloud.com/users/password/new\e[0m")
|
196
195
|
lambda {
|
197
196
|
fake_stdin(["megan@example.com", "secret"]) do
|
198
197
|
@main.login
|
@@ -218,7 +217,7 @@ OUT
|
|
218
217
|
|
219
218
|
it "should exit with message if command run outside git repository" do
|
220
219
|
Shelly::App.stub(:inside_git_repository?).and_return(false)
|
221
|
-
$stdout.should_receive(:puts).with("\e[
|
220
|
+
$stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
|
222
221
|
lambda {
|
223
222
|
fake_stdin(["staging", "", ""]) do
|
224
223
|
@main.add
|
@@ -323,7 +322,7 @@ OUT
|
|
323
322
|
response = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
|
324
323
|
exception = Shelly::Client::APIError.new(response.to_json)
|
325
324
|
@app.should_receive(:create).and_raise(exception)
|
326
|
-
$stdout.should_receive(:puts).with("\e[
|
325
|
+
$stdout.should_receive(:puts).with("\e[31mcode_name has been already taken\e[0m")
|
327
326
|
lambda {
|
328
327
|
fake_stdin(["", "", ""]) do
|
329
328
|
@main.add
|
@@ -24,7 +24,7 @@ describe Shelly::CLI::Users do
|
|
24
24
|
|
25
25
|
it "should exit with message if command run outside git repository" do
|
26
26
|
Shelly::App.stub(:inside_git_repository?).and_return(false)
|
27
|
-
$stdout.should_receive(:puts).with("\e[
|
27
|
+
$stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
|
28
28
|
lambda {
|
29
29
|
@users.list
|
30
30
|
}.should raise_error(SystemExit)
|
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.
|
4
|
+
version: 0.0.16
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
16
|
-
requirement: &
|
16
|
+
requirement: &2153427120 !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: *2153427120
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rake
|
27
|
-
requirement: &
|
27
|
+
requirement: &2153426700 !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: *2153426700
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: guard
|
38
|
-
requirement: &
|
38
|
+
requirement: &2153426280 !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: *2153426280
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: guard-rspec
|
49
|
-
requirement: &
|
49
|
+
requirement: &2153425840 !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: *2153425840
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: growl_notify
|
60
|
-
requirement: &
|
60
|
+
requirement: &2153425360 !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: *2153425360
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rb-fsevent
|
71
|
-
requirement: &
|
71
|
+
requirement: &2153424920 !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: *2153424920
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: fakefs
|
82
|
-
requirement: &
|
82
|
+
requirement: &2153424500 !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: *2153424500
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: fakeweb
|
93
|
-
requirement: &
|
93
|
+
requirement: &2153424080 !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: *2153424080
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: thor
|
104
|
-
requirement: &
|
104
|
+
requirement: &2153423660 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2153423660
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: rest-client
|
115
|
-
requirement: &
|
115
|
+
requirement: &2153423240 !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: *2153423240
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: json
|
126
|
-
requirement: &
|
126
|
+
requirement: &2153422820 !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: *2153422820
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: launchy
|
137
|
-
requirement: &
|
137
|
+
requirement: &2153422400 !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: *2153422400
|
146
146
|
description: Tool for managing applications and clouds at shellycloud.com
|
147
147
|
email:
|
148
148
|
- support@shellycloud.com
|