shelly 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b85bcd0e7111d1a7bdaf59a47384141a49fb347
-  data.tar.gz: c0279a7748d978b1cb427240b4b0c9a49dbbd039
+  metadata.gz: d3108d5cd82ebb8ac69e5fd386eb9411449723c8
+  data.tar.gz: 16d0a5f75fc68e4126726035ffd456f29806add9
 SHA512:
-  metadata.gz: 72a140d37c0f1027109b1a066e9ac6b9c4e8c785be895e46c3225b8b9c92f166b15ba72fc85439137bb3f0de2c18cfd0489d76b8a82085fe8d9bafd05a12409d
-  data.tar.gz: a9c4dc381a59cd781993d8a319767552ea013eea3aace1fead433a14a369cbe58f636baadc2db18cc5d3ce32ad156e2dce5868a62f49011ab5bed84e6165f6f5
+  metadata.gz: 25ab6d5221843cef3dae2a38b1d6f3864c8a4c5b2af71d1b0bc0afc4708347faab21dacb51e4b9d7bedd9fad7eccb81e9477cc3d72f751f8cd39afdc30268b8c
+  data.tar.gz: c4fb2607b1c07cb6c0d7e67211a006c5d3e6a922cfba831ff6bf7c21230ab9630ef2ccbaf5a12773152570f06e85552f52a6cf7bd85cfb622a4bc6f7c42159b0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.1 / 2015-02-01
+
+* [improvement] shelly logout --key option
+* [bugfix] Show proper error message when log file does not exist
+* [bugfix] Catch 404s when updating and deleting endpoints. API resource
+  certificate changed to endpoint
+
 ## 0.5.0 / 2015-01-02
 
 * [bugfix] Catch Conflict 409 when creating or updating endpoints

data/lib/shelly/cli/endpoint.rb

@@ -143,7 +143,7 @@ module Shelly
       rescue Client::ConflictException => e
         say_error e['message']
       rescue Client::NotFoundException => e
-        raise unless e.resource == :certificate
+        raise unless e.resource == :endpoint
         say_error "Endpoint not found"
       end
 
@@ -160,7 +160,7 @@ module Shelly
           say "Endpoint was deleted"
         end
       rescue Client::NotFoundException => e
-        raise unless e.resource == :certificate
+        raise unless e.resource == :endpoint
         say_error "Endpoint not found"
       end
 

data/lib/shelly/cli/logs.rb

@@ -43,8 +43,9 @@ module Shelly
 
         say_new_line
         say "Log file saved to #{attributes["filename"]}", :green
-      rescue RestClient::ResourceNotFound => e
-        say_error "Log file not found", :with_exit => false
+      rescue Client::NotFoundException => e
+        bar.clear
+        say_error "Log file for #{date} not found", :with_exit => false
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
       end

data/lib/shelly/cli/main.rb

@@ -283,9 +283,15 @@ Wait until cloud is in 'turned off' state and try again.}
       end
 
       desc "logout", "Logout from Shelly Cloud"
+      method_option :key, :alias => :k, :desc => "Path to specific SSH key",
+        :default => nil
       def logout
         user = Shelly::User.new
-        say "Your public SSH key has been removed from Shelly Cloud" if user.ssh_keys.destroy
+        key = Shelly::SshKey.new(options[:key]) if options[:key]
+        if (key || user.ssh_keys).destroy
+          say "Your public SSH key has been removed from Shelly Cloud"
+        end
+
         say "You have been successfully logged out" if user.logout
       end
 

data/lib/shelly/client.rb

@@ -53,8 +53,10 @@ module Shelly
     def download_file(cloud, filename, url, progress_callback = nil)
       File.open(filename, "wb") do |out|
         process_response = lambda do |response|
+          raise_error_for_400_to_599(response.code.to_i)
 
           total_size = response.to_hash['file-size'].first.to_i if response.to_hash['file-size']
+
           response.read_body do |chunk|
             out.write(chunk)
 
@@ -110,8 +112,14 @@ module Shelly
     def process_response(response)
       body = JSON.parse(response.body) rescue JSON::ParserError && {}
       code = response.code
+      raise_error_for_400_to_599(code, body, response)
+      response.return!
+      body
+    end
+
+    def raise_error_for_400_to_599(code, body = nil, response = nil)
       if (400..599).include?(code)
-        exception_class = case response.code
+        exception_class = case code
         when 401; UnauthorizedException
         when 403; ForbiddenException
         when 404; NotFoundException
@@ -122,10 +130,9 @@ module Shelly
         when 504; GatewayTimeoutException
         else; APIException
         end
-        raise exception_class.new(body, code, response.headers[:x_request_id])
+        request_id = response.headers[:x_request_id] if response.respond_to?(:headers)
+        raise exception_class.new(body, code, request_id)
       end
-      response.return!
-      body
     end
   end
 end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/shelly/cli/logs_spec.rb

@@ -124,9 +124,10 @@ describe Shelly::CLI::Logs do
 
     context "on log file not found" do
       it "should display error message" do
-        exception = RestClient::ResourceNotFound.new
+        exception = Shelly::Client::NotFoundException.new
         @client.stub(:download_file).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Log file not found")
+        @bar.should_receive(:clear)
+        $stdout.should_receive(:puts).with(red "Log file for 2013-05-31 not found")
         invoke(@cli_logs, :get, "2013-05-31")
       end
     end

data/spec/shelly/cli/main_spec.rb

@@ -1508,6 +1508,17 @@ Wait until cloud is in 'turned off' state and try again.")
       user.ssh_keys.should_receive(:destroy)
       invoke(@main, :logout)
     end
+
+    context "option key" do
+      it "should be removed" do
+        sshkey = mock
+        Shelly::SshKey.should_receive(:new).with('path/sshkey.pub').and_return(sshkey)
+        $stdout.should_receive(:puts).with("Your public SSH key has been removed from Shelly Cloud")
+        sshkey.should_receive(:destroy).and_return(true)
+        @main.options = {:key => "path/sshkey.pub"}
+        invoke(@main, :logout)
+      end
+    end
   end
 
   describe "#rake" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool