brightbox-cli 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96fa4d23d9ae155d8bed3923b2008147d5f02e5d
-  data.tar.gz: 8e2c0fc64b410dc6f62e35b7e3f5636fa02db1bc
+  metadata.gz: 2f0236852c669e77d8e4d89e5947a5a3043ec42f
+  data.tar.gz: bc9e0ade011ecdb7c610c3d82b1ffd49ab2c8924
 SHA512:
-  metadata.gz: 75b51b5235e6a878194476c16eef375e65b538fc35e7fae7741f2d021b846b54cdf23c80d3040d9d5a583aa61b2ea9b0f2375e69010ae394f33e45f17ffed44c
-  data.tar.gz: 413d50665c92d89d79fc2256cc2dc98811158954d404ba5bbe420c7bff6377989a9f2aa23bb52911a20f98349214be48ea92b53f45fd276762f7136fc0467d64
+  metadata.gz: dbf2d4a5f305d2b8aafceba0244bb0a9d0145f08d8516d7e60eb849aaa614d6d605c27072ab57f3f2c8bb9f6a9d5a23bd4837a7429917a6b3c979c803fa39d1a
+  data.tar.gz: 2160feaa504a2fb29fbca45086e2dc9eef801036bce3620fc09be3eb97ae003f328859e6515bf30cbee9ee18c6f165e1e006edde4e05e4da57d91d8316a80c62

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 sudo: false
+before_install:
+  - gem install bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.4
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### v2.7.0 / 2017-09-06
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.6.0...v2.7.0)
+
+Enhancements:
+
+* Add `cloud-ip` argument to `server create` command to pre-allocate and map
+  a cloud IP to a server upon build completion.
+
+Changes:
+
+* Update `fog-brightbox` to v0.13.0
+* Various changes to Travis settings
+
 ### v2.6.0 / 2016-07-07
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.5.0...v2.6.0)

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     brightbox-cli (2.6.0)
-      fog-brightbox (>= 0.11.0)
+      fog-brightbox (>= 0.13.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
       hirb (~> 0.6)
@@ -15,19 +15,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    builder (3.2.2)
+    builder (3.2.3)
     coderay (1.0.9)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    excon (0.50.1)
-    fog-brightbox (0.11.0)
+    excon (0.58.0)
+    fog-brightbox (0.13.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.42.0)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.49)
+      excon (~> 0.58)
       formatador (~> 0.2)
     fog-json (1.0.2)
       fog-core (~> 1.0)
@@ -40,7 +40,7 @@ GEM
     inflecto (0.0.2)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (2.99.2)
+    mime-types (2.99.3)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.3)
@@ -81,4 +81,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/README.rdoc

@@ -0,0 +1 @@
+README

data/brightbox-cli.gemspec

@@ -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.11.0"
+  s.add_dependency "fog-brightbox", ">= 0.13.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "mime-types", "~> 2.6"

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

@@ -32,6 +32,9 @@ module Brightbox
       c.desc "Server groups to place server in - comma delimited list"
       c.flag [:g, "server-groups"]
 
+      c.desc I18n.t("servers.create.cloud_ip.desc")
+      c.flag ["cloud-ip"]
+
       c.action do |global_options, options, args|
 
         if args.empty?
@@ -93,6 +96,14 @@ module Brightbox
         msg << " in zone #{zone.handle} (#{zone})" if zone
         msg << " in groups #{server_groups.map(&:id).join(", ")}" unless server_groups.empty?
         msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
+        if options[:"cloud-ip"] && options[:"cloud-ip"].respond_to?(:start_with?)
+          if options[:"cloud-ip"].start_with?("cip-")
+            msg << " mapping #{options[:'cloud-ip']} when built"
+          end
+          if options[:"cloud-ip"] == "true"
+            msg << " mapping a new cloud IP when built"
+          end
+        end
         info msg
 
         params = {
@@ -104,7 +115,10 @@ module Brightbox
           :server_groups => server_groups.map(&:id)
         }
 
+        params[:cloud_ip] = options[:"cloud-ip"] if options.key?(:"cloud-ip")
+
         servers = Server.create_servers options[:i], params
+        info servers.inspect
         render_table(servers, global_options)
       end
     end

data/lib/brightbox-cli/version.rb

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

data/locales/en.yml

@@ -142,6 +142,8 @@ en:
       desc: Activate web consoles for a number of servers
     create:
       desc: Create servers
+      cloud_ip:
+        desc: Immediately map a Cloud IP to new server? Either "true" or the identifier of the Cloud IP
     destroy:
       desc: Destroy servers
     lock:

data/spec/commands/servers/create_spec.rb

@@ -7,12 +7,85 @@ describe "brightbox servers" 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")
+
+      stub_request(:post, "http://api.brightbox.dev/token").to_return(
+        :status => 200,
+        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}')
+    end
+
+    context "without arguments" do
       let(:argv) { %w(servers create) }
 
       it "does not error" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "with --cloud-ip with nominated IP argument" do
+      let(:argv) { %w(servers create --cloud-ip cip-12345 img-12345) }
+
+      let(:image) { double(:id => "img-12345", :name => "Linux") }
+      let(:type) { double(:id => "typ-12345", :handle => "nano") }
+      let(:zone) { double(:handle => "gb1-a") }
+
+      before do
+        expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
+        expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
+      end
+
+      it "requests nominated Cloud IP" do
+        stub_request(:post, "http://api.brightbox.dev/1.0/servers?account_id=acc-12345")
+          .with(:body => /"cloud_ip":"cip-12345"/)
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("mapping cip-12345 when built")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
+    context "with --cloud-ip true argument" do
+      let(:argv) { %w(servers create --cloud-ip true img-12345) }
+
+      let(:image) { double(:id => "img-12345", :name => "Linux") }
+      let(:type) { double(:id => "typ-12345", :handle => "nano") }
+      let(:zone) { double(:handle => "gb1-a") }
+
+      before do
+        expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
+        expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
+      end
+
+      it "requests new allocated Cloud IP" do
+        stub_request(:post, "http://api.brightbox.dev/1.0/servers?account_id=acc-12345")
+          .with(:body => /"cloud_ip":"true"/)
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("mapping a new cloud IP when built")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
+    def sample_response
+      '{
+        "id": "srv-12345",
+        "image": {
+          "id": "img-12345"
+        },
+        "interfaces": [],
+        "server_type": {
+          "handle": "nano"
+        },
+        "zone": {
+          "handle": "gb1-a"
+        },
+        "cloud_ips": [],
+        "snapshots": []
+      }'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -746,7 +746,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: brightbox-cli
-rubygems_version: 2.2.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: The Brightbox cloud management system

data/README.rdoc

@@ -1,170 +0,0 @@
-= Brightbox Cloud Command Line Interface
-
-`brightbox-cli` is a set of cli tools to interact with the Brightbox Cloud API.
-
-You will need a user account on the Brightbox Cloud in order to make use of
-these tools.
-
-You can sign up at https://manage.brightbox.com
-
-{<img src="https://travis-ci.org/brightbox/brightbox-cli.png?branch=master" alt="Build Status" />}[https://travis-ci.org/brightbox/brightbox-cli]
-
-== UPGRADE NOTES
-
-Version 1.0.0 adds a new top level `brightbox` command for the suite.
-
-This may clash with our `brightbox` (brightbox-deployment) gem which, before
-version 2.4.0, used `brightbox` as the name for it's binary. Please ensure you
-update your `brightbox` gem to avoid using the wrong command.
-
-We have included backwards compatible binaries for all the older CLI commands
-(brightbox-accounts, brightbox-servers etc...) but recommend getting used to the
-new form.
-
-== Installation instructions
-
-Install from Rubygems
-
-    $ gem install brightbox-cli
-
-== Usage
-
-The Brightbox CLI is a suite of tools that are accessible through the
-`brightbox` command in a similar way to how you access `git` commands.
-
-For a list of available commands use:
-
-   $ brightbox help
-
-To add client (account based) credentials use:
-
-   $ brightbox config client_add cli-2igtb theclientsecret
-   Using config file /home/ubuntu/.brightbox/config
-   Creating new api client config cli-2igtb
-
-To browse available resources use the resource name as the command:
-
-   $ brightbox servers
-   ... List of servers
-   $ brightbox images
-   ... List of images
-
-Command structure may be subject to change.
-
-=== Using GPG to secure passwords
-
-If you use an OAuth application to access your accounts
-(https://www.brightbox.com/docs/guides/manager/oauth-applications/) then you
-frequently need to renter your password.
-
-From v1.5.0 you can store your password locally encrypted by GPG (https://www.gnupg.org/)
-which will decrypt the password when needed. This will prompt for your GPG key
-if not available to the GPG agent using your OS's configured pinentry program.
-
-You need to have setup GPG with your own keys and have configured the pinentry
-to prompt you when the key is locked.
-
-The password file is named after your configuration's alias:
-
-    $ brightbox config
-     alias                 client_id  secret           api_url                         auth_url
-    ------------------------------------------------------------------------------------------------------------------
-     *main                 app-12345  xxxxxxxxxxxxxxx  https://api.gb1.brightbox.com   https://api.gb1.brightbox.com
-    ------------------------------------------------------------------------------------------------------------------
-
-The alias here is `main`. To prepare the password run this command:
-
-    $ gpg --encrypt --recipient gpg@example.com > ~/.brightbox/main.password.gpg
-    (type your password)<RETURN>
-    <CTRL+D>
-    # Test it with...
-    $ gpg --decrypt ~/.brightbox/main.password.gpg
-    password!2015
-    $ brightbox accounts
-    INFO: client_id: app-12345 (main)
-    INFO: Decrypting /home/user/.brightbox/main.password.gpg to obtain password
-    gpg: encrypted with 2048-bit RSA key, ID ABCDE890, created 2015-01-01
-          "Jason Null <gpg@example.com>"
-    Your API credentials have been updated, please re-run your command.
-
-Now when making commands you should only have to unlock your keyring to avoid
-typing your password.
-
-If you are prompted to enter your password still then the file may be named
-incorrectly or there may be an issue with your GPG configuration.
-
-To remove the password delete the `~/.brightbox/main.password.gpg` file.
-
-== Usage guides
-
-* http://docs.brightbox.com/reference/cli
-* http://brightbox.com
-* http://docs.brightbox.com/reference/api/
-
-== BASH Auto-completion
-
-A bash shell auto-completion script is provided to allow
-autocompletion of all sub-commands, options and resource
-identifiers. It is automatically configured by the Debian/Ubuntu
-packages, but if you're installing from a gem you can manually tell
-bash about it like this:
-
-    complete -C _brightbox-bash-completer -o filenames brightbox
-
-The command `_brightbox-bash-completer` should be installed in the
-system path when you install the gem. If for whatever reason it is not
-in the path, just specify the full path to it:
-
-    complete -C /full/path/to/bin/_brightbox-bash-completer -o filenames brightbox
-
-== Testing
-
-You should be able to run the specs and features with the following steps:
-
-    $ bundle install
-    $ bundle exec rake
-
-The specs use VCR to playback filtered recordings from real API sessions. This
-process is not perfect, please report an issue
-
-== Alternatives
-
-There are a number of alternative ways to interact with the Brightbox Cloud.
-
-* The Web GUI - https://manage.brightbox.com/
-* fog - https://github.com/fog/fog
-* knife plugin - https://github.com/rubiojr/knife-brightbox
-* Vagrant plugin - https://github.com/NeilW/vagrant-brightbox
-
-== Packaging
-
-=== Vendoring libraries
-
-gems can be vendored into `lib/brightbox-cli/vendor/` for packaging and will be
-prioritised over any gems.
-
-=== Debian/Ubuntu packaging
-
-Packaging scripts are available in https://github.com/NeilW/brightbox-cli-debian-packaging
-
-== License
-
-Copyright (c) 2010-2013 John Leach, Brightbox Systems Ltd <john@brightbox.co.uk>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.