brightbox-cli 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0678676cc55013c6898bee325427d0c02bb2fe54
+  data.tar.gz: b5239144c91e70eefd0af9b738a93e951da60412
+SHA512:
+  metadata.gz: c686363ed9d54106512b609ea7bb999fae4cdb2acdf59cbe52fb8f187d8c7b0e14746f9940b1840bffff964b257be3b76b0c3ac0810bfe329a4d6699e7657157
+  data.tar.gz: 124cf8b8199b53f2eb08039b296a4fe396c8f7e1b1b718457b6845638e06010890c2493b4c31109970c194137a558d96312add6ff5c0d037449352daef346045

data/.travis.yml

@@ -5,8 +5,4 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-matrix:
-  allow_failures:
-    - rvm: 1.8.7
-    - rvm: ree
 

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (1.0.0)
+    brightbox-cli (1.1.0)
       excon
-      fog (~> 1.15.0)
+      fog (~> 1.17.0)
       gli (~> 2.8)
       highline (~> 1.6)
       hirb (~> 0.6)
       json
+      mime-types (~> 1.25)
       nokogiri (~> 1.5.0)
 
 GEM
@@ -16,10 +17,10 @@ GEM
     builder (3.2.2)
     coderay (1.0.9)
     diff-lcs (1.2.4)
-    excon (0.25.3)
-    fog (1.15.0)
+    excon (0.27.6)
+    fog (1.17.0)
       builder
-      excon (~> 0.25.0)
+      excon (~> 0.27.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -28,16 +29,16 @@ GEM
       nokogiri (~> 1.5)
       ruby-hmac
     formatador (0.2.4)
-    gli (2.8.0)
-    highline (1.6.19)
+    gli (2.8.1)
+    highline (1.6.20)
     hirb (0.7.1)
-    json (1.8.0)
+    json (1.8.1)
     metaclass (0.0.1)
     method_source (0.8.1)
     mime-types (1.25)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)

data/bin/_brightbox-bash-completer

@@ -336,7 +336,9 @@ SPEC = { "brightbox" =>
                "-t=" => "--hc-timeout=",
                "--hc-timeout=" => [%w{5000 10000 15000}],
                "-y=" => "--hc-type=",
-               "--hc-type=" => [%w{http tcp}]
+               "--hc-type=" => [%w{http tcp}],
+               "--ssl-cert" => true,
+               "--ssl-key" => true
               },
             "update" =>
               {
@@ -360,6 +362,9 @@ SPEC = { "brightbox" =>
                "--hc-timeout=" => [%w{5000 10000 15000}],
                "-y=" => "--hc-type=",
                "--hc-type=" => [%w{http tcp}],
+               "--ssl-cert" => true,
+               "--ssl-key" => true,
+               "--remove-ssl" => true,
                :include => find_identifiers("lba-")
               },
             "list" => find_identifiers("lba-"),
@@ -411,6 +416,7 @@ SPEC = { "brightbox" =>
             "list" => find_identifiers("srv-"),
             "show" => find_identifiers("srv-"),
             "shutdown" => find_identifiers("srv-"),
+            "snapshot" => find_identifiers("srv-"),
             "start" => find_identifiers("srv-"),
             "stop" => find_identifiers("srv-")
            },

data/brightbox-cli.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "gli", "~> 2.8"
-  s.add_dependency "fog", "~> 1.15.0"
+  s.add_dependency "fog", "~> 1.17.0"
   s.add_dependency "nokogiri", "~> 1.5.0" # 1.5.x last versions with 1.8.7 support
+  s.add_dependency "mime-types", "~> 1.25"
   s.add_dependency "excon"
   s.add_dependency "json"
 

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

@@ -43,6 +43,12 @@ module Brightbox
       c.default_value "3"
       c.flag [:d, "hc-down"]
 
+      c.desc "Filepath to the SSL certificate file to use."
+      c.flag ["ssl-cert"]
+
+      c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
+      c.flag ["ssl-key"]
+
       c.action do |global_options, options, args|
 
         raise "You must specify which servers to balance connections to" if args.empty?
@@ -76,6 +82,18 @@ module Brightbox
           end
         end
 
+        # SSL argumens
+        ssl_cert_path = options["ssl-cert"]
+        ssl_key_path = options["ssl-key"]
+
+        if ssl_cert_path.nil? ^ ssl_key_path.nil?
+          raise "Both SSL arguments (ssl-cert and ssl-key) are required."
+        end
+        if ssl_cert_path && ssl_key_path
+          ssl_cert = File.read(File.expand_path(ssl_cert_path))
+          ssl_key = File.read(File.expand_path(ssl_key_path))
+        end
+
         nodes = args.collect { |i| { :node => i } }
 
         msg = "Creating a new load balancer"
@@ -84,6 +102,8 @@ module Brightbox
                                  :name => options[:n],
                                  :healthcheck => healthcheck,
                                  :listeners => listeners,
+                                 :certificate_pem => ssl_cert,
+                                 :certificate_private_key => ssl_key,
                                  :nodes => nodes)
         render_table([lb], global_options)
       end

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

@@ -13,10 +13,22 @@ module Brightbox
           raise "Couldn't find lb #{id}"
         end
 
-        table_opts = global_options.merge({
+        table_opts = global_options.merge(
           :vertical => true,
-          :fields => [:id, :status, :name, "created_at", "deleted_at", :policy, :cloud_ips, :nodes, :listeners, :healthcheck]
-        })
+          :fields => [
+            :id,
+            :status,
+            :name,
+            :created_at,
+            :deleted_at,
+            :policy,
+            :ssl_subject,
+            :ssl_expires_at,
+            :cloud_ips,
+            :nodes,
+            :listeners,
+            :healthcheck
+        ])
 
         render_table(lbs, table_opts)
 

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

@@ -36,6 +36,15 @@ 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 "Filepath to the SSL certificate file to use."
+      c.flag ["ssl-cert"]
+
+      c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
+      c.flag ["ssl-key"]
+
+      c.desc "Clears SSL details from the load balancer."
+      c.switch ["remove-ssl"], :negatable => false
+
       c.action do |global_options, options, args|
 
         lb_id = args.shift
@@ -78,6 +87,29 @@ module Brightbox
           lbopts[:policy] = options[:p]
         end
 
+        # SSL argumens
+        ssl_cert_path = options["ssl-cert"]
+        ssl_key_path = options["ssl-key"]
+        remove_ssl = options["remove-ssl"]
+
+        if remove_ssl && (ssl_cert_path || ssl_key_path)
+          raise "Cannot set an SSL argument whilst removing the certificate!"
+        end
+
+        if ssl_cert_path.nil? ^ ssl_key_path.nil?
+          raise "Both SSL arguments (ssl-cert and ssl-key) are required."
+        end
+
+        if ssl_cert_path && ssl_key_path
+          lbopts[:certificate_pem] = File.read(File.expand_path(ssl_cert_path))
+          lbopts[:certificate_private_key] = File.read(File.expand_path(ssl_key_path))
+        end
+
+        if remove_ssl
+          lbopts[:certificate_pem] = ""
+          lbopts[:certificate_private_key] = ""
+        end
+
         lbopts.nilify_blanks
 
         lb = LoadBalancer.find lb_id

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

@@ -8,37 +8,34 @@ module Brightbox
       c.desc "Path to public ssh key file"
       c.long_desc "This is the path to the public ssh key that you'd like to use
       for new servers. You can specify '-' to read from stdin"
-        c.flag [:f, "ssh-key"]
+      c.flag [:f, "ssh-key"]
 
-        c.desc "Name"
-        c.flag [:n, "name"]
+      c.desc "Name"
+      c.flag [:n, "name"]
 
-        c.action do |global_options, options, args|
+      c.action do |global_options, options, args|
 
-          raise "You must specify the user id as the first argument" if args.empty?
+        raise "You must specify the user id as the first argument" if args.empty?
 
-          user = User.find args.first
+        user = User.find args.first
 
-          if options[:f] == "-"
-            user.ssh_key = STDIN.read
-          elsif options[:f]
-            File.open(File.expand_path(options[:f])) { |f| user.ssh_key = f.read }
-          end
-
-          if options[:n]
-            user.name = options[:n]
-          end
+        if options[:f] == "-"
+          user.ssh_key = STDIN.read
+        elsif options[:f]
+          File.open(File.expand_path(options[:f])) { |f| user.ssh_key = f.read }
+        end
 
-          user.save
+        user.name = options[:n] if options[:n]
 
-          table_opts = global_options.merge({
-            :vertical => true,
-            :fields => [:id, :name, :email_address, :ssh_key ]
-          })
+        user.save
 
-          render_table([user], table_opts)
+        table_opts = global_options.merge(
+          :vertical => true,
+          :fields => [:id, :name, :email_address, :ssh_key]
+        )
 
-        end
+        render_table([user], table_opts)
       end
     end
   end
+end

data/lib/brightbox-cli/load_balancers.rb

@@ -10,11 +10,14 @@ module Brightbox
     end
 
     def to_row
-      attributes.merge({ :nodes => node_ids,
+      attributes.merge(
+        :ssl_subject => certificate_subject,
+        :ssl_expires_at => certificate_expires_at,
+        :nodes => node_ids,
         :created_on => created_on,
         :listeners => listeners,
         :cloud_ips => cloud_ip_ids
-      })
+      )
     end
 
     def created_on

data/lib/brightbox-cli/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,47 +48,55 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,23 +125,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,17 +167,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Scripts to interact with the Brightbox cloud API
@@ -592,39 +583,41 @@ files:
 homepage: http://docs.brightbox.com/cli
 licenses:
 - MIT
-post_install_message: ! "The CLI command is now `brightbox` with subcommands for the
-  resources.\nSuch as `brightbox config` or `brightbox servers`.\n\n  `brightbox --help`
-  lists all the commands.\n\nThe old hypenated versions of the commands (e.g. `brightbox-servers`)\nare
-  deprecated and may be removed in the future.\n\nIf you have been using the old \"brightbox\"
-  gem please ensure you have\nthe latest version to be able to use the `brightbox-capify`
-  command.\n\nTo enable Bash auto-completion you can do the following:\n\n  complete
-  -C _brightbox-bash-completer -o filenames brightbox\n\n"
+metadata: {}
+post_install_message: |+
+  The CLI command is now `brightbox` with subcommands for the resources.
+  Such as `brightbox config` or `brightbox servers`.
+
+    `brightbox --help` lists all the commands.
+
+  The old hypenated versions of the commands (e.g. `brightbox-servers`)
+  are deprecated and may be removed in the future.
+
+  If you have been using the old "brightbox" gem please ensure you have
+  the latest version to be able to use the `brightbox-capify` command.
+
+  To enable Bash auto-completion you can do the following:
+
+    complete -C _brightbox-bash-completer -o filenames brightbox
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 743872907520673837
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 743872907520673837
 requirements: []
 rubyforge_project: brightbox-cli
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The Brightbox cloud management system
 test_files:
 - spec/brightbox_spec.rb