brightbox-cli 3.3.0 → 4.0.0.rc2

data/lib/brightbox-cli/collaborating_account.rb

@@ -45,9 +45,10 @@ module Brightbox
       @id = fog_model.id
       # Rather than merging, we have store the collaboration as a secondary item
       @collaboration = collaboration
-      if @collaboration.nil? && @fog_model.attributes["resource_type"] == "collaboration"
-        @collaboration = @fog_model
-      end
+
+      return unless @collaboration.nil? && @fog_model.attributes["resource_type"] == "collaboration"
+
+      @collaboration = @fog_model
     end
 
     # Is this record based on an account?
@@ -64,7 +65,6 @@ module Brightbox
       attributes[:resource_type] || attributes["resource_type"]
     end
 
-    #
     def id
       if collaboration?
         account_id
@@ -133,7 +133,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :cloud_ips_limit, :lb_limit, :ram_limit, :ram_used, :ram_free, :role, :name]
+      %i[id cloud_ips_limit lb_limit ram_limit ram_used ram_free role name]
     end
 
     private

data/lib/brightbox-cli/collaboration.rb

@@ -22,7 +22,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :status, :role, :email, :name]
+      %i[id status role email name]
     end
 
     def to_s

data/lib/brightbox-cli/commands/accounts/{accept-invite.rb → accept_invite.rb}

@@ -1,7 +1,6 @@
 module Brightbox
   desc I18n.t("accounts.desc")
   command [:accounts] do |cmd|
-
     cmd.desc I18n.t("accounts.accept_invite.desc")
     cmd.arg_name "account_id"
     cmd.command [:accept_invite] do |c|
@@ -10,12 +9,9 @@ module Brightbox
 
         # Find the collaboration for that account
         collaboration = UserCollaboration.get_for_account(account_id)
-        if collaboration
-          collaboration.accept
-        else
-          raise "Couldn't find an invite for account #{account_id}"
-        end
+        raise "Couldn't find an invite for account #{account_id}" unless collaboration
 
+        collaboration.accept
         render_table([collaboration], global_options)
       end
     end

data/lib/brightbox-cli/commands/accounts/default.rb

@@ -1,14 +1,13 @@
 module Brightbox
   command [:accounts] do |cmd|
-
     cmd.desc I18n.t("accounts.default.desc")
     cmd.arg_name "account-id"
     cmd.command [:default] do |c|
-
       c.action do |_global_options, _options, args|
         if args.empty?
           raise "You must specify the account-id to set as default."
         end
+
         account_id = args.shift
         account = Account.find(account_id)
 

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

@@ -1,19 +1,17 @@
 module Brightbox
   command [:accounts] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("accounts.list.desc")
     cmd.arg_name "[account-id...]"
     cmd.command [:list] do |c|
-
       c.action do |global_options, _options, _args|
-        if Brightbox.config.using_application?
-          # Collaborating Accounts are combined from owned and collaborations
-          accounts = CollaboratingAccount.all
-        else
-          accounts = Account.find(:all)
-        end
+        accounts = if Brightbox.config.using_application?
+                     # Collaborating Accounts are combined from owned and collaborations
+                     CollaboratingAccount.all
+                   else
+                     Account.find(:all)
+                   end
 
         render_table(accounts, global_options)
       end

data/lib/brightbox-cli/commands/accounts/remove.rb

@@ -1,6 +1,5 @@
 module Brightbox
   command [:accounts] do |cmd|
-
     cmd.desc I18n.t("accounts.remove.desc")
     cmd.arg_name "account_id"
     cmd.command [:remove] do |c|
@@ -9,12 +8,9 @@ module Brightbox
 
         # Find the collaboration for that account
         collaboration = UserCollaboration.get_for_account(account_id)
-        if collaboration
-          collaboration.remove
-        else
-          raise "Couldn't find an invite for account #{account_id}"
-        end
+        raise "Couldn't find an invite for account #{account_id}" unless collaboration
 
+        collaboration.remove
         render_table([collaboration], global_options)
       end
     end

data/lib/brightbox-cli/commands/accounts/{reset-ftp-password.rb → reset_ftp_password.rb}

@@ -1,12 +1,9 @@
 module Brightbox
   command [:accounts] do |cmd|
-
     cmd.desc I18n.t("accounts.reset_ftp_password.desc")
     cmd.arg_name "account-id..."
     cmd.command [:reset_ftp_password] do |c|
-
       c.action do |global_options, _options, args|
-
         if args.empty?
           raise "You must specify the accounts to reset ftp passwords for"
         end
@@ -27,12 +24,12 @@ module Brightbox
 
         table_opts = global_options.merge(
           :vertical => true,
-          :fields => [
-            :id,
-            :name,
-            :library_ftp_host,
-            :library_ftp_user,
-            :library_ftp_password
+          :fields => %i[
+            id
+            name
+            library_ftp_host
+            library_ftp_user
+            library_ftp_password
           ]
         )
 

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

@@ -1,12 +1,9 @@
 module Brightbox
   command [:accounts] do |cmd|
-
     cmd.desc I18n.t("accounts.show.desc")
     cmd.arg_name "account-id..."
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
-
         if args.empty?
           raise "You must specify the accounts to show"
         end
@@ -17,16 +14,16 @@ module Brightbox
 
         table_opts = global_options.merge(
           :vertical => true,
-          :fields => [
-            :id,
-            :name,
-            :cloud_ip_limit,
-            :ram_limit,
-            :ram_used,
-            :lb_limit,
-            :ram_free,
-            :library_ftp_host,
-            :library_ftp_user
+          :fields => %i[
+            id
+            name
+            cloud_ip_limit
+            ram_limit
+            ram_used
+            lb_limit
+            ram_free
+            library_ftp_host
+            library_ftp_user
           ]
         )
 

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

@@ -1,22 +1,19 @@
 module Brightbox
   desc I18n.t("cloudips.desc")
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.create.desc")
     cmd.command [:create] do |c|
-
       c.desc "Number of Cloud IPs to create"
       c.default_value 1
       c.flag [:i, "count"]
 
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("cloudips.options.port_translators.desc")
-      c.flag [:t, :"port-translators"]
+      c.flag %i[t port-translators]
 
       c.action do |global_options, options, _args|
-
         if options[:i].to_s !~ /^[0-9]+$/
           raise "count must be a number"
         end

data/lib/brightbox-cli/commands/cloudips/destroy.rb

@@ -1,15 +1,12 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.destroy.desc")
     cmd.arg_name "[cloudip-id...]"
     cmd.command [:destroy] do |c|
-
       c.desc "Unmap mapped IPs before destroying them"
       c.switch [:u, "unmap"], :negatable => false
 
       c.action do |_global_options, options, args|
-
         if args.empty?
           raise "You must specify the Cloud IPs you want to destroy"
         end
@@ -19,20 +16,19 @@ module Brightbox
         end
 
         ips.each do |ip|
-
           if ip.mapped?
-            if options[:u]
-              info "Unmapping Cloud IP #{ip}"
-              ip.unmap
-              3.times do
-                break unless ip.mapped?
-                sleep 1
-                ip.reload
-              end
-            else
-              raise "Cannot destroy mapped Cloud IP #{ip}"
+            raise "Cannot destroy mapped Cloud IP #{ip}" unless options[:u]
+
+            info "Unmapping Cloud IP #{ip}"
+            ip.unmap
+            3.times do
+              break unless ip.mapped?
+
+              sleep 1
+              ip.reload
             end
           end
+
           info "Destroying Cloud IP #{ip}"
           ip.destroy
         end

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

@@ -1,12 +1,10 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("cloudips.list.desc")
     cmd.arg_name "[cloudip-id...]"
     cmd.command [:list] do |c|
-
       c.action do |global_options, _options, args|
         ips = CloudIP.find_all_or_warn(args)
         render_table(ips.sort, global_options)

data/lib/brightbox-cli/commands/cloudips/map.rb

@@ -1,15 +1,12 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.map.desc")
     cmd.arg_name "cloudip-id destination"
     cmd.command [:map] do |c|
-
       c.desc "Unmap mapped IPs before remapping them"
       c.switch [:u, "unmap"], :negatable => false
 
       c.action do |global_options, options, args|
-
         if args.size > 2
           raise "Too many arguments"
         end
@@ -24,7 +21,7 @@ module Brightbox
 
         destination_id = args.last
         case destination_id
-        when /^srv\-/
+        when /^srv-/
           server = Server.find destination_id
           destination_id = server.interfaces.first["id"]
           info "Mapping #{ip} to interface #{destination_id} on #{server}"
@@ -33,15 +30,14 @@ module Brightbox
         end
 
         if ip.mapped?
-          if options[:u]
-            ip.unmap
-            3.times do
-              break unless ip.mapped?
-              sleep 1
-              ip.reload
-            end
-          else
-            raise "Refusing to map already mapped IP #{ip}"
+          raise "Refusing to map already mapped IP #{ip}" unless options[:u]
+
+          ip.unmap
+          3.times do
+            break unless ip.mapped?
+
+            sleep 1
+            ip.reload
           end
         end
 
@@ -51,6 +47,7 @@ module Brightbox
         3.times do
           ip.reload
           break if ip.mapped?
+
           sleep 1
         end
 

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

@@ -1,12 +1,9 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.show.desc")
     cmd.arg_name "cloudip-id..."
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
-
         if args.empty?
           raise "You must specify the cloud ips you want to show"
         end
@@ -15,17 +12,17 @@ module Brightbox
           warn "Couldn't find Cloud IP #{id}"
         end
 
-        fields = [
-          :id,
-          :name,
-          :status,
-          :public_ipv4,
-          :public_ipv6,
-          :fqdn,
-          :reverse_dns,
-          :destination,
-          :interface_id,
-          :port_translators
+        fields = %i[
+          id
+          name
+          status
+          public_ipv4
+          public_ipv6
+          fqdn
+          reverse_dns
+          destination
+          interface_id
+          port_translators
         ]
 
         render_table(ips.compact, global_options.merge(:vertical => true, :fields => fields))

data/lib/brightbox-cli/commands/cloudips/unmap.rb

@@ -1,12 +1,9 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.map.desc")
     cmd.arg_name "cloudip-id..."
     cmd.command [:unmap] do |c|
-
       c.action do |global_options, _options, args|
-
         if args.empty?
           raise "You must specify the Cloud IPs you want to unmap"
         end
@@ -27,7 +24,8 @@ module Brightbox
 
         # Wait up to 3 seconds for unmapping to complete
         3.times do
-          break unless ips.find { |ip| ip.mapped? }
+          break unless ips.find(&:mapped?)
+
           sleep 1
           ips.each { |ip| ip.reload if ip.mapped? }
         end

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:cloudips] do |cmd|
-
     cmd.desc I18n.t("cloudips.update.desc")
     cmd.arg_name "cloudip-id"
     cmd.command [:update] do |c|
-
       c.desc "Set reverse DNS for this Cloud IP"
       c.flag [:r, "reverse-dns"]
 
@@ -12,10 +10,10 @@ module Brightbox
       c.switch ["delete-reverse-dns"], :negatable => false
 
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("cloudips.options.port_translators.desc")
-      c.flag [:t, :"port-translators"]
+      c.flag %i[t port-translators]
 
       c.action do |global_options, options, args|
         cip_id = args.shift

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

@@ -1,7 +1,6 @@
 module Brightbox
   desc "Lists collaborations scoped to an account"
   command [:collaborators] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc "List an accounts collaborations"
@@ -36,7 +35,7 @@ module Brightbox
         collaborations = Collaboration.find_or_call(args) do |id|
           warn "Couldn't find collaboration #{id}"
         end
-        collaborations.each { |col| col.resend }
+        collaborations.each(&:resend)
         render_table(collaborations, global_options)
       end
     end
@@ -59,7 +58,7 @@ module Brightbox
         collaborations = Collaboration.find_or_call(args) do |id|
           warn "Couldn't find collaboration #{id}"
         end
-        collaborations.each { |col| col.destroy }
+        collaborations.each(&:destroy)
         render_table(collaborations, global_options)
       end
     end

data/lib/brightbox-cli/commands/config/{client-add.rb → client_add.rb}

@@ -1,11 +1,9 @@
 module Brightbox
   desc I18n.t("config.desc")
   command [:config] do |cmd|
-
     cmd.desc I18n.t("config.client_add.desc")
     cmd.arg_name "client-id secret [api_url, auth_url]"
     cmd.command [:client_add] do |c|
-
       c.desc "client alias (local reference)"
       c.flag [:a, "alias"]
 
@@ -13,7 +11,6 @@ module Brightbox
       c.flag [:t, "auth-url"]
 
       c.action do |_global_options, options, args|
-
         info "Using config file #{Brightbox.config.config_filename}"
 
         client_id = args.shift

data/lib/brightbox-cli/commands/config/client_default.rb

@@ -0,0 +1,18 @@
+module Brightbox
+  command [:config] do |cmd|
+    cmd.desc I18n.t("config.client_default.desc")
+    cmd.arg_name "alias"
+    cmd.command [:client_default] do |c|
+      c.action do |_global_options, _options, args|
+        info "Using config file #{Brightbox.config.config_filename}"
+        calias = args.shift
+
+        raise "You must specify the api alias you want to set as the default" if calias.nil?
+        raise "An api client with the alias #{calias} does not exist in the config" unless Brightbox.config.client_named?(calias)
+
+        info "Setting #{calias} as default api client"
+        Brightbox.config.set_default_client(calias)
+      end
+    end
+  end
+end

data/lib/brightbox-cli/commands/config/{client-list.rb → client_list.rb}

@@ -1,13 +1,10 @@
 module Brightbox
   command [:config] do |cmd|
-
     cmd.default_command :client_list
 
     cmd.desc I18n.t("config.client_list.desc")
     cmd.command [:client_list] do |c|
-
       c.action do |global_options, _options, _args|
-
         info "Using config file #{Brightbox.config.config_filename}"
 
         clients = Brightbox.config.section_names.map do |cid|
@@ -28,7 +25,7 @@ module Brightbox
           }
         end
 
-        render_table clients, global_options.merge(:fields => [:alias, :client_id, :secret, :api_url, :auth_url])
+        render_table clients, global_options.merge(:fields => %i[alias client_id secret api_url auth_url])
       end
     end
   end

data/lib/brightbox-cli/commands/config/{client-remove.rb → client_remove.rb}

@@ -1,12 +1,9 @@
 module Brightbox
   command [:config] do |cmd|
-
     cmd.desc "Remove api client details from config"
     cmd.arg_name "alias"
     cmd.command [:client_remove] do |c|
-
       c.action do |_global_options, _options, args|
-
         info "Using config file #{Brightbox.config.config_filename}"
 
         calias = args.shift

data/lib/brightbox-cli/commands/config/{user-add.rb → user_add.rb}

@@ -1,10 +1,8 @@
 module Brightbox
   command [:config] do |cmd|
-
     cmd.desc I18n.t("config.user_add.desc")
     cmd.arg_name "email client-id secret [api_url auth_url]"
     cmd.command [:user_add] do |c|
-
       c.desc "client alias (local reference)"
       c.flag [:a, "alias"]
 
@@ -12,8 +10,7 @@ module Brightbox
       c.flag [:p, "password"]
 
       c.action do |_global_options, options, args|
-
-        require 'highline'
+        require "highline"
 
         info "Using config file #{Brightbox.config.config_filename}"
 

data/lib/brightbox-cli/commands/firewall/{policies-apply.rb → policies_apply.rb}

@@ -1,11 +1,9 @@
 module Brightbox
   desc I18n.t("firewall.policies.desc")
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.apply.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:apply] do |c|
-
       c.action do |global_options, options, args|
         if args.size != 2
           raise "You must specify firewall_policy_id and server_group_id as arguments"
@@ -13,6 +11,7 @@ module Brightbox
 
         firewall_policy_id = args.shift
         raise "Invalid firewall policy id" unless firewall_policy_id[/^fwp-/]
+
         server_group_id = args.shift
         raise "Invalid Server Group id" unless server_group_id[/^grp-/]
 
@@ -26,6 +25,7 @@ module Brightbox
         unless server_group
           raise "Can\'t find group with #{options[:g]}"
         end
+
         firewall_policy.apply_to(server_group.id)
         render_table([firewall_policy], global_options)
       end

data/lib/brightbox-cli/commands/firewall/{policies-create.rb → policies_create.rb}

@@ -1,15 +1,13 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.create.desc")
     cmd.arg_name "[server-group-id...]"
     cmd.command [:create] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.action do |global_options, options, args|
         server_group_id = nil

data/lib/brightbox-cli/commands/firewall/{policies-destroy.rb → policies_destroy.rb}

@@ -1,12 +1,9 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.destroy.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:destroy] do |c|
-
       c.action do |_global_options, _options, args|
-
         raise "You must specify firewall-policy-id to destroy" if args.empty?
 
         firewall_policies = FirewallPolicy.find_or_call(args) do |id|

data/lib/brightbox-cli/commands/firewall/{policies-list.rb → policies_list.rb}

@@ -1,12 +1,10 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("firewall.policies.list.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:list] do |c|
-
       c.action do |global_options, _options, args|
         firewall_policies = FirewallPolicy.find_all_or_warn(args)
         render_table(firewall_policies, global_options)

data/lib/brightbox-cli/commands/firewall/{policies-remove.rb → policies_remove.rb}

@@ -1,10 +1,8 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.remove.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:remove] do |c|
-
       c.action do |global_options, options, args|
         if args.size != 2
           raise "You must specify firewall_policy_id and server_group_id as arguments"
@@ -12,6 +10,7 @@ module Brightbox
 
         firewall_policy_id = args.shift
         raise "Invalid firewall policy id" unless firewall_policy_id[/^fwp-/]
+
         server_group_id = args.shift
         raise "Invalid Server Group id" unless server_group_id[/^grp-/]
 
@@ -25,6 +24,7 @@ module Brightbox
         unless server_group
           raise "Can't find group with #{options[:g]}"
         end
+
         firewall_policy.remove(server_group.id)
         render_table([firewall_policy], global_options)
       end