shelly 0.4.21 → 0.4.22

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDdlYTA5ZTNlZDdhNTdhNDNmNjFiMzE2Njk0ZDZjN2NiOTBiZjYyMw==
-  data.tar.gz: !binary |-
-    NGNhNjJjZmIzZTE4NDkyMjIzOThkYWE0Yjk1Y2RjODdmNDJlODc0ZQ==
+SHA1:
+  metadata.gz: 545be45650bd9ce16d17c0ab7dfec2792a6b4edd
+  data.tar.gz: e80d05c0fad6c11775d524a43562f8cf95939720
 SHA512:
-  metadata.gz: !binary |-
-    NzI5YWUxNDAxNzExNGJkNjFiNGE1ZTM5NjAwN2ZiMmNjYjljODMzNmI5NDdk
-    ZTEyMjBkNzBhZWY2YmE2NDY0ZDNiMWZlNTFlNjVkMGE0MjFiZWY1M2Q1MDY5
-    NDkyZjUyYzY2NjQwNmM1YzE1YTYwZjY0MTc0MTdkZDFhZmIzYzM=
-  data.tar.gz: !binary |-
-    NjhkYjkwY2QxZTMwMzBjNDU5MzFlODZlMjVkNmQ0NmEwMTAzMTk5MWIxZGMw
-    MGFlYzhiNjBiNWVlOGYzZTk0YzE1ZjA5ODgyZGZkYjZmYjc2YTdjNGYzMWI4
-    ZDNlODlkMzYxZTMyNGYzYjhmOTdkM2Q2MDgzMTIzNzcyNDI5YmU=
+  metadata.gz: 1172c76aceccf7697fdb9689de43fb0004886c92eef6cc8489a920650afd59579a92a760b51a761706dd0ea28e34975365d4c53eb78293c007fd61876919eee8
+  data.tar.gz: a5df073a82931e5ff68b7e7144ca3d841c84621f9284b64175f47fedeb92a1c3845b8c6152099923c89a9261177dcc018e8026aa12ccf34cfd30fc2093f2891f

data/.gitignore

@@ -5,3 +5,6 @@ Gemfile.lock
 pkg/*
 .rvmrc
 coverage
+
+/.ruby-gemset
+/.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.22 / 2014-02-07
+
+* [improvement] Update shelly after confirmation
+* [improvement] User can specify SSH public key to be
+  uploaded with `shelly login --key PATH` (Done by https://github.com/we5)
+
 ## 0.4.21 / 2014-01-15
 
 * [improvement] destination path when uploading files to Shelly Cloud

data/lib/shelly/cli/main.rb

@@ -55,14 +55,22 @@ module Shelly
       end
 
       desc "login [EMAIL]", "Log into Shelly Cloud"
+      method_option :key, :alias => :k, :desc => "Path to specific SSH key", :default => nil
       def login(email = nil)
         user = Shelly::User.new
-        say "Your public SSH key will be uploaded to Shelly Cloud after login."
-        raise Errno::ENOENT, user.ssh_key.path unless user.ssh_key.exists?
+
+        if options[:key]
+          given_key = Shelly::SshKey.new(options[:key])
+          say "Your given SSH key (#{given_key.path}) will be uploaded to Shelly Cloud after login."
+          raise Errno::ENOENT, given_key.path unless given_key.exists?
+        else
+          say "Your public SSH key will be uploaded to Shelly Cloud after login."
+          raise Errno::ENOENT, user.ssh_key.path unless user.ssh_key.exists?
+        end
         email ||= ask_for_email
         password = ask_for_password(:with_confirmation => false)
         user.login(email, password)
-        upload_ssh_key
+        upload_ssh_key(options[:key])
         say "Login successful", :green
         list
       rescue Client::ValidationException => e
@@ -465,17 +473,19 @@ Wait until cloud is in 'turned off' state and try again.}
           say_new_line
         end
 
-        def upload_ssh_key
+        def upload_ssh_key(given_key_path = nil)
           user = Shelly::User.new
-          if user.ssh_key.exists?
-            if user.ssh_key.uploaded?
-              say "Your SSH key from #{user.ssh_key.path} is already uploaded"
+          ssh_key = given_key_path ? Shelly::SshKey.new(given_key_path) : user.ssh_key
+
+          if ssh_key.exists?
+            if ssh_key.uploaded?
+              say "Your SSH key from #{ssh_key.path} is already uploaded"
             else
-              say "Uploading your public SSH key from #{user.ssh_key.path}"
-              user.ssh_key.upload
+              say "Uploading your public SSH key from #{ssh_key.path}"
+              ssh_key.upload
             end
           else
-            say_error "No such file or directory - #{user.ssh_key_path}", :with_exit => false
+            say_error "No such file or directory - #{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

data/lib/shelly/cli/runner.rb

@@ -28,8 +28,11 @@ module Shelly
         raise if debug?
         say "Required shelly gem version: #{e.body["required_version"]}"
         say "Your version: #{VERSION}"
-        say "Update shelly gem with `gem install shelly`"
-        say_error "or `bundle update shelly` when using bundler"
+        if yes? "Update shelly gem?"
+          system "gem install shelly"
+        else
+          say_error "Update shelly gem with `gem install shelly`"
+        end
       rescue Interrupt
         raise if debug?
         say_new_line

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.21"
+  VERSION = "0.4.22"
 end

data/shelly.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency "ruby_gntp"
     s.add_development_dependency "rb-fsevent"
   end
-  s.add_development_dependency "fakefs"
+  s.add_development_dependency "fakefs", "~> 0.4.3"
   s.add_development_dependency "fakeweb"
   s.add_runtime_dependency "wijet-thor", "~> 0.14.10"
   s.add_runtime_dependency "rest-client"

data/spec/shelly/cli/main_spec.rb

@@ -154,13 +154,12 @@ describe Shelly::CLI::Main do
     end
   end
 
-  describe "#login" do
-    let(:key_path) { File.expand_path("~/.ssh/id_rsa.pub") }
-
+  shared_examples "login" do
     before do
-      user.ssh_key.stub(:upload => nil, :uploaded? => false)
+      Shelly::SshKey.any_instance.stub(:upload => nil, :uploaded? => false)
       FileUtils.mkdir_p("~/.ssh")
       File.open(key_path, "w") { |f| f << "ssh-rsa AAAAB3NzaC1" }
+      @main.options = main_options
       @client.stub(:apps).and_return([
           {"code_name" => "abc", "state" => "running",
             "state_description" => "running"},
@@ -187,8 +186,15 @@ describe Shelly::CLI::Main do
         end
       end
 
+      it "should accept given path to specific key as parameter" do
+        $stdout.should_receive(:puts).with(green "Login successful")
+        fake_stdin(["secret"]) do
+          invoke(@main, :login, "megan@example.com")
+        end
+      end
+
       it "should upload user's public SSH key" do
-        user.ssh_key.should_receive(:upload)
+        Shelly::SshKey.any_instance.should_receive(:upload)
         $stdout.should_receive(:puts).with("Uploading your public SSH key from #{key_path}")
         fake_stdin(["megan@example.com", "secret"]) do
           invoke(@main, :login)
@@ -206,7 +212,7 @@ describe Shelly::CLI::Main do
 
       context "SSH key already uploaded" do
         it "should display message to user" do
-          user.ssh_key.stub(:uploaded? => true)
+          Shelly::SshKey.any_instance.stub(:uploaded? => true)
           $stdout.should_receive(:puts).with("Your SSH key from #{key_path} is already uploaded")
           fake_stdin(["megan@example.com", "secret"]) do
             invoke(@main, :login)
@@ -219,7 +225,7 @@ describe Shelly::CLI::Main do
           body = {"message" => "Validation Failed",
             "errors" => [["fingerprint", "already exists. This SSH key is already in use"]]}
           ex = Shelly::Client::ValidationException.new(body)
-          user.ssh_key.stub(:upload).and_raise(ex)
+          Shelly::SshKey.any_instance.stub(:upload).and_raise(ex)
           user.should_receive(:logout)
           $stdout.should_receive(:puts).with(red "Fingerprint already exists. This SSH key is already in use")
           lambda {
@@ -276,6 +282,22 @@ describe Shelly::CLI::Main do
     end
   end
 
+  describe "#login" do
+    context "with default keys in place" do
+      let(:key_path) { File.expand_path("~/.ssh/id_rsa.pub") }
+      let(:main_options) { {} }
+
+      it_behaves_like "login"
+    end
+
+    context "with given path to specific key" do
+      let(:key_path) { File.expand_path("~/.ssh/specific.pub") }
+      let(:main_options) { {:key => "~/.ssh/specific.pub"} }
+
+      it_behaves_like "login"
+    end
+  end
+
   describe "#add" do
     before do
       FileUtils.mkdir_p("/projects/foo")

data/spec/shelly/cli/runner_spec.rb

@@ -56,13 +56,13 @@ describe Shelly::CLI::Runner do
       Shelly::CLI::Main.stub(:start).and_raise(Shelly::Client::GemVersionException.new(
         {"required_version" => "0.0.48"}))
       runner = Shelly::CLI::Runner.new(%w(login))
+      runner.should_receive(:system).with("gem install shelly")
       $stdout.should_receive(:puts).with("Required shelly gem version: 0.0.48")
       $stdout.should_receive(:puts).with("Your version: #{Shelly::VERSION}")
-      $stdout.should_receive(:puts).with("Update shelly gem with `gem install shelly`")
-      $stdout.should_receive(:puts).with("or `bundle update shelly` when using bundler")
-      lambda {
+      $stdout.should_receive(:print).with("Update shelly gem? ")
+      fake_stdin(["yes"]) do
         runner.start
-      }.should raise_error(SystemExit)
+      end
     end
 
     describe "API exception handling" do

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.22
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
-  prerelease: false
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !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'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: ruby_gntp
   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'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: rb-fsevent
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.4.3
   type: :development
   prerelease: false
-  name: fakefs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: fakeweb
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.14.10
   type: :runtime
   prerelease: false
-  name: wijet-thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.10
+- !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.10
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :runtime
   prerelease: false
-  name: rest-client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: '1.16'
   type: :runtime
   prerelease: false
-  name: mime-types
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :runtime
   prerelease: false
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: progressbar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: launchy
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: netrc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -310,17 +310,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool