brightbox-cli 2.10.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e149ba9690fe26c97b144bb44335ad61bb1d4b618dc40cf25d67db0ce2125f
-  data.tar.gz: 671a10236bb00873715e7efbb833517bdada9fa473b53ae59ada833c5f213e0c
+  metadata.gz: 0c5b05513e19a2b2086a60adcdcc9db34da763ea57057fe3cd4565f13d996325
+  data.tar.gz: 2330375316fccfb4681d2eafd793070821ac58e8af68d73c9b8370301a4ecd43
 SHA512:
-  metadata.gz: 32983783ff888dbd51d1b3e2354e39d2958e9c88e44058e1a9e0f6e3eb660379fcb1b40d7b1a6b98a0911fbb95005fdd06d846b253efde60cf2da94abe42989e
-  data.tar.gz: 9f8b40a4566056cb001c6370e6f0b9b801e1955124610f0a993d6d3b6725c86643ee7452765c532e297b6be3886b081c22165ba7b2bca90a1ea664c1f636e4c9
+  metadata.gz: a2b9f70e55d3ac5273a6179ff17bd10f5c99d75c628d67dfd671413d657717d34f00a8ecbbb1397b952b56ed34b55249e836c09417c32b69eebcb677877b941e
+  data.tar.gz: de89095e13e79781b3c04828a4e20e1150056a4e3f838fa19923f949741c332cbeb4bb4b46b38566f2a7dc2b6e76b893cd658963b5194b33f7a79674cf650314

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 sudo: false
+
 rvm:
-  - 1.9
   - 2.0
   - 2.1
   - 2.2
   - 2.3
   - 2.4
-  - 2.5
+  - 2.6

data/CHANGELOG.md

@@ -1,3 +1,55 @@
+### v3.0.0 / 2020-07-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.12.0...v3.0.0)
+
+Backwards incompatible changes:
+
+* Dropped support for Ruby 1.9
+
+Changes:
+
+* Update `fog-brightbox` to v1.1.0
+* Update `rake` to v12.3.3 to resolve CVE-2020-8130
+* Update `rspec` to v3.9 to avoid issue when updating `rake`
+
+Bug fixes:
+
+* Creating an SQL instance from an existing snapshot has been fixed following
+  the update for `fog-brightbox v1.1.0`
+
+### v2.12.0 / 2020-01-28
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.11.2...v2.12.0)
+
+Enhancements:
+
+* Adds `token create` to always attempt to reauthenticate and display a token.
+
+### v2.11.2 / 2020-01-07
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.11.1...v2.11.2)
+
+Bug fixes:
+
+* Update `excon` to v0.71.0 to fix security issue.
+
+### v2.11.1 / 2019-10-29
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.11.0...v2.11.1)
+
+Bug fixes:
+
+* Constrain version of `dry-inflector` to ensure gem can work with older
+  versions of Ruby.
+
+### v2.11.0 / 2019-06-06
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.10.0...v2.11.0)
+
+Enhancements:
+
+* Prompts for 2FA token if set up on a user account being used to authenticate.
+
 ### v2.10.0 / 2019-03-20
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.9.3...v2.10.0)

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.10.0)
-      fog-brightbox (>= 0.16.0, < 1.0)
+    brightbox-cli (3.0.0)
+      dry-inflector (< 0.2)
+      fog-brightbox (>= 1.1.0)
       fog-core (< 2.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
@@ -15,18 +16,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    builder (3.2.3)
+    builder (3.2.4)
     coderay (1.0.9)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.3)
     dry-inflector (0.1.2)
-    excon (0.62.0)
-    fog-brightbox (0.16.1)
+    excon (0.75.0)
+    fog-brightbox (1.1.0)
       dry-inflector
-      fog-core
+      fog-core (>= 1.45, < 3.0)
       fog-json
-      mime-types
     fog-core (1.45.0)
       builder
       excon (~> 0.58)
@@ -52,15 +52,20 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rake (10.1.0)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
+    rake (12.3.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     safe_yaml (1.0.4)
     slop (3.4.5)
     vcr (2.5.0)
@@ -76,9 +81,9 @@ DEPENDENCIES
   mocha
   pry-remote
   rake
-  rspec (~> 2.99)
+  rspec
   vcr (~> 2.5)
   webmock
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/Jenkinsfile

@@ -9,17 +9,6 @@ pipeline {
   stages {
     stage("Run tests") {
       parallel {
-        stage("Ruby 1.9.3") {
-          agent {
-            docker {
-              image 'ruby:1.9.3'
-            }
-          }
-          steps {
-            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config BUNDLE_DISABLE_SHARED_GEMS=true bundle install --deployment'
-            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config bundle exec rake test'
-          }
-        }
         stage("Ruby 2.0") {
           agent {
             docker {
@@ -86,7 +75,17 @@ pipeline {
             sh 'bundle exec rake test'
           }
         }
-
+        stage("Ruby 2.6") {
+          agent {
+            docker {
+              image 'ruby:2.6'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
       }
     }
   }

data/Rakefile

@@ -1,16 +1,6 @@
-require "bundler"
 require "rspec/core/rake_task"
 
-bbcloud_path = File.expand_path("./lib", File.dirname(__FILE__))
-$LOAD_PATH.unshift(bbcloud_path)
-
-task :default => [:test]
-
 Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new
-
-desc "Runs all tests (rspec and cucumber)"
-task :test do
-  Rake::Task["spec"].invoke
-end
+task :default => :spec

data/brightbox-cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q(Scripts to interact with the Brightbox cloud API)
   s.license     = "MIT"
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.0"
 
   s.rubyforge_project = "brightbox-cli"
 
@@ -21,7 +21,7 @@ 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 "fog-brightbox", ">= 0.16.0", "< 1.0"
+  s.add_dependency "fog-brightbox", ">= 1.1.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
@@ -30,10 +30,13 @@ Gem::Specification.new do |s|
   s.add_dependency "highline", "~> 1.6.0"
   s.add_dependency "hirb", "~> 0.6"
 
+  # dry-inflector >= 0.2 drops supports for Ruby < 2.4
+  s.add_dependency "dry-inflector", "< 0.2"
+
   s.add_development_dependency "mocha"
   s.add_development_dependency "pry-remote"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.99"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "vcr", "~> 2.5"
   s.add_development_dependency "webmock"
 

data/lib/brightbox-cli/api.rb

@@ -16,7 +16,7 @@ module Brightbox
     # Returns the current connection to the Brightbox API, creating a new
     # {ConnectionManager} and connection if necessary.
     #
-    # @return [Fog::Compute::Brightbox::Real]
+    # @return [Fog::Brightbox::Compute::Real]
     #
     def self.conn
       if @@connection_manager

data/lib/brightbox-cli/collaboration.rb

@@ -9,7 +9,7 @@ module Brightbox
     def self.invite(email, role)
       options = { :email => email, :role => role }
       data = conn.create_collaboration(options)
-      model = Fog::Compute::Brightbox::Collaboration.new(data)
+      model = Fog::Brightbox::Compute::Collaboration.new(data)
       new(model)
     end
 

data/lib/brightbox-cli/commands/firewall/policies-update.rb

@@ -36,7 +36,7 @@ module Brightbox
         # with a request, before updating the model
         data = FirewallPolicy.conn.update_firewall_policy(policy_id, params)
 
-        model = Fog::Compute::Brightbox::FirewallPolicy.new(data)
+        model = Fog::Brightbox::Compute::FirewallPolicy.new(data)
         policy = FirewallPolicy.new(model)
 
         render_table([policy], global_options)

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

@@ -32,6 +32,8 @@ module Brightbox
       end
       raise "You must specify your Brightbox password." if password.empty?
 
+      password = Brightbox.config.extend_with_two_factor_pin(password)
+
       section_options = {
         :client_name => config_name,
         :alias => config_name,

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

@@ -10,10 +10,25 @@ module Brightbox
       c.default_value "text"
       c.flag [:format]
 
-      c.action do |global_options, options, args|
+      c.action do |_, options, _|
+        token = Token.show(Brightbox.config, options)
+        $stdout.puts token.format(options[:format] || "text")
+      end
+    end
+
+    cmd.desc "Create new OAuth2 Bearer token"
+    cmd.command [:create] do |c|
+      c.desc "Either 'text', 'token', 'json' or 'curl'"
+      c.arg_name "format"
+      c.default_value "text"
+      c.flag [:format]
+
+      c.action do |_, options, _|
+        config.reauthenticate
         token = Token.show(Brightbox.config, options)
         $stdout.puts token.format(options[:format])
       end
     end
+
   end
 end

data/lib/brightbox-cli/config.rb

@@ -14,6 +14,7 @@ module Brightbox
     include Brightbox::Config::Cache
     include Brightbox::Config::GpgEncryptedPasswords
     include Brightbox::Config::PasswordHelper
+    include Brightbox::Config::TwoFactorAuth
     include Brightbox::Config::AuthenticationTokens
     include Brightbox::Config::Accounts
     include Brightbox::Config::Clients

data/lib/brightbox-cli/config/authentication_tokens.rb

@@ -193,6 +193,8 @@ module Brightbox
         password ||= password_helper_password
         password ||= prompt_for_password
 
+        password = extend_with_two_factor_pin(password)
+
         # FIXME: options are required to work
         options = {
           :client_id => client_name,

data/lib/brightbox-cli/config/two_factor_auth.rb

@@ -0,0 +1,31 @@
+module Brightbox
+  module Config
+    module TwoFactorAuth
+
+      def extend_with_two_factor_pin(password)
+        if two_factor_enabled
+          suffix = "+" + two_factor_pin
+          password += suffix unless password.end_with?(suffix)
+        end
+        password
+      end
+
+      private
+
+      def two_factor_enabled
+        return config[client_name]["two_factor"] == "true" unless client_name.nil?
+      end
+
+      def two_factor_pin
+        @two_factor_pin ||= prompt_for_two_factor_pin if two_factor_enabled
+      end
+
+      def prompt_for_two_factor_pin
+        require "highline"
+        highline = HighLine.new
+        # FIXME: Capture interupts if user aborts
+        highline.ask("Enter your two factor pin : ")
+      end
+    end
+  end
+end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.10.0" unless defined?(Brightbox::VERSION)
+  VERSION = "3.0.0" unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -72,6 +72,7 @@ require_relative "brightbox-cli/api"
 require_relative "brightbox-cli/config/cache"
 require_relative "brightbox-cli/config/gpg_encrypted_passwords"
 require_relative "brightbox-cli/config/password_helper"
+require_relative "brightbox-cli/config/two_factor_auth"
 require_relative "brightbox-cli/config/authentication_tokens"
 require_relative "brightbox-cli/config/accounts"
 require_relative "brightbox-cli/config/clients"

data/spec/support/shared/collaborating_accounts_context.rb

@@ -19,7 +19,7 @@ shared_context "collaborating accounts" do
       "load_balancers_limit" => 5,
       "load_balancers_used" => 0
     }
-    Fog::Compute::Brightbox::Account.new(data)
+    Fog::Brightbox::Compute::Account.new(data)
   end
 
   # As returned from conn.user_collaborations.all
@@ -35,7 +35,7 @@ shared_context "collaborating accounts" do
         "status" => "active"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(data)
+    Fog::Brightbox::Compute::UserCollaboration.new(data)
   end
 
   # As returned from conn.user_collaborations.all
@@ -51,6 +51,6 @@ shared_context "collaborating accounts" do
         "status" => "active"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(data)
+    Fog::Brightbox::Compute::UserCollaboration.new(data)
   end
 end

data/spec/unit/brightbox/account/all_spec.rb

@@ -13,7 +13,7 @@ describe Brightbox::Account do
         expect(Brightbox::Account.all).to be_kind_of(Array)
 
         Brightbox::Account.all.each do |account|
-          expect(account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(account).to be_kind_of(Fog::Brightbox::Compute::Account)
         end
       end
 
@@ -31,7 +31,7 @@ describe Brightbox::Account do
         expect(Brightbox::Account.all).to be_kind_of(Array)
 
         Brightbox::Account.all.each do |account|
-          expect(account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(account).to be_kind_of(Fog::Brightbox::Compute::Account)
         end
       end
 

data/spec/unit/brightbox/account/get_spec.rb

@@ -18,7 +18,7 @@ describe Brightbox::Account do
         end
 
         it "returns requested account" do
-          expect(@account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(@account).to be_kind_of(Fog::Brightbox::Compute::Account)
           expect(@account.id).to eql(@account_id)
         end
 
@@ -46,7 +46,7 @@ describe Brightbox::Account do
         end
 
         it "returns the client's owning account" do
-          expect(@account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(@account).to be_kind_of(Fog::Brightbox::Compute::Account)
           expect(@account.id).to eql(@account_id)
         end
 

data/spec/unit/brightbox/api/conn_spec.rb

@@ -7,7 +7,7 @@ describe Brightbox::Api, ".conn" do
 
   context "when account is not required", vcr: true do
     it "returns a 'real' fog compute instance" do
-      expect(Brightbox::Api.conn).to be_instance_of(Fog::Compute::Brightbox::Real)
+      expect(Brightbox::Api.conn).to be_instance_of(Fog::Brightbox::Compute::Real)
     end
   end
 end

data/spec/unit/brightbox/collaborating_account_spec.rb

@@ -5,7 +5,7 @@ describe Brightbox::CollaboratingAccount do
     data = {
       "id" => "acc-12345"
     }
-    account_model = Fog::Compute::Brightbox::Account.new(data)
+    account_model = Fog::Brightbox::Compute::Account.new(data)
     Brightbox::CollaboratingAccount.new(account_model)
   end
 

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

@@ -19,7 +19,7 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
 
   context "when not requesting a scoped connection" do
     it "returns a fog compute instance" do
-      expect(connection_manager.fetch_connection(false)).to be_kind_of(Fog::Compute::Brightbox::Real)
+      expect(connection_manager.fetch_connection(false)).to be_kind_of(Fog::Brightbox::Compute::Real)
     end
 
     it "returns a connection without account scope" do

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

@@ -2,7 +2,7 @@ require "spec_helper"
 require "fog/brightbox/models/compute/database_server"
 
 describe Brightbox::DatabaseServer, "#cloud_ips" do
-  let(:fog_model) { Fog::Compute::Brightbox::DatabaseServer.new(fog_settings) }
+  let(:fog_model) { Fog::Brightbox::Compute::DatabaseServer.new(fog_settings) }
   let(:dbs) { described_class.new(fog_model) }
 
   context "when attribute is missing" do

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

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

data/spec/unit/brightbox/user_collaboration/get_for_account_spec.rb

@@ -141,7 +141,7 @@ describe Brightbox::UserCollaboration do
       # Collection#load is private in fog so we can't just pass our collection
       # into get the correct object initialised.
       api_response_data.map do |datum|
-        Fog::Compute::Brightbox::UserCollaboration.new(datum)
+        Fog::Brightbox::Compute::UserCollaboration.new(datum)
       end
     end
   end

data/spec/unit/brightbox/user_collaboration/remove_spec.rb

@@ -52,6 +52,6 @@ describe Brightbox::UserCollaboration do
         "email_address" => "marie@example.com"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(api_response_data)
+    Fog::Brightbox::Compute::UserCollaboration.new(api_response_data)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 3.0.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 1970-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -174,16 +182,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +371,7 @@ files:
 - lib/brightbox-cli/config/section_name_deduplicator.rb
 - lib/brightbox-cli/config/sections.rb
 - lib/brightbox-cli/config/to_fog.rb
+- lib/brightbox-cli/config/two_factor_auth.rb
 - lib/brightbox-cli/config/user_application.rb
 - lib/brightbox-cli/connection_manager.rb
 - lib/brightbox-cli/database_server.rb
@@ -748,15 +757,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: brightbox-cli
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The Brightbox cloud management system