brightbox-cli 0.15.0 → 0.16.0

data/lib/brightbox-cli/cloud_ips.rb

@@ -11,10 +11,6 @@ module Brightbox
     def self.create
       r = conn.create_cloud_ip
       new(r["id"])
-    rescue Excon::Errors::Forbidden => e
-      response = JSON.parse(e.response.body) rescue {}
-      response = response.fetch("error", {})
-      raise Forbidden, "#{response["details"]}: #{response["summary"]}"
     end
 
     def attributes
@@ -47,8 +43,6 @@ module Brightbox
       self.class.conn.update_cloud_ip(id, options)
       self.reload
       self
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
   end

data/lib/brightbox-cli/commands/config-client-add.rb

@@ -23,6 +23,10 @@ module Brightbox
         raise "You must specify the api client-id"
       end
 
+      unless client_id[/^cli-.{5}$/]
+        raise "You must specify a valid api client-id in the format cli-xxxxx"
+      end
+
       if secret.nil?
         raise "You must specify the api secret"
       end

data/lib/brightbox-cli/commands/firewall-rules-show.rb

@@ -10,7 +10,7 @@ module Brightbox
       end
 
       display_options = { :fields => [
-          :id, :protocol,:source, :sport,:destination, :dport, :icmp_type, :firewall_policy
+          :id, :protocol,:source, :sport, :destination, :dport, :icmp_type, :firewall_policy, :description
         ],
         :vertical => true
       }

data/lib/brightbox-cli/commands/groups-add-server.rb

@@ -5,7 +5,7 @@ module Brightbox
 
     c.action do |global_options, options, args|
       grp_id = args.shift
-      raise "You must specify the server group and the server ids to add" unless grp_id && grp_id[/^grp-/] && !args.empty?
+      raise "You must specify the server group and then the server ids to add" unless grp_id && grp_id[/^grp-/] && !args.empty?
 
       sg = ServerGroup.find grp_id
 

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

@@ -15,7 +15,7 @@ module Brightbox
 
       table_opts = global_options.merge({
                                           :vertical => true,
-                                          :fields => [:id, :type, :owner, :created_at, :status, :arch, :name, :description, :virtual_size, :disk_size, :public, :"compatibility_mode", :official, :ancestor_id ]
+                                          :fields => [:id, :type, :owner, :created_at, :status, :arch, :name, :description, :username, :virtual_size, :disk_size, :public, :"compatibility_mode", :official, :ancestor_id ]
                                         })
 
       render_table(images, table_opts)

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

@@ -12,13 +12,16 @@ module Brightbox
     c.desc "Set image mode to be either 'virtio' or 'compatibility'"
     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.flag [:p, "public"]
 
+    c.desc "Set image to be deprecated (true or false)"
+    c.flag "deprecated"
+
     c.desc "Image description"
     c.flag [:d, "description"]
 
-    c.desc "Image Usernmae"
+    c.desc "Image Username"
     c.flag [:u, "username"]
 
     c.action do |global_options,options,args|
@@ -44,6 +47,10 @@ module Brightbox
       params[:public] = true if options[:p] == "true"
       params[:public] = false if options[:p] == "false"
 
+      # If options[:deprecated] isn't specified, leave the status alone
+      params[:status] = "deprecated" if options[:deprecated] == "true"
+      params[:status] = "available" if options[:deprecated] == "false"
+
       image = Image.find img_id
 
       info "Updating image #{image}"

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

@@ -2,7 +2,14 @@ module Brightbox
   desc 'List servers'
   arg_name '[server-id...]'
   command [:list] do |c|
+
+    c.desc "Group identifier"
+    c.flag [:g, :group]
+
     c.action do |global_options,options,args|
+      # Check this here before we make any network connections
+      raise "A valid server group identifier is required for the group argument" unless options[:g].nil? || options[:g] =~ /^grp-.{5}$/
+
       if args.empty?
         servers = Server.find(:all)
       else
@@ -10,6 +17,10 @@ module Brightbox
           warn "Couldn't find server #{id}"
         end
       end
+
+      # Scope by group if a group identifier is specified
+      servers = servers.select {|server| server.server_groups.any? {|grp| grp["id"] == options[:g] } } if options[:g]
+
       render_table(servers, global_options)
     end
   end

data/lib/brightbox-cli/error_parser.rb

@@ -11,24 +11,29 @@ module Brightbox
       case socket_error
       when Excon::Errors::ServiceUnavailable
         error "Api currently unavailable"
-      when Excon::Errors::Error
-        parse_http_error(socket_error)
       else
-        error "ERROR: #{socket_error}"
+        parse_http_error(socket_error)
       end
     end
 
     def parse_http_error(e)
       if e.respond_to?(:response) and e.response.respond_to?(:body)
         json_response = JSON.parse(e.response.body) rescue {}
-        if json_error = json_response['errors']
-          error "ERROR: #{json_error.join(" ")}"
-        else
-          error "ERROR: #{e}"
-        end
+        extract_response_from_json(json_response,e)
+      else
+        error "ERROR: #{e}"
+      end
+    end
+
+    def extract_response_from_json(error_json,e)
+      json_error = error_json['errors'] || error_json['error']
+      if json_error && !json_error.empty?
+        error_string = Array(json_error).join(" ")
+        error "ERROR: #{error_string}"
       else
         error "ERROR: #{e}"
       end
     end
+
   end
 end

data/lib/brightbox-cli/firewall_rule.rb

@@ -33,7 +33,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :protocol,:source, :sport,:destination, :dport, :icmp_type]
+      [:id, :protocol,:source, :sport, :destination, :dport, :icmp_type, :description]
     end
   end
 end

data/lib/brightbox-cli/images.rb

@@ -15,15 +15,13 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :owner, :type, :created_on, :status, :size, :username,:name]
+      [:id, :owner, :type, :created_on, :status, :size, :username, :name]
     end
 
     def update options
       self.class.conn.update_image(id, options)
       self.reload
       self
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def to_row

data/lib/brightbox-cli/load_balancers.rb

@@ -50,24 +50,17 @@ module Brightbox
     def add_nodes(nodes)
       node_hashes = nodes.collect { |n| { :node => n.id } }
       LoadBalancer.conn.add_nodes_load_balancer(id, :nodes => node_hashes)
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def remove_nodes(nodes)
       node_hashes = nodes.collect { |n| { :node => n.id } }
       LoadBalancer.conn.remove_nodes_load_balancer(id, :nodes => node_hashes)
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def update(options)
-      debug options.inspect
       LoadBalancer.conn.update_load_balancer(id, options)
       self.reload
       self
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def self.get(id)

data/lib/brightbox-cli/server_groups.rb

@@ -27,8 +27,6 @@ module Brightbox
       self.class.conn.update_server_group(id, options)
       self.reload
       self
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def destroy

data/lib/brightbox-cli/servers.rb

@@ -25,8 +25,6 @@ module Brightbox
       self.class.conn.update_server id, options
       self.reload
       self
-    rescue Excon::Errors::BadRequest => e
-      raise Conflict, JSON.parse(e.response.body)['error']['details']
     end
 
     def destroy

data/lib/brightbox-cli/users.rb

@@ -32,8 +32,6 @@ module Brightbox
 
     def save
       fog_model.save
-    rescue Excon::Errors::UnprocessableEntity
-      raise InvalidRecord, "Could not save user #{self.id}"
     end
 
     def ssh_key_set?

data/lib/brightbox-cli/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-cli
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 95
   prerelease: 
   segments: 
   - 0
-  - 15
+  - 16
   - 0
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - John Leach
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-12-01 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -2283,6 +2284,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/common_helpers.rb
 - tools/bash_completion_script
+has_rdoc: true
 homepage: http://docs.brightbox.com/cli
 licenses: []
 
@@ -2312,9 +2314,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox-cli
-rubygems_version: 1.8.10
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: The Brightbox cloud management system
-test_files: []
-
+test_files: 
+- spec/brightbox/config.example
+- spec/cloud_ips_spec.rb
+- spec/firewall_policy_spec.rb
+- spec/firewall_rule_spec.rb
+- spec/fixtures/vcr_cassettes/apply_firewall_policy.yml
+- spec/fixtures/vcr_cassettes/create_firewall_policy.yml
+- spec/fixtures/vcr_cassettes/destroy_firewall_policy.yml
+- spec/fixtures/vcr_cassettes/firewall_rule.yml
+- spec/fixtures/vcr_cassettes/firewall_rule_create.yml
+- spec/fixtures/vcr_cassettes/firewall_rule_destroy.yml
+- spec/fixtures/vcr_cassettes/firewall_rule_list.yml
+- spec/fixtures/vcr_cassettes/firewall_rule_show.yml
+- spec/fixtures/vcr_cassettes/list_cloud_ip.yml
+- spec/fixtures/vcr_cassettes/list_firewall_policy.yml
+- spec/fixtures/vcr_cassettes/list_server_groups.yml
+- spec/fixtures/vcr_cassettes/server_destroy.yml
+- spec/fixtures/vcr_cassettes/server_list.yml
+- spec/fixtures/vcr_cassettes/server_show.yml
+- spec/fixtures/vcr_cassettes/server_shutdown.yml
+- spec/fixtures/vcr_cassettes/server_start.yml
+- spec/fixtures/vcr_cassettes/server_stop.yml
+- spec/fixtures/vcr_cassettes/show_firewall_policy.yml
+- spec/server_group_spec.rb
+- spec/servers_spec.rb
+- spec/spec_helper.rb
+- spec/support/common_helpers.rb