brightbox-cli 0.14.1 → 0.15.0

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

@@ -13,11 +13,10 @@ module Fog
         Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
       end
 
-      def ssh(commands)
+      def ssh(commands, options={})
         require 'net/ssh'
         requires :public_ip_address, :username
 
-        options = {}
         options[:key_data] = [private_key] if private_key
         Fog::SSH.new(public_ip_address, username, options).run(commands)
       end

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

@@ -38,6 +38,9 @@ module Fog
       when :ninefold
         require 'fog/ninefold/compute'
         Fog::Compute::Ninefold.new(attributes)
+      when :openstack
+        require 'fog/openstack/compute'
+        Fog::Compute::OpenStack.new(attributes)
       when :rackspace
         require 'fog/rackspace/compute'
         Fog::Compute::Rackspace.new(attributes)

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

@@ -25,9 +25,9 @@ module Fog
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
               attributes[:#{name}] = case new_#{name}
-              when 'true'
+              when true,'true'
                 true
-              when 'false'
+              when false,'false'
                 false
               end
             end
@@ -71,8 +71,8 @@ module Fog
             class_eval <<-EOS, __FILE__, __LINE__
               def #{name}=(new_data)
                 if new_data.is_a?(Hash)
-                  if new_data.has_key?(:#{squash})
-                    attributes[:#{name}] = new_data[:#{squash}]
+                  if new_data.has_key?(:'#{squash}')
+                    attributes[:#{name}] = new_data[:'#{squash}']
                   elsif new_data.has_key?("#{squash}")
                     attributes[:#{name}] = new_data["#{squash}"]
                   else
@@ -142,7 +142,7 @@ module Fog
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
               send("#{aliased_key}=", value)
-            elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
+            elsif self.respond_to?("#{key}=",true)
               send("#{key}=", value)
             else
               attributes[key] = value

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

@@ -45,6 +45,11 @@ module Fog
     end
   end
 
+  # @return [Hash] The newly assigned credentials
+  def self.credentials=(new_credentials)
+    @credentials = new_credentials
+  end
+
   def self.symbolize_credentials(args)
     if args.is_a? Hash
       Hash[ *args.collect do |key, value|

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

@@ -48,6 +48,10 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :new_servers_username:
   :public_key_path:
   :private_key_path:
+  :openstack_api_key:
+  :openstack_username:
+  :openstack_auth_url:
+  :openstack_tenant:
   :rackspace_api_key:
   :rackspace_username:
   :rackspace_servicenet:

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

@@ -10,15 +10,20 @@ module Fog
       Fog.providers << base.to_s.split('::').last
     end
 
-    def service(new_service, path)
+    def [](service_key)
+      eval(@services_registry[service_key]).new
+    end
+
+    def service(new_service, path, constant_string)
       Fog.services[new_service] ||= []
-      Fog.services[new_service] << self.to_s.split('::').last.downcase.to_sym
-      self.services << new_service
+      Fog.services[new_service] |= [self.to_s.split('::').last.downcase.to_sym]
+      @services_registry ||= {}
+      @services_registry[new_service] = [self.to_s, constant_string].join('::')
       require File.join('fog', path)
     end
 
     def services
-      @services ||= []
+      @services_registry.keys
     end
 
   end

data/lib/brightbox-cli/vendor/fog/lib/fog/dnsimple.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dnsimple/dns')
+    service(:dns, 'dnsimple/dns', 'DNS')
 
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/dnsmadeeasy.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dnsmadeeasy/dns')
+    service(:dns, 'dnsmadeeasy/dns', 'DNS')
 
   end
 end

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

@@ -7,7 +7,7 @@ module Fog
   module Dynect
     extend Fog::Provider
 
-    service(:dns, 'dynect/dns')
+    service(:dns, 'dynect/dns', 'DNS')
 
     class Mock
       def self.job_id

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

@@ -18,11 +18,7 @@ module Fog
 
       def check_href!(opts = {})
         unless href
-          if opts.is_a?(String)
-            t = Hash.new
-            t[:parent] = opts
-            opts = t
-          end
+          opts = { :parent => opts } if opts.is_a?(String)
           msg = ":href missing, call with a :href pointing to #{if opts[:message]
                   opts[:message]
                 elsif opts[:parent]

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'ecloud/compute')
+    service(:compute, 'ecloud/compute', 'Compute')
 
   end
 end

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

@@ -36,12 +36,28 @@ module Fog
 
       class Mock
 
-        def initialize(options)
-          Fog::Mock.not_implemented
+        def initialize(options={})
+          @api_url            = options[:glesys_api_url] || Fog.credentials[:glesys_api_url] || API_URL
+          @glesys_username    = options[:glesys_username] || Fog.credentials[:glesys_api_key]
+          @glesys_api_key     = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
+          @connection_options = options[:connection_options] || {}
+        end
+
+        def self.data
+          @data ||= {
+          }
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def data
+          self.class.data
         end
 
-        def request(method_name, options = {})
-          Fog::Mock.not_implemented
+        def reset_data
+          self.class.reset
         end
 
       end

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

@@ -9,12 +9,6 @@ module Fog
 
         model Fog::Glesys::Compute::Template
 
-        #attribute :platform
-        #attribute :name
-        #attribute :os
-        #attribute :min_mem_size
-        #attribute :min_disk_size
-
         def all
           openvz = connection.template_list.body['response']['templates']['OpenVZ']
           xen    = connection.template_list.body['response']['templates']['Xen']

data/lib/brightbox-cli/vendor/fog/lib/fog/glesys.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'glesys/compute')
+    service(:compute, 'glesys/compute', 'Compute')
 
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/go_grid.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'go_grid/compute')
+    service(:compute, 'go_grid/compute', 'Compute')
 
   end
 end

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

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'google/storage')
+    service(:storage, 'google/storage', 'Storage')
 
     class Mock
 

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

@@ -279,7 +279,7 @@ module Fog
           # Aug 24 17:34:41 juno arpwatch: new station 10.247.4.137 52:54:00:88:5a:0a eth0.4
           # Aug 24 17:37:19 juno arpwatch: changed ethernet address 10.247.4.137 52:54:00:27:33:00 (52:54:00:88:5a:0a) eth0.4
           # Check if another ip_command string was provided
-          ip_command_global=@connection.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : @connection.ip_command
+          ip_command_global=@connection.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : @connection.ip_command
           ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command]
 
           ip_command="mac=#{mac}; "+ip_command_local

data/lib/brightbox-cli/vendor/fog/lib/fog/libvirt/models/compute/uri.rb

@@ -126,9 +126,13 @@ module Fog
         # http://libvirt.org/remote.html
         private
         def value(name)
-          params=CGI.parse(@parsed_uri.query)
-          if params.has_key?(name)
-            return params[name].first
+          unless @parsed_uri.query.nil?
+            params=CGI.parse(@parsed_uri.query)
+            if params.has_key?(name)
+              return params[name].first
+            else
+              return nil
+            end
           else
             return nil
           end

data/lib/brightbox-cli/vendor/fog/lib/fog/libvirt.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'libvirt/compute')
+    service(:compute, 'libvirt/compute', 'Compute')
 
   end
 end

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

@@ -5,14 +5,24 @@ module Fog
     class Linode
       class Server < Fog::Compute::Server
         attr_reader :stack_script
+        attr_accessor :private_key, :username
         identity :id
         attribute :name
         attribute :status
 
+        def initialize(attributes={})
+          super
+          self.username = 'root'
+        end
+
         def ips
           Fog::Compute::Linode::Ips.new :server => self, :connection => connection
         end
 
+        def public_ip_address
+          ips.find{|ip| ip.ip !~ /^192/}.ip
+        end
+
         def disks
           Fog::Compute::Linode::Disks.new :server => self, :connection => connection
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_create.rb

@@ -8,7 +8,7 @@ module Fog
         # ==== Parameters
         # * domain<~String>: The zone's name.  Note, if master zone, SOA_email is required and if slave
         #                    master_ips is/are required
-        # * type<~String>: master or slave 
+        # * type<~String>: master or slave
         # * options<~Hash>
         #   * description<~String> Currently undisplayed
         #   * SOA_email<~String> Required when type=master
@@ -16,8 +16,8 @@ module Fog
         #   * retry_sec<~Integer> numeric, default: '0'
         #   * expire_sec<~Integer> numeric, default: '0'
         #   * ttl_sec<~String> numeric, default: '0'
-        #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1 
-        #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated 
+        #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1
+        #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated
         #
         # ==== Returns
         # * response<~Excon::Response>:

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_list.rb

@@ -28,7 +28,7 @@ module Fog
           if domain_id
             options.merge!(:domainId => domain_id)
           end
-          
+
           request(
             :expects  => 200,
             :method   => 'GET',

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_resource_create.rb

@@ -7,18 +7,18 @@ module Fog
         #
         # ==== Parameters
         # * domain_id<~Integer>: limit the list to the domain ID specified
-        # * type<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV 
+        # * type<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV
         # * options<~Hash>
-        #   * name<~String>: The hostname or FQDN. When Type=MX the subdomain to delegate to the 
+        #   * name<~String>: The hostname or FQDN. When Type=MX the subdomain to delegate to the
         #                    Target MX server
         #   * target<~String> When Type=MX the hostname. When Type=CNAME the target of the alias.
-        #                    When Type=TXT the value of the record. When Type=A or AAAA the token 
-        #                    of '[remote_addr]' will be substituted with the IP address of the request. 
-        #   * priority<~Integer>: priority for MX and SRV records, 0-255 - default: 10 
+        #                    When Type=TXT the value of the record. When Type=A or AAAA the token
+        #                    of '[remote_addr]' will be substituted with the IP address of the request.
+        #   * priority<~Integer>: priority for MX and SRV records, 0-255 - default: 10
         #   * weight<~Integer>: default: 5
-        #   * port<~Integer>: default: 80 
-        #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record 
-        #                        types. default: udp 
+        #   * port<~Integer>: default: 80
+        #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record
+        #                        types. default: udp
         #   * ttl_sec<~Integer>: note, Linode will round the input to set values (300, 3600, 7200, etc)
         # ==== Returns
         # * response<~Excon::Response>:

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_resource_list.rb

@@ -13,18 +13,18 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Array>:
         #     * DATA<~Array>
-        #       * 'PROTOCOL'<~String>:  for SRV records. default is UDP 
-        #       * 'TTL_SEC'<~Interger>: 
+        #       * 'PROTOCOL'<~String>:  for SRV records. default is UDP
+        #       * 'TTL_SEC'<~Interger>:
         #       * 'PRIORITY'<~Interger>: for MX and SRV records
-        #       * 'TYPE'<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV 
-        #       * 'TARGET'<~String>: When Type=MX the hostname. When Type=CNAME the target of the alias. 
-        #                           When Type=TXT the value of the record. When Type=A or AAAA the token 
+        #       * 'TYPE'<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV
+        #       * 'TARGET'<~String>: When Type=MX the hostname. When Type=CNAME the target of the alias.
+        #                           When Type=TXT the value of the record. When Type=A or AAAA the token
         #                           of '[remote_addr]' will be substituted with the IP address of the request.
-        #       * 'WEIGHT'<~Interger>: 
+        #       * 'WEIGHT'<~Interger>:
         #       * 'RESOURCEID'<~Interger>: ID of the resource record
-        #       * 'PORT'<~Interger>: 
+        #       * 'PORT'<~Interger>:
         #       * 'DOMAINID'<~Interger>: ID of the domain that this record belongs to
-        #       * 'NAME'<~Interger>: The hostname or FQDN. When Type=MX, the subdomain to delegate to        
+        #       * 'NAME'<~Interger>: The hostname or FQDN. When Type=MX, the subdomain to delegate to
         def domain_resource_list(domain_id, resource_id = nil)
           query = { :api_action => 'domain.resource.list', :domainID => domain_id }
           if resource_id

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_resource_update.rb

@@ -9,17 +9,17 @@ module Fog
         # * domain_id<~Integer>: limit the list to the domain ID specified
         # * resource_id<~Integer>: id of resouce to delete
         # * options<~Hash>
-        #   * type<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV 
-        #   * name<~String>: The hostname or FQDN. When Type=MX the subdomain to delegate to the 
+        #   * type<~String>: One of: NS, MX, A, AAAA, CNAME, TXT, or SRV
+        #   * name<~String>: The hostname or FQDN. When Type=MX the subdomain to delegate to the
         #                    Target MX server
-        #   * target<~String> When Type=MX the hostname. When Type=CNAME the target of the alias. 
-        #                    When Type=TXT the value of the record. When Type=A or AAAA the token 
-        #                    of '[remote_addr]' will be substituted with the IP address of the request. 
-        #   * priority<~Integer>: priority for MX and SRV records, 0-255 - default: 10 
+        #   * target<~String> When Type=MX the hostname. When Type=CNAME the target of the alias.
+        #                    When Type=TXT the value of the record. When Type=A or AAAA the token
+        #                    of '[remote_addr]' will be substituted with the IP address of the request.
+        #   * priority<~Integer>: priority for MX and SRV records, 0-255 - default: 10
         #   * weight<~Integer>: default: 5
-        #   * port<~Integer>: default: 80 
-        #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record 
-        #                        types. default: udp 
+        #   * port<~Integer>: default: 80
+        #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record
+        #                        types. default: udp
         #   * ttl_sec<~Integer>: note, Linode will round the input to set values (300, 3600, 7200, etc)
         # ==== Returns
         # * response<~Excon::Response>:

data/lib/brightbox-cli/vendor/fog/lib/fog/linode/{models/dns/linode → requests/dns}/domain_update.rb

@@ -8,16 +8,16 @@ module Fog
         # ==== Parameters
         # * domain_id<~Integer>: The ID to identify the zone
         # * options<~Hash>
-        #   * domain<~String>: The zone's name.  
-        #   * type<~String>: master or slave 
+        #   * domain<~String>: The zone's name.
+        #   * type<~String>: master or slave
         #   * description<~String> Currently undisplayed
         #   * SOA_email<~String> Required when type=master
         #   * refresh_sec<~Integer> numeric, default: '0'
         #   * retry_sec<~Integer> numeric, default: '0'
         #   * expire_sec<~Integer> numeric, default: '0'
         #   * ttl_sec<~String> numeric, default: '0'
-        #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1 
-        #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated 
+        #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1
+        #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -25,7 +25,7 @@ module Fog
         #     * DATA<~Hash>:
         #       * 'DomainID'<~Integer>: domain ID
         def domain_update(domain_id, options = {})
-          
+
           request(
             :expects  => 200,
             :method   => 'GET',

data/lib/brightbox-cli/vendor/fog/lib/fog/linode.rb

@@ -3,8 +3,8 @@ require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
 module Fog
   module Linode
     extend Fog::Provider
-    service(:compute, 'linode/compute')
-    service(:dns,     'linode/dns')
+    service(:compute, 'linode/compute', 'Compute')
+    service(:dns,     'linode/dns',     'DNS')
   end
 end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/local/models/storage/directories.rb

@@ -0,0 +1,33 @@
+require 'fog/core/collection'
+require 'fog/local/models/storage/directory'
+
+module Fog
+  module Storage
+    class Local
+
+      class Directories < Fog::Collection
+
+        model Fog::Storage::Local::Directory
+
+        def all
+          data = Dir.entries(connection.local_root).select do |entry|
+            entry[0...1] != '.' && ::File.directory?(connection.path_to(entry))
+          end.map do |entry|
+            {:key => entry}
+          end
+          load(data)
+        end
+
+        def get(key)
+          if ::File.directory?(connection.path_to(key))
+            new(:key => key)
+          else
+            nil
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/local/models/storage/directory.rb

@@ -0,0 +1,57 @@
+require 'fog/core/model'
+require 'fog/local/models/storage/files'
+
+module Fog
+  module Storage
+    class Local
+
+      class Directory < Fog::Model
+
+        identity  :key
+
+        def destroy
+          requires :key
+
+          if ::File.directory?(path)
+            Dir.rmdir(path)
+            true
+          else
+            false
+          end
+        end
+
+        def files
+          @files ||= begin
+            Fog::Storage::Local::Files.new(
+              :directory    => self,
+              :connection   => connection
+            )
+          end
+        end
+
+        def public=(new_public)
+          new_public
+        end
+
+        def public_url
+          nil
+        end
+
+        def save
+          requires :key
+
+          Dir.mkdir(path)
+          true
+        end
+
+        private
+
+        def path
+          connection.path_to(key)
+        end
+
+      end
+
+    end
+  end
+end