shelly 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db6979b83360ab5ec5289105c40db990afeb6ec
-  data.tar.gz: a897299673d1c2e26a1702bd7b69a4ab3de9b694
+  metadata.gz: c215723a3d368ed383af7f81a602aba05b518686
+  data.tar.gz: babb10677df55d5e611317d74a6126afcb6cb63e
 SHA512:
-  metadata.gz: 3ea8b51d8271633030d0647bcc6da3b96801506d82de8245a9ba082047185a6e6f9f3d7c7e43885e6ad8a41419f27131a8f4ae503bee67b87bc036a8975b96d0
-  data.tar.gz: 5a018835c3e98760a88f0cec95658b6db742f38833e738db8d815efbd6f12226b1628c3bbf0879dd3830be9d74c0bf89d9272baa7fad5b89b77e0ed19787748e
+  metadata.gz: 4ddd0924ff53084715bca2e0d6bd86d978fe6a754ce101f3dc6e175abf7301169ab40a18e141eff8e5b8192550161687e9b4c92363ba2ba745ed01ed6061d76a
+  data.tar.gz: d2ea74d688c3a9d90f341a2488a758cee8155879d4997779f0cf68b6eb54f1da624c0cb730046a2c1d53316dd99ed2af85f5bd6858ed9826b1f35a3cc48bf693

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.4.13 / 2013-11-11
+
+* [improvement] Don't upload SSH key on register,
+  it will be uploaded at login which is required anyway after register
+
+* internal changes
+
 # 0.4.12 / 2013-11-05
 
 * [bugfix] Print user-friendly message if user tries to operate on files

data/lib/shelly/cli/main.rb

@@ -41,19 +41,12 @@ module Shelly
 
       desc "register [EMAIL]", "Register new account"
       def register(email = nil)
-        say "Your public SSH key will be uploaded to Shelly Cloud after registration."
         say "Registering with email: #{email}" if email
         user = Shelly::User.new
         email ||= ask_for_email
         password = ask_for_password
         ask_for_acceptance_of_terms
         user.register(email, password)
-        if user.ssh_key_exists?
-          say "Uploading your public SSH key from #{user.ssh_key_path}"
-        else
-          say_error "No such file or directory - #{user.ssh_key_path}", :with_exit => false
-          say_error "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`", :with_exit => false
-        end
         say "Successfully registered!", :green
         say "Check you mailbox for email address confirmation", :green
       rescue Client::ValidationException => e
@@ -70,8 +63,7 @@ module Shelly
         password = ask_for_password(:with_confirmation => false)
         user.login(email, password)
         say "Login successful", :green
-        user.upload_ssh_key
-        say "Uploading your public SSH key"
+        upload_ssh_key
         list
       rescue Client::ValidationException => e
         e.each_error { |error| say_error "#{error}", :with_exit => false }
@@ -461,6 +453,19 @@ Wait until cloud is in 'turned off' state and try again.}
           say "  git push #{remote} master"
           say_new_line
         end
+
+        def upload_ssh_key
+          user = Shelly::User.new
+          if user.ssh_key_exists?
+            say "Uploading your public SSH key from #{user.ssh_key_path}"
+            user.upload_ssh_key
+          else
+            say_error "No such file or directory - #{user.ssh_key_path}", :with_exit => false
+            say_error "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`", :with_exit => false
+          end
+        rescue Client::ValidationException => e
+          e.each_error { |error| say_error error, :with_exit => false }
+        end
       end
     end
   end

data/lib/shelly/client/users.rb

@@ -1,5 +1,5 @@
 class Shelly::Client
-  def register_user(email, password, ssh_key)
-    post("/users", :user => {:email => email, :password => password, :ssh_key => ssh_key})
+  def register_user(email, password)
+    post("/users", :user => {:email => email, :password => password})
   end
 end

data/lib/shelly/user.rb

@@ -19,8 +19,7 @@ module Shelly
     end
 
     def register(email, password)
-      ssh_key = File.read(ssh_key_path) if ssh_key_exists?
-      shelly.register_user(email, password, ssh_key)
+      shelly.register_user(email, password)
     end
 
     def authorize!

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/shelly/cli/main_spec.rb

@@ -77,16 +77,7 @@ describe Shelly::CLI::Main do
       FileUtils.mkdir_p("~/.ssh")
       File.open("~/.ssh/id_rsa.pub", "w") { |f| f << "ssh-key AAbbcc" }
       user.stub(:register).with("better@example.com", "secret") { true }
-    end
-
-    it "should register user without local SSH Key and show message to create SSH Key" do
-      FileUtils.rm_rf(@key_path)
-      File.exists?(@key_path).should be_false
-      $stdout.should_receive(:puts).with(red "No such file or directory - #{@key_path}")
-      $stdout.should_receive(:puts).with(red "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`")
-      fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
-        invoke(@main, :register)
-      end
+      user.stub(:upload_ssh_key)
     end
 
     it "should ask for email, password and password confirmation" do
@@ -127,28 +118,6 @@ describe Shelly::CLI::Main do
       end
     end
 
-    context "public SSH key exists" do
-      it "should register with the public SSH key" do
-        FileUtils.mkdir_p("~/.ssh")
-        File.open(@key_path, "w") { |f| f << "key" }
-        $stdout.should_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
-          invoke(@main, :register)
-        end
-      end
-    end
-
-    context "public SSH key doesn't exist" do
-      it "should register user without the public SSH key" do
-        user.stub(:ssh_key_registered?)
-        FileUtils.rm_rf(@key_path)
-        $stdout.should_not_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
-          invoke(@main, :register)
-        end
-      end
-    end
-
     context "on successful registration" do
       it "should display message about registration and email address confirmation" do
         $stdout.should_receive(:puts).with(green "Successfully registered!")
@@ -219,7 +188,7 @@ describe Shelly::CLI::Main do
 
       it "should upload user's public SSH key" do
         user.should_receive(:upload_ssh_key)
-        $stdout.should_receive(:puts).with("Uploading your public SSH key")
+        $stdout.should_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
         fake_stdin(["megan@example.com", "secret"]) do
           invoke(@main, :login)
         end

data/spec/shelly/client_spec.rb

@@ -88,8 +88,8 @@ describe Shelly::Client do
   describe "#register_user" do
     it "should send post request with login and password" do
       @client.should_receive(:post).with("/users", {:user => {:email => "test@example.com",
-        :password => "secret", :ssh_key => "ssh-key Abb"}})
-      @client.register_user("test@example.com", "secret", "ssh-key Abb")
+        :password => "secret"}})
+      @client.register_user("test@example.com", "secret")
     end
   end
 

data/spec/shelly/user_spec.rb

@@ -28,18 +28,9 @@ describe Shelly::User do
     end
 
     it "should register user at Shelly Cloud" do
-      @client.should_receive(:register_user).with(email, password, "dsa-key AAbbcc")
+      @client.should_receive(:register_user).with(email, password)
       @user.register(email, password)
     end
-
-    context "when ssh key is not available" do
-      it "should register without it" do
-        FileUtils.rm_rf("~/.ssh/id_rsa.pub")
-        FileUtils.rm_rf("~/.ssh/id_dsa.pub")
-        @client.should_receive(:register_user).with(email, password, nil)
-        @user.register(email, password)
-      end
-    end
   end
 
   describe "#delete_credentials" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -288,8 +316,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool
-test_files: []
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/cert_spec.rb
+- spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/database_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
+- spec/shelly/cli/logs_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/organization_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/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/organization_spec.rb
+- spec/shelly/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb