brightbox-cli 4.8.0 → 5.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1957aedb76eb618990c1deca7846319433ce2cc3b88ed2f4b3eac0b4aca3b3c0
-  data.tar.gz: b7a83328c30eb76699b880cb8a6a356cf61bf3e362c19c50b1f8c4dcbbc17c6d
+  metadata.gz: 4acdda82f537081ebb5cb73f47463dcb76aa4d13903ef59df37e9c7159e6bcef
+  data.tar.gz: 653ee68c860f906a56daa9c859fcd62b625bcaa32f2c7610fdd62ea57513544e
 SHA512:
-  metadata.gz: 1a2a3316ce568a85d06eea928b5382d0a9a0b2737e2e14c01940a2f2071f8cd10d5c7a25c4f3af2878d5d453c98d70b1bfb50a6fa92b46ed7c5ca4f075fb844f
-  data.tar.gz: 3cd77f4748d94aea53ac8685268228f112aef95e9c8b9a8aca00692d67dc10e92948fa5acef2c696cf6ce08c58920ded07a1167e3933fcc4faf9e2736c480903
+  metadata.gz: 64289163116f1e986cad76c3794870c7fe28ac5d2a96ad7cf433ad3bf4fb4f8cb4445930dbddd13d7e9a803df1497940df47877689a3cee5fac5f50561b3f99d
+  data.tar.gz: 793e0f20d1b18450a7024272a6eebb1b61e470c250e3dee740c7251c963b63914fd38ee48af2ae113a27d4046f251320267fece5b8cdd4d298222524aeb46d64

data/.github/workflows/ruby.yml

@@ -19,8 +19,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
 
     steps:
     - uses: actions/checkout@v3
@@ -30,6 +31,8 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - name: Install Bundler
+      run: gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1 | awk '{print $1}')
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.8.0)
-      dry-inflector (= 0.2.0)
-      fog-brightbox (>= 1.11.0)
+    brightbox-cli (5.0.0.alpha)
+      fog-brightbox (>= 1.12.0)
       fog-core (< 2.0)
       gli (~> 2.21)
       highline (~> 2.0)
@@ -24,9 +23,10 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    dry-inflector (0.2.0)
+    docile (1.4.1)
+    dry-inflector (1.1.0)
     excon (0.112.0)
-    fog-brightbox (1.11.0)
+    fog-brightbox (1.12.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json
@@ -38,18 +38,18 @@ GEM
       fog-core
       multi_json (~> 1.10)
     formatador (0.3.0)
-    gli (2.21.5)
+    gli (2.22.0)
     hashdiff (1.0.1)
     highline (2.1.0)
     hirb (0.7.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    logger (1.6.1)
+    logger (1.6.2)
     method_source (1.0.0)
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+    mime-types-data (3.2024.1203)
     mocha (1.14.0)
     multi_json (1.15.0)
     parallel (1.22.1)
@@ -65,7 +65,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rexml (3.2.5)
+    rexml (3.3.9)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -95,6 +95,12 @@ GEM
     rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
     slop (3.6.0)
     unicode-display_width (2.1.0)
     vcr (2.9.3)
@@ -115,8 +121,9 @@ DEPENDENCIES
   rubocop
   rubocop-rake
   rubocop-rspec
+  simplecov
   vcr (~> 2.5)
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.4.22

data/brightbox-cli.gemspec

@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.metadata['rubygems_mfa_required'] = 'true'
 
-  s.required_ruby_version = ">= 2.5"
+  s.required_ruby_version = ">= 2.7"
 
   s.files         = `git ls-files`.split("\n") + `find lib/brightbox-cli/vendor`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 1.11.0"
+  s.add_dependency "fog-brightbox", ">= 1.12.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.21"
   s.add_dependency "highline", "~> 2.0"
@@ -30,11 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency "mime-types", "~> 3.0"
   s.add_dependency "multi_json", "~> 1.11"
 
-  # Indirect dependency
-  # 0.3 drops support for Ruby < 2.7
-  # 0.2.1 drops support for Ruby < 2.6
-  s.add_dependency "dry-inflector", "= 0.2.0"
-
   s.add_development_dependency "mocha"
   s.add_development_dependency "pry-remote"
   s.add_development_dependency "rake"
@@ -42,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rubocop"
   s.add_development_dependency "rubocop-rake"
   s.add_development_dependency "rubocop-rspec"
+  s.add_development_dependency "simplecov"
   s.add_development_dependency "vcr", "~> 2.5"
   s.add_development_dependency "webmock"
 end

data/lib/brightbox-cli/commands/cloudips/unmap.rb

@@ -1,6 +1,6 @@
 module Brightbox
   command [:cloudips] do |cmd|
-    cmd.desc I18n.t("cloudips.map.desc")
+    cmd.desc I18n.t("cloudips.unmap.desc")
     cmd.arg_name "cloudip-id..."
     cmd.command [:unmap] do |c|
       c.action do |global_options, _options, args|

data/lib/brightbox-cli/commands/firewall/policies_apply.rb

@@ -1,6 +1,6 @@
 module Brightbox
   desc I18n.t("firewall.policies.desc")
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.apply.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:apply] do |c|

data/lib/brightbox-cli/commands/firewall/policies_create.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.create.desc")
     cmd.arg_name "[server-group-id...]"
     cmd.command [:create] do |c|

data/lib/brightbox-cli/commands/firewall/policies_destroy.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.destroy.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:destroy] do |c|

data/lib/brightbox-cli/commands/firewall/policies_list.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.default_command :list
 
     cmd.desc I18n.t("firewall.policies.list.desc")

data/lib/brightbox-cli/commands/firewall/policies_remove.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.remove.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:remove] do |c|

data/lib/brightbox-cli/commands/firewall/policies_show.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.show.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:show] do |c|

data/lib/brightbox-cli/commands/firewall/policies_update.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  command [:"firewall-policies"] do |cmd|
+  command ["firewall-policies", "firewall-policy"] do |cmd|
     cmd.desc I18n.t("firewall.policies.update.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:update] do |c|

data/lib/brightbox-cli/commands/lbs/create.rb

@@ -32,18 +32,21 @@ module Brightbox
       c.default_value "/"
       c.flag [:s, "hc-request"]
 
-      c.desc "Healthcheck interval"
+      c.desc "Health check interval"
       c.default_value "5000"
       c.flag [:e, "hc-interval"]
 
-      c.desc "Healthcheck threshold up. Number of successful healthchecks for the node to be considered up."
+      c.desc "Health check threshold up. Number of successful health checks for the node to be considered up."
       c.default_value "3"
       c.flag [:u, "hc-up"]
 
-      c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
+      c.desc "Health check threshold down. Number of failed health checks for the node to be considered down."
       c.default_value "3"
       c.flag [:d, "hc-down"]
 
+      c.desc "ACME domains"
+      c.flag ["acme_domains"]
+
       c.desc "Filepath to the SSL certificate file to use."
       c.flag ["ssl-cert"]
 
@@ -78,6 +81,14 @@ module Brightbox
           options[:y] = listeners.first[:protocol]
         end
 
+        if options[:b]
+          options[:b] = options[:b].to_i
+        end
+
+        if options["acme_domains"]
+          options["acme_domains"] = options["acme_domains"].split(",")
+        end
+
         hc_arg_lookup = {
           :k => :port,
           :y => :type,
@@ -96,7 +107,7 @@ module Brightbox
           end
         end
 
-        # SSL argumens
+        # SSL arguments
         ssl_cert_path = options["ssl-cert"]
         ssl_key_path = options["ssl-key"]
 
@@ -113,16 +124,19 @@ module Brightbox
 
         msg = "Creating a new load balancer"
         info msg
-        lb = LoadBalancer.create(:policy => options[:policy],
-                                 :name => options[:n],
-                                 :buffer_size => options[:b],
-                                 :healthcheck => healthcheck,
-                                 :listeners => listeners,
-                                 :certificate_pem => ssl_cert,
-                                 :certificate_private_key => ssl_key,
-                                 :ssl_minimum_version => options["ssl-min-ver"],
-                                 :sslv3 => options["sslv3"],
-                                 :nodes => nodes)
+        lb = LoadBalancer.create(
+          domains: options["acme_domains"],
+          buffer_size: options[:b],
+          certificate_pem: ssl_cert,
+          certificate_private_key: ssl_key,
+          healthcheck: healthcheck,
+          listeners: listeners,
+          name: options[:n],
+          nodes: nodes,
+          policy: options[:policy],
+          ssl_minimum_version: options["ssl-min-ver"],
+          sslv3: options["sslv3"]
+        )
         render_table([lb], global_options)
       end
     end

data/lib/brightbox-cli/commands/lbs/show.rb

@@ -16,6 +16,7 @@ module Brightbox
             created_at
             deleted_at
             policy
+            acme_domains
             ssl_minimum_version
             ssl_issuer
             ssl_subject

data/lib/brightbox-cli/commands/lbs/update.rb

@@ -37,6 +37,9 @@ module Brightbox
       c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
       c.flag [:d, "hc-down"]
 
+      c.desc "ACME domains"
+      c.flag ["acme_domains"]
+
       c.desc "Filepath to the SSL certificate file to use."
       c.flag ["ssl-cert"]
 
@@ -100,10 +103,10 @@ module Brightbox
         end
 
         if options[:b]
-          lbopts[:buffer_size] = options[:b]
+          lbopts[:buffer_size] = options[:b].to_i
         end
 
-        # SSL argumens
+        # SSL arguments
         ssl_cert_path = options["ssl-cert"]
         ssl_key_path = options["ssl-key"]
         remove_ssl = options["remove-ssl"]
@@ -132,6 +135,10 @@ module Brightbox
           lbopts[:ssl_minimum_version] = options["ssl-min-ver"]
         end
 
+        if options["acme_domains"]
+          lbopts[:domains] = options["acme_domains"].split(",")
+        end
+
         lbopts.nilify_blanks
 
         lb = LoadBalancer.find lb_id

data/lib/brightbox-cli/config.rb

@@ -112,7 +112,8 @@ module Brightbox
     private
 
     def default_config_dir
-      File.join(ENV.fetch("HOME", nil), ".brightbox")
+      config_dir = ENV.fetch("HOME", nil) || Dir.pwd
+      File.join(config_dir, ".brightbox")
     end
 
     def configured?

data/lib/brightbox-cli/images.rb

@@ -16,7 +16,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      %i[id owner type created_on status size name]
+      %i[id owner type created_on status size arch name]
     end
 
     # Filter out images that are not of the right type, account or status if the option is passed
@@ -82,7 +82,7 @@ module Brightbox
       o[:locked] = locked?
       o[:username] = username
       o[:arch] = arch
-      o[:name] = name.to_s + " (#{arch})"
+      o[:name] = name.to_s
       o[:owner] = owner_id
       o[:owner] = "brightbox" if official
       o[:type] = type

data/lib/brightbox-cli/load_balancers.rb

@@ -3,9 +3,24 @@ module Brightbox
     def self.require_account?; true; end
 
     def self.create(options)
+      options.delete(:buffer_size) if options[:buffer_size].nil?
+      options[:buffer_size] = options[:buffer_size].to_i if options[:buffer_size]
+
       new(conn.load_balancers.create(options))
     end
 
+    def acme_domains
+      if attributes["acme"]
+        attributes["acme"]["domains"].map do |domain|
+          [domain["identifier"], domain["status"]].join(":")
+        end.join(",")
+      else
+        []
+      end
+    rescue StandardError
+      []
+    end
+
     def attributes
       fog_model.attributes
     end
@@ -13,6 +28,7 @@ module Brightbox
     def to_row
       attributes.merge(
         :locked => locked?,
+        :acme_domains => acme_domains,
         :ssl_minimum_version => ssl_minimum_version,
         :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,
@@ -31,11 +47,13 @@ module Brightbox
     end
 
     def cloud_ip_ids
-      @cloud_ip_ids ||= attributes["cloud_ips"].map { |n| n["id"] } if attributes["cloud_ips"]
+      cips = attributes["cloud_ips"] || attributes[:cloud_ips]
+      @cloud_ip_ids ||= cips.map { |n| n["id"] } if cips
     end
 
     def cloud_ips
-      @cloud_ips ||= attributes["cloud_ips"].map { |n| n["public_ip"] } if attributes["cloud_ips"]
+      cips = attributes["cloud_ips"] || attributes[:cloud_ips]
+      @cloud_ips ||= cips.map { |n| n["public_ip"] } if cips
     end
 
     def listeners

data/lib/brightbox-cli/servers.rb

@@ -45,7 +45,7 @@ module Brightbox
       a[:status] = fog_model.state
       a[:locked] = locked?
       a[:zone] = zone && zone["handle"]
-      a[:hostname] = id
+      a[:hostname] = hostname
       a[:public_hostname] = "public.#{fqdn}" unless cloud_ips.empty?
       a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? { |i| i["ipv6_address"] }
       a

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "4.8.0".freeze unless defined?(Brightbox::VERSION)
+  VERSION = "5.0.0.alpha".freeze unless defined?(Brightbox::VERSION)
 end

data/spec/commands/lbs/create_spec.rb

@@ -11,20 +11,145 @@ describe "brightbox lbs" do
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
     end
 
-    context "" do
+    context "without required nodes arguments" do
       let(:argv) { %w[lbs create] }
 
       it "does not error" do
         expect { output }.to_not raise_error
+
+        expect(stderr).to eq("ERROR: You must specify which servers to balance connections to\n")
+      end
+    end
+
+    context "with required nodes arguments" do
+      let(:argv) { %w[lbs create srv-12345] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }] } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "nodes": [
+            {
+              "id": "srv-12345"
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("nodes" => [{ "node" => "srv-12345" }]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "makes request" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    context "with required nodes arguments" do
+      let(:argv) { %w[lbs create srv-12345] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }] } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "nodes": [
+            {
+              "id": "srv-12345"
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("nodes" => [{ "node" => "srv-12345" }]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "makes request" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    context "with multiple nodes" do
+      let(:argv) { %w[lbs create srv-12345 srv-54321] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }, { node: "srv-54321" }] } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "nodes": [
+            {
+              "id": "srv-12345"
+            },
+            {
+              "id": "srv-54321"
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("nodes" => [{ "node" => "srv-12345" }, { "node" => "srv-54321" }]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "makes request" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
       end
     end
 
-    context "--ssl-min-ver=TLSv1.0" do
+    context "with --buffer_size" do
+      let(:argv) { %w[lbs create --buffer-size 1024 srv-12345] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }], buffer_size: 1024 } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "buffer_size": 1024
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("buffer_size" => 1024))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes buffer_size in response" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    context "with --ssl-min-ver=TLSv1.0" do
       let(:argv) { ["lbs", "create", "--ssl-min-ver", "TLSv1.0", "srv-12345"] }
       let(:expected_args) { { ssl_minimum_version: "TLSv1.0" } }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-12345",
           "ssl_minimum_version":"TLSv1.0"
@@ -44,5 +169,46 @@ describe "brightbox lbs" do
         expect(stdout).to include("lba-12345")
       end
     end
+
+    context "--acme-domains=example.com" do
+      let(:argv) { ["lbs", "create", "--acme-domains", "example.com", "--listeners", "443:443:https:5000", "lba-12345"] }
+      let(:json_response) do
+        <<~EOS
+        {
+          "id":"lba-12345",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "example.com",
+                "last_message": null,
+                "status": "pending"
+              }
+            ]
+          },
+          "certificate": null,
+          "listeners": [
+            {
+              "in": 443,
+              "out": 443,
+              "protocol": "https",
+              "proxy_protocol": null,
+              "timeout": 5000
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(body: hash_including(domains: ["example.com"]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes acme_certificate_domain in response" do
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

data/spec/commands/lbs/show_spec.rb

@@ -6,11 +6,95 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
-    context "" do
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
+    context "without identifier argument" do
       let(:argv) { %w[lbs show] }
+      let(:json_response) do
+        <<~EOS
+        [
+          {
+            "id":"lba-12345",
+            "name":"app-lb1",
+            "status":"active",
+            "created_at":"2012-03-05T12:00:00Z",
+            "nodes":[
+              {
+                "id":"srv-12345",
+                "status":"active"
+              }
+            ]
+          }
+        ]
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .to_return(:status => 200, :body => json_response)
+      end
+
+      it "shows load balancer details" do
+        aggregate_failures do
+          expect(stderr).to eq("")
+          expect(stdout).to include("id: lba-12345")
+          expect(stdout).to include("status: active")
+          expect(stdout).to include("name: app-lb1")
+          expect(stdout).to include("created_at: 2012-03-05T12:00Z")
+          expect(stdout).to include("nodes: srv-12345")
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[lbs show lba-12345] }
+      let(:json_response) do
+        <<~EOS
+        {
+          "id":"lba-12345",
+          "name":"app-lb1",
+          "status":"active",
+          "created_at":"2012-03-05T12:00:00Z",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "domain.test",
+                "status": "verified"
+              },
+              {
+                "identifier": "domain2.test",
+                "status": "verified"
+              }
+            ]
+          },
+          "nodes":[
+            {
+              "id":"srv-12345",
+              "status":"active"
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => json_response)
+      end
 
-      it "does not error" do
-        expect { output }.to_not raise_error
+      it "shows load balancer details" do
+        aggregate_failures do
+          expect(stderr).to eq("")
+          expect(stdout).to include("id: lba-12345")
+          expect(stdout).to include("status: active")
+          expect(stdout).to include("name: app-lb1")
+          expect(stdout).to include("created_at: 2012-03-05T12:00Z")
+          expect(stdout).to include("nodes: srv-12345")
+          expect(stdout).to include("acme_domains: domain.test:verified,domain2.test:verified")
+        end
       end
     end
   end

data/spec/commands/lbs/update_spec.rb

@@ -23,7 +23,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--ssl-min-ver", "TLSv1.0", "lba-12345"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-12345",
           "ssl_minimum_version":"TLSv1.0"
@@ -50,7 +50,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--sslv3", "lba-grt24"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-grt24",
           "ssl_minimum_version":"TLSv1.0"
@@ -77,7 +77,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--no-sslv3", "lba-kl432"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-kl432",
           "ssl_minimum_version":"TLSv1.0"
@@ -99,5 +99,49 @@ describe "brightbox lbs" do
         expect(stdout).to include("lba-kl432")
       end
     end
+
+    context "--acme-domains=example.com" do
+      let(:argv) { ["lbs", "update", "--acme-domains", "example.com", "--listeners", "443:443:https:5000", "lba-12345"] }
+      let(:json_response) do
+        <<~EOS
+        {
+          "id":"lba-12345",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "example.com",
+                "last_message": null,
+                "status": "pending"
+              }
+            ]
+          },
+          "certificate": null,
+          "listeners": [
+            {
+              "in": 443,
+              "out": 443,
+              "protocol": "https",
+              "proxy_protocol": null,
+              "timeout": 5000
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"lba-12345"}')
+
+        stub_request(:put, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .with(body: hash_including(domains: ["example.com"]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes acme_certificate_domain in response" do
+        expect(stderr).to eq("Updating load balancer lba-12345\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift LIB_DIR unless
   $LOAD_PATH.include?(LIB_DIR) || $LOAD_PATH.include?(File.expand_path(LIB_DIR))
 
+require "simplecov"
 require "brightbox_cli"
 require "json"
 require "tmpdir"
@@ -28,6 +29,17 @@ TEST_RUNNER_HOME = ENV.fetch("HOME", nil)
 # Reduce the default fog timeout
 Fog.timeout = 10
 
+require "fog/brightbox"
+
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter "/config/"
+  add_filter "/vendor/"
+end
+
+# Currently just above 80% coverage - don't make it worse
+SimpleCov.minimum_coverage 80
+
 RSpec.configure do |config|
   config.include CommonHelpers
   config.include ConfigHelpers

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

@@ -2,25 +2,45 @@ require "spec_helper"
 
 describe Brightbox::BBConfig do
   describe "#config_directory" do
+    context "when HOME is not set" do
+      let(:working_dir) { Dir.mktmpdir("working") }
+
+      before do
+        allow(Dir).to receive(:pwd).and_return(working_dir)
+        allow(ENV).to receive(:fetch).with("HOME", nil).and_return(nil)
+      end
+
+      it "returns current directory" do
+        config = Brightbox::BBConfig.new
+
+        expect(config.config_directory).to start_with(working_dir)
+        expect(config.config_directory).to end_with(".brightbox")
+      end
+    end
+
     context "when default location is used" do
       it "returns a String of the users `.brightbox` directory" do
         config = Brightbox::BBConfig.new
 
         expanded_path = File.expand_path("~/.brightbox")
-        expect(config.config_directory).to eql(expanded_path)
+        expect(config.config_directory).to eq(expanded_path)
       end
     end
 
     context "when absolute custom location is set" do
       let(:custom_dir) { Dir.mktmpdir("custom") }
 
+      after do
+        FileUtils.rm_rf(custom_dir)
+      end
+
       it "returns a String of the expanded directory" do
         config_options = {
           :directory => custom_dir
         }
         config = Brightbox::BBConfig.new(config_options)
 
-        expect(config.config_directory).to eql(custom_dir)
+        expect(config.config_directory).to eq(custom_dir)
       end
     end
 
@@ -32,7 +52,7 @@ describe Brightbox::BBConfig do
         config = Brightbox::BBConfig.new(config_options)
 
         expanded_path = File.expand_path("~/.cli_config")
-        expect(config.config_directory).to eql(expanded_path)
+        expect(config.config_directory).to eq(expanded_path)
       end
     end
   end

data/spec/unit/brightbox/server/hostname_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/server"
+
+RSpec.describe Brightbox::Server, "#hostname" do
+  let(:fog_model) { Fog::Brightbox::Compute::Server.new(fog_settings) }
+  let(:server) { described_class.new(fog_model) }
+
+  context "when hostname is not equal to id" do
+    let(:fog_settings) do
+      {
+        id: "srv-12345",
+        cloud_ips: [],
+        hostname: "server-hostname",
+        image_id: "img-12345",
+        interfaces: [],
+        server_type: "typ-12345"
+      }
+    end
+
+    it "returns the hostname" do
+      expect(server.attributes[:id]).to eq("srv-12345")
+      expect(server.attributes[:hostname]).to eq("server-hostname")
+
+      expect(server.hostname).to eq("server-hostname")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 5.0.0.alpha
 platform: ruby
 authors:
 - John Leach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -130,21 +130,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -158,7 +158,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-remote
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,7 +186,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -200,7 +200,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -214,7 +214,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,7 +228,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -781,6 +781,7 @@ files:
 - spec/unit/brightbox/server/destroy_spec.rb
 - spec/unit/brightbox/server/find_or_call_spec.rb
 - spec/unit/brightbox/server/find_spec.rb
+- spec/unit/brightbox/server/hostname_spec.rb
 - spec/unit/brightbox/server/shutdown_spec.rb
 - spec/unit/brightbox/server/start_spec.rb
 - spec/unit/brightbox/server/stop_spec.rb
@@ -812,14 +813,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: The Brightbox cloud management system
@@ -1149,6 +1150,7 @@ test_files:
 - spec/unit/brightbox/server/destroy_spec.rb
 - spec/unit/brightbox/server/find_or_call_spec.rb
 - spec/unit/brightbox/server/find_spec.rb
+- spec/unit/brightbox/server/hostname_spec.rb
 - spec/unit/brightbox/server/shutdown_spec.rb
 - spec/unit/brightbox/server/start_spec.rb
 - spec/unit/brightbox/server/stop_spec.rb