dpl 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047c9cb931b4dd71cebddefe53239b136ecf595d
-  data.tar.gz: c99a2c3f08fce7d984164c889ee8018732455273
+  metadata.gz: 8e3c33a3ba9317c2ca7251ece9b609b8be16f3de
+  data.tar.gz: a5b9b8fb38f7749e80d9267064de88074e16e560
 SHA512:
-  metadata.gz: 0d956daf11c31122513cc4980d5d1575ee4e81b08a478734a704ebf4d1f7bb3c392769894300818b89e88f00da7bb17d61c62c933bfc20d2e14d52783345f855
-  data.tar.gz: 208879e98475e851f2683ed0e076f69623152336493cdf11b7d3aaec85cd6db33d93a8e1631775130338e111f710c4055374026379a81057f51b8900cea9e8f5
+  metadata.gz: b0f4b8bbc2e41006ca90ffbd551ab07cbc7a52dba8b1714cd99d53fa3d1c7637532649208ae3181c11f498d5dc89682054697dbb5ba360ab5a94ce40154700e9
+  data.tar.gz: 6958e8af70889427c816cebb2e72d7f8d6dd71533f23e5106d0f3eca390310e79edb61b0ab6dc35e01b65f5e0c71ac0ce83072716cd5696bcec1d2b86e7f3025

data/lib/dpl/provider.rb

@@ -91,7 +91,9 @@ module DPL
         end
       end
     ensure
-      remove_key if needs_key?
+      if needs_key?
+        remove_key rescue nil
+      end
     end
 
     def sha

data/lib/dpl/provider/openshift.rb

@@ -24,8 +24,9 @@ module DPL
         log "found app #{app.name}"
       end
 
-      def setup_key(file, type='ssh-rsa')
-        api.add_key(option(:key_name), type, File.read(file))
+      def setup_key(file, type = nil)
+        specified_type, content, comment = File.read(file).split
+        api.add_key(option(:key_name), content, type || specified_type)
       end
 
       def remove_key

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/spec/provider/openshift_spec.rb

@@ -51,8 +51,8 @@ describe DPL::Provider::Openshift do
 
     describe :setup_key do
       example do
-        File.should_receive(:read).with("the file").and_return("foo")
-        api.should_receive(:add_key).with("key", "ssh-rsa", "foo")
+        File.should_receive(:read).with("the file").and_return("ssh-rsa\nfoo")
+        api.should_receive(:add_key).with("key", "foo", "ssh-rsa")
         provider.setup_key("the file")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: deploy tool