shelly 0.4.16 → 0.4.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjMwYjRkZDhhYjI0ZjI1NTFmNzY1YzkwZjU2YTI4NGUwYWY4NTliOQ==
+    OTQwZWEzYzYyMjJiMGE4ODE4NWQ0ZjVjY2E3ZGUyYjNmYjg3MGE1Zg==
   data.tar.gz: !binary |-
-    YzdkNDUwYmRlNWYyYzBkOTk4NjBjNGFhY2MyOTllZjYzMzU3NzZlMQ==
+    NmI3YWMzMzU0YzE1OGMwZmQyZTFhNDY3ZWM2OWU4YWYxMzVkNDIxNA==
 SHA512:
   metadata.gz: !binary |-
-    ZjA4ZmRmNTE4NjQ1NjA0NGJkZGVmMDEyZjNlMWM0MzVlNDFkYWU1NGFjOGVj
-    NWFmMTZmYjU4YzJkOTQ1YWU3OGI4YTA1NGE1MGU5NmY5ODM1NmY3YTBmMjc3
-    NjY1ZDM3NjI1MTExNDUwMDlmYzg0YTk1MGEyZjVjNzNlODJmY2E=
+    YmM0MDMzMTU2Yzk5ODk3OTE5ZDRiOWYzOWU5MTMzYzVhNDgwODU2ZDA5MDIy
+    MzMzZjU2YzYyMzJhZjFiMzM1OTljODc3ZWI1OGEzYzFlZGU3MGI1NjI1NmNk
+    OGY1Y2Q4OTM1Y2VhNzc3NGNhYjY3Mzg1ZTIwYjhmZmVmNjYyMTE=
   data.tar.gz: !binary |-
-    ODc0YTAyZWRlZjgwMGIwMzI1ZjJjYTFmMjFmOGZmMmJmOWNkMWI2MDc0Mjk4
-    ZjJmMDU3NGI5ZmMxODcxNWI5MzM4NTc4MWQ0OGFjNTk0M2YwNTNmYmY3ZGYx
-    ZTI0ZGExMzg4ZGZhNjZiNTUxNGM3NDJkNWU0Y2QxODExN2U5Y2E=
+    YzkwZjU5MGQzMGExMzIzMjRmMWJjZjk0Y2RiODA3NjNhZjgwMzYyZDlkNTBl
+    ZGQ0MjZkMjRiODlmYjM2YTk0NmEyMTZjMzUwOTUyMDNmOTQ0MjJhMTVmYzA4
+    ODAxNWJhODNhYmQ5OTE3Yzg4ZDNkOWY5N2RkNDFjMDc2YWFmOWQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.17 / 2013-12-03
+
+* [bugfix] Remove ssh_key from Shelly Cloud only if it was already uploaded
+
 ## 0.4.16 / 2013-11-26
 
 * [improvement] Validate kind when importing database backup

data/lib/shelly/cli/main/add.rb

@@ -29,6 +29,7 @@ module Shelly
         app.size = options["size"] || "large"
         app.organization_name = options["organization"] || ask_for_organization(options)
         app.zone_name = options["zone"]
+
         app.create
         say "Cloud '#{app}' created in '#{app.organization_name}' organization", :green
         say_new_line
@@ -59,7 +60,7 @@ module Shelly
         say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
         say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --organization=#{app.organization_name} --size=#{app.size}"
       rescue Client::ForbiddenException
-        say_error "You have to be the owner of '#{options[:organization]}' organization to add clouds"
+        say_error "You have to be the owner of '#{app.organization_name}' organization to add clouds"
       rescue Client::NotFoundException => e
         raise unless e.resource == :organization
         say_error "Organization '#{app.organization_name}' not found", :with_exit => false

data/lib/shelly/ssh_key.rb

@@ -10,7 +10,7 @@ module Shelly
     end
 
     def destroy
-      shelly.delete_ssh_key(fingerprint) if exists?
+      shelly.delete_ssh_key(fingerprint) if uploaded?
     end
 
     def upload

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 end

data/spec/shelly/cli/main_spec.rb

@@ -546,10 +546,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should show forbidden exception" do
-      @main.options = {:organization => "foo"}
+      @main.options = {'organization' => "foobar"}
       exception = Shelly::Client::ForbiddenException.new
       @app.should_receive(:create).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have to be the owner of 'foo' organization to add clouds")
+      $stdout.should_receive(:puts).with(red "You have to be the owner of 'foobar' organization to add clouds")
 
       expect do
         fake_stdin(["foooo", "none"]) do

data/spec/shelly/ssh_key_spec.rb

@@ -13,10 +13,12 @@ describe Shelly::SshKey do
   end
 
   describe "#destroy?" do
-    it "should destroy key via API" do
+    it "should destroy key via API if it's uploaded" do
+      @client.should_receive(:ssh_key).with(fingerprint).and_return(true)
       @client.should_receive(:delete_ssh_key).with(fingerprint)
       ssh_key.destroy
     end
+
     context "key doesn't exist" do
       it "should not try to destroy it" do
         FileUtils.rm_rf(ssh_key.path)
@@ -24,6 +26,15 @@ describe Shelly::SshKey do
         ssh_key.destroy
       end
     end
+
+    context "key isn't uploaded" do
+      it "should not try to destroy it" do
+        @client.should_receive(:ssh_key).with(fingerprint).
+          and_raise(Shelly::Client::NotFoundException.new)
+        @client.should_not_receive(:delete_ssh_key)
+        ssh_key.destroy
+      end
+    end
   end
 
   describe "#uploaded?" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development