shelly 0.0.47 → 0.0.48.pre
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/shelly/cli/user.rb +25 -2
- data/lib/shelly/client.rb +4 -0
- data/lib/shelly/user.rb +4 -0
- data/lib/shelly/version.rb +1 -1
- data/spec/shelly/cli/user_spec.rb +60 -0
- data/spec/shelly/client_spec.rb +7 -1
- data/spec/shelly/user_spec.rb +7 -0
- metadata +34 -34
data/lib/shelly/cli/user.rb
CHANGED
@@ -6,8 +6,8 @@ module Shelly
|
|
6
6
|
namespace :user
|
7
7
|
include Helpers
|
8
8
|
|
9
|
-
before_hook :logged_in?, :only => [:list, :add]
|
10
|
-
before_hook :cloudfile_present?, :only => [:list, :add]
|
9
|
+
before_hook :logged_in?, :only => [:list, :add, :delete]
|
10
|
+
before_hook :cloudfile_present?, :only => [:list, :add, :delete]
|
11
11
|
|
12
12
|
desc "list", "List users with access to clouds defined in Cloudfile"
|
13
13
|
def list
|
@@ -46,6 +46,29 @@ module Shelly
|
|
46
46
|
end
|
47
47
|
end
|
48
48
|
end
|
49
|
+
|
50
|
+
desc "delete [EMAIL]", "Remove developer from clouds defined in Cloudfile"
|
51
|
+
def delete(email = nil)
|
52
|
+
@cloudfile = Cloudfile.new
|
53
|
+
@user = Shelly::User.new
|
54
|
+
user_email = email || ask_for_email({:guess_email => false})
|
55
|
+
@cloudfile.clouds.each do |cloud|
|
56
|
+
begin
|
57
|
+
@user.delete_collaboration(cloud, user_email)
|
58
|
+
say "User #{user_email} deleted from cloud #{cloud}"
|
59
|
+
rescue Client::NotFoundException => e
|
60
|
+
case e.resource
|
61
|
+
when :cloud
|
62
|
+
say_error "You have no access to '#{cloud}' cloud defined in Cloudfile"
|
63
|
+
when :user
|
64
|
+
say_error "User '#{user_email}' not found", :with_exit => false
|
65
|
+
say_error "You can list users with `shelly user list`"
|
66
|
+
else raise
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
49
72
|
end
|
50
73
|
end
|
51
74
|
end
|
data/lib/shelly/client.rb
CHANGED
@@ -83,6 +83,10 @@ module Shelly
|
|
83
83
|
post("/apps/#{cloud}/collaborations", :email => email)
|
84
84
|
end
|
85
85
|
|
86
|
+
def delete_collaboration(cloud, email)
|
87
|
+
delete("/apps/#{cloud}/collaborations/#{email}")
|
88
|
+
end
|
89
|
+
|
86
90
|
def create_app(attributes)
|
87
91
|
post("/apps", :app => attributes)
|
88
92
|
end
|
data/lib/shelly/user.rb
CHANGED
@@ -33,6 +33,10 @@ module Shelly
|
|
33
33
|
shelly.send_invitation(cloud, email)
|
34
34
|
end
|
35
35
|
|
36
|
+
def delete_collaboration(cloud, email)
|
37
|
+
shelly.delete_collaboration(cloud, email)
|
38
|
+
end
|
39
|
+
|
36
40
|
def load_credentials
|
37
41
|
return unless credentials_exists?
|
38
42
|
@email, @password = File.read(credentials_path).split("\n")
|
data/lib/shelly/version.rb
CHANGED
@@ -117,4 +117,64 @@ describe Shelly::CLI::User do
|
|
117
117
|
end
|
118
118
|
end
|
119
119
|
end
|
120
|
+
|
121
|
+
describe "#delete" do
|
122
|
+
before do
|
123
|
+
@user = Shelly::User.new
|
124
|
+
@client.stub(:apps).and_return([{"code_name" => "abc"}, {"code_name" => "fooo"}])
|
125
|
+
Shelly::User.stub(:new).and_return(@user)
|
126
|
+
end
|
127
|
+
|
128
|
+
it "should ensure user has logged in" do
|
129
|
+
hooks(@cli_user, :delete).should include(:logged_in?)
|
130
|
+
end
|
131
|
+
|
132
|
+
it "should ensure that Cloudfile is present" do
|
133
|
+
hooks(@cli_user, :delete).should include(:cloudfile_present?)
|
134
|
+
end
|
135
|
+
|
136
|
+
context "on success" do
|
137
|
+
it "should ask about email" do
|
138
|
+
@client.should_receive(:delete_collaboration).with("foo-production", "megan@example.com")
|
139
|
+
@client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
|
140
|
+
fake_stdin(["megan@example.com"]) do
|
141
|
+
invoke(@cli_user, :delete)
|
142
|
+
end
|
143
|
+
end
|
144
|
+
|
145
|
+
it "should receive email from param" do
|
146
|
+
@client.should_receive(:delete_collaboration).with("foo-production", "megan@example.com")
|
147
|
+
@client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
|
148
|
+
invoke(@cli_user, :delete, "megan@example.com")
|
149
|
+
end
|
150
|
+
|
151
|
+
it "should show that user was removed" do
|
152
|
+
@client.stub(:delete_collaboration)
|
153
|
+
$stdout.should_receive(:puts).with("User megan@example.com deleted from cloud foo-production")
|
154
|
+
$stdout.should_receive(:puts).with("User megan@example.com deleted from cloud foo-staging")
|
155
|
+
invoke(@cli_user, :delete, "megan@example.com")
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
context "on failure" do
|
160
|
+
it "should show that user wasn't found" do
|
161
|
+
exception = Shelly::Client::NotFoundException.new("resource" => "user")
|
162
|
+
@client.stub(:delete_collaboration).and_raise(exception)
|
163
|
+
$stdout.should_receive(:puts).with(red "User 'megan@example.com' not found")
|
164
|
+
$stdout.should_receive(:puts).with(red "You can list users with `shelly user list`")
|
165
|
+
lambda {
|
166
|
+
invoke(@cli_user, :delete, "megan@example.com")
|
167
|
+
}.should raise_error(SystemExit)
|
168
|
+
end
|
169
|
+
|
170
|
+
it "should raise error if user doesnt have access to cloud" do
|
171
|
+
exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
|
172
|
+
@client.stub(:delete_collaboration).and_raise(exception)
|
173
|
+
$stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
|
174
|
+
lambda {
|
175
|
+
invoke(@cli_user, :delete, "megan@example.com")
|
176
|
+
}.should raise_error(SystemExit)
|
177
|
+
end
|
178
|
+
end
|
179
|
+
end
|
120
180
|
end
|
data/spec/shelly/client_spec.rb
CHANGED
@@ -200,12 +200,18 @@ describe Shelly::Client do
|
|
200
200
|
describe "#send_invitation" do
|
201
201
|
it "should send post with developer's email" do
|
202
202
|
FakeWeb.register_uri(:post, api_url("apps/staging-foo/collaborations"), :body => {}.to_json)
|
203
|
-
FakeWeb.register_uri(:post, api_url("apps/production-foo/collaborations"), :body => {}.to_json)
|
204
203
|
response = @client.send_invitation("staging-foo", "megan@example.com")
|
205
204
|
response.should == {}
|
206
205
|
end
|
207
206
|
end
|
208
207
|
|
208
|
+
describe "#delete_collaboration" do
|
209
|
+
it "should send delete with developer's email in url" do
|
210
|
+
FakeWeb.register_uri(:delete, api_url("apps/staging-foo/collaborations/megan@example.com"), :body => {}.to_json)
|
211
|
+
@client.delete_collaboration("staging-foo", "megan@example.com")
|
212
|
+
end
|
213
|
+
end
|
214
|
+
|
209
215
|
describe "#add_ssh_key" do
|
210
216
|
it "should send put with give SSH key" do
|
211
217
|
@client.should_receive(:post).with("/ssh_keys", {:ssh_key => "abc"})
|
data/spec/shelly/user_spec.rb
CHANGED
@@ -109,6 +109,13 @@ describe Shelly::User do
|
|
109
109
|
end
|
110
110
|
end
|
111
111
|
|
112
|
+
describe "#delete_collaboration" do
|
113
|
+
it "should delete collaboration" do
|
114
|
+
@client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
|
115
|
+
@user.delete_collaboration("foo-staging", "megan@example.com")
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
112
119
|
describe "#ssh_key_path" do
|
113
120
|
it "should return path to public ssh key file" do
|
114
121
|
@user.ssh_key_path.should == File.expand_path("~/.ssh/id_rsa.pub")
|
metadata
CHANGED
@@ -1,19 +1,19 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shelly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
5
|
-
prerelease:
|
4
|
+
version: 0.0.48.pre
|
5
|
+
prerelease: 7
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Shelly Cloud team
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-02-
|
12
|
+
date: 2012-02-08 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
16
|
-
requirement: &
|
16
|
+
requirement: &70166830512540 !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: *70166830512540
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rake
|
27
|
-
requirement: &
|
27
|
+
requirement: &70166830511620 !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: *70166830511620
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: guard
|
38
|
-
requirement: &
|
38
|
+
requirement: &70166830487640 !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: *70166830487640
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: guard-rspec
|
49
|
-
requirement: &
|
49
|
+
requirement: &70166830486920 !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: *70166830486920
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: simplecov
|
60
|
-
requirement: &
|
60
|
+
requirement: &70166830486120 !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: *70166830486120
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: ruby_gntp
|
71
|
-
requirement: &
|
71
|
+
requirement: &70166830485160 !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: *70166830485160
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: rb-fsevent
|
82
|
-
requirement: &
|
82
|
+
requirement: &70166830484340 !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: *70166830484340
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: fakefs
|
93
|
-
requirement: &
|
93
|
+
requirement: &70166830483520 !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: *70166830483520
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: fakeweb
|
104
|
-
requirement: &
|
104
|
+
requirement: &70166830482600 !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: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *70166830482600
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: wijet-thor
|
115
|
-
requirement: &
|
115
|
+
requirement: &70166830481360 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ~>
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: 0.14.7
|
121
121
|
type: :runtime
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *70166830481360
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rest-client
|
126
|
-
requirement: &
|
126
|
+
requirement: &70166830480580 !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: *70166830480580
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: json
|
137
|
-
requirement: &
|
137
|
+
requirement: &70166830478900 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :runtime
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *70166830478900
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: wijet-launchy
|
148
|
-
requirement: &
|
148
|
+
requirement: &70166830478240 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ! '>='
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: '0'
|
154
154
|
type: :runtime
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *70166830478240
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: progressbar
|
159
|
-
requirement: &
|
159
|
+
requirement: &70166830477440 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ! '>='
|
@@ -164,7 +164,7 @@ dependencies:
|
|
164
164
|
version: '0'
|
165
165
|
type: :runtime
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *70166830477440
|
168
168
|
description: Tool for managing applications and clouds at shellycloud.com
|
169
169
|
email:
|
170
170
|
- support@shellycloud.com
|
@@ -237,12 +237,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
237
237
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
238
238
|
none: false
|
239
239
|
requirements:
|
240
|
-
- - ! '
|
240
|
+
- - ! '>'
|
241
241
|
- !ruby/object:Gem::Version
|
242
|
-
version:
|
242
|
+
version: 1.3.1
|
243
243
|
requirements: []
|
244
244
|
rubyforge_project: shelly
|
245
|
-
rubygems_version: 1.8.
|
245
|
+
rubygems_version: 1.8.10
|
246
246
|
signing_key:
|
247
247
|
specification_version: 3
|
248
248
|
summary: Shelly Cloud command line tool
|