fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/riakcs.rb

@@ -1,122 +1,2 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
-
-module Fog
-  module RiakCS
-
-    module MultipartUtils
-      require 'net/http'
-
-      class Headers
-        include Net::HTTPHeader
-
-        def initialize
-          initialize_http_header({})
-        end
-
-        # Parse a single header line into its key and value
-        # @param [String] chunk a single header line
-        def self.parse(chunk)
-          line = chunk.strip
-          # thanks Net::HTTPResponse
-          return [nil,nil] if chunk =~ /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in
-          m = /\A([^:]+):\s*/.match(line)
-          [m[1], m.post_match] rescue [nil, nil]
-        end
-
-        # Parses a header line and adds it to the header collection
-        # @param [String] chunk a single header line
-        def parse(chunk)
-          key, value = self.class.parse(chunk)
-          add_field(key, value) if key && value
-        end
-      end
-
-      def parse(data, boundary)
-        contents = data.match(end_boundary_regex(boundary)).pre_match rescue ""
-        contents.split(inner_boundary_regex(boundary)).reject(&:empty?).map do |part|
-          parse_multipart_section(part)
-        end.compact
-      end
-
-      def extract_boundary(header_string)
-        $1 if header_string =~ /boundary=([A-Za-z0-9\'()+_,-.\/:=?]+)/
-      end
-
-      private
-      def end_boundary_regex(boundary)
-        /\r?\n--#{Regexp.escape(boundary)}--\r?\n?/
-      end
-
-      def inner_boundary_regex(boundary)
-        /\r?\n--#{Regexp.escape(boundary)}\r?\n/
-      end
-
-      def parse_multipart_section(part)
-        headers = Headers.new
-        if md = part.match(/\r?\n\r?\n/)
-          body = md.post_match
-          md.pre_match.split(/\r?\n/).each do |line|
-            headers.parse(line)
-          end
-
-          if headers["content-type"] =~ /multipart\/mixed/
-            boundary = extract_boundary(headers.to_hash["content-type"].first)
-            parse(body, boundary)
-          else
-            {:headers => headers.to_hash, :body => body}
-          end
-        end
-      end
-    end
-
-    module UserUtils
-      def update_riakcs_user(key_id, user)
-        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", Fog::JSON.encode(user), { 'Content-Type' => 'application/json' })
-        if !response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-        end
-        response
-      end
-
-      def update_mock_user(key_id, user)
-        if data[key_id]
-          if status = user[:status]
-            data[key_id][:status] = status
-          end
-
-          if user[:new_key_secret]
-            data[key_id][:key_secret] = rand(100).to_s
-          end
-
-          Excon::Response.new.tap do |response|
-            response.status = 200
-            response.body   = data[key_id]
-          end
-        else
-          Excon::Response.new.tap do |response|
-            response.status = 403
-          end
-        end
-      end
-    end
-
-    module Utils
-      def configure_uri_options(options = {})
-        @host       = options[:host]       || 'localhost'
-        @persistent = options[:persistent] || true
-        @port       = options[:port]       || 8080
-        @scheme     = options[:scheme]     || 'http'
-      end
-
-      def riakcs_uri
-        "#{@scheme}://#{@host}:#{@port}"
-      end
-    end
-
-    extend Fog::Provider
-
-    service(:provisioning, 'riakcs/provisioning', 'Provisioning')
-    service(:usage,        'riakcs/usage',        'Usage')
-
-  end
-end
+require 'fog/riakcs/provisioning'
+require 'fog/riakcs/usage'

data/lib/fog/riakcs/core.rb

@@ -0,0 +1,122 @@
+require 'fog/core'
+
+module Fog
+  module RiakCS
+
+    module MultipartUtils
+      require 'net/http'
+
+      class Headers
+        include Net::HTTPHeader
+
+        def initialize
+          initialize_http_header({})
+        end
+
+        # Parse a single header line into its key and value
+        # @param [String] chunk a single header line
+        def self.parse(chunk)
+          line = chunk.strip
+          # thanks Net::HTTPResponse
+          return [nil,nil] if chunk =~ /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in
+          m = /\A([^:]+):\s*/.match(line)
+          [m[1], m.post_match] rescue [nil, nil]
+        end
+
+        # Parses a header line and adds it to the header collection
+        # @param [String] chunk a single header line
+        def parse(chunk)
+          key, value = self.class.parse(chunk)
+          add_field(key, value) if key && value
+        end
+      end
+
+      def parse(data, boundary)
+        contents = data.match(end_boundary_regex(boundary)).pre_match rescue ""
+        contents.split(inner_boundary_regex(boundary)).reject(&:empty?).map do |part|
+          parse_multipart_section(part)
+        end.compact
+      end
+
+      def extract_boundary(header_string)
+        $1 if header_string =~ /boundary=([A-Za-z0-9\'()+_,-.\/:=?]+)/
+      end
+
+      private
+      def end_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}--\r?\n?/
+      end
+
+      def inner_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}\r?\n/
+      end
+
+      def parse_multipart_section(part)
+        headers = Headers.new
+        if md = part.match(/\r?\n\r?\n/)
+          body = md.post_match
+          md.pre_match.split(/\r?\n/).each do |line|
+            headers.parse(line)
+          end
+
+          if headers["content-type"] =~ /multipart\/mixed/
+            boundary = extract_boundary(headers.to_hash["content-type"].first)
+            parse(body, boundary)
+          else
+            {:headers => headers.to_hash, :body => body}
+          end
+        end
+      end
+    end
+
+    module UserUtils
+      def update_riakcs_user(key_id, user)
+        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", Fog::JSON.encode(user), { 'Content-Type' => 'application/json' })
+        if !response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+        end
+        response
+      end
+
+      def update_mock_user(key_id, user)
+        if data[key_id]
+          if status = user[:status]
+            data[key_id][:status] = status
+          end
+
+          if user[:new_key_secret]
+            data[key_id][:key_secret] = rand(100).to_s
+          end
+
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body   = data[key_id]
+          end
+        else
+          Excon::Response.new.tap do |response|
+            response.status = 403
+          end
+        end
+      end
+    end
+
+    module Utils
+      def configure_uri_options(options = {})
+        @host       = options[:host]       || 'localhost'
+        @persistent = options[:persistent] || true
+        @port       = options[:port]       || 8080
+        @scheme     = options[:scheme]     || 'http'
+      end
+
+      def riakcs_uri
+        "#{@scheme}://#{@host}:#{@port}"
+      end
+    end
+
+    extend Fog::Provider
+
+    service(:provisioning, 'Provisioning')
+    service(:usage,        'Usage')
+
+  end
+end

data/lib/fog/riakcs/provisioning.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'riakcs'))
+require 'fog/riakcs/core'
 
 module Fog
   module RiakCS

data/lib/fog/riakcs/usage.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'riakcs'))
+require 'fog/riakcs/core'
 require 'time'
 
 module Fog

data/lib/fog/serverlove.rb

@@ -1,10 +1 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
-
-module Fog
-  module Serverlove
-    extend Fog::Provider
-
-    service(:compute, 'serverlove/compute', 'Compute')
-
-  end
-end
+require 'fog/serverlove/compute'

data/lib/fog/serverlove/compute.rb

@@ -1,3 +1,5 @@
+require 'fog/serverlove/core'
+
 module Fog
   module Compute
     class Serverlove < Fog::Service

data/lib/fog/serverlove/core.rb

@@ -0,0 +1,10 @@
+require 'fog/core'
+
+module Fog
+  module Serverlove
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end

data/lib/fog/storm_on_demand.rb

@@ -1,20 +1,9 @@
-require 'fog/core'
-
-module Fog
-  module StormOnDemand
-
-    extend Fog::Provider
-
-    service(:compute, 'storm_on_demand/compute', 'Compute')
-    service(:network, 'storm_on_demand/network', 'Network')
-    service(:storage, 'storm_on_demand/storage', 'Storage')
-    service(:dns, 'storm_on_demand/dns', 'DNS')
-    service(:billing, 'storm_on_demand/billing', 'Billing')
-    service(:monitoring, 'storm_on_demand/monitoring', 'Monitoring')
-    service(:support, 'storm_on_demand/support', 'Support')
-    service(:account, 'storm_on_demand/account', 'Account')
-    service(:vpn, 'storm_on_demand/vpn', 'VPN')
-    
-  end
-end
-
+require 'fog/storm_on_demand/account'
+require 'fog/storm_on_demand/billing'
+require 'fog/storm_on_demand/compute'
+require 'fog/storm_on_demand/dns'
+require 'fog/storm_on_demand/monitoring'
+require 'fog/storm_on_demand/network'
+require 'fog/storm_on_demand/storage'
+require 'fog/storm_on_demand/support'
+require 'fog/storm_on_demand/vpn'

data/lib/fog/storm_on_demand/account.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/storm_on_demand/shared'
 require 'fog/account'
 

data/lib/fog/storm_on_demand/billing.rb

@@ -1,5 +1,5 @@
+require 'fog/storm_on_demand/core'
 require 'fog/billing'
-require 'fog/storm_on_demand'
 require 'fog/storm_on_demand/shared'
 
 module Fog

data/lib/fog/storm_on_demand/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/compute'
 require 'fog/storm_on_demand/shared'
 

data/lib/fog/storm_on_demand/core.rb

@@ -0,0 +1,20 @@
+require 'fog/core'
+
+module Fog
+  module StormOnDemand
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+    service(:network, 'Network')
+    service(:storage, 'Storage')
+    service(:dns, 'DNS')
+    service(:billing, 'Billing')
+    service(:monitoring, 'Monitoring')
+    service(:support, 'Support')
+    service(:account, 'Account')
+    service(:vpn, 'VPN')
+    
+  end
+end
+

data/lib/fog/storm_on_demand/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/dns'
 require 'fog/storm_on_demand/shared'
 

data/lib/fog/storm_on_demand/monitoring.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/monitoring'
 require 'fog/storm_on_demand/shared'
 

data/lib/fog/storm_on_demand/network.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/storm_on_demand/shared'
 require 'fog/network'
 

data/lib/fog/storm_on_demand/shared.rb

@@ -29,7 +29,6 @@ module Fog
               'Content-Type' => 'application/json',
               'Authorization' => 'Basic ' << Base64.encode64("#{@storm_on_demand_username}:#{@storm_on_demand_password}").chomp
             }.merge!(params[:headers] || {}),
-            :host     => @host,
             :path     => "#{@path}/#{API_VERSION}#{params[:path]}",
             :expects  => 200,
             :method   => :post

data/lib/fog/storm_on_demand/storage.rb

@@ -1,4 +1,4 @@
-require "fog/storm_on_demand"
+require 'fog/storm_on_demand/core'
 require "fog/storage"
 require "fog/storm_on_demand/shared"
 

data/lib/fog/storm_on_demand/support.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/support'
 require 'fog/storm_on_demand/shared'
 

data/lib/fog/storm_on_demand/vpn.rb

@@ -1,4 +1,4 @@
-require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/core'
 require 'fog/storm_on_demand/shared'
 require 'fog/vpn'
 

data/lib/fog/vcloud.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module Vcloud
-
-    extend Fog::Provider
-
-    service(:compute, 'vcloud/compute', 'Compute')
-
-  end
-end
+require 'fog/vcloud/compute'

data/lib/fog/vcloud/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/vcloud'
+require 'fog/vcloud/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/vcloud/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module Vcloud
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end