shelly 0.0.47 → 0.0.48.pre

data/lib/shelly/cli/user.rb

@@ -6,8 +6,8 @@ module Shelly
       namespace :user
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :add]
-      before_hook :cloudfile_present?, :only => [:list, :add]
+      before_hook :logged_in?, :only => [:list, :add, :delete]
+      before_hook :cloudfile_present?, :only => [:list, :add, :delete]
 
       desc "list", "List users with access to clouds defined in Cloudfile"
       def list
@@ -46,6 +46,29 @@ module Shelly
           end
         end
       end
+
+      desc "delete [EMAIL]", "Remove developer from clouds defined in Cloudfile"
+      def delete(email = nil)
+        @cloudfile = Cloudfile.new
+        @user = Shelly::User.new
+        user_email = email || ask_for_email({:guess_email => false})
+        @cloudfile.clouds.each do |cloud|
+          begin
+            @user.delete_collaboration(cloud, user_email)
+            say "User #{user_email} deleted from cloud #{cloud}"
+          rescue Client::NotFoundException => e
+            case e.resource
+            when :cloud
+              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile"
+            when :user
+              say_error "User '#{user_email}' not found", :with_exit => false
+              say_error "You can list users with `shelly user list`"
+            else raise
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/shelly/client.rb

@@ -83,6 +83,10 @@ module Shelly
       post("/apps/#{cloud}/collaborations", :email => email)
     end
 
+    def delete_collaboration(cloud, email)
+      delete("/apps/#{cloud}/collaborations/#{email}")
+    end
+
     def create_app(attributes)
       post("/apps", :app => attributes)
     end

data/lib/shelly/user.rb

@@ -33,6 +33,10 @@ module Shelly
       shelly.send_invitation(cloud, email)
     end
 
+    def delete_collaboration(cloud, email)
+      shelly.delete_collaboration(cloud, email)
+    end
+
     def load_credentials
       return unless credentials_exists?
       @email, @password = File.read(credentials_path).split("\n")

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.47"
+  VERSION = "0.0.48.pre"
 end

data/spec/shelly/cli/user_spec.rb

@@ -117,4 +117,64 @@ describe Shelly::CLI::User do
       end
     end
   end
+
+  describe "#delete" do
+    before do
+      @user = Shelly::User.new
+      @client.stub(:apps).and_return([{"code_name" => "abc"}, {"code_name" => "fooo"}])
+      Shelly::User.stub(:new).and_return(@user)
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@cli_user, :delete).should include(:logged_in?)
+    end
+
+    it "should ensure that Cloudfile is present" do
+      hooks(@cli_user, :delete).should include(:cloudfile_present?)
+    end
+
+    context "on success" do
+      it "should ask about email" do
+        @client.should_receive(:delete_collaboration).with("foo-production", "megan@example.com")
+        @client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
+        fake_stdin(["megan@example.com"]) do
+          invoke(@cli_user, :delete)
+        end
+      end
+
+      it "should receive email from param" do
+        @client.should_receive(:delete_collaboration).with("foo-production", "megan@example.com")
+        @client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
+        invoke(@cli_user, :delete, "megan@example.com")
+      end
+
+      it "should show that user was removed" do
+        @client.stub(:delete_collaboration)
+        $stdout.should_receive(:puts).with("User megan@example.com deleted from cloud foo-production")
+        $stdout.should_receive(:puts).with("User megan@example.com deleted from cloud foo-staging")
+        invoke(@cli_user, :delete, "megan@example.com")
+      end
+    end
+
+    context "on failure" do
+      it "should show that user wasn't found" do
+        exception = Shelly::Client::NotFoundException.new("resource" => "user")
+        @client.stub(:delete_collaboration).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "User 'megan@example.com' not found")
+        $stdout.should_receive(:puts).with(red "You can list users with `shelly user list`")
+        lambda {
+          invoke(@cli_user, :delete, "megan@example.com")
+        }.should raise_error(SystemExit)
+      end
+
+      it "should raise error if user doesnt have access to cloud" do
+        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
+        @client.stub(:delete_collaboration).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
+        lambda {
+          invoke(@cli_user, :delete, "megan@example.com")
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
 end

data/spec/shelly/client_spec.rb

@@ -200,12 +200,18 @@ describe Shelly::Client do
   describe "#send_invitation" do
     it "should send post with developer's email" do
       FakeWeb.register_uri(:post, api_url("apps/staging-foo/collaborations"), :body => {}.to_json)
-      FakeWeb.register_uri(:post, api_url("apps/production-foo/collaborations"), :body => {}.to_json)
       response = @client.send_invitation("staging-foo", "megan@example.com")
       response.should == {}
     end
   end
 
+  describe "#delete_collaboration" do
+    it "should send delete with developer's email in url" do
+      FakeWeb.register_uri(:delete, api_url("apps/staging-foo/collaborations/megan@example.com"), :body => {}.to_json)
+      @client.delete_collaboration("staging-foo", "megan@example.com")
+    end
+  end
+
   describe "#add_ssh_key" do
     it "should send put with give SSH key" do
       @client.should_receive(:post).with("/ssh_keys", {:ssh_key => "abc"})

data/spec/shelly/user_spec.rb

@@ -109,6 +109,13 @@ describe Shelly::User do
     end
   end
 
+  describe "#delete_collaboration" do
+    it "should delete collaboration" do
+      @client.should_receive(:delete_collaboration).with("foo-staging", "megan@example.com")
+      @user.delete_collaboration("foo-staging", "megan@example.com")
+    end
+  end
+
   describe "#ssh_key_path" do
     it "should return path to public ssh key file" do
       @user.ssh_key_path.should == File.expand_path("~/.ssh/id_rsa.pub")

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.47
-  prerelease: 
+  version: 0.0.48.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336310334100 !ruby/object:Gem::Requirement
+  requirement: &70166830512540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310334100
+  version_requirements: *70166830512540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70336310333680 !ruby/object:Gem::Requirement
+  requirement: &70166830511620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310333680
+  version_requirements: *70166830511620
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70336310333260 !ruby/object:Gem::Requirement
+  requirement: &70166830487640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310333260
+  version_requirements: *70166830487640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70336310332840 !ruby/object:Gem::Requirement
+  requirement: &70166830486920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310332840
+  version_requirements: *70166830486920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70336310332420 !ruby/object:Gem::Requirement
+  requirement: &70166830486120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310332420
+  version_requirements: *70166830486120
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70336310331960 !ruby/object:Gem::Requirement
+  requirement: &70166830485160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310331960
+  version_requirements: *70166830485160
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70336310331540 !ruby/object:Gem::Requirement
+  requirement: &70166830484340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310331540
+  version_requirements: *70166830484340
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70336310331120 !ruby/object:Gem::Requirement
+  requirement: &70166830483520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310331120
+  version_requirements: *70166830483520
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70336310330700 !ruby/object:Gem::Requirement
+  requirement: &70166830482600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336310330700
+  version_requirements: *70166830482600
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70336310330200 !ruby/object:Gem::Requirement
+  requirement: &70166830481360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70336310330200
+  version_requirements: *70166830481360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70336310329780 !ruby/object:Gem::Requirement
+  requirement: &70166830480580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336310329780
+  version_requirements: *70166830480580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70336310345680 !ruby/object:Gem::Requirement
+  requirement: &70166830478900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336310345680
+  version_requirements: *70166830478900
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &70336310345260 !ruby/object:Gem::Requirement
+  requirement: &70166830478240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336310345260
+  version_requirements: *70166830478240
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70336310344840 !ruby/object:Gem::Requirement
+  requirement: &70166830477440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336310344840
+  version_requirements: *70166830477440
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -237,12 +237,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool