brightbox-cli 2.2.0 → 2.3.0

data/spec/unit/brightbox/bb_config/add_login_spec.rb

@@ -0,0 +1,222 @@
+require "spec_helper"
+
+describe Brightbox::BBConfig, "#add_login" do
+  let(:config) { Brightbox::BBConfig.new }
+
+  let(:email) { "jason.null@brightbox.com" }
+  let(:password) { "N:B3e%7Cmh" }
+  let(:api_url) { ENV["BRIGHTBOX_API_URL"] || "http://api.brightbox.dev" }
+
+  context "when no config exists", vcr: true do
+    let(:expected_config) do
+      <<EOS
+[core]
+default_client = #{email}
+
+[#{email}]
+username = #{email}
+api_url = #{api_url}
+auth_url = #{api_url}
+default_account = acc-12345
+
+EOS
+    end
+
+    before do
+      remove_config
+    end
+
+    it "creates the configuration" do
+      FauxIO.new do
+        config.add_login(email, password)
+      end
+      expect(config_file_contents).to eq(expected_config)
+    end
+
+    it "refreshed tokens" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.not_to raise_error
+      end
+
+      expect(cached_access_token(config)).to eq(config.access_token)
+      expect(cached_refresh_token(config)).to eq(config.refresh_token)
+    end
+  end
+
+  context "when logged in previously", vcr: true do
+    let(:original_config) { config_file_contents }
+
+    before do
+      FauxIO.new { config.add_login(email, password) }
+    end
+
+    it "does not alter the configuration" do
+      FauxIO.new do
+        expect {
+          config.add_login(email, password)
+        }.not_to change { config_file_contents }.from(original_config)
+      end
+    end
+
+    it "updates access token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.access_token
+        }.from(cached_access_token(config))
+      end
+    end
+
+    it "updates refresh token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.refresh_token
+        }.from(cached_refresh_token(config))
+      end
+    end
+  end
+
+  context "when configured with custom options", vcr: true do
+    let(:original_config) { config_file_contents }
+
+    let(:custom_url) { ENV["BRIGHTBOX_API_URL"] || "http://api.brightbox.dev" }
+    let(:custom_app_id) { "app-23456" }
+    let(:custom_app_secret) { "ho04hondtzjjdf4" }
+    let(:custom_default_account) { "acc-23456" }
+
+    let(:custom_options) do
+      {
+        api_url: custom_url,
+        auth_url: custom_url,
+        default_account: custom_default_account,
+        client_id: custom_app_id,
+        secret: custom_app_secret
+      }
+    end
+
+    before do
+      FauxIO.new { config.add_login(email, password, custom_options) }
+    end
+
+    it "does not alter the configuration" do
+      FauxIO.new do
+        expect {
+          config.add_login(email, password)
+        }.not_to change { config_file_contents }.from(original_config)
+      end
+
+      expect(config_file_contents).to match("[#{email}]")
+      expect(config_file_contents).to match("api_url = #{custom_url}")
+      expect(config_file_contents).to match("auth_url = #{custom_url}")
+      expect(config_file_contents).to match("username = #{email}")
+      expect(config_file_contents).to match("default_account = #{custom_default_account}")
+      expect(config_file_contents).to match("default_client = #{email}")
+    end
+
+    it "updates access token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.access_token
+        }.from(cached_access_token(config))
+      end
+    end
+
+    it "updates refresh token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.refresh_token
+        }.from(cached_refresh_token(config))
+      end
+    end
+  end
+
+  context "when altering a custom option", vcr: true do
+    let(:original_config) { config_file_contents }
+
+    let(:custom_url) { ENV["BRIGHTBOX_API_URL"] || "http://api.brightbox.dev" }
+    let(:custom_app_id) { "app-23456" }
+    let(:custom_app_secret) { "ho04hondtzjjdf4" }
+    let(:custom_default_account) { "acc-23456" }
+
+    let(:custom_options) do
+      {
+        api_url: custom_url,
+        auth_url: custom_url,
+        default_account: custom_default_account,
+        client_id: custom_app_id,
+        secret: custom_app_secret
+      }
+    end
+
+    before do
+      FauxIO.new { config.add_login(email, password, custom_options) }
+    end
+
+    it "does not alter the configuration" do
+      FauxIO.new do
+        expect {
+          config.add_login(email, password)
+        }.not_to change { config_file_contents }.from(original_config)
+      end
+
+      expect(config_file_contents).to match("[#{email}]")
+      expect(config_file_contents).to match("api_url = #{custom_url}")
+      expect(config_file_contents).to match("username = #{email}")
+      expect(config_file_contents).to match("default_account = #{custom_default_account}")
+      expect(config_file_contents).to match("default_client = #{email}")
+    end
+
+    it "updates access token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.access_token
+        }.from(cached_access_token(config))
+      end
+    end
+
+    it "updates refresh token" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.to change {
+          config.refresh_token
+        }.from(cached_refresh_token(config))
+      end
+    end
+  end
+
+  context "when using an email and suffix", vcr: true do
+    let(:client_name) { "#{email}/dev" }
+    let(:expected_config) do
+      <<EOS
+[core]
+default_client = #{client_name}
+
+[#{client_name}]
+username = #{email}
+api_url = #{api_url}
+auth_url = #{api_url}
+default_account = acc-12345
+
+EOS
+    end
+
+    before do
+      remove_config
+    end
+
+    it "creates the configuration" do
+      FauxIO.new do
+        config.add_login(client_name, password)
+      end
+      expect(config_file_contents).to eq(expected_config)
+    end
+
+    it "refreshed tokens" do
+      FauxIO.new do
+        expect { config.add_login(email, password) }.not_to raise_error
+      end
+
+      expect(cached_access_token(config)).to eq(config.access_token)
+      expect(cached_refresh_token(config)).to eq(config.refresh_token)
+    end
+  end
+
+end

data/spec/unit/brightbox/bb_config/client_name_spec.rb

@@ -56,39 +56,31 @@ describe Brightbox::BBConfig do
         [cli-12345]
         client_id = cli-12345
         EOS
-        @tmp_config = TmpConfig.new(contents)
-      end
-
-      after do
-        @tmp_config.close
+        config_from_contents(contents)
       end
 
       context "and force_default_config is on" do
         before do
           config_opts = {
-            :directory => @tmp_config.path,
             :force_default_config => true
           }
           @config = Brightbox::BBConfig.new(config_opts)
         end
 
-        it "raises an error" do
-          expect do
-            @config.client_name
-          end.to raise_error(Brightbox::BBConfigError, "You must specify a default client using brightbox config client_default")
+        it "returns nil" do
+          expect(@config.client_name).to be_nil
         end
       end
 
       context "and force_default_config is off" do
         before do
           config_opts = {
-            :directory => @tmp_config.path,
             :force_default_config => false
           }
           @config = Brightbox::BBConfig.new(config_opts)
         end
 
-        it "returns first client" do
+        it "returns nil" do
           expect(@config.client_name).to be_nil
         end
       end

data/spec/unit/brightbox/bb_config/client_named_spec.rb

@@ -6,7 +6,7 @@ describe Brightbox::BBConfig do
     [core]
     default_client = fnord
 
-    [fnord]
+    [other]
     client_id = cli-12345
     alias = test
 

data/spec/unit/brightbox/bb_config/config_directory_exists_spec.rb

@@ -26,8 +26,11 @@ describe Brightbox::BBConfig do
 
     context "when directory does not exist" do
       it "returns false" do
-        @dir = "fnord"
-        expect(config.config_directory_exists?).to be false
+        # Create a tmpdir and delete it so we are sure it should not exist
+        Dir.mktmpdir { |dir| @dir = dir }
+        expect(config.config_directory).to eq(@dir)
+        Dir.rmdir(@dir) if Dir.exist?(@dir)
+        expect(config.config_directory_exists?).to eq(false)
       end
     end
   end

data/spec/unit/brightbox/bb_config/config_directory_spec.rb

@@ -13,13 +13,15 @@ describe Brightbox::BBConfig do
     end
 
     context "when absolute custom location is set" do
+      let(:custom_dir) { Dir.mktmpdir("custom") }
+
       it "returns a String of the expanded directory" do
         config_options = {
-          :directory => "/etc/local/brightbox_cli"
+          :directory => custom_dir
         }
         config = Brightbox::BBConfig.new(config_options)
 
-        expect(config.config_directory).to eql("/etc/local/brightbox_cli")
+        expect(config.config_directory).to eql(custom_dir)
       end
     end
 

data/spec/unit/brightbox/bb_config/config_spec.rb

@@ -10,7 +10,6 @@ describe Brightbox::BBConfig do
         Dir.mktmpdir do |tmp_dir|
           target_dir = File.join(tmp_dir, "config")
           @config = Brightbox::BBConfig.new :directory => target_dir
-          expect(@config.config_directory_exists?).to be false
           example.run
         end
       end
@@ -62,21 +61,18 @@ describe Brightbox::BBConfig do
     end
 
     context "when config file can not be parsed" do
-      around do |example|
+      it "raises an error" do
         Dir.mktmpdir do |target_dir|
           test_config_filename = File.join(target_dir, "config")
           File.open(test_config_filename, "w") do |f|
             f.puts "not:ini"
           end
 
-          @config = Brightbox::BBConfig.new :directory => target_dir
-          example.run
+          expect {
+            @config = Brightbox::BBConfig.new :directory => target_dir
+          }.to raise_error(Brightbox::BBConfigError)
         end
       end
-
-      it "raises an error" do
-        expect { @config.config }.to raise_error(Brightbox::BBConfigError)
-      end
     end
   end
 end

data/spec/unit/brightbox/bb_config/default_account_spec.rb

@@ -43,13 +43,17 @@ describe Brightbox::BBConfig do
     end
 
     context "when set in config" do
-      before do
-        @account_name = "acc-ghj32"
-        @client_name = "app-b3n5b"
-        contents = <<-EOS
-        [#{@client_name}]
-        default_account = #{@account_name}
+      let(:account_name) { "acc-ghj32" }
+      let(:client_name) { "app-b3n5b" }
+
+      let(:contents) do
+        <<-EOS
+        [#{client_name}]
+        default_account = #{account_name}
         EOS
+      end
+
+      before do
         @config = config_from_contents(contents)
       end
 

data/spec/unit/brightbox/bb_config/find_or_set_default_account_spec.rb

@@ -61,6 +61,8 @@ describe Brightbox::BBConfig do
     context "when client may access one account", vcr: true do
       let(:contents) do
         <<-EOS
+        [core]
+        default_client = cli-12345
         [cli-12345]
         api_url = http://api.brightbox.dev
         client_id = cli-12345

data/spec/unit/brightbox/bb_config/renew_tokens_spec.rb

@@ -15,6 +15,9 @@ describe Brightbox::BBConfig do
     context "when using a user app with no tokens", vcr: true do
       before do
         contents = <<-EOS
+        [core]
+        default_client = app-12345
+
         [app-12345]
         api_url = #{api_endpoint}
         client_id = #{app_id}

data/spec/unit/brightbox/bb_config/section_names_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+describe Brightbox::BBConfig, "#section_names" do
+  subject(:config) { config_from_contents(ini) }
+
+  context "when no sections exist" do
+    let(:ini) { "" }
+    it { expect(config.section_names).to be_empty }
+  end
+
+  context "when only a 'core' section exists" do
+    let(:ini) do
+      <<-EOS
+      [core]
+      setting = value
+      EOS
+    end
+    it { expect(config.section_names).to be_empty }
+  end
+
+  context "when only an 'alias' section exists" do
+    let(:ini) do
+      <<-EOS
+      [alias]
+      setting = value
+      EOS
+    end
+    it { expect(config.section_names).to be_empty }
+  end
+
+  context "when multiple sections exist" do
+    let(:ini) do
+      <<-EOS
+      [core]
+      setting = value
+
+      [cli-12345]
+      setting = value
+
+      [app-12345]
+      setting = value
+      EOS
+    end
+    it { expect(config.section_names).to eq(%w(cli-12345 app-12345)) }
+  end
+end

data/spec/unit/brightbox/bb_config/using_client_spec.rb

@@ -2,20 +2,20 @@ require "spec_helper"
 
 describe Brightbox::BBConfig do
   let(:api_client_id) { "cli-12345" }
-  let(:user_client_id) { "app-12345" }
-  let(:user_app_two) { "app-54321" }
+  let(:custom_app) { "app-54321" }
+  let(:username) { "jason.null@brightbox.com" }
 
   let(:contents) do
     <<-EOS
     [#{api_client_id}]
     client_id = #{api_client_id}
     secret = #{random_token}
-    [#{user_client_id}]
-    client_id = #{user_client_id}
-    secret = #{random_token}
-    [#{user_app_two}]
-    client_id = #{user_app_two}
+    [#{username}]
+    username = #{username}
+    [#{custom_app}]
+    client_id = #{custom_app}
     secret = #{random_token}
+    username = #{username}
     EOS
   end
 
@@ -36,7 +36,7 @@ describe Brightbox::BBConfig do
     end
 
     context "when selected config is for a user application" do
-      let(:client_name) { user_client_id }
+      let(:client_name) { username }
 
       it "returns true" do
         config.client_name = client_name
@@ -54,7 +54,7 @@ describe Brightbox::BBConfig do
     end
 
     context "when selected config is for a user application with generic key" do
-      let(:client_name) { user_app_two }
+      let(:client_name) { custom_app }
 
       it "returns true" do
         config.client_name = client_name
@@ -69,7 +69,7 @@ describe Brightbox::BBConfig do
         remove_config
       end
 
-      it "does not raise an error" do
+      it "raises an error" do
         expect do
           Brightbox::BBConfig.new.using_api_client?
         end.to raise_error(Brightbox::NoSelectedClientError, error_message)
@@ -77,7 +77,7 @@ describe Brightbox::BBConfig do
     end
 
     context "when selected config is for a user application" do
-      let(:client_name) { user_client_id }
+      let(:client_name) { username }
 
       it "returns false" do
         config.client_name = client_name
@@ -95,7 +95,7 @@ describe Brightbox::BBConfig do
     end
 
     context "when selected config is for a user application with generic key" do
-      let(:client_name) { user_app_two }
+      let(:client_name) { custom_app }
 
       it "returns false" do
         config.client_name = client_name

data/spec/unit/brightbox/bb_config_spec.rb

@@ -9,7 +9,6 @@ describe Brightbox::BBConfig do
   it { expect(config).to respond_to(:config_directory) }
   it { expect(config).to respond_to(:config_filename) }
   it { expect(config).to respond_to(:delete_section) }
-  it { expect(config).to respond_to(:clients) }
   it { expect(config).to respond_to(:client_name) }
   it { expect(config).to respond_to(:access_token_filename) }
   it { expect(config).to respond_to(:refresh_token_filename) }

data/spec/unit/brightbox/cloud_ip/find_spec.rb

@@ -1,6 +1,9 @@
 require "spec_helper"
 
 describe Brightbox::CloudIP do
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+  end
 
   describe "#find(:all)" do
     context "when a Cloud IP exists" do

data/spec/unit/brightbox/config/user_application/to_fog_spec.rb

@@ -11,13 +11,11 @@ describe Brightbox::Config::UserApplication do
   subject(:for_fog) { section.to_fog }
 
   describe "#to_fog" do
-    context "when config is valid" do
+    context "when config is using embedded client" do
       let(:contents) do
         <<-EOS
         [#{client_name}]
         api_url = http://api.brightbox.dev
-        client_id = #{client_name}
-        secret = #{secret}
         username = user@example.com
         EOS
       end
@@ -35,11 +33,11 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets client_id correctly" do
-        expect(for_fog[:brightbox_client_id]).to eql(client_name)
+        expect(for_fog[:brightbox_client_id]).to eql(Brightbox::EMBEDDED_APP_ID)
       end
 
       it "sets secret correctly" do
-        expect(for_fog[:brightbox_secret]).to eql(secret)
+        expect(for_fog[:brightbox_secret]).to eql(Brightbox::EMBEDDED_APP_SECRET)
       end
 
       it "sets persistent correctly" do
@@ -47,86 +45,92 @@ describe Brightbox::Config::UserApplication do
       end
     end
 
-    context "when config has alternative auth endpoint" do
+    context "when config is using custom client" do
       let(:contents) do
         <<-EOS
         [#{client_name}]
         api_url = http://api.brightbox.dev
-        auth_url = http://auth.dev.brightbox.com
         client_id = #{client_name}
         secret = #{secret}
         username = user@example.com
         EOS
       end
 
+      it "sets provider as 'Brightbox'" do
+        expect(for_fog[:provider]).to eql("Brightbox")
+      end
+
       it "sets API endpoint correctly" do
         expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
-        expect(for_fog[:brightbox_auth_url]).to eql("http://auth.dev.brightbox.com")
+        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.dev")
       end
-    end
 
-    context "when config has persistence setting" do
-      let(:contents) do
-        <<-EOS
-        [#{client_name}]
-        api_url = http://api.brightbox.dev
-        client_id = #{client_name}
-        secret = #{secret}
-        username = user@example.com
-        persistent = false
-        EOS
+      it "sets client_id correctly" do
+        expect(for_fog[:brightbox_client_id]).to eql(client_name)
+      end
+
+      it "sets secret correctly" do
+        expect(for_fog[:brightbox_secret]).to eql(secret)
       end
 
       it "sets persistent correctly" do
-        expect(for_fog[:persistent]).to be false
+        expect(for_fog[:persistent]).to be true
       end
     end
 
-    context "when config is missing api_url" do
+    context "when config has alternative auth endpoint" do
       let(:contents) do
         <<-EOS
         [#{client_name}]
+        api_url = http://api.brightbox.dev
+        auth_url = http://auth.dev.brightbox.com
         client_id = #{client_name}
         secret = #{secret}
         username = user@example.com
         EOS
       end
 
-      it "raises error" do
-        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "api_url option missing from config in section app-12345")
+      it "sets API endpoint correctly" do
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+      end
+
+      it "copies API endpoint for auth endpoint correctly" do
+        expect(for_fog[:brightbox_auth_url]).to eql("http://auth.dev.brightbox.com")
       end
     end
 
-    context "when config is missing client_id" do
+    context "when config has persistence setting" do
       let(:contents) do
         <<-EOS
         [#{client_name}]
         api_url = http://api.brightbox.dev
+        client_id = #{client_name}
         secret = #{secret}
         username = user@example.com
+        persistent = false
         EOS
       end
 
-      it "raises error" do
-        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "client_id option missing from config in section app-12345")
+      it "sets persistent correctly" do
+        expect(for_fog[:persistent]).to be false
       end
     end
 
-    context "when config is missing secret" do
+    context "when config is missing api_url" do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
         client_id = #{client_name}
+        secret = #{secret}
         username = user@example.com
         EOS
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "secret option missing from config in section app-12345")
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "api_url option missing from config in section app-12345")
       end
     end