shelly 0.0.22 → 0.0.23

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/cli/user.rb

@@ -1,3 +1,5 @@
+require "shelly/cli/command"
+
 module Shelly
   module CLI
     class User < Command

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/cloudfile.rb

@@ -41,7 +41,8 @@ module Shelly
       response = shelly.apps_users(clouds)
       response.inject({}) do |result, app|
         result[app['code_name']] = app['users'].map do |user|
-          user['name'] ? "#{user['email']} (#{user['name']})" : user['email']
+          #user['name'] ? "#{user['email']} (#{user['name']})" : user['email']
+          user['email']
         end
         result
       end

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.22"
+  VERSION = "0.0.23"
 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/cli/user_spec.rb

@@ -58,7 +58,7 @@ describe Shelly::CLI::User do
         $stdout.should_receive(:puts).with("Cloud foo-production:")
         $stdout.should_receive(:puts).with("  user@example.com")
         $stdout.should_receive(:puts).with("Cloud foo-staging:")
-        $stdout.should_receive(:puts).with("  user2@example.com (username2)")
+        $stdout.should_receive(:puts).with("  user2@example.com")
         @cli_user.list
       end
     end

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/cloudfile_spec.rb

@@ -27,11 +27,11 @@ describe Shelly::Cloudfile do
       @cloudfile.write(@hash)
       @client.should_receive(:apps_users).and_return(response)
       response = @cloudfile.fetch_users
-      response.should == {"foo-staging" => ["user@example.com (username)"]}
+      response.should == {"foo-staging" => ["user@example.com"]}
     end
 
     def response
-      [{'code_name' => 'foo-staging','users' => [{'name' => 'username','email' => 'user@example.com'}]}]
+      [{'code_name' => 'foo-staging','users' => [{'email' => 'user@example.com'}]}]
     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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 Z
+date: 2011-11-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -74,7 +74,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: growl_notify
+  name: fakefs
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rb-fsevent
+  name: fakeweb
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -101,38 +101,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: wijet-thor
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +116,11 @@ dependencies:
         - 7
         version: 0.14.7
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,11 +130,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,11 +144,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,7 +158,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id010
 description: Tool for managing applications and clouds at shellycloud.com
 email: 
 - support@shellycloud.com
@@ -267,16 +239,5 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: 
-- spec/helpers.rb
-- spec/input_faker.rb
-- spec/shelly/app_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/runner_spec.rb
-- spec/shelly/cli/user_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []
+