brightbox-cli 3.2.0 → 4.0.0

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#clear_default_client" do
     context "when default client is set" do
       let(:contents) do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#client_id" do
     context "when client has old 'alias' key" do
       let(:contents) do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#client_name" do
     context "when passed as an option" do
       before do

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

@@ -2,7 +2,6 @@ require "spec_helper"
 require "tmpdir"
 
 describe Brightbox::BBConfig do
-
   describe "#config_directory_exists?" do
     let(:config) { Brightbox::BBConfig.new(:directory => @dir) }
 

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#config_directory" do
     context "when default location is used" do
       it "returns a String of the users `.brightbox` directory" do

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

@@ -3,7 +3,6 @@ require "tmpdir"
 require "tempfile"
 
 describe Brightbox::BBConfig do
-
   describe "#config" do
     context "when config directory is missing" do
       around do |example|
@@ -68,9 +67,9 @@ describe Brightbox::BBConfig do
             f.puts "not:ini"
           end
 
-          expect {
+          expect do
             @config = Brightbox::BBConfig.new :directory => target_dir
-          }.to raise_error(Brightbox::BBConfigError)
+          end.to raise_error(Brightbox::BBConfigError)
         end
       end
     end

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#default_account" do
     context "when no config file is available" do
       before do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#default_client" do
     context "when config file is empty" do
       before do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#delete_section" do
     let(:client_name) { "removable" }
 

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

@@ -20,7 +20,7 @@ describe Brightbox::BBConfig do
       let(:contents) do
         <<-EOS
         [cli-default]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = cli-default
         secret = qy6xxnvy4o0tgv5
         default_account = acc-default
@@ -38,7 +38,7 @@ describe Brightbox::BBConfig do
       let(:contents) do
         <<-EOS
         [cli-12345]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = cli-12345
         secret = wrong_password
         EOS
@@ -64,7 +64,7 @@ describe Brightbox::BBConfig do
         [core]
         default_client = cli-12345
         [cli-12345]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = cli-12345
         secret = qy6xxnvy4o0tgv5
         EOS
@@ -81,7 +81,7 @@ describe Brightbox::BBConfig do
       let(:contents) do
         <<-EOS
         [app-12345]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = app-12345
         secret = mocbuipbiaa6k6c
         EOS

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#refresh_token_filename" do
     context "when using a custom directory" do
       before do

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-  let(:api_endpoint) { "http://api.brightbox.dev" }
+  let(:api_endpoint) { Brightbox::DEFAULT_API_ENDPOINT }
 
   # These are fake values that dev servers may choose to allow
   let(:username) { "jason.null@brightbox.com" }
@@ -43,7 +43,6 @@ describe Brightbox::BBConfig do
         # Refresh token
         expect(cached_refresh_token(@config)).to eql(@new_refresh_token)
       end
-
     end
 
     context "when using a user app with a cached refresh token", vcr: true do
@@ -67,7 +66,7 @@ describe Brightbox::BBConfig do
         # Access token
         expect(File.exist?(@config.access_token_filename)).to be true
 
-        # NOTE The cached to disk version is filtered by VCR when testing
+        # NOTE: The cached to disk version is filtered by VCR when testing
         expect(cached_access_token(@config)).to eql(@new_access_token)
 
         # Refresh token
@@ -95,7 +94,7 @@ describe Brightbox::BBConfig do
         # Access token
         expect(File.exist?(@config.access_token_filename)).to be true
 
-        # NOTE The cached to disk version is filtered by VCR when testing
+        # NOTE: The cached to disk version is filtered by VCR when testing
         expect(cached_access_token(@config)).to eql(@new_access_token)
 
         # Refresh token

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   describe "#save_default_account" do
     context "when setting has not changed" do
       let(:account_id) { "acc-12345" }

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::BBConfig do
-
   context "when config is clean" do
     let(:config) { Brightbox::BBConfig.new }
 

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

@@ -41,6 +41,6 @@ describe Brightbox::BBConfig, "#section_names" do
       setting = value
       EOS
     end
-    it { expect(config.section_names).to eq(%w(cli-12345 app-12345)) }
+    it { expect(config.section_names).to eq(%w[cli-12345 app-12345]) }
   end
 end

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

@@ -43,7 +43,7 @@ describe Brightbox::BBConfig do
 
       it "returns correct fog options" do
         expect(fog_config[:provider]).to eql("Brightbox")
-        expect(fog_config[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(fog_config[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
         expect(fog_config[:brightbox_client_id]).to eql("cli-12345")
         expect(fog_config[:brightbox_secret]).to eql("qy6xxnvy4o0tgv5")
       end
@@ -54,7 +54,7 @@ describe Brightbox::BBConfig do
 
       it "returns correct fog options" do
         expect(fog_config[:provider]).to eql("Brightbox")
-        expect(fog_config[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(fog_config[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
         expect(fog_config[:brightbox_client_id]).to eql("app-12345")
         expect(fog_config[:brightbox_secret]).to eql("mocbuipbiaa6k6c")
       end

data/spec/unit/brightbox/collaborating_account/to_row_spec.rb

@@ -10,9 +10,9 @@ describe Brightbox::CollaboratingAccount do
     context "when initialised with an account" do
       let(:initial_model) { owned_account }
 
-      [:cloud_ips_limit, :lb_limit, :ram_limit, :ram_used, :ram_free].each do |key|
+      %i[cloud_ips_limit lb_limit ram_limit ram_used ram_free].each do |key|
         it "returns the number for #{key}" do
-          expect(row_data[key]).to be_kind_of(Fixnum)
+          expect(row_data[key]).to be_kind_of(Integer)
         end
       end
     end
@@ -20,7 +20,7 @@ describe Brightbox::CollaboratingAccount do
     context "when initialised with a collaboration" do
       let(:initial_model) { active_collaboration }
 
-      [:cloud_ips_limit, :lb_limit, :ram_limit, :ram_used, :ram_free].each do |key|
+      %i[cloud_ips_limit lb_limit ram_limit ram_used ram_free].each do |key|
         it "returns empty string for #{key}" do
           expect(row_data[key]).to eql("")
         end

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

@@ -15,7 +15,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{secret}
         EOS
@@ -26,11 +26,11 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "sets API endpoint correctly" do
-        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
-        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "sets client_id correctly" do
@@ -50,7 +50,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         auth_url = http://auth.dev.brightbox.com
         client_id = #{client_name}
         secret = #{secret}
@@ -58,7 +58,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "sets API endpoint correctly" do
-        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
@@ -70,7 +70,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{secret}
         persistent = false
@@ -100,7 +100,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         secret = #{random_token}
         EOS
       end
@@ -114,7 +114,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         EOS
       end

data/spec/unit/brightbox/config/api_client/valid_spec.rb

@@ -12,7 +12,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{random_token}
         EOS
@@ -27,7 +27,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{random_token}
         theme = blue
@@ -57,7 +57,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         secret = #{random_token}
         EOS
       end
@@ -71,7 +71,7 @@ describe Brightbox::Config::ApiClient do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         EOS
       end

data/spec/unit/brightbox/config/discover_two_factor_pin_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+RSpec.describe Brightbox::Config, "#discover_two_factor_pin" do
+  subject(:config) { config_from_contents(contents) }
+
+  let(:api_url) { "http://api.brightbox.localhost" }
+  let(:client_alias) { email }
+  let(:default_account) { "acc-12345" }
+  let(:email) { "jason.null@brightbox.com" }
+
+  context "when 2FA is enabled" do
+    context "with password helper" do
+      let(:cmd) { "fnord" }
+      let(:contents) do
+        <<-EOS
+        [core]
+        default_client = #{client_alias}
+
+        [#{client_alias}]
+        username = #{email}
+        two_factor = true
+        two_factor_helper_command = #{cmd}
+        EOS
+      end
+
+      it "returns helper's response" do
+        expect(IO).to receive(:popen).with([cmd], "r").and_return("111111")
+
+        expect(config.discover_two_factor_pin).to eq("111111")
+      end
+    end
+
+    context "with invalid password helper" do
+      let(:contents) do
+        <<-EOS
+        [core]
+        default_client = #{client_alias}
+
+        [#{client_alias}]
+        username = #{email}
+        two_factor = true
+        two_factor_helper_command = #{cmd}
+        EOS
+      end
+
+      context "when setting is empty" do
+        let(:cmd) { nil }
+
+        it "prompts for OTP" do
+          mock_otp_entry("123456")
+
+          expect(config.discover_two_factor_pin).to eq("123456")
+        end
+      end
+
+      context "when command doesn't exist" do
+        let(:cmd) { "fnord" }
+
+        it "prompts for OTP" do
+          expect(IO).to receive(:popen).with([cmd], "r").and_raise(Errno::ENOENT)
+          mock_otp_entry("123456")
+
+          expect(config.discover_two_factor_pin).to eq("123456")
+        end
+      end
+    end
+
+    context "without password helper" do
+      let(:contents) do
+        <<-EOS
+        [core]
+        default_client = #{client_alias}
+
+        [#{client_alias}]
+        username = #{email}
+        two_factor = true
+        EOS
+      end
+
+      it "prompts for OTP" do
+        mock_otp_entry("123456")
+
+        expect(config.discover_two_factor_pin).to eq("123456")
+      end
+    end
+  end
+end

data/spec/unit/brightbox/config/section_name_deduplicator_spec.rb

@@ -33,7 +33,7 @@ describe Brightbox::Config::SectionNameDeduplicator do
 
     context "when name has been deduped before" do
       let(:name) { "dev" }
-      let(:in_use) { %w(dev dev_1 dev_2) }
+      let(:in_use) { %w[dev dev_1 dev_2] }
 
       it "returns a deduplicated name" do
         expect(deduper.next).to eql("dev_3")

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

@@ -15,7 +15,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         username = user@example.com
         EOS
       end
@@ -25,11 +25,11 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets API endpoint correctly" do
-        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
-        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "sets client_id correctly" do
@@ -49,7 +49,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{secret}
         username = user@example.com
@@ -61,11 +61,11 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets API endpoint correctly" do
-        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
-        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_auth_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "sets client_id correctly" do
@@ -85,7 +85,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         auth_url = http://auth.dev.brightbox.com
         client_id = #{client_name}
         secret = #{secret}
@@ -94,7 +94,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets API endpoint correctly" do
-        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.dev")
+        expect(for_fog[:brightbox_api_url]).to eql("http://api.brightbox.localhost")
       end
 
       it "copies API endpoint for auth endpoint correctly" do
@@ -106,7 +106,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{secret}
         username = user@example.com
@@ -138,7 +138,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{secret}
         EOS

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

@@ -12,7 +12,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         username = user@example.com
         EOS
       end
@@ -26,7 +26,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{random_token}
         username = user@example.com
@@ -58,7 +58,7 @@ describe Brightbox::Config::UserApplication do
       let(:contents) do
         <<-EOS
         [#{client_name}]
-        api_url = http://api.brightbox.dev
+        api_url = http://api.brightbox.localhost
         client_id = #{client_name}
         secret = #{random_token}
         EOS

data/spec/unit/brightbox/connection_manager/fetch_connection_spec.rb

@@ -52,7 +52,7 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
 
     it "selects configured account" do
       skip "Fails out of sequence, mocked config incorrect"
-      Brightbox.config.stubs(:selected_config).returns('default_account' => "acc-12345")
+      Brightbox.config.stubs(:selected_config).returns("default_account" => "acc-12345")
       connection = connection_manager.fetch_connection(true)
       expect(connection).not_to be_nil
       expect(connection.scoped_account).to eq("acc-12345")

data/spec/unit/brightbox/database_server/clean_arguments_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 require "fog/brightbox/models/compute/database_server"
 
 describe Brightbox::DatabaseServer do
-
   describe ".clean_arguments" do
     let(:parameters) { Brightbox::DatabaseServer.clean_arguments(arguments) }
 
@@ -21,7 +20,7 @@ describe Brightbox::DatabaseServer do
     context "when --allow-access=10.0.0.0,11.0.0.0" do
       let(:arguments) { { "allow-access" => "10.0.0.0,11.0.0.0" } }
 
-      it { expect(parameters[:allow_access]).to eql(%w(10.0.0.0 11.0.0.0)) }
+      it { expect(parameters[:allow_access]).to eql(%w[10.0.0.0 11.0.0.0]) }
     end
 
     context "when --maintenance-weekday=4" do

data/spec/unit/brightbox/database_server/maintenance_window_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 require "fog/brightbox/models/compute/database_server"
 
 describe Brightbox::DatabaseServer do
-
   describe "#maintenance_window" do
     let(:fog_model) { Fog::Brightbox::Compute::DatabaseServer.new(fog_settings) }
     let(:dbs) { Brightbox::DatabaseServer.new(fog_model) }

data/spec/unit/brightbox/error_parser/pretty_print_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Brightbox::ErrorParser do
-
   describe "#pretty_print" do
     let(:parser) { Brightbox::ErrorParser.new(error_to_parse) }
 

data/spec/unit/brightbox/firewall_policy/apply_to_spec.rb

@@ -6,7 +6,6 @@ describe Brightbox::FirewallPolicy do
   end
 
   describe "#apply_to", vcr: true do
-
     it "should apply firewall policy" do
       expect do
         params = { :name => "rspec_tests_apply" }

data/spec/unit/brightbox/firewall_policy/create_spec.rb

@@ -6,7 +6,6 @@ describe Brightbox::FirewallPolicy do
   end
 
   describe "#create", vcr: true do
-
     it "should create firewall policy" do
       params = { :name => "rspec_tests" }
       @group = Brightbox::ServerGroup.create(params)

data/spec/unit/brightbox/firewall_policy/find_or_call_spec.rb

@@ -6,7 +6,6 @@ describe Brightbox::FirewallPolicy do
   end
 
   describe "#find_or_call" do
-
     context "when a policy exists" do
       before do
         options = {

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

@@ -6,7 +6,6 @@ describe Brightbox::FirewallPolicy do
   end
 
   describe "#find(:all)", vcr: true do
-
     context "when a policy exists" do
       before do
         options = {}

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

@@ -26,15 +26,15 @@ describe Brightbox::FirewallRule do
         end.to_not raise_error
 
         display_options = {
-          :fields => [
-            :id,
-            :protocol,
-            :source,
-            :sport,
-            :destination,
-            :dport,
-            :icmp_type,
-            :firewall_policy
+          :fields => %i[
+            id
+            protocol
+            source
+            sport
+            destination
+            dport
+            icmp_type
+            firewall_policy
           ],
           :vertical => true
         }