tugboat 1.3.1 → 2.0.0.RC1

data/spec/cli/start_cli_spec.rb

@@ -5,72 +5,76 @@ describe Tugboat::CLI do
 
   describe "start" do
     it "starts the droplet with a fuzzy name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
-      stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 
-      @cli.start("foo")
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164444/actions").
+         with(:body => "{\"type\":\"power_on\"}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('droplet_start_response'), :headers => {})
+
+      @cli.start("example3.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing start for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
+Queuing start for 3164444 (example3.com)...Start complete!
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "starts the droplet with an id" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-       to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet_inactive"))
-      stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-       to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/3164494?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet_inactive"))
+
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164494/actions").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet_inactive"))
+
 
-      @cli.options = @cli.options.merge(:id => droplet_id)
+      @cli.options = @cli.options.merge(:id => '3164494')
       @cli.start
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
-Queuing start for 100823 (foo)...done
+Droplet id provided. Finding Droplet...done\e[0m, 3164494 (example.com)
+Queuing start for 3164494 (example.com)...Start complete!
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
 
     it "starts the droplet with a name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
-      stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164444/actions").
+         with(:body => "{\"type\":\"power_on\"}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('droplet_start_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example3.com')
       @cli.start
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing start for 100823 (foo)...done
+Droplet name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
+Queuing start for 3164444 (example3.com)...Start complete!
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "does not start a droplet that is inactive" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example.com')
       expect {@cli.start}.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Droplet must be off for this operation to be successful.
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+
     end
   end
 end

data/spec/cli/verify_cli_spec.rb

@@ -5,27 +5,35 @@ describe Tugboat::CLI do
 
   describe "verify" do
     it "returns confirmation text when verify passes" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200)
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
       @cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
     end
 
-    it "returns error string when verify fails" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 401, :body => '{"status":"ERROR", "error_message":"Access Denied"}')
+    it "returns error when verify fails" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:headers => {'Content-Type' => 'text/html'}, :status => 500, :body => fixture('500','html'))
+
       expect { @cli.verify }.to raise_error(SystemExit)
-      expect($stdout.string).to eq "\e[31mthe server responded with status 401!\e[0m\n\n\e[31mAccess Denied\e[0m\n\nDouble-check your parameters and configuration (in your ~/.tugboat file)\n"
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect($stdout.string).to include "Authentication with DigitalOcean failed."
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
     end
 
     it "returns error string when verify fails and a non-json reponse is given" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'text/html'}, :status => 500, :body => fixture('500','html'))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+        to_return(:headers => {'Content-Type' => 'text/html'}, :status => 500, :body => fixture('500','html'))
+
       expect { @cli.verify }.to raise_error(SystemExit)
-      expect($stdout.string).to eq "\e[31mthe server responded with status 500!\e[0m\n"
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect($stdout.string).to include "Authentication with DigitalOcean failed."
+      expect($stdout.string).to include "<title>DigitalOcean - Seems we've encountered a problem!</title>"
+      # TODO: Make it so this doesnt barf up a huge HTML file...
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
     end
 
   end

data/spec/cli/wait_cli_spec.rb

@@ -5,60 +5,76 @@ describe Tugboat::CLI do
 
   describe "wait" do
     it "waits for a droplet with a fuzzy name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet'), :headers => {})
 
       @cli.options = @cli.options.merge(:state => "active")
-      @cli.wait("foo")
+      @cli.wait("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
 eos
+    end
+
+    it "loops whilst it waits for state" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet_inactive'), :headers => {})
+
+
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet'), :headers => {})
+
+      @cli.options = @cli.options.merge(:state => "active")
+      @cli.wait("example.com")
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect($stdout.string).to eq <<-eos
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Waiting for droplet to become active..done\e[0m (0s)
+eos
     end
 
     it "waits for a droplet with an id" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
-
-      @cli.options = @cli.options.merge(:id => droplet_id, :state => "active")
+      @cli.options = @cli.options.merge(:id => '6918990', :state => "active")
       @cli.wait
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
+Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "waits for a droplet with a name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name, :state => "active")
+      @cli.options = @cli.options.merge(:name => 'example.com', :state => "active")
       @cli.wait
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
 eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
   end

data/spec/config_spec.rb

@@ -23,23 +23,22 @@ describe Tugboat::Configuration do
   end
 
   describe "the file" do
-    let(:client_key)         { "foo" }
-    let(:api_key)            { "bar" }
-    let(:ssh_user)           { "baz" }
-    let(:ssh_key_path)       { "~/.ssh/id_rsa2" }
-    let(:ssh_port)           { "22" }
-    let(:region)             { "2" }
-    let(:image)              { "345791" }
-    let(:size)               { "66" }
+    let(:access_token)       { 'foo' }
+    let(:ssh_user)           { 'root' }
+    let(:ssh_key_path)       { '~/.ssh/id_rsa2' }
+    let(:ssh_port)           { '22' }
+    let(:region)             { 'lon1' }
+    let(:image)              { 'ubuntu-14-04-x64' }
+    let(:size)               { '512mb' }
     let(:ssh_key_id)         { '1234' }
-    let(:private_networking) { 'true' }
-    let(:backups_enabled)    { 'true' }
+    let(:private_networking) { 'false' }
+    let(:backups_enabled)    { 'false' }
 
     let(:config)           { config = Tugboat::Configuration.instance }
 
     before :each do
       # Create a temporary file
-      config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled)
+      config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled)
     end
 
     it "can be created" do
