tugboat 1.3.1 → 2.0.0.RC1

data/spec/cli/regions_cli_spec.rb

@@ -5,19 +5,26 @@ describe Tugboat::CLI do
 
   describe "regions" do
     it "shows a list" do
-      stub_request(:get, "https://api.digitalocean.com/regions?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_regions"))
+      stub_request(:get, "https://api.digitalocean.com/v2/regions?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_regions"), :headers => {'Content-Type' => 'application/json'},)
 
       @cli.regions
 
       expect($stdout.string).to eq <<-eos
 Regions:
-Region 1 (id: 1) (slug: reg1)
-Region 2 (id: 2) (slug: reg2)
-Region 3 (id: 3) (slug: reg3)
+Amsterdam 1 (slug: ams1)
+Amsterdam 2 (slug: ams2)
+Amsterdam 3 (slug: ams3)
+London 1 (slug: lon1)
+New York 1 (slug: nyc1)
+New York 2 (slug: nyc2)
+New York 3 (slug: nyc3)
+San Francisco 1 (slug: sfo1)
+Singapore 1 (slug: sgp1)
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/regions?api_key=#{api_key}&client_id=#{client_key}")).
+      expect(a_request(:get, "https://api.digitalocean.com/v2/regions?per_page=200")).
         to have_been_made
     end
   end

data/spec/cli/resize_cli_spec.rb

@@ -5,78 +5,81 @@ describe Tugboat::CLI do
 
   describe "resize" do
     it "resizes 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/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
+      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(:size => 123)
-      @cli.resize("foo")
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
+         with(:body => "{\"type\":\"resize\",\"size\":\"1gb\"}",
+              :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('resize_droplet'), :headers => {})
+
+      @cli.options = @cli.options.merge(:size => '1gb')
+      @cli.resize("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing resize for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing resize for 6918990 (example.com)...Resize 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(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123")).
-        to have_been_made
     end
 
     it "resizes a droplet with an id" do
-      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/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
+      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(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
+         with(:body => "{\"type\":\"resize\",\"size\":\"1gb\"}",
+              :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('resize_droplet'), :headers => {})
 
-      @cli.options = @cli.options.merge(:size => 123, :id => 100823)
+      @cli.options = @cli.options.merge(:size => '1gb', :id => 6918990)
       @cli.resize
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
-Queuing resize for 100823 (foo)...done
+Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
+Queuing resize for 6918990 (example.com)...Resize complete!
       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/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123")).
-        to have_been_made
     end
 
     it "resizes 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/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
+      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/6918990/actions").
+         with(:body => "{\"type\":\"resize\",\"size\":\"1gb\"}",
+              :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('resize_droplet'), :headers => {})
 
-      @cli.options = @cli.options.merge(:size => 123, :name => "foo")
+      @cli.options = @cli.options.merge(:size => '1gb', :name => "example.com")
       @cli.resize
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing resize for 100823 (foo)...done
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing resize for 6918990 (example.com)...Resize 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(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123")).
-        to have_been_made
     end
 
     it "raises SystemExit when a request 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 => 200, :body => fixture("show_droplets"))
-      stub_request(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 500, :body => '{"status":"ERROR","message":"Some error"}')
-
-      @cli.options = @cli.options.merge(:size => 123)
-      expect { @cli.resize("foo") }.to raise_error(SystemExit)
-
-      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/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123")).
-        to have_been_made
+      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/6918990/actions").
+         with(:body => "{\"type\":\"resize\",\"size\":\"1gb\"}",
+              :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 => 500, :body => '{"status":"ERROR","message":"Some error"}')
+
+      @cli.options = @cli.options.merge(:size => '1gb')
+      expect { @cli.resize("example.com") }.to raise_error(SystemExit)
+
+      expect($stdout.string).to eq <<-eos
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing resize for 6918990 (example.com)...Failed to resize Droplet: Some error
+      eos
+
     end
   end
 end

data/spec/cli/restart_cli_spec.rb

@@ -5,78 +5,80 @@ describe Tugboat::CLI do
 
   describe "restarts a droplet" do
     it "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(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
+         with(:body => "{\"type\":\"reboot\"}",
+              :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('restart_response'), :headers => {})
 
-      @cli.restart("foo")
+      @cli.restart("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing restart for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing restart for 6918990 (example.com)...Restart 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/reboot?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "restarts a droplet hard when the hard option is used" 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(:put, "https://api.digitalocean.com/droplets/100823/power_cycle?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/6918990/actions").
+         with(:body => "{\"type\":\"power_cycle\"}",
+              :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 => "", :headers => {})
 
       @cli.options = @cli.options.merge(:hard => true)
-      @cli.restart("foo")
+      @cli.restart("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing hard restart for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing hard restart for 6918990 (example.com)...Restart 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_cycle?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "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(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
+         with(:body => "{\"type\":\"reboot\"}",
+              :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('restart_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:id => droplet_id)
+      @cli.options = @cli.options.merge(:id => '6918990')
       @cli.restart
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
-Queuing restart for 100823 (foo)...done
+Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
+Queuing restart for 6918990 (example.com)...Restart 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/reboot?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
 
     it "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(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
+         with(:body => "{\"type\":\"reboot\"}",
+              :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('restart_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example.com')
       @cli.restart
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing restart for 100823 (foo)...done
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing restart for 6918990 (example.com)...Restart 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/reboot?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
   end

data/spec/cli/sizes_cli_spec.rb

@@ -5,20 +5,25 @@ describe Tugboat::CLI do
 
   describe "sizes" do
     it "shows a list" do
-      stub_request(:get, "https://api.digitalocean.com/sizes?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_sizes"))
+
+      stub_request(:get, "https://api.digitalocean.com/v2/sizes?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_sizes"))
 
       @cli.sizes
 
       expect($stdout.string).to eq <<-eos
 Sizes:
-Size 1 (id: 1)
-Size 2 (id: 2)
-Size 3 (id: 3)
+Disk: 20GB, Memory: 512MB (slug: 512mb)
+Disk: 30GB, Memory: 1024MB (slug: 1gb)
+Disk: 40GB, Memory: 2048MB (slug: 2gb)
+Disk: 60GB, Memory: 4096MB (slug: 4gb)
+Disk: 80GB, Memory: 8192MB (slug: 8gb)
+Disk: 160GB, Memory: 16384MB (slug: 16gb)
+Disk: 320GB, Memory: 32768MB (slug: 32gb)
+Disk: 480GB, Memory: 49152MB (slug: 48gb)
+Disk: 640GB, Memory: 65536MB (slug: 64gb)
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/sizes?api_key=#{api_key}&client_id=#{client_key}")).
-        to have_been_made
     end
   end
 end

data/spec/cli/snapshot_cli_spec.rb

@@ -7,78 +7,77 @@ describe Tugboat::CLI do
 
   describe "snapshots a droplet" do
     it "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(: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/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164444/actions").
+         with(:body => "{\"type\":\"snapshot\",\"name\":\"foo-snapshot\"}",
+              :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('snapshot_response'), :headers => {})
 
-      @cli.snapshot(snapshot_name, "foo")
+      @cli.snapshot(snapshot_name, 'example3.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, 3164444 (example3.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
-Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
+Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful!
       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(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}")).to have_been_made
     end
 
     it "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(:get, "https://api.digitalocean.com/v2/droplets/3164444?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(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164494/actions").
+         with(:body => "{\"type\":\"snapshot\",\"name\":\"foo-snapshot\"}",
+              :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('snapshot_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:id => droplet_id)
+      @cli.options = @cli.options.merge(:id => '3164444')
       @cli.snapshot(snapshot_name)
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
+Droplet id provided. Finding Droplet...done\e[0m, 3164494 (example.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
-Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
+Queuing snapshot 'foo-snapshot' for 3164494 (example.com)...Snapshot successful!
       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(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}")).to have_been_made
     end
 
 
     it "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(: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/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets/3164444/actions").
+         with(:body => "{\"type\":\"snapshot\",\"name\":\"foo-snapshot\"}",
+              :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('snapshot_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example3.com')
       @cli.snapshot(snapshot_name)
 
       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, 3164444 (example3.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
-Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
+Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful!
       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(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}")).to have_been_made
     end
 
-    it "does not snaphshot a droplet that is active" 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"))
+    it "does not snapshot a droplet that is active" 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 => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example.com')
       expect {@cli.snapshot(snapshot_name)}.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

data/spec/cli/ssh_cli_spec.rb

@@ -5,32 +5,24 @@ describe Tugboat::CLI do
 
   describe "ssh" do
     it "tries to fetch the droplet's IP from the API" 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").
         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
-      allow(Kernel).to receive(:exec)
-
-      @cli.ssh("test222")
+      allow(Kernel).to receive(:exec).with('ssh', anything(), anything(),anything(), anything(),anything(), anything(),anything(), anything(),anything(), anything(),anything(), anything(),anything())
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).
-        to have_been_made
+      @cli.ssh("example.com")
     end
 
     it "does not allow ssh into 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_inactive"))
-
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       allow(Kernel).to receive(:exec)
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
-
-      expect {@cli.ssh("test222")}.to raise_error(SystemExit)
+      expect {@cli.ssh("example3.com")}.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Droplet must be on 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