conjure 0.2.0 → 0.2.1

data/History.md

@@ -1,3 +1,9 @@
+### Version 0.2.1
+2014-3-19
+
+* Uniquify server name to avoid conflicts when provisioning
+* Remove existing fog_default key to avoid conflicts when provisioning
+
 ### Version 0.2.0
 2014-3-18
 

data/lib/conjure/provision/server.rb

@@ -35,7 +35,8 @@ module Conjure
       def self.create(name)
         puts "Creating DigitalOcean droplet..."
         connection = Fog::Compute.new compute_options
-        new connection.servers.bootstrap(bootstrap_options name)
+        delete_default_key connection
+        new connection.servers.bootstrap(bootstrap_options uniquify(name))
       end
 
       def self.compute_options
@@ -59,6 +60,15 @@ module Conjure
           :public_key_path => "#{ssh_dir}/id_rsa.pub",
         }
       end
+
+      def self.delete_default_key(connection)
+        connection.ssh_keys.find{|k| k.name=="fog_default"}.try :destroy
+      end
+
+      def self.uniquify(server_name)
+        require "securerandom"
+        "#{server_name}-#{SecureRandom.hex 4}"
+      end
     end
   end
 end

data/lib/conjure/version.rb

@@ -1,3 +1,3 @@
 module Conjure
-  VERSION = "0.2.0" unless defined?(VERSION)
+  VERSION = "0.2.1" unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: