brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/lib/fog/core/service.rb

@@ -172,11 +172,17 @@ module Fog
       end
 
       def recognized
-        @recognized ||= []
+        @recognized ||= [:connection_options]
       end
 
       def validate_options(options)
-        missing = requirements - options.keys
+        keys = []
+        for key, value in options
+          unless value.nil?
+            keys << key
+          end
+        end
+        missing = requirements - keys
         unless missing.empty?
           raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/dnsmadeeasy/models/dns/record.rb

@@ -58,11 +58,12 @@ module Fog
 
           if id.nil?
             data = connection.create_record(zone.domain, name, type, value, options).body
+            merge_attributes(data)
           else
-            data = connection.update_record(zone.domain, id, options).body
+            options.merge!(:name => name, :type => type, :data => value)
+            connection.update_record(zone.domain, id, options).body
           end
 
-          merge_attributes(data)
           true
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/dynect/dns.rb

@@ -26,6 +26,8 @@ module Fog
       request :post_zone
       request :put_zone
 
+      class JobIncomplete < Error; end
+
       class Mock
         def initialize(options={})
           @dynect_customer = options[:dynect_customer]
@@ -80,18 +82,23 @@ module Fog
 
         def request(params)
           begin
+            # any request could redirect to a job
+            params[:expects] = Array(params[:expects]) | [307]
+
             params[:headers] ||= {}
             params[:headers]['Content-Type'] = 'application/json'
             params[:headers]['API-Version'] = @version
             params[:headers]['Auth-Token'] = auth_token unless params[:path] == "Session"
