shelly 0.0.21.pre3 → 0.0.21.pre5

data/lib/shelly/cli/main.rb

@@ -47,8 +47,12 @@ module Shelly
         user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
         user.login
         say "Login successful"
-        say "Uploading your public SSH key"
-        user.upload_ssh_key
+        begin user.upload_ssh_key
+          conflict = false
+        rescue RestClient::Conflict
+          conflict = true
+        end
+        say "Uploading your public SSH key" if conflict == false
         say "You have following clouds available:", :green
         user.apps.each do |app|
           say "  #{app["code_name"]}"
@@ -56,14 +60,13 @@ module Shelly
       rescue Client::APIError => e
         if e.validation?
           e.each_error { |error| say_error "#{error}", :with_exit => false }
-          exit 1
         end
         if e.unauthorized?
           say_error "Wrong email or password", :with_exit => false
           say_error "You can reset password by using link:", :with_exit => false
           say_error "#{e.url}", :with_exit => false
-          exit 1
         end
+        exit 1
       end
 
       method_option "code-name", :type => :string, :aliases => "-c",

data/lib/shelly/client.rb

@@ -64,8 +64,8 @@ module Shelly
       post("/apps", :app => attributes)
     end
 
-    def update_ssh_key(ssh_key)
-      put("/ssh_key", :ssh_key => ssh_key)
+    def add_ssh_key(ssh_key)
+      post("/ssh_key", :ssh_key => ssh_key)
     end
 
     def apps

data/lib/shelly/user.rb

@@ -66,8 +66,8 @@ module Shelly
     end
 
     def upload_ssh_key
-      key = File.read(ssh_key_path)
-      shelly.update_ssh_key(key)
+      key = File.read(ssh_key_path).strip
+      shelly.add_ssh_key(key)
     end
 
     protected

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.21.pre3"
+  VERSION = "0.0.21.pre5"
 end

data/spec/shelly/cli/main_spec.rb

@@ -191,6 +191,14 @@ OUT
         end
       end
 
+      it "should upload user's public SSH key and raise HTTP status 409 Conflict when SSH key exists in database" do
+        @user.should_receive(:upload_ssh_key).and_raise(RestClient::Conflict)
+        $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
+        fake_stdin(["megan@example.com", "secret"]) do
+          @main.login
+        end
+      end
+
       it "should display list of applications to which user has access" do
         $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
         $stdout.should_receive(:puts).with("  abc")

data/spec/shelly/client_spec.rb

@@ -125,10 +125,10 @@ describe Shelly::Client do
     end
   end
 
-  describe "#update_ssh_key" do
+  describe "#add_ssh_key" do
     it "should send put with give SSH key" do
-      @client.should_receive(:put).with("/ssh_key", {:ssh_key => "abc"})
-      @client.update_ssh_key("abc")
+      @client.should_receive(:post).with("/ssh_key", {:ssh_key => "abc"})
+      @client.add_ssh_key("abc")
     end
   end
 

data/spec/shelly/user_spec.rb

@@ -122,7 +122,7 @@ describe Shelly::User do
 
   describe "#upload_ssh_key" do
     it "should read and upload user's public SSH key" do
-      @client.should_receive(:update_ssh_key).with("ssh-key AAbbcc")
+      @client.should_receive(:add_ssh_key).with("ssh-key AAbbcc")
       @user.upload_ssh_key
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.21.pre3
+  version: 0.0.21.pre5
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157359120 !ruby/object:Gem::Requirement
+  requirement: &2161001720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157359120
+  version_requirements: *2161001720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157358600 !ruby/object:Gem::Requirement
+  requirement: &2161001240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157358600
+  version_requirements: *2161001240
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157358080 !ruby/object:Gem::Requirement
+  requirement: &2161000780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157358080
+  version_requirements: *2161000780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157357600 !ruby/object:Gem::Requirement
+  requirement: &2161000260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157357600
+  version_requirements: *2161000260
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2157357140 !ruby/object:Gem::Requirement
+  requirement: &2160999740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157357140
+  version_requirements: *2160999740
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2157356720 !ruby/object:Gem::Requirement
+  requirement: &2160999320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157356720
+  version_requirements: *2160999320
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2157356060 !ruby/object:Gem::Requirement
+  requirement: &2160998820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157356060
+  version_requirements: *2160998820
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2157355360 !ruby/object:Gem::Requirement
+  requirement: &2160998100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157355360
+  version_requirements: *2160998100
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &2157354860 !ruby/object:Gem::Requirement
+  requirement: &2160997460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157354860
+  version_requirements: *2160997460
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157354440 !ruby/object:Gem::Requirement
+  requirement: &2160997040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157354440
+  version_requirements: *2160997040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157353960 !ruby/object:Gem::Requirement
+  requirement: &2160996580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157353960
+  version_requirements: *2160996580
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &2157353540 !ruby/object:Gem::Requirement
+  requirement: &2160996140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157353540
+  version_requirements: *2160996140
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com