Merge pull request #184 from pearkes/add_ability_to_use_env_creds

Adds ability to use environment variable for key

lib/tugboat/config.rb

@@ -39,7 +39,7 @@ def load_config_file
     end
 
     def access_token
-      @data['authentication']['access_token']
+      env_access_token || @data['authentication']['access_token']
     end
 
     def ssh_key_path
@@ -86,6 +86,10 @@ def default_backups_enabled
       @data['defaults'].nil? ? DEFAULT_BACKUPS_ENABLED : @data['defaults']['backups_enabled']
     end
 
+    def env_access_token
+      ENV['DO_API_TOKEN'] unless ENV['DO_API_TOKEN'].to_s.empty?
+    end
+
     # Re-runs initialize
     def reset!
       self.send(:initialize)

spec/cli/add_key_spec.rb

@@ -39,7 +39,9 @@
     before :each do
       allow(ENV).to receive(:[]).with('HOME').and_return(fake_home)
       allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+
       FileUtils.mkdir_p "#{fake_home}/.ssh"
       File.open("#{fake_home}/.ssh/id_rsa.pub", 'w') {|f| f.write("ssh-dss A456= user@host") }
     end

spec/cli/env_variable_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  describe "DO_API_TOKEN=foobar" do
+    it "verifies with the ENV variable DO_API_TOKEN" 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 env_variable', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('env_variable')
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+
+      @cli.verify
+      expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
+    end
+
+    it "does not use ENV variable DO_API_TOKEN if empty" 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 => {})
+
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('')
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+
+      @cli.verify
+      expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
+    end
+  end
+end
+