@@ -62,14 +61,9 @@ describe Tugboat::Configuration do
       expect(data).to have_key("ssh")
     end
 
-    it "should have a client key" do
+    it "should have an access token" do
       auth = data["authentication"]
-      expect(auth).to have_key("client_key")
-    end
-
-    it "should have an api key" do
-      auth = data["authentication"]
-      expect(auth).to have_key("api_key")
+      expect(auth).to have_key("access_token")
     end
 
     it "should have an ssh key path" do
@@ -98,11 +92,11 @@ describe Tugboat::Configuration do
     end
   end
   describe "backwards compatible" do
-    let(:client_key)       { "foo" }
-    let(:api_key)          { "bar" }
-    let(:ssh_user)         { "baz" }
-    let(:ssh_key_path)     { "~/.ssh/id_rsa2" }
-    let(:ssh_port)         { "22" }
+    let(:client_key)       { 'foo' }
+    let(:api_key)          { 'bar' }
+    let(:ssh_user)         { 'baz' }
+    let(:ssh_key_path)     { '~/.ssh/id_rsa2' }
+    let(:ssh_port)         { '22' }
 
     let(:config)                    { config = Tugboat::Configuration.instance }
     let(:config_default_region)     { Tugboat::Configuration::DEFAULT_REGION }
@@ -113,8 +107,8 @@ describe Tugboat::Configuration do
     let(:config_default_backups)    { Tugboat::Configuration::DEFAULT_BACKUPS_ENABLED }
     let(:backwards_config) {
       {
-                "authentication" => { "client_key" => client_key, "api_key" => api_key },
-                "ssh" => { "ssh_user" => ssh_user, "ssh_key_path" => ssh_key_path , "ssh_port" => ssh_port},
+                'authentication' => { 'client_key' => client_key, 'api_key' => api_key },
+                'ssh' => { 'ssh_user' => ssh_user, 'ssh_key_path' => ssh_key_path , 'ssh_port' => ssh_port},
       }
     }
 

data/spec/fixtures/create_droplet.json

@@ -0,0 +1,44 @@
+{
+  "droplet": {
+    "id": 3164494,
+    "name": "example.com",
+    "memory": 512,
+    "vcpus": 1,
+    "disk": 20,
+    "locked": true,
+    "status": "new",
+    "kernel": {
+      "id": 2233,
+      "name": "Ubuntu 14.04 x64 vmlinuz-3.13.0-37-generic",
+      "version": "3.13.0-37-generic"
+    },
+    "created_at": "2014-11-14T16:36:31Z",
+    "features": [
+      "virtio"
+    ],
+    "backup_ids": [
+
+    ],
+    "snapshot_ids": [
+
+    ],
+    "image": {
+    },
+    "size": {
+    },
+    "size_slug": "512mb",
+    "networks": {
+    },
+    "region": {
+    }
+  },
+  "links": {
+    "actions": [
+      {
+        "id": 36805096,
+        "rel": "create",
+        "href": "https://api.digitalocean.com/v2/actions/36805096"
+      }
+    ]
+  }
+}

data/spec/fixtures/create_ssh_key.json

@@ -1,8 +1,8 @@
 {
-  "status": "OK",
   "ssh_key": {
-    "id": 47,
-    "name": "my_key",
-    "ssh_pub_key": "ssh-dss AAAAB3NzaC1kc3MAAACBAK5uLwicCrFEpaVKBzkWxC7RQn+smg5ZQb5keh9RQKo8AszFTol5npgUAr0JWmqKIHv7nof0HndO86x9iIqNjq3vrz9CIVcFfZM7poKBJZ27Hv3v0fmSKfAc6eGdx8eM9UkZe1gzcLXK8UP2HaeY1Y4LlaHXS5tPi/dXooFVgiA7AAAAFQCQl6LZo/VYB9VgPEZzOmsmQevnswAAAIBCNKGsVP5eZ+IJklXheUyzyuL75i04OOtEGW6MO5TymKMwTZlU9r4ukuwxty+T9Ot2LqlNRnLSPQUjb0vplasZ8Ix45JOpRbuSvPovryn7rvS7//klu9hIkFAAQ/AZfGTw+696EjFBg4F5tN6MGMA6KrTQVLXeuYcZeRXwE5t5lwAAAIEAl2xYh098bozJUANQ82DiZznjHc5FW76Xm1apEqsZtVRFuh3V9nc7QNcBekhmHp5Z0sHthXCm1XqnFbkRCdFlX02NpgtNs7OcKpaJP47N8C+C/Yrf8qK/Wt3fExrL2ZLX5XD2tiotugSkwZJMW5Bv0mtjrNt0Q7P45rZjNNTag2c= user@host"
+      "fingerprint": "f5:de:eb:64:2d:6a:b6:d5:bb:06:47:7f:04:4b:f8:e2",
+      "id": 3,
+      "name": "macbook_pro",
+      "public_key": "ssh-dss A123= user@host"
   }
 }

data/spec/fixtures/create_ssh_key_from_file.json

@@ -0,0 +1,8 @@
+{
+  "ssh_key": {
+      "fingerprint": "f5:de:eb:64:2d:6a:b6:d5:bb:06:47:7f:04:4b:f8:e2",
+      "id": 5,
+      "name": "cool_key",
+      "public_key": "ssh-dss A456= user@host"
+  }
+}

data/spec/fixtures/droplet_start_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 3164494,
+    "status": "in-progress",
+    "type": "power_on",
+    "started_at": "2014-11-14T16:31:19Z",
+    "completed_at": null,
+    "resource_id": 3164450,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/not_found.json

@@ -0,0 +1,4 @@
+{
+  "id":"not_found",
+  "message":"The resource you were accessing could not be found."
+}

data/spec/fixtures/password_reset_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 36804760,
+    "status": "in-progress",
+    "type": "password_reset",
+    "started_at": "2014-11-14T16:31:25Z",
+    "completed_at": null,
+    "resource_id": 6918990,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/power_cycle_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 36804748,
+    "status": "in-progress",
+    "type": "reboot",
+    "started_at": "2014-11-14T16:31:00Z",
+    "completed_at": null,
+    "resource_id": 6918990,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/resize_droplet.json

@@ -0,0 +1,13 @@
+{
+ "action": {
+    "id": 36804888,
+    "status": "in-progress",
+    "type": "resize",
+    "started_at": "2014-11-14T16:33:17Z",
+    "completed_at": null,
+    "resource_id": 6918990,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/restart_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 36804748,
+    "status": "in-progress",
+    "type": "reboot",
+    "started_at": "2014-11-14T16:31:00Z",
+    "completed_at": null,
+    "resource_id": 6918990,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/show_coreos_image.json

@@ -0,0 +1,23 @@
+{
+    "image": {
+        "id": 12789325,
+        "name": "745.1.0 (alpha)",
+        "distribution": "CoreOS",
+        "slug": "coreos-alpha",
+        "public": true,
+        "regions": [
+        "nyc1",
+        "sfo1",
+        "nyc2",
+        "ams2",
+        "sgp1",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "fra1"
+        ],
+        "created_at": "2015-07-17T13:34:11Z",
+        "min_disk_size": 20,
+        "type": "snapshot"
+    }
+}

data/spec/fixtures/show_droplet.json

@@ -1,14 +1,93 @@
 {
-  "status": "OK",
   "droplet": {
-    "backups_active": null,
-    "id": 100823,
-    "image_id": 420,
-    "name": "foo",
-    "ip_address": "33.33.33.10",
-    "private_ip_address": "10.20.30.40",
-    "region_id": 1,
-    "size_id": 33,
-    "status": "active"
+    "id": 6918990,
+    "name": "example.com",
+    "memory": 512,
+    "vcpus": 1,
+    "disk": 20,
+    "locked": false,
+    "status": "active",
+    "kernel": {
+      "id": 2233,
+      "name": "Ubuntu 14.04 x64 vmlinuz-3.13.0-37-generic",
+      "version": "3.13.0-37-generic"
+    },
+    "created_at": "2014-11-14T16:36:31Z",
+    "features": [
+      "ipv6",
+      "virtio"
+    ],
+    "backup_ids": [
+
+    ],
+    "snapshot_ids": [
+      7938206
+    ],
+    "image": {
+      "id": 6918990,
+      "name": "14.04 x64",
+      "distribution": "Ubuntu",
+      "slug": "ubuntu-14-04-x64",
+      "public": true,
+      "regions": [
+        "nyc1",
+        "ams1",
+        "sfo1",
+        "nyc2",
+        "ams2",
+        "sgp1",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "nyc3"
+      ],
+      "created_at": "2014-10-17T20:24:33Z",
+      "type": "snapshot",
+      "min_disk_size": 20
+    },
+    "size": {
+    },
+    "size_slug": "512mb",
+    "networks": {
+      "v4": [
+        {
+          "ip_address": "104.131.186.241",
+          "netmask": "255.255.240.0",
+          "gateway": "104.131.176.1",
+          "type": "public"
+        }
+      ],
+      "v6": [
+        {
+          "ip_address": "2604:A880:0800:0010:0000:0000:031D:2001",
+          "netmask": 64,
+          "gateway": "2604:A880:0800:0010:0000:0000:0000:0001",
+          "type": "public"
+        }
+      ]
+    },
+    "region": {
+      "name": "New York 3",
+      "slug": "nyc3",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    }
   }
-}
+}