-            params[:path] = "#{@path}/#{params[:path]}"
+            params[:path] = "#{@path}/#{params[:path]}" unless params[:path] =~ %r{^#{Regexp.escape(@path)}/}
             response = @connection.request(params.merge!({:host => @host}))
 
-            unless response.body.empty?
+            if response.status == 307
+              response = poll_job(response)
+            elsif !response.body.empty?
               response.body = MultiJson.decode(response.body)
             end
-            response
 
+            response
           rescue Excon::Errors::HTTPStatusError => error
             if @auth_token && error.message =~ /login: (Bad or expired credentials|inactivity logout)/
               @auth_token = nil
@@ -103,6 +110,21 @@ module Fog
 
           response
         end
+
+        def poll_job(response, time_to_wait = 10)
+          job_location = response.headers['Location']
+
+          Fog.wait_for(time_to_wait) do
+            response = request(:expects => 200, :method => :get, :path => job_location)
+            response.body['status'] != 'incomplete'
+          end
+
+          if response.body['status'] == 'incomplete'
+            raise JobIncomplete.new("Job #{response.body['job_id']} is still incomplete")
+          end
+
+          response
+        end
       end
 
     end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/compute.rb

@@ -1061,7 +1061,7 @@ module Fog
         end
 
         def self.data_reset
-          Fog::Logger.warning("#{self} => #data_reset is deprecated, use #reset instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("#{self} => #data_reset is deprecated, use #reset instead [light_black](#{caller.first})[/]")
           self.reset
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/go_grid/requests/compute/grid_server_power.rb

@@ -16,7 +16,7 @@ module Fog
         def grid_server_power(server, power)
           request(
             :path     => 'grid/server/power',
-            :query    => {'server' => server}
+            :query    => {'server' => server, 'power' => power}
           )
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/google/models/storage/file.rb

@@ -106,7 +106,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
-            Fog::Logger.warning("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
           end
           options['x-goog-acl'] ||= @acl if @acl
           options['Cache-Control'] = cache_control if cache_control

data/lib/brightbox-cli/vendor/fog/lib/fog/google/requests/storage/get_object_url.rb

@@ -18,7 +18,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
+          Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
           get_object_https_url(bucket_name, object_name, expires)
         end
 
@@ -27,7 +27,7 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
+          Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
           get_object_https_url(bucket_name, object_name, expires)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/google/storage.rb

@@ -45,7 +45,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.warning("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/ninefold/models/storage/file.rb

@@ -13,7 +13,7 @@ module Fog
         attribute :objectid,        :aliases => :ObjectID
 
         def body
-          attributes[:body] ||= if last_modified
+          attributes[:body] ||= if objectid
             collection.get(identity).body
           else
             ''
@@ -73,13 +73,15 @@ module Fog
           options[:headers] ||= {}
           options[:headers]['Content-Type'] = content_type if content_type
           options[:body] = body
-          if objectid
-            # pre-existing file, do a PUT
-            data = connection.put_namespace(ns, options)
-          else
-            # new file, POST
+          begin
             data = connection.post_namespace(ns, options)
             self.objectid = data.headers['location'].split('/')[-1]
+          rescue => error
+            if error.message =~ /The resource you are trying to create already exists./
+              data = connection.put_namespace(ns, options)
+            else
+              raise error
+            end
           end
           # merge_attributes(data.headers)
           true

data/lib/brightbox-cli/vendor/fog/lib/fog/ninefold/models/storage/files.rb

@@ -51,12 +51,13 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key)
+          data = connection.head_namespace(directory.key + key, :parse => false)
           file_data = data.headers.merge({
+            :body => data.body,
             :key => key
           })
           new(file_data)
-        rescue Fog::Storage::Rackspace::NotFound
+        rescue Fog::Storage::Ninefold::NotFound
           nil
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/ninefold/requests/storage/head_namespace.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Storage
+    class Ninefold
+      class Real
+
+        def head_namespace(namespace = '', options = {})
+          options = options.reject {|key, value| value.nil?}
+          request({
+                    :expects  => 200,
+                    :method   => 'HEAD',
+                    :path     => "namespace/" + namespace,
+                    :query    => {},
+                    :parse => true
+                  }.merge(options))
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/ninefold/storage.rb

@@ -20,6 +20,7 @@ module Fog
       request_path 'fog/ninefold/requests/storage'
       # request :delete_container
       request :get_namespace
+      request :head_namespace
       request :post_namespace
       request :put_namespace
       request :delete_namespace
@@ -107,9 +108,10 @@ module Fog
 
           customheaders = {}
           params[:headers].each { |key,value|
-            if key == "x-emc-date"
+            case key
+            when 'x-emc-date', 'x-emc-signature'
               #skip
-            elsif key =~ /^x-emc-/
+            when /^x-emc-/
               customheaders[ key.downcase ] = value
             end
           }

data/lib/brightbox-cli/vendor/fog/lib/fog/openstack/models/compute/server.rb

@@ -21,6 +21,7 @@ module Fog
         attribute :accessIPv4
         attribute :accessIPv6
         attribute :availability_zone
+        attribute :user_data_encoded
         attribute :state,       :aliases => 'status'
 
         attr_reader :password
@@ -47,6 +48,10 @@ module Fog
           metadata.load(metas)
         end
 
+        def user_data=(ascii_userdata)
+          self.user_data_encoded = [ascii_userdata].pack('m')
+        end
+
         def destroy
           requires :id
           connection.delete_server(id)
@@ -155,7 +160,8 @@ module Fog
             'personality' => personality,
             'accessIPv4' => accessIPv4,
             'accessIPv6' => accessIPv6,
-            'availability_zone' => availability_zone
+            'availability_zone' => availability_zone,
+            'user_data' => user_data_encoded
           }
           options = options.reject {|key, value| value.nil?}
           data = connection.create_server(name, image_ref, flavor_ref, options)

data/lib/brightbox-cli/vendor/fog/lib/fog/openstack/requests/compute/create_server.rb

@@ -12,15 +12,12 @@ module Fog
             }
           }
 
-          if options['metadata']
-            data['server']['metadata'] = options['metadata']
-          end
-          if options['accessIPv4']
-            data['server']['accessIPv4'] = options['accessIPv4']
-          end
-          if options['accessIPv6']
-            data['server']['accessIPv6'] = options['accessIPv6']
+          vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
+                             'availability_zone', 'user_data']
+          vanilla_options.select{|o| options[o]}.each do |key|
+            data['server'][key] = options[key]
           end
+
           if options['personality']
             data['server']['personality'] = []
             for file in options['personality']
@@ -30,9 +27,7 @@ module Fog
               }
             end
           end
-          if options['availability_zone']
-            data['server']['availability_zone'] = options['availability_zone']
-          end
+
           request(
             :body     => MultiJson.encode(data),
             :expects  => [200, 202],

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/load_balancers.rb

@@ -16,6 +16,7 @@ module Fog
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :rackspace_auth_token
+      recognizes :rackspace_lb_endpoint
 
       model_path 'fog/rackspace/models/load_balancers'
       collection :load_balancers

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/models/dns/callback.rb

@@ -11,7 +11,7 @@ module Fog
           response = nil
           Fog.wait_for(timeout, interval) do
             response = connection.callback job_id
-            if response.status != 202
+            if response.body['status'] != 'RUNNING'
               true
             elsif retries == 0
               raise Fog::Errors::Error.new("Wait on job #{job_id} took too long")

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/models/dns/record.rb

@@ -51,7 +51,7 @@ module Fog
           }
 
           response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
-          merge_attributes(response.body['records'].first)
+          merge_attributes(response.body['response']['records'].select {|record| record['name'] == self.name && record['type'] == self.type && record['data'] == self.value}.first)
           true
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/rackspace/models/dns/zone.rb

@@ -52,7 +52,7 @@ module Fog
           response = connection.create_domains([data])
 
           response = wait_for_job response.body['jobId']
-          merge_attributes(response.body['domains'].first)
+          merge_attributes(response.body['response']['domains'].select {|domain| domain['name'] == self.domain}.first)
         end
 
         def update

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/dns.rb

@@ -23,6 +23,7 @@ module Fog
       request :get_records
       request :get_zone
       request :get_zones
+      request :update_record
 
       class Mock
 

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/models/dns/record.rb

@@ -12,7 +12,7 @@ module Fog
         identity :id
 
         attribute :active
-        attribute :value,       :aliases => 'ip'
+        attribute :value,       :aliases => ['ip', 'data']
         attribute :name
         attribute :description, :aliases => 'aux'
         attribute :ttl
@@ -45,13 +45,17 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          
           requires :name, :type, :value, :zone
           options = {}
           options[:active]  = active ? 'Y' : 'N'
           options[:aux]     = description if description
           options[:ttl]     = ttl if ttl
-          data = connection.create_record(type, zone.id, name, value, options)
+          if identity
+            data = connection.update_record(identity, type, zone.id, name, value, options)
+          else
+            data = connection.create_record(type, zone.id, name, value, options)
+          end
           merge_attributes(data.body)
           true
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/models/dns/zone.rb

@@ -39,7 +39,7 @@ module Fog
             Fog::DNS::Slicehost::Records.new(
               :zone       => self,
               :connection => connection
-            )
+            ).all
           end
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/parsers/dns/create_record.rb

@@ -11,9 +11,15 @@ module Fog
 
           def end_element(name)
             case name
-            when 'zone-id', 'ttl', 'id'
+            when 'zone_id'
+              @response["zone-id"] = value.to_i
+            when 'record_type'
+              @response["record-type"] = value
+            when 'ttl', 'id'
               @response[name] = value.to_i
-            when 'record-type', 'name', 'data', 'active', 'aux'
+            when 'value'
+              @response["data"] = value
+            when 'name', 'data', 'active', 'aux'
               @response[name] = value
             end
           end

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/parsers/dns/get_record.rb

@@ -6,15 +6,27 @@ module Fog
         class GetRecord < Fog::Parsers::Base
 
           def reset
+            @record = {}
             @response = { }
           end
 
           def end_element(name)
             case name
-            when 'zone-id', 'ttl'
-              @response[name] = value.to_i
-            when 'record-type', 'name', 'data', 'active', 'aux'
-              @response[name] = value
+            when 'id'
+              @record["id"] = value.to_i
+            when 'zone-id'
+              @record["zone_id"] = value.to_i
+            when 'record-type'
+              @record["record_type"] = value
+            when 'ttl'
+              @record[name] = value.to_i
+            when 'data'
+              @record["value"] = value
+            when 'name', 'active', 'aux'
+              @record[name] = value
+            when 'record'
+              @response = @record
+              @record = {}
             end
           end
 
@@ -23,4 +35,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/parsers/dns/get_records.rb

@@ -12,9 +12,17 @@ module Fog
 
           def end_element(name)
             case name
-            when 'zone-id', 'ttl'
+            when 'id'
+              @record["id"] = value.to_i
+            when 'zone-id'
+              @record["zone_id"] = value.to_i
+            when 'record-type'
+              @record["record_type"] = value
+            when 'ttl'
               @record[name] = value.to_i
-            when 'record-type', 'name', 'data', 'active', 'aux'
+            when 'data'
+              @record["value"] = value
+            when 'name', 'active', 'aux'
               @record[name] = value
             when 'record'
               @response['records'] << @record

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/requests/dns/get_record.rb

@@ -21,7 +21,7 @@ module Fog
           request(
             :expects  => 200,
             :method   => 'GET',
-            :parser   => Fog::Parsers::DNS::Slicehost::GetRecords.new,
+            :parser   => Fog::Parsers::DNS::Slicehost::GetRecord.new,
             :path     => "records/#{record_id}.xml"
           )
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/requests/dns/get_records.rb

@@ -10,14 +10,13 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
-        #     * 'addresses'<~Array> - Ip addresses for the slice
-        #     * 'backup-id'<~Integer> - Id of backup slice was booted from
-        #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
-        #     * 'id'<~Integer> - Id of the slice
-        #     * 'image-id'<~Integer> - Id of image slice was booted from
-        #     * 'name'<~String> - Name of the slice
-        #     * 'progress'<~Integer> - Progress of current action, in percentage
-        #     * 'status'<~String> - Current status of the slice
+        #     * 'name'<~String> - Record NAME field (e.g. "example.org." or "www")
+        #     * 'data'<~String> - Data contained by the record (e.g. an IP address, for A records)
+        #     * 'record_type'<~String> - Type of record (A, CNAME, TXT, etc)
+        #     * 'aux'<~String> - Aux data for the record, for those types which have it (e.g. TXT)
+        #     * 'zone_id'<~Integer> - zone ID to which this record belongs
+        #     * 'active'<~String> - whether this record is active in the Slicehost DNS (Y for yes, N for no)
+        #     * 'ttl'<~Integer> - TTL in seconds
         def get_records
           request(
             :expects  => 200,

data/lib/brightbox-cli/vendor/fog/lib/fog/slicehost/requests/dns/update_record.rb

@@ -0,0 +1,43 @@
+module Fog
+  module DNS
+    class Slicehost
+      class Real
+
+        #require 'fog/slicehost/parsers/dns/update_record'
+
+        # Get an individual DNS record from the specified zone
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'record_type'<~String> - type of DNS record to create (A, CNAME, etc)
+        #     * 'zone_id'<~Integer> - ID of the zone to update
+        #     * 'name'<~String> - host name this DNS record is for
+        #     * 'data'<~String> - data for the DNS record (ie for an A record, the IP address)
+        #     * 'ttl'<~Integer> - time to live in seconds
+        #     * 'active'<~String> - whether this record is active or not ('Y' or 'N')
+        #     * 'aux'<~String> - extra data required by the record
+        def update_record(record_id, record_type, zone_id, name, data, options = {})
+          optional_tags= ''
+          options.each { |option, value|
+            case option
+            when :ttl
+              optional_tags+= "<ttl type='integer'>#{value}</ttl>"
+            when :active
+              optional_tags+= "<active>#{value}</active>"
+            when :aux
+              optional_tags+= "<aux>#{value}</aux>"
+            end
+          }
+          request(
+            :body     => %Q{<?xml version="1.0" encoding="UTF-8"?><record><record_type>#{record_type}</record_type><zone_id type="integer">#{zone_id}</zone_id><name>#{name}</name><data>#{data}</data>#{optional_tags}</record>},
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "records/#{record_id}.xml"
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/storm_on_demand/models/compute/balancers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Balancer
 
         def all
-          data = connection.list_balancers.body['loadbalancers']
+          data = connection.list_balancers.body['items']
           load(data)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/storm_on_demand/models/compute/configs.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Config
 
         def all
-          data = connection.list_configs.body['configs']
+          data = connection.list_configs.body['items']
           load(data)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/storm_on_demand/models/compute/images.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Image
 
         def all
-          data = connection.list_images.body['images']
+          data = connection.list_images.body['items']
           load(data)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/storm_on_demand/models/compute/servers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Server
 
         def all
-          data = connection.list_servers.body['servers']
+          data = connection.list_servers.body['items']
           load(data)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/storm_on_demand/models/compute/templates.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Template
 
         def all
-          data = connection.list_templates.body['templates']
+          data = connection.list_templates.body['items']
           load(data)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/terremark/vcloud.rb

@@ -15,7 +15,7 @@ module Fog
      extend Fog::Terremark::Shared
 
      def self.new(options={})
-       Fog::Logger.warning("Fog::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe [light_black](#{caller.first})[/]")
+       Fog::Logger.deprecation("Fog::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe [light_black](#{caller.first})[/]")
 
        unless @required
          shared_requires