tugboat 1.3.1 → 2.0.0.RC1

data/spec/fixtures/show_images_global.json

@@ -1,20 +1,29 @@
 {
-  "status": "OK",
   "images": [
     {
-      "id": 466,
-      "name": "NYTD Backup 1-18-2012",
-      "distribution": "Ubuntu"
-    },
-    {
-      "id": 478,
-      "name": "NLP Final",
-      "distribution": "Ubuntu"
-    },
-    {
-      "id": 479,
-      "name": "Global Final",
-      "distribution": "Ubuntu"
+      "id": 6376601,
+      "name": "My application image",
+      "distribution": "Ubuntu",
+      "public": false,
+      "regions": [
+        "nyc1",
+        "ams1",
+        "sfo1",
+        "nyc2",
+        "ams2",
+        "sgp1"
+      ],
+      "created_at": "2014-09-26T20:20:24Z",
+      "min_disk_size": 20
+    }
+  ],
+  "links": {
+    "pages": {
+      "last": "https://api.digitalocean.com/v2/images?page=14&per_page=1&type=application",
+      "next": "https://api.digitalocean.com/v2/images?page=2&per_page=1&type=application"
     }
-  ]
-}
+  },
+  "meta": {
+    "total": 14
+  }
+}

data/spec/fixtures/show_keys.json

@@ -1,13 +1,21 @@
 {
-  "status": "OK",
   "ssh_keys": [
     {
-      "id": 10,
-      "name": "office-imac"
+      "id": 512189,
+      "fingerprint": "3b:16:bf:e4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa",
+      "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAQQDDHr/jh2Jy4yALcK4JyWbVkPRaWmhck3IgCoeOO3z1e2dBowLh64QAM+Qb72pxekALga2oi4GvT+TlWNhzPH4V example",
+      "name": "My SSH Public Key"
     },
     {
-      "id": 11,
-      "name": "macbook-air"
+      "id": 512110,
+      "fingerprint": "3b:16:bf:d4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa",
+      "public_key": "ssh-rsa otherexample example",
+      "name": "My Other SSH Public Key"
     }
-  ]
-}
+  ],
+  "links": {
+  },
+  "meta": {
+    "total": 2
+  }
+}

data/spec/fixtures/show_redmine_image.json

@@ -0,0 +1,24 @@
+{
+    "image": {
+        "id": 12438838,
+        "name": "Redmine on 14.04",
+        "distribution": "Ubuntu",
+        "slug": "redmine",
+        "public": true,
+        "regions": [
+            "nyc1",
+            "ams1",
+            "sfo1",
+            "nyc2",
+            "ams2",
+            "sgp1",
+            "lon1",
+            "nyc3",
+            "ams3",
+            "fra1"
+        ],
+        "created_at": "2015-06-22T22:27:52Z",
+        "min_disk_size": 20,
+        "type": "snapshot"
+    }
+}

data/spec/fixtures/show_regions.json

@@ -1,20 +1,189 @@
 {
-  "status": "OK",
   "regions": [
     {
-      "id": 2,
-      "name": "Region 2",
-      "slug": "reg2"
+      "name": "New York 1",
+      "slug": "nyc1",
+      "sizes": [
+
+      ],
+      "features": [
+        "virtio",
+        "backups"
+      ],
+      "available": false
     },
     {
-      "id": 3,
-      "name": "Region 3",
-      "slug": "reg3"
+      "name": "San Francisco 1",
+      "slug": "sfo1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "backups",
+        "metadata"
+      ],
+      "available": true
     },
     {
-      "id": 1,
-      "name": "Region 1",
-      "slug": "reg1"
+      "name": "Amsterdam 1",
+      "slug": "ams1",
+      "sizes": [
+
+      ],
+      "features": [
+        "virtio",
+        "backups"
+      ],
+      "available": false
+    },
+    {
+      "name": "New York 2",
+      "slug": "nyc2",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups"
+      ],
+      "available": true
+    },
+    {
+      "name": "Amsterdam 2",
+      "slug": "ams2",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Singapore 1",
+      "slug": "sgp1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "London 1",
+      "slug": "lon1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "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
+    },
+    {
+      "name": "Amsterdam 3",
+      "slug": "ams3",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
     }
-  ]
-}
+  ],
+  "links": {
+  },
+  "meta": {
+    "total": 9
+  }
+}

data/spec/fixtures/show_sizes.json

@@ -1,17 +1,186 @@
 {
-  "status": "OK",
   "sizes": [
     {
-      "id": 1,
-      "name": "Size 1"
+      "slug": "512mb",
+      "memory": 512,
+      "vcpus": 1,
+      "disk": 20,
+      "transfer": 1.0,
+      "price_monthly": 5.0,
+      "price_hourly": 0.00744,
+      "regions": [
+        "nyc1",
+        "sgp1",
+        "ams1",
+        "ams2",
+        "sfo1",
+        "nyc2",
+        "lon1",
+        "nyc3",
+        "ams3"
+      ]
     },
     {
-      "id": 2,
-      "name": "Size 2"
+      "slug": "1gb",
+      "memory": 1024,
+      "vcpus": 1,
+      "disk": 30,
+      "transfer": 2.0,
+      "price_monthly": 10.0,
+      "price_hourly": 0.01488,
+      "regions": [
+        "nyc2",
+        "sgp1",
+        "ams1",
+        "sfo1",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "ams2",
+        "nyc1"
+      ]
     },
     {
-      "id": 3,
-      "name": "Size 3"
+      "slug": "2gb",
+      "memory": 2048,
+      "vcpus": 2,
+      "disk": 40,
+      "transfer": 3.0,
+      "price_monthly": 20.0,
+      "price_hourly": 0.02976,
+      "regions": [
+        "nyc2",
+        "sfo1",
+        "ams1",
+        "sgp1",
+        "ams2",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "nyc1"
+      ]
+    },
+    {
+      "slug": "4gb",
+      "memory": 4096,
+      "vcpus": 2,
+      "disk": 60,
+      "transfer": 4.0,
+      "price_monthly": 40.0,
+      "price_hourly": 0.05952,
+      "regions": [
+        "nyc2",
+        "sfo1",
+        "ams1",
+        "sgp1",
+        "ams2",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "nyc1"
+      ]
+    },
+    {
+      "slug": "8gb",
+      "memory": 8192,
+      "vcpus": 4,
+      "disk": 80,
+      "transfer": 5.0,
+      "price_monthly": 80.0,
+      "price_hourly": 0.11905,
+      "regions": [
+        "nyc2",
+        "sfo1",
+        "sgp1",
+        "ams1",
+        "ams2",
+        "nyc1",
+        "lon1",
+        "nyc3",
+        "ams3"
+      ]
+    },
+    {
+      "slug": "16gb",
+      "memory": 16384,
+      "vcpus": 8,
+      "disk": 160,
+      "transfer": 6.0,
+      "price_monthly": 160.0,
+      "price_hourly": 0.2381,
+      "regions": [
+        "sgp1",
+        "nyc1",
+        "sfo1",
+        "ams2",
+        "nyc3",
+        "lon1",
+        "nyc2",
+        "ams1",
+        "ams3"
+      ]
+    },
+    {
+      "slug": "32gb",
+      "memory": 32768,
+      "vcpus": 12,
+      "disk": 320,
+      "transfer": 7.0,
+      "price_monthly": 320.0,
+      "price_hourly": 0.47619,
+      "regions": [
+        "nyc2",
+        "sgp1",
+        "ams2",
+        "nyc1",
+        "sfo1",
+        "lon1",
+        "ams3",
+        "nyc3"
+      ]
+    },
+    {
+      "slug": "48gb",
+      "memory": 49152,
+      "vcpus": 16,
+      "disk": 480,
+      "transfer": 8.0,
+      "price_monthly": 480.0,
+      "price_hourly": 0.71429,
+      "regions": [
+        "sgp1",
+        "ams2",
+        "sfo1",
+        "nyc1",
+        "lon1",
+        "nyc2",
+        "ams3",
+        "nyc3"
+      ]
+    },
+    {
+      "slug": "64gb",
+      "memory": 65536,
+      "vcpus": 20,
+      "disk": 640,
+      "transfer": 9.0,
+      "price_monthly": 640.0,
+      "price_hourly": 0.95238,
+      "regions": [
+        "sgp1",
+        "nyc1",
+        "nyc2",
+        "sfo1",
+        "lon1",
+        "ams3",
+        "ams2",
+        "nyc3"
+      ]
     }
-  ]
-}
+  ],
+  "links": {
+  },
+  "meta": {
+    "total": 9
+  }
+}

data/spec/fixtures/shutdown_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 36077293,
+    "status": "in-progress",
+    "type": "shutdown",
+    "started_at": "2014-11-04T17:08:03Z",
+    "completed_at": null,
+    "resource_id": 6918990,
+    "resource_type": "droplet",
+    "region": "nyc2",
+    "region_slug": "nyc2"
+  }
+}

data/spec/fixtures/snapshot_response.json

@@ -0,0 +1,13 @@
+{
+  "action": {
+    "id": 36805022,
+    "status": "in-progress",
+    "type": "snapshot",
+    "started_at": "2014-11-14T16:34:39Z",
+    "completed_at": null,
+    "resource_id": 3164444,
+    "resource_type": "droplet",
+    "region": "nyc3",
+    "region_slug": "nyc3"
+  }
+}

data/spec/fixtures/ubuntu_image_9801951.json

@@ -0,0 +1,24 @@
+{
+  "image": {
+    "id": 9801951,
+    "name": "14.10 x32",
+    "distribution": "Ubuntu",
+    "slug": "ubuntu-14-10-x32",
+    "public": true,
+    "regions": [
+    "nyc1",
+    "ams1",
+    "sfo1",
+    "nyc2",
+    "ams2",
+    "sgp1",
+    "lon1",
+    "nyc3",
+    "ams3",
+    "fra1"
+    ],
+    "created_at": "2015-01-08T18:41:22Z",
+    "min_disk_size": 20,
+    "type": "snapshot"
+  }
+}

data/spec/middleware/check_credentials_spec.rb

@@ -5,14 +5,15 @@ describe Tugboat::Middleware::CheckCredentials do
 
   describe ".call" do
     it "raises SystemExit with no configuration" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
+      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' => 'application/json'}, :status => 200, :body => "<html>You are being redirected...</html>")
 
       # Inject the client.
-      env["ocean"] = ocean
+      env["barge"] = ocean
 
       expect {described_class.new(app).call(env) }.to raise_error(SystemExit)
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).
         to have_been_made
     end
   end

data/spec/middleware/inject_client_spec.rb

@@ -15,11 +15,11 @@ describe Tugboat::Middleware::InjectClient do
     it "loads the client into the environment" do
       described_class.new(app).call(env)
 
-      env["ocean"].should be_a DigitalOcean::API
+      env["barge"].should be_a Barge::Client
     end
 
     it "creates a client with values from config file" do
-      DigitalOcean::API.should_receive(:new).with(hash_including(:client_id=>"foo", :api_key=>"bar"))
+      Barge::Client.should_receive(:new).with(hash_including(:access_token=>"foo"))
 
       described_class.new(app).call(env)
     end

data/spec/shared/environment.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 shared_context "spec" do
   # Default configuration and
   let(:config)             { Tugboat::Configuration.instance }
-  let(:client_key)         { "foo" }
-  let(:api_key)            { "bar" }
+  let(:access_token)       { 'foo' }
   let(:ssh_user)           { "baz" }
   let(:ssh_port)           { "33" }
   let(:ssh_key_path)       { "~/.ssh/id_rsa2" }
@@ -12,15 +11,15 @@ shared_context "spec" do
   let(:droplet_ip)         { "33.33.33.10" }
   let(:droplet_ip_private) { "10.20.30.40" }
   let(:droplet_id)         { 1234 }
-  let(:region)             { '3' }
-  let(:image)              { '345791'}
-  let(:size)               { '67'}
+  let(:region)             { 'nyc2' }
+  let(:image)              { 'ubuntu-14-04-x64'}
+  let(:size)               { '512mb'}
   let(:ssh_key_id)         { '1234' }
   let(:ssh_key_name)       { 'macbook_pro' }
   let(:ssh_public_key)     { 'ssh-dss A123= user@host' }
   let(:private_networking) { 'false'}
   let(:backups_enabled)    { 'false'}
-  let(:ocean)              { DigitalOcean::API.new :client_id => client_key, :api_key =>api_key }
+  let(:ocean)              { Barge::Client.new(:access_token => access_token) }
   let(:app)                { lambda { |env| } }
   let(:env)                { {} }
 
@@ -31,7 +30,7 @@ shared_context "spec" do
     @cli = Tugboat::CLI.new
 
     # Set a temprary project path and create fake config.
-    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)
     config.reload!
 
     # Keep track of the old stderr / out

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ end
 
 require 'tugboat'
 require 'webmock/rspec'
-require 'digital_ocean'
+require 'barge'
 require "shared/environment"
 
 RSpec.configure do |config|