brightbox-cli 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc36c35cb32073368b55abc445d0720ce2e635336e1c3b8af4ef9e1dcedc0000
-  data.tar.gz: '0351935cba15d3c1503c1e8c44d7d4f5258d3d07f67700d363a5b043e58e287e'
+  metadata.gz: b24f4292c151b1a916960e8a251c3928468ac915ee5f1fe139e8ef3a4d1e0a82
+  data.tar.gz: f7da261677380fd05cf1e4c3f73021db46c0b24b7da36a8e3820928ca96cfbe4
 SHA512:
-  metadata.gz: e230034d8c611139a5ed70b1508f1aef3ff3dd263e8f8f53acd58aad72c0616bdcfd5c44ae267e1fa27be66c7958e25e7de986f9169e29c484a47f4b5ceb1e0b
-  data.tar.gz: c4672a3f3efcb30390a6fb536d2542c36988fbb1ba82b5fa59d6dfa1f58868d5518e36ac48f54d9987294b0de46531f0c9b8cb383d21817631a0436008d3e825
+  metadata.gz: e8eed506ef89c92c2f85d0567fb3e1c8910c3705a209330025d2443ead0fc237bc210d9a5867d9dc92b8331ba9d10d03992640307fcdf5e00575f815af1a8984
+  data.tar.gz: 49ae72e6347419f04bdb4c2190a0dc7ca2dc5066eda0c831adfe80cf4cec7483be83a3b6feabb1de837827dc97bbe5e0cd891874875e19115a30a523ed9ac3b9

data/CHANGELOG.md

@@ -1,10 +1,33 @@
+### v4.2.1 / 2022-11-16
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.2.0...v4.2.1)
+
+Bug fixes:
+
+* Bumped version of `highline` gem to fix issue when prompting for password during `brightbox login` command on Ruby 3.0+.
+* Fixed help output for `brightbox login` by correcting DSL declaration.
+
+### v4.2.0 / 2022-11-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.1.0...v4.2.0)
+
+Changes:
+
+* Adds three new, mutually exclusive options to `images create` to specify
+  different sources:
+  * `url` can specify source as a URL for a HTTP or HTTPS download rather than
+     an existing FTP upload.
+  * `server` can specify a server ID to create a snapshot image from.
+  * `volume` can specify a volume ID to create a snapshot image from.
+
 ### v4.1.0 / 2022-08-01
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.0.0...v4.1.0)
 
 Changes:
 
-* Add `volume-size` to `servers create` to allow passing of arbitary sizes for network based storage types.
+* Adds `volume-size` to `servers create` to allow passing of arbitrary sizes for
+  network based storage types.
 
 ### v4.0.0 / 2022-08-01
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.1.0)
+    brightbox-cli (4.2.1)
       dry-inflector (= 0.2.0)
       fog-brightbox (>= 1.8.0)
       fog-core (< 2.0)
       gli (~> 2.21)
-      highline (~> 1.6)
+      highline (~> 2.0)
       hirb (~> 0.6)
       i18n (>= 0.6, < 1.11)
       mime-types (~> 3.0)
@@ -25,7 +25,7 @@ GEM
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.92.4)
+    excon (0.94.0)
     fog-brightbox (1.8.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
@@ -40,7 +40,7 @@ GEM
     formatador (0.3.0)
     gli (2.21.0)
     hashdiff (1.0.1)
-    highline (1.7.10)
+    highline (2.0.3)
     hirb (0.7.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
@@ -117,4 +117,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/brightbox-cli.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog-brightbox", ">= 1.8.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.21"
-  s.add_dependency "highline", "~> 1.6"
+  s.add_dependency "highline", "~> 2.0"
   s.add_dependency "hirb", "~> 0.6"
   s.add_dependency "i18n", ">= 0.6", "< 1.11"
   s.add_dependency "mime-types", "~> 3.0"

data/lib/brightbox-cli/commands/images/register.rb

@@ -11,17 +11,26 @@ module Brightbox
       c.desc "Image Username"
       c.flag [:u, "username"]
 
-      c.desc "Archtecture of the image (i686 or x86_64)"
+      c.desc "Architecture of the image (i686 or x86_64)"
       c.flag [:a, "arch"]
 
       c.desc "Source filename of the image you uploaded to the image library"
       c.flag [:s, "source"]
 
+      c.desc "Source server ID to create image from"
+      c.flag ["server"]
+
+      c.desc "Source URL of the image to download via HTTP"
+      c.flag ["url"]
+
+      c.desc "Source volume ID to create image from"
+      c.flag ["volume"]
+
       c.desc "Set image mode to be either 'virtio' or 'compatibility'"
       c.default_value "virtio"
       c.flag [:m, "mode"]
 
-      c.desc "Set image to be publically visible (true or false)"
+      c.desc "Set image to be publicly visible (true or false)"
       c.default_value "false"
       c.flag [:p, "public"]
 
@@ -30,22 +39,38 @@ module Brightbox
 
       c.action do |global_options, options, _args|
         raise "You must specify the architecture" unless options[:a]
-        raise "You must specify the source filename" unless options[:s]
         raise "Mode must be 'virtio' or 'compatibility'" unless options[:m] == "virtio" || options[:m] == "compatibility"
         raise "Public must be true or false" unless options[:p] == "true" || options[:p] == "false"
 
+        # Sources are mutually exclusive but at least one is required from this list
+        source_options = [:s, :server, :url, :volume].map { |k| options[k] }
+
+        if source_options.none?
+          raise "You must specify one of 'server', 'source', 'url', or 'volume'"
+        elsif !source_options.one?
+          raise "You cannot register from multiple sources. Use either 'source', 'server', 'url', or 'volume'"
+        end
+
         compatibility_flag = options[:m] == "compatibility"
 
         public_flag = options[:p] == "true"
 
         image_options = {
-          :name => options[:n], :arch => options[:a],
-          :username => options[:u], :source => options[:s],
+          :arch => options[:a],
           :compatibility_mode => compatibility_flag,
-          :description => options[:d], :public => public_flag,
-          :min_ram => options["min-ram"].to_i
+          :description => options[:d],
+          :min_ram => options["min-ram"].to_i,
+          :name => options[:n],
+          :public => public_flag,
+          :username => options[:u]
         }
 
+        # These should be limited to one by the mutually exclusive check earlier
+        image_options[:http_url] = options[:url] if options[:url]
+        image_options[:server] = options[:server] if options[:server]
+        image_options[:source] = options[:s] if options[:s]
+        image_options[:volume] = options[:volume] if options[:volume]
+
         image = Image.register(image_options)
 
         render_table([image], global_options)

data/lib/brightbox-cli/commands/login.rb

@@ -1,13 +1,12 @@
 module Brightbox
+  desc I18n.t("login.desc")
+  arg :email
   command [:login] do |cmd|
-    cmd.desc I18n.t("login.desc")
-    cmd.arg_name "email"
-
     cmd.desc "password, if not specified you will be prompted"
-    cmd.flag [:p, "password"]
+    cmd.flag [:p, "password"], arg_name: "password"
 
-    cmd.desc "default account"
-    cmd.flag [:"default-account"]
+    cmd.desc "Set a default account"
+    cmd.flag [:"default-account"], arg_name: "acc-12345"
 
     cmd.flag [:"application-id"]
     cmd.flag [:"application-secret"]

data/lib/brightbox-cli/version.rb

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

data/locales/en.yml

@@ -136,6 +136,8 @@ en:
     update:
       desc: Update a load balancer
       long_desc: All intervals and timeouts are in milliseconds
+  login:
+    desc: Authenticate using an email address
   servers:
     desc: Manage an account's servers
     activate_console:

data/spec/commands/images/register_spec.rb

@@ -23,7 +23,67 @@ describe "brightbox images" do
       end
     end
 
-    context "with minimal arguments" do
+    context "without any source" do
+      let(:argv) { %w[images register --arch x86_64] }
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("ERROR: You must specify one of 'server', 'source', 'url', or 'volume'")
+        expect(stdout).to match("")
+      end
+    end
+
+    context "with mutually exclusive arguments" do
+      let(:argv) { %w[images register --arch x86_64 --source test.img --url http://example.com/test.img] }
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("ERROR: You cannot register from multiple sources. Use either 'source', 'server', 'url', or 'volume'")
+        expect(stdout).to match("")
+      end
+    end
+
+    context "with 'server' argument" do
+      let(:argv) { %w[images register --arch x86_64 --server srv-12345] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  server: "srv-12345"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: /"server":"srv-12345"/)
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+      end
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("img-12345")
+      end
+    end
+
+    context "with 'source' argument" do
       let(:argv) { %w[images register --arch x86_64 --source custom.img] }
 
       before do
@@ -61,6 +121,82 @@ describe "brightbox images" do
       end
     end
 
+    context "with 'url' argument" do
+      let(:argv) { %w[images register --arch x86_64 --url https://example.com/os-22.iso] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  http_url: "https://example.com/os-22.iso"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: %r{"http_url":"https://example.com/os-22.iso"})
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+      end
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("img-12345")
+      end
+    end
+
+    context "with 'volume' argument" do
+      let(:argv) { %w[images register --arch x86_64 --volume vol-12345] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  volume: "vol-12345"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: /"volume":"vol-12345"/)
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+      end
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("img-12345")
+      end
+    end
+
     context "with min-ram argument" do
       let(:argv) { %w[images register --arch x86_64 --source custom.img --min-ram 2048] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - John Leach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement