conjure 0.2.5 → 0.2.6

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.2.6
+2014-10-23
+
+* Use DigitalOcean API v2 for provisioning
+
 ### Version 0.2.5
 2014-9-3
 

data/lib/conjure/digital_ocean/account.rb

@@ -0,0 +1,39 @@
+require "json"
+require "conjure/http_request"
+
+module Conjure
+  module DigitalOcean
+    class Account
+      def initialize(options)
+        @token = options[:token]
+      end
+
+      def get(path)
+        request path, :method => :get
+      end
+
+      def post(path, data = {})
+        request path, :method => :post, :data => JSON.unparse(data)
+      end
+
+      private
+
+      def request(path, options)
+        url = endpoint + path
+        options = options.merge :headers => headers
+        JSON.parse HttpRequest.new(url, options).data
+      end
+
+      def headers
+        {
+          "Authorization" => "Bearer #{@token}",
+          "Content-Type" => "application/json",
+        }
+      end
+
+      def endpoint
+        "https://api.digitalocean.com/v2/"
+      end
+    end
+  end
+end

data/lib/conjure/digital_ocean/droplet.rb

@@ -0,0 +1,47 @@
+module Conjure
+  module DigitalOcean
+    class Droplet
+      def initialize(options)
+        @options = options
+        @properties = {}
+        create
+      end
+
+      def ip_address
+        @ip_address ||= begin
+          wait_until_ready
+          @properties["networks"]["v4"].first["ip_address"]
+        end
+      end
+
+      private
+
+      def create
+        response = account.post("droplets", {
+          image: @options[:image],
+          name: @options[:name],
+          region: @options[:region],
+          size: @options[:size],
+          ssh_keys: [key.id],
+        })
+        @properties = response["droplet"]
+      end
+
+      def wait_until_ready
+        while @properties["status"] != "active" do
+          sleep 5
+          @properties = account.get("droplets/#{@properties['id']}")["droplet"]
+        end
+        sleep 30
+      end
+
+      def account
+        @account ||= Account.new(:token => @options[:token])
+      end
+
+      def key
+        KeySet.new(account).find_or_create @options[:key_data]
+      end
+    end
+  end
+end

data/lib/conjure/digital_ocean/key.rb

@@ -0,0 +1,12 @@
+module Conjure
+  module DigitalOcean
+    class Key
+      attr_reader :id, :public_key
+
+      def initialize(data)
+        @id = data["id"]
+        @public_key = data["public_key"]
+      end
+    end
+  end
+end

data/lib/conjure/digital_ocean/key_set.rb

@@ -0,0 +1,30 @@
+require "digest/sha1"
+
+module Conjure
+  module DigitalOcean
+    class KeySet
+      def initialize(account)
+        @account = account
+      end
+
+      def find_or_create(data)
+        find(data) || create(data)
+      end
+
+      private
+
+      def keys
+        @account.get("account/keys")["ssh_keys"].map { |data| Key.new data }
+      end        
+
+      def find(data)
+        keys.select { |key| key.public_key.strip == data.strip }.first
+      end
+
+      def create(data)
+        name = "conjure_" + Digest::SHA1.hexdigest(data).slice(0, 8)
+        Key.new @account.post("account/keys", :name => name, :public_key => data)["ssh_key"]
+      end
+    end
+  end
+end

data/lib/conjure/http_request.rb

@@ -0,0 +1,32 @@
+require "net/http"
+
+module Conjure
+  class HttpRequest
+    def initialize(url, options = {})
+      @uri = URI(url)
+      @headers = options[:headers] || {}
+      @data = options[:data]
+      @method = options[:method] || :get
+      @ssl = (url.index("https://") == 0)
+    end
+
+    def data
+      Net::HTTP.start @uri.host, @uri.port, :use_ssl => @ssl do |http|
+        http.request(request).body
+      end
+    end
+
+    private
+
+    def request
+      request_class.new(@uri).tap do |object|
+        @headers.each { |key, value| object[key] = value }
+        object.body = @data if @data
+      end
+    end
+
+    def request_class
+      @method == :post ? Net::HTTP::Post : Net::HTTP::Get
+    end
+  end
+end

data/lib/conjure/provision/server.rb

@@ -1,3 +1,4 @@
+require "conjure/digital_ocean/droplet"
 require "securerandom"
 
 module Conjure
@@ -10,7 +11,7 @@ module Conjure
       end
 
       def ip_address
-        @server.public_ip_address
+        @server.ip_address
       end
 
       def run(command)
@@ -36,35 +37,25 @@ module Conjure
 
       def self.create(name)
         puts "Creating DigitalOcean droplet..."
-        connection = Fog::Compute.new compute_options
-        delete_default_key connection
-        new connection.servers.bootstrap(bootstrap_options uniquify(name))
+        new DigitalOcean::Droplet.new(droplet_options uniquify(name))
       end
 
-      def self.compute_options
-        raise "Error: DIGITALOCEAN_API_KEY and DIGITALOCEAN_CLIENT_ID env vars must both be set." unless ENV["DIGITALOCEAN_API_KEY"] && ENV["DIGITALOCEAN_CLIENT_ID"]
+      def self.droplet_options(name)
+        raise "Error: DIGITALOCEAN_API_TOKEN must be set." unless ENV["DIGITALOCEAN_API_TOKEN"]
         {
-          :provider => :digitalocean,
-          :digitalocean_api_key => ENV["DIGITALOCEAN_API_KEY"],
-          :digitalocean_client_id => ENV["DIGITALOCEAN_CLIENT_ID"],
+          image: "docker",
+          key_data: key_data,
+          name: name,
+          region: "nyc3",
+          size: "512mb",
+          token: ENV["DIGITALOCEAN_API_TOKEN"],
         }
       end
 
-      def self.bootstrap_options(name)
-        ssh_dir = File.expand_path("~/.ssh")
-        raise "Error: ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub must exist." unless File.exist?(ssh_dir) && File.exist?("#{ssh_dir}/id_rsa") && File.exist?("#{ssh_dir}/id_rsa.pub")
-        {
-          :name => name,
-          :flavor_id =>  "66",
-          :region_id => "4",
-          :image_id => "5506141",
-          :private_key_path => "#{ssh_dir}/id_rsa",
-          :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
+      def self.key_data
+        ssh_dir = File.expand_path "~/.ssh"
+        raise "Error: ~/.ssh/id_rsa.pub must exist." unless File.exist?(ssh_dir) && File.exist?("#{ssh_dir}/id_rsa.pub")
+        File.read "#{ssh_dir}/id_rsa.pub"
       end
 
       def self.uniquify(server_name)

data/lib/conjure/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,38 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brianauton@gmail.com
@@ -156,6 +188,11 @@ files:
 - lib/conjure/notes.txt
 - lib/conjure/view/table_view.rb
 - lib/conjure/view/application_view.rb
+- lib/conjure/digital_ocean/key.rb
+- lib/conjure/digital_ocean/key_set.rb
+- lib/conjure/digital_ocean/account.rb
+- lib/conjure/digital_ocean/droplet.rb
+- lib/conjure/http_request.rb
 - README.md
 - History.md
 - License.txt