brightbox-cli 5.0.0.rc2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb6588f842b8e2bb0a2b48e1a1eece122697726faa67032b43a868f273b49cd
-  data.tar.gz: 41e2cd7ac07f8423f5a401196710c26befa93e50740248a0d8f430a16c67ec8d
+  metadata.gz: 762c685461579ff25f8897f1e1dc628d8b54624aef6524d681fedfc820422593
+  data.tar.gz: 131247b684d91cbdc8642f5a9c01de913fd415fc98b3b5fd6c32d5f4fe90d444
 SHA512:
-  metadata.gz: e6c6997a8f17a14293c46bc07b040b1d3b07fb3409e3fc60fe02b577e8f5cdf1bfde2fa5d5eb6ae526c680e558b114c28908c3d6614b8efa775a866e201830f3
-  data.tar.gz: 912baa8d1adba3c050bfc5d0f0fc69cf69621d5c28da4d063dfe4a6751e42c54d5b36dec2c017286579c745b3b9ce53bff8354f30081911bc0539e923eb3ece4
+  metadata.gz: e150f42838b2597cfbf35778514fbc8c9dbd42fd571be5a09709bd8b4a2dde6d1957d265646f88b06213be664a1414a1f1e77f6d949899721297072055a4abb4
+  data.tar.gz: 7ceab3597a0ecd83bb829b8833309c20b245d2f0fb49022c52dec8c68be7b0646a17c39a65763b60e210819b35478950b2155adc465c4c65ad12b4ac309931ee

data/.devcontainer/Dockerfile

@@ -0,0 +1,50 @@
+FROM mcr.microsoft.com/devcontainers/ruby:2-3.4-trixie
+
+# Install additional OS packages
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+    libssl-dev \
+    libreadline-dev \
+    zlib1g-dev \
+    libncurses-dev \
+    libyaml-dev \
+    libffi-dev \
+    libgdbm-dev \
+    && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+
+# Switch to vscode user
+USER vscode
+
+# Install OpenSSL 1.1.1w locally
+RUN mkdir -p /home/vscode/.openssl_src \
+    && cd /home/vscode/.openssl_src \
+    && wget -q https://www.openssl.org/source/openssl-1.1.1w.tar.gz \
+    && tar -zxf openssl-1.1.1w.tar.gz \
+    && cd openssl-1.1.1w \
+    && ./config --prefix=/home/vscode/.openssl/1.1.1w --openssldir=/home/vscode/.openssl/1.1.1w \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -rf /home/vscode/.openssl_src
+
+# Link system certificates
+RUN rmdir /home/vscode/.openssl/1.1.1w/certs \
+    && ln -s /etc/ssl/certs /home/vscode/.openssl/1.1.1w/certs \
+    && ln -s /etc/ssl/certs/ca-certificates.crt /home/vscode/.openssl/1.1.1w/cert.pem
+
+# Update RVM
+USER root
+SHELL ["/bin/bash", "-lc"]
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \
+    && curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - \
+    && rvm get master
+
+# Install Rubies
+USER vscode
+RUN git config --global --add safe.directory /usr/local/rvm/repos/ruby
+ENV RUBY_CFLAGS="-Wno-error=implicit-function-declaration"
+RUN rvm install 2.7 --disable-binary --with-openssl-dir=/home/vscode/.openssl/1.1.1w
+RUN rvm install 3.0 --disable-binary --with-openssl-dir=/home/vscode/.openssl/1.1.1w
+RUN rvm install 3.1.6 --disable-binary
+RUN rvm install 3.2.4 --disable-binary
+RUN rvm install 3.3.1 --disable-binary

data/.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+  "name": "Ruby",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers-extra/features/fish-apt-get:1": {},
+    "ghcr.io/devcontainers-extra/features/neovim-apt-get:1": {},
+    "ghcr.io/devcontainers-extra/features/ripgrep:1": {},
+    "ghcr.io/schlich/devcontainer-features/jujutsu:0": {},
+    "ghcr.io/stuartleeks/dev-container-features/shell-history:0": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "visualjj.visualjj"
+      ]
+    }
+  }
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "ruby --version",
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

data/.github/workflows/ruby.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "head"]
     env:
       DEBUG: "true"
     steps:

data/CHANGELOG.md

@@ -1,6 +1,23 @@
-### v5.0.0.rc1 / 2024-12-20
+### v5.1.0 / 2025-12-18
 
-[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.8.0...v5.0.0.rc1)
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v5.0.0...v5.1.0)
+
+Enhancements:
+
+* Update dependencies for Ruby 4.0 support
+
+Changes:
+
+* Numerous dependency gems updated
+
+Testing:
+
+* Added development container
+* CI changes
+
+### v5.0.0 / 2025-01-20
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.8.0...v5.0.0)
 
 Backwards incompatible changes:
 
@@ -11,6 +28,8 @@ Backwards incompatible changes:
 * `show` commands require at least one argument to
    prevent an issue where the wrong, summary API was
    used resulting in missing data in tables
+* `images` architecture is now its own `arch` column and no longer
+  combined with the name field.
 
 Enhancements:
 
@@ -60,6 +79,8 @@ Testing:
   test coverage.
 * Temporary testing config directories are removed explicitly to prevent
   config bleeding in some test scenarios
+* Tests for `server activate_console` confirm support for local time and
+  time zones.
 
 ### v4.8.0 / 2024-10-23
 

data/Gemfile.lock

@@ -1,7 +1,10 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (5.0.0.rc2)
+    brightbox-cli (5.1.0)
+      abbrev
+      base64
+      bigdecimal
       fog-brightbox (>= 1.12.0)
       fog-core (< 2.0)
       gli (~> 2.21)
@@ -10,13 +13,17 @@ PATH
       i18n (>= 0.6, < 1.11)
       mime-types (~> 3.0)
       multi_json (~> 1.11)
+      ostruct
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abbrev (0.1.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
     builder (3.3.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
@@ -52,6 +59,7 @@ GEM
     mime-types-data (3.2024.1203)
     mocha (1.14.0)
     multi_json (1.15.0)
+    ostruct (0.6.3)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
@@ -65,7 +73,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rexml (3.3.9)
+    rexml (3.4.2)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)

data/Jenkinsfile

@@ -4,39 +4,37 @@ pipeline {
     ansiColor('xterm')
   }
   triggers {
-    cron('@monthly')
+    cron('@weekly')
   }
   stages {
     stage("Run tests") {
       parallel {
-        stage("Ruby 2.5") {
+        stage("Ruby 2.7") {
           agent {
             docker {
-              image 'ruby:2.5'
+              image 'ruby:2.7'
             }
           }
           steps {
-            sh 'gem install bundler:2.1.4'
             sh 'bundle install --deployment'
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.6") {
+        stage("Ruby 3.0") {
           agent {
             docker {
-              image 'ruby:2.6'
+              image 'ruby:3.0'
             }
           }
           steps {
-            sh 'gem install bundler:2.1.4'
             sh 'bundle install --deployment'
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.7") {
+        stage("Ruby 3.1") {
           agent {
             docker {
-              image 'ruby:2.7'
+              image 'ruby:3.1'
             }
           }
           steps {
@@ -44,10 +42,10 @@ pipeline {
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 3.0") {
+        stage("Ruby 3.2") {
           agent {
             docker {
-              image 'ruby:3.0'
+              image 'ruby:3.2'
             }
           }
           steps {
@@ -55,10 +53,10 @@ pipeline {
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 3.1") {
+        stage("Ruby 3.3") {
           agent {
             docker {
-              image 'ruby:3.1'
+              image 'ruby:3.3'
             }
           }
           steps {

data/brightbox-cli.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency "abbrev"
+  s.add_dependency "base64"
+  s.add_dependency "bigdecimal"
   s.add_dependency "fog-brightbox", ">= 1.12.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.21"
@@ -29,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", ">= 0.6", "< 1.11"
   s.add_dependency "mime-types", "~> 3.0"
   s.add_dependency "multi_json", "~> 1.11"
+  s.add_dependency "ostruct"
 
   s.add_development_dependency "mocha"
   s.add_development_dependency "pry-remote"

data/lib/brightbox-cli/commands/servers/activate_console.rb

@@ -23,7 +23,11 @@ module Brightbox
           uri.query = "password=#{r['console_token']}"
 
           expires = Time.parse(r["console_token_expires"])
-          consoles << { :url => uri.to_s, :token => r["console_token"], :expires => expires.localtime.to_s }
+          consoles << {
+            url: uri.to_s,
+            token: r["console_token"],
+            expires: expires.localtime.to_s
+          }
         end
 
         render_table(consoles, global_options.merge(:fields => %i[url token expires], :resize => false))

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
@@ -84,7 +84,7 @@ module Brightbox
         locked: locked?,
         username: username,
         arch: arch,
-        name: name.to_s + " (#{arch})",
+        name: name.to_s,
         owner: official ? "brightbox" : owner_id,
         type: type,
         created_at: created_at,

data/lib/brightbox-cli/version.rb

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

data/spec/commands/servers/activate_console_spec.rb

@@ -6,11 +6,153 @@ describe "brightbox servers" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
-    context "" do
+    before do
+      WebMock.reset!
+
+      config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+      stub_client_token_request
+      Brightbox.config.reauthenticate
+    end
+
+    context "without arguments" do
       let(:argv) { %w[servers activate_console] }
 
       it "does not error" do
         expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify servers to activate the console for")
+          expect(stdout).to be_empty
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[servers activate_console srv-lv426] }
+      let(:token_expires) { "2025-01-01T01:01:01Z" }
+
+      before do
+        stub_request(:get, "#{api_url}/1.0/servers/srv-lv426")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              id: "srv-lv426",
+              console_token: nil,
+              console_token_expires: nil,
+              console_url: nil,
+              image: {
+                id: "img-12345"
+              }
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: [
+              {
+                id: "img-12345"
+              }
+            ].to_json
+          )
+
+        stub_request(:post, "#{api_url}/1.0/servers/srv-lv426/activate_console")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 202,
+            body: {
+              id: "srv-lv426",
+              console_token: "<test-token-placeholder>",
+              console_token_expires: token_expires,
+              console_url: "https://console.test.test/srv-lv426",
+              image: {
+                id: "img-12345"
+              }
+            }.to_json
+          )
+      end
+
+      context "when in different time zone" do
+        around do |example|
+          original_tz = ENV["TZ"]
+          example.run
+          ENV["TZ"] = original_tz
+        end
+
+        context "when in UTC" do
+          before do
+            ENV["TZ"] = "Europe/London"
+          end
+
+          context "without daylight savings" do
+            it "does not error" do
+              expect { output }.to_not raise_error
+
+              aggregate_failures do
+                expect(stderr).to match("")
+                expect(stderr).not_to match("ERROR")
+
+                expect(stdout).to match("url")
+                expect(stdout).to match("https://console.test.test/srv-lv426")
+
+                expect(stdout).to match("token")
+                expect(stdout).to match("<test-token-placeholder>")
+
+                expect(stdout).to match("expires")
+                expect(stdout).to match("2025-01-01T01:01")
+              end
+            end
+          end
+
+          context "with daylight savings (BST)" do
+            let(:token_expires) { "2025-07-01T01:01:01Z" }
+
+            it "does not error" do
+              expect { output }.to_not raise_error
+
+              aggregate_failures do
+                expect(stderr).to match("")
+                expect(stderr).not_to match("ERROR")
+
+                expect(stdout).to match("url")
+                expect(stdout).to match("https://console.test.test/srv-lv426")
+
+                expect(stdout).to match("token")
+                expect(stdout).to match("<test-token-placeholder>")
+
+                expect(stdout).to match("expires")
+                expect(stdout).to match("2025-07-01T02:01")
+              end
+            end
+          end
+        end
+
+        context "when in EST" do
+          around do |example|
+            ENV["TZ"] = "America/New_York"
+            example.run
+          end
+
+          it "does not error" do
+            expect { output }.to_not raise_error
+
+            aggregate_failures do
+              expect(stderr).to match("")
+              expect(stderr).not_to match("ERROR")
+
+              expect(stdout).to match("url")
+              expect(stdout).to match("https://console.test.test/srv-lv426")
+
+              expect(stdout).to match("token")
+              expect(stdout).to match("<test-token-placeholder>")
+
+              expect(stdout).to match("expires")
+              expect(stdout).to match("2024-12-31T20:01")
+            end
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ SimpleCov.start do
 
   # Currently just above 75% coverage - don't make it worse
   minimum_coverage 75
-  refuse_coverage_drop
 end
 
 LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))

data/spec/support/vcr.rb

@@ -1,3 +1,17 @@
+# Polyfill for newer Ruby versions that remove
+require "cgi"
+
+unless CGI.respond_to?(:parse)
+  require "uri"
+  def CGI.parse(query)
+    params = Hash.new { |h, k| h[k] = [] }
+    URI.decode_www_form(query).each do |key, value|
+      params[key] << value
+    end
+    params
+  end
+end
+
 require "vcr"
 
 VCR.configure do |vcr|

metadata

@@ -1,15 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.1.0
 platform: ruby
 authors:
 - John Leach
 - Paul Thornthwaite
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-12-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: abbrev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +171,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +335,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - ".gitattributes"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -826,6 +885,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -840,7 +900,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: The Brightbox cloud management system
 test_files: