tugboat 1.3.1 → 2.0.0.RC1

data/spec/cli/droplets_cli_spec.rb

@@ -5,23 +5,25 @@ describe Tugboat::CLI do
 
   describe "droplets" do
     it "shows a list when droplets exist" 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 => {'Content-Type' => 'application/json'},)
 
       @cli.droplets
 
       expect($stdout.string).to eq <<-eos
-test222 (ip: 33.33.33.10, privateip: 10.20.30.1, status: \e[32mactive\e[0m, region: 1, id: 100823)
-test223 (ip: 33.33.33.10, status: \e[32mactive\e[0m, region: 1, id: 100823)
-foo (ip: 33.33.33.10, privateip: 10.20.30.40, status: \e[32mactive\e[0m, region: 1, id: 100823)
+example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990)
+example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956)
+example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444)
       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/v2/droplets?per_page=200")).to have_been_made
     end
 
     it "returns an error message when no droplets exist" 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_empty"))
+      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_empty"), :headers => {'Content-Type' => 'application/json'},)
 
       @cli.droplets
 
@@ -30,11 +32,12 @@ You don't appear to have any droplets.
 Try creating one with \e[32m`tugboat create`\e[0m
       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/v2/droplets?per_page=200")).to have_been_made
     end
     it "shows no output when --quiet is set" 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_empty"))
+      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 => {'Content-Type' => 'application/json'},)
 
       @cli.options = @cli.options.merge(:quiet => true)
       @cli.droplets
@@ -42,7 +45,7 @@ Try creating one with \e[32m`tugboat create`\e[0m
       # Should be /dev/null not stringIO
       expect($stdout).to be_a File
 
-      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
   end
 

data/spec/cli/halt_cli_spec.rb

@@ -5,94 +5,98 @@ describe Tugboat::CLI do
 
   describe "halt" do
     it "halts 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(:put, "https://api.digitalocean.com/droplets/100823/shutdown?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\":\"shutdown\"}",
+              :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('shutdown_response'), :headers => {})
 
-      @cli.halt("foo")
+      @cli.halt("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing shutdown for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing shutdown for 6918990 (example.com)...Halt 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(:put, "https://api.digitalocean.com/droplets/100823/shutdown?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "halts 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_off?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_off\"}",
+              :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.halt("foo")
+      @cli.halt("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing hard shutdown for 100823 (foo)...done
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing hard shutdown for 6918990 (example.com)...Halt 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(:put, "https://api.digitalocean.com/droplets/100823/power_off?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "halts 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/?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 => {'Content-Type' => 'application/json'},)
+
+      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/shutdown?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\":\"shutdown\"}",
+              :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('shutdown_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:id => droplet_id)
+      @cli.options = @cli.options.merge(:id => '6918990')
       @cli.halt
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
-Queuing shutdown for 100823 (foo)...done
+Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
+Queuing shutdown for 6918990 (example.com)...Halt 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(:put, "https://api.digitalocean.com/droplets/100823/shutdown?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
 
     it "halts 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 => {'Content-Type' => 'application/json'},)
 
-      stub_request(:put, "https://api.digitalocean.com/droplets/100823/shutdown?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\":\"shutdown\"}",
+              :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('shutdown_response'), :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example.com')
       @cli.halt
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing shutdown for 100823 (foo)...done
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing shutdown for 6918990 (example.com)...Halt 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(:put, "https://api.digitalocean.com/droplets/100823/shutdown?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
 
     it "does not halt a droplet that is off" 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 => {'Content-Type' => 'application/json'},)
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example3.com')
       expect {@cli.halt}.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, 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

data/spec/cli/images_cli_spec.rb

@@ -4,86 +4,162 @@ describe Tugboat::CLI do
   include_context "spec"
 
   describe "images" do
-    it "shows a list" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
+    it "shows all images by default" do
+      stub_request(:get, "https://api.digitalocean.com/v2/images?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_images'), :headers => {})
 
-      @cli.images
-
-      expect($stdout.string).to eq <<-eos
-Listing Your Images
-(Use `tugboat images --global` to show all images)
-My Images:
-NYTD Backup 1-18-2012 (id: 466, distro: Ubuntu)
-NLP Final (id: 478, distro: Ubuntu)
-      eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
-    end
-
-    it "acknowledges when my images are empty" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
-      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images_empty"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200&private=true").
+         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_images_global'), :headers => {})
 
       @cli.images
 
       expect($stdout.string).to eq <<-eos
-Listing Your Images
-(Use `tugboat images --global` to show all images)
-My Images:
-No images found
+Showing both private and public images
+Private Images:
+My application image (id: 6376601, distro: Ubuntu)
+
+Public Images:
+745.1.0 (alpha) (slug: coreos-alpha, id: 12789325, distro: CoreOS)
+723.3.0 (beta) (slug: coreos-beta, id: 12789350, distro: CoreOS)
+717.3.0 (stable) (slug: coreos-stable, id: 12789351, distro: CoreOS)
+5.10 x64 (slug: centos-5-8-x64, id: 6372321, distro: CentOS)
+5.10 x32 (slug: centos-5-8-x32, id: 6372425, distro: CentOS)
+6.0 x64 (slug: debian-6-0-x64, id: 6372581, distro: Debian)
+6.0 x32 (slug: debian-6-0-x32, id: 6372662, distro: Debian)
+21 x64 (slug: fedora-21-x64, id: 9640922, distro: Fedora)
+14.10 x32 (slug: ubuntu-14-10-x32, id: 9801951, distro: Ubuntu)
+14.10 x64 (slug: ubuntu-14-10-x64, id: 9801954, distro: Ubuntu)
+10.1 (slug: freebsd-10-1-x64, id: 10144573, distro: FreeBSD)
+12.04.5 x64 (slug: ubuntu-12-04-x64, id: 10321756, distro: Ubuntu)
+12.04.5 x32 (slug: ubuntu-12-04-x32, id: 10321777, distro: Ubuntu)
+7.0 x64 (slug: debian-7-0-x64, id: 10322059, distro: Debian)
+7.0 x32 (slug: debian-7-0-x32, id: 10322378, distro: Debian)
+7 x64 (slug: centos-7-0-x64, id: 10322623, distro: CentOS)
+6.5 x32 (slug: centos-6-5-x32, id: 11523060, distro: CentOS)
+6.5 x64 (slug: centos-6-5-x64, id: 11523085, distro: CentOS)
+22 x64 (slug: fedora-22-x64, id: 12065782, distro: Fedora)
+15.04 x64 (slug: ubuntu-15-04-x64, id: 12658446, distro: Ubuntu)
+15.04 x32 (slug: ubuntu-15-04-x32, id: 12660649, distro: Ubuntu)
+8.1 x64 (slug: debian-8-x64, id: 12778278, distro: Debian)
+8.1 x32 (slug: debian-8-x32, id: 12778337, distro: Debian)
+14.04 x32 (slug: ubuntu-14-04-x32, id: 12790298, distro: Ubuntu)
+14.04 x64 (slug: ubuntu-14-04-x64, id: 12790328, distro: Ubuntu)
+FreeBSD AMP on 10.1 (slug: freebsd-amp, id: 10163059, distro: FreeBSD)
+Mumble Server (murmur) on 14.04 (slug: mumble, id: 11132249, distro: Ubuntu)
+LAMP on 14.04 (slug: lamp, id: 11146541, distro: Ubuntu)
+LEMP on 14.04 (slug: lemp, id: 11146558, distro: Ubuntu)
+MEAN on 14.04 (slug: mean, id: 11146864, distro: Ubuntu)
+Joomla! 3.4.1 on 14.04 (slug: joomla, id: 11163798, distro: Ubuntu)
+Drone on 14.04 (slug: drone, id: 11774848, distro: Ubuntu)
+Magento 1.9.1.1 on 14.04 (slug: magento, id: 11876697, distro: Ubuntu)
+Ghost 0.6.4 on 14.04 (slug: ghost, id: 12035275, distro: Ubuntu)
+Ruby on Rails on 14.04 (Postgres, Nginx, Unicorn) (slug: ruby-on-rails, id: 12035706, distro: Ubuntu)
+ownCloud 8.0.4 on 14.04 (slug: owncloud, id: 12333784, distro: Ubuntu)
+Drupal 7.38 on 14.04 (slug: drupal, id: 12394820, distro: Ubuntu)
+Dokku v0.3.19 on 14.04 (slug: dokku, id: 12466201, distro: Ubuntu)
+MongoDB 3.0.4 on 14.04 (slug: mongodb, id: 12467027, distro: Ubuntu)
+node-v0.12.5 on 14.04 (slug: node, id: 12467797, distro: Ubuntu)
+Cassandra on 14.04 (slug: cassandra, id: 12540744, distro: Ubuntu)
+ELK Logging Stack on 14.04 (slug: elk, id: 12542038, distro: Ubuntu)
+GitLab 7.12.2 CE on 14.04 (slug: gitlab, id: 12702571, distro: Ubuntu)
+WordPress on 14.04 (slug: wordpress, id: 12740613, distro: Ubuntu)
+Django on 14.04 (slug: django, id: 12740667, distro: Ubuntu)
+Docker 1.7.1 on 14.04 (slug: docker, id: 12764973, distro: Ubuntu)
+MediaWiki 1.24.2 on 14.04 (slug: mediawiki, id: 11716043, distro: Ubuntu)
+PHPMyAdmin on 14.04 (slug: phpmyadmin, id: 11730661, distro: Ubuntu)
+Redmine on 14.04 (slug: redmine, id: 12438838, distro: Ubuntu)
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
     end
 
-    it "acknowledges when my images are empty and also shows a global list" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images_empty"))
+    it "acknowledges when personal images are empty when showing default full list" do
+      stub_request(:get, "https://api.digitalocean.com/v2/images?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_images'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images_global"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200&private=true").
+         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_images_empty'), :headers => {})
 
-      @cli.options = @cli.options.merge(:global => true)
+      @cli.options = @cli.options.merge(:show_private_images => true)
       @cli.images
 
       expect($stdout.string).to eq <<-eos
-My Images:
-No images found
-
-Global Images:
-NYTD Backup 1-18-2012 (id: 466, distro: Ubuntu)
-NLP Final (id: 478, distro: Ubuntu)
-Global Final (id: 479, distro: Ubuntu)
+Showing both private and public images
+Private Images:
+No private images found
+
+Public Images:
+745.1.0 (alpha) (slug: coreos-alpha, id: 12789325, distro: CoreOS)
+723.3.0 (beta) (slug: coreos-beta, id: 12789350, distro: CoreOS)
+717.3.0 (stable) (slug: coreos-stable, id: 12789351, distro: CoreOS)
+5.10 x64 (slug: centos-5-8-x64, id: 6372321, distro: CentOS)
+5.10 x32 (slug: centos-5-8-x32, id: 6372425, distro: CentOS)
+6.0 x64 (slug: debian-6-0-x64, id: 6372581, distro: Debian)
+6.0 x32 (slug: debian-6-0-x32, id: 6372662, distro: Debian)
+21 x64 (slug: fedora-21-x64, id: 9640922, distro: Fedora)
+14.10 x32 (slug: ubuntu-14-10-x32, id: 9801951, distro: Ubuntu)
+14.10 x64 (slug: ubuntu-14-10-x64, id: 9801954, distro: Ubuntu)
+10.1 (slug: freebsd-10-1-x64, id: 10144573, distro: FreeBSD)
+12.04.5 x64 (slug: ubuntu-12-04-x64, id: 10321756, distro: Ubuntu)
+12.04.5 x32 (slug: ubuntu-12-04-x32, id: 10321777, distro: Ubuntu)
+7.0 x64 (slug: debian-7-0-x64, id: 10322059, distro: Debian)
+7.0 x32 (slug: debian-7-0-x32, id: 10322378, distro: Debian)
+7 x64 (slug: centos-7-0-x64, id: 10322623, distro: CentOS)
+6.5 x32 (slug: centos-6-5-x32, id: 11523060, distro: CentOS)
+6.5 x64 (slug: centos-6-5-x64, id: 11523085, distro: CentOS)
+22 x64 (slug: fedora-22-x64, id: 12065782, distro: Fedora)
+15.04 x64 (slug: ubuntu-15-04-x64, id: 12658446, distro: Ubuntu)
+15.04 x32 (slug: ubuntu-15-04-x32, id: 12660649, distro: Ubuntu)
+8.1 x64 (slug: debian-8-x64, id: 12778278, distro: Debian)
+8.1 x32 (slug: debian-8-x32, id: 12778337, distro: Debian)
+14.04 x32 (slug: ubuntu-14-04-x32, id: 12790298, distro: Ubuntu)
+14.04 x64 (slug: ubuntu-14-04-x64, id: 12790328, distro: Ubuntu)
+FreeBSD AMP on 10.1 (slug: freebsd-amp, id: 10163059, distro: FreeBSD)
+Mumble Server (murmur) on 14.04 (slug: mumble, id: 11132249, distro: Ubuntu)
+LAMP on 14.04 (slug: lamp, id: 11146541, distro: Ubuntu)
+LEMP on 14.04 (slug: lemp, id: 11146558, distro: Ubuntu)
+MEAN on 14.04 (slug: mean, id: 11146864, distro: Ubuntu)
+Joomla! 3.4.1 on 14.04 (slug: joomla, id: 11163798, distro: Ubuntu)
+Drone on 14.04 (slug: drone, id: 11774848, distro: Ubuntu)
+Magento 1.9.1.1 on 14.04 (slug: magento, id: 11876697, distro: Ubuntu)
+Ghost 0.6.4 on 14.04 (slug: ghost, id: 12035275, distro: Ubuntu)
+Ruby on Rails on 14.04 (Postgres, Nginx, Unicorn) (slug: ruby-on-rails, id: 12035706, distro: Ubuntu)
+ownCloud 8.0.4 on 14.04 (slug: owncloud, id: 12333784, distro: Ubuntu)
+Drupal 7.38 on 14.04 (slug: drupal, id: 12394820, distro: Ubuntu)
+Dokku v0.3.19 on 14.04 (slug: dokku, id: 12466201, distro: Ubuntu)
+MongoDB 3.0.4 on 14.04 (slug: mongodb, id: 12467027, distro: Ubuntu)
+node-v0.12.5 on 14.04 (slug: node, id: 12467797, distro: Ubuntu)
+Cassandra on 14.04 (slug: cassandra, id: 12540744, distro: Ubuntu)
+ELK Logging Stack on 14.04 (slug: elk, id: 12542038, distro: Ubuntu)
+GitLab 7.12.2 CE on 14.04 (slug: gitlab, id: 12702571, distro: Ubuntu)
+WordPress on 14.04 (slug: wordpress, id: 12740613, distro: Ubuntu)
+Django on 14.04 (slug: django, id: 12740667, distro: Ubuntu)
+Docker 1.7.1 on 14.04 (slug: docker, id: 12764973, distro: Ubuntu)
+MediaWiki 1.24.2 on 14.04 (slug: mediawiki, id: 11716043, distro: Ubuntu)
+PHPMyAdmin on 14.04 (slug: phpmyadmin, id: 11730661, distro: Ubuntu)
+Redmine on 14.04 (slug: redmine, id: 12438838, distro: Ubuntu)
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global")).to have_been_made
     end
 
-    it "shows a global list" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
+    it "acknowledges when personal images are empty when just show private images flag given" do
+      stub_request(:get, "https://api.digitalocean.com/v2/images?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_images'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images_global"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200&private=true").
+         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_images_empty'), :headers => {})
 
-      @cli.options = @cli.options.merge(:global => true)
+      @cli.options = @cli.options.merge(:show_just_private_images => true)
       @cli.images
 
       expect($stdout.string).to eq <<-eos
-My Images:
-NYTD Backup 1-18-2012 (id: 466, distro: Ubuntu)
-NLP Final (id: 478, distro: Ubuntu)
-
-Global Images:
-NYTD Backup 1-18-2012 (id: 466, distro: Ubuntu)
-NLP Final (id: 478, distro: Ubuntu)
-Global Final (id: 479, distro: Ubuntu)
+Showing just private images
+Private Images:
+No private images found
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global")).to have_been_made
     end
   end