fog-softlayer 0.4.2.pre → 0.4.2

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.4.2.pre
+  version: 0.4.2
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,56 +126,56 @@ dependencies:
   name: shindo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: fission
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: osrcry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Module for the 'fog' gem to support SoftLayer Cloud
@@ -185,8 +185,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -214,8 +214,9 @@ files:
 - lib/fog/softlayer.rb
 - lib/fog/softlayer/compute.rb
 - lib/fog/softlayer/compute/shared.rb
-- lib/fog/softlayer/core.rb
 - lib/fog/softlayer/dns.rb
+- lib/fog/softlayer/ext/hash.rb
+- lib/fog/softlayer/ext/string.rb
 - lib/fog/softlayer/models/compute/flavor.rb
 - lib/fog/softlayer/models/compute/flavors.rb
 - lib/fog/softlayer/models/compute/image.rb
@@ -264,13 +265,21 @@ files:
 - lib/fog/softlayer/requests/compute/delete_vm.rb
 - lib/fog/softlayer/requests/compute/delete_vm_tags.rb
 - lib/fog/softlayer/requests/compute/describe_tags.rb
+- lib/fog/softlayer/requests/compute/get_bare_metal_active_tickets.rb
+- lib/fog/softlayer/requests/compute/get_bare_metal_create_options.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_server.rb
+- lib/fog/softlayer/requests/compute/get_bare_metal_server_by_ip.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_servers.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_tags.rb
+- lib/fog/softlayer/requests/compute/get_bare_metal_users.rb
 - lib/fog/softlayer/requests/compute/get_key_pair.rb
 - lib/fog/softlayer/requests/compute/get_key_pairs.rb
 - lib/fog/softlayer/requests/compute/get_references_by_tag_name.rb
 - lib/fog/softlayer/requests/compute/get_tag.rb
+- lib/fog/softlayer/requests/compute/get_virtual_guest_active_tickets.rb
+- lib/fog/softlayer/requests/compute/get_virtual_guest_by_ip.rb
+- lib/fog/softlayer/requests/compute/get_virtual_guest_create_options.rb
+- lib/fog/softlayer/requests/compute/get_virtual_guest_users.rb
 - lib/fog/softlayer/requests/compute/get_vm.rb
 - lib/fog/softlayer/requests/compute/get_vm_tags.rb
 - lib/fog/softlayer/requests/compute/get_vms.rb
@@ -338,6 +347,7 @@ files:
 - lib/fog/softlayer/requests/storage/put_object.rb
 - lib/fog/softlayer/requests/storage/put_object_manifest.rb
 - lib/fog/softlayer/requests/storage/put_static_obj_manifest.rb
+- lib/fog/softlayer/slapi.rb
 - lib/fog/softlayer/storage.rb
 - lib/fog/softlayer/version.rb
 - spec/fog/compute/softlayer_spec.rb
@@ -397,21 +407,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This library can be used as a module for `fog` or as standalone provider
   to use the SoftLayer Cloud in applications
 test_files:
 - spec/fog/compute/softlayer_spec.rb
-has_rdoc: 

data/lib/fog/softlayer/core.rb

@@ -1,176 +0,0 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: MIT (http://opensource.org/licenses/MIT)
-#
-
-require 'fog/core'
-require 'fog/json'
-require 'fog/softlayer/version'
-require 'time'
-
-module Fog
-  module Softlayer
-
-    module Slapi
-
-      # Sends the real request to the real SoftLayer service.
-      #
-      # @param [String] service
-      #   ...ayer.com/rest/v3/Softlayer_Service_Name...
-      # @param path [String]
-      #   ...ayer.com/rest/v3/Softlayer_Service_Name/path.json
-      # @param [Hash] options
-      # @option options [Array<Hash>] :body
-      #   HTTP request body parameters
-      # @option options [String] :softlayer_api_url
-      #   Override the default (or configured) API endpoint
-      # @option options [String] :softlayer_username
-      #   Email or user identifier for user based authentication
-      # @option options [String] :softlayer_api_key
-      #   Password for user based authentication
-      # @return [Excon::Response]
-      def self.slapi_request(service, path, options)
-          # default HTTP method to get if not passed
-          http_method = options[:http_method] || :get
-          # set the target base url
-          @request_url = options[:softlayer_api_url] || Fog::Softlayer::SL_API_URL
-          # tack on the username and password
-          credentialize_url(options[:username], options[:api_key])
-          # set the SoftLayer Service name
-          set_sl_service(service)
-          # set the request path (known as the "method" in SL docs)
-          set_sl_path(path)
-          # set the query params if any
-
-
-          # build request params
-          params = { :headers => user_agent_header }
-          params[:headers]['Content-Type'] = 'application/json'
-          params[:expects] = options[:expected] || [200,201]
-          params[:query] = options[:query] unless options[:query].nil?
-          unless options[:body].nil?
-            options[:body] = [options[:body]] unless options[:body].kind_of?(Array)
-            params[:body] = Fog::JSON.encode({:parameters => options[:body]})
-          end
-
-          # initialize connection object
-          @connection = Fog::Core::Connection.new(@request_url, false, params)
-
-          # send it
-          response = @connection.request(:method => http_method)
-
-          # decode it
-          response.body = Fog::JSON.decode(response.body)
-          response
-      end
-
-      private
-
-      def self.credentialize_url(username, apikey)
-        @request_url = "https://#{sanitize_username(username)}:#{apikey}@#{@request_url}"
-      end
-      
-      def self.sanitize_username(username)
-        username.gsub!(/@/, '%40')
-        username
-      end
-
-      ##
-      # Prepend "SoftLayer_" to the service name and Snake_Camel_Case the string before appending it to the @request_url.
-      #
-      def self.set_sl_service(service)
-        service = "SoftLayer_" << service.to_s.gsub(/^softlayer_/i, '').split('_').map{|i|i.capitalize}.join('_')
-        service.fix_convention_exceptions
-        @request_url += "/#{service}"
-      end
-
-      ##
-      # Try to smallCamelCase the path before appending it to the @request_url
-      #
-      def self.set_sl_path(path)
-        path = path.to_s.softlayer_underscore.softlayer_camelize
-        path.fix_convention_exceptions
-        @request_url += "/#{path}.json"
-      end
-
-      def self.user_agent_header
-        {"User-Agent" => "Fog SoftLayer Adapter #{Fog::Softlayer::VERSION}"}
-      end
-
-    end
-
-
-    extend Fog::Provider
-    SL_API_URL = 'api.softlayer.com/rest/v3' unless defined? SL_API_URL
-    SL_STORAGE_AUTH_URL = 'objectstorage.softlayer.net/auth/v1.0' unless defined? SL_STORAGE_AUTH_URL
-
-    service(:compute, 'Compute')
-    service(:dns, 'DNS')
-    service(:network, 'Network')
-    service(:product, 'Product')
-    service(:storage, 'Storage')
-
-    def self.mock_account_id
-      Fog.mocking? and @sl_account_id ||= Fog::Mock.random_numbers(7)
-    end
-
-    def self.mock_vm_id
-      Fog::Mock.random_numbers(7)
-    end
-
-    def self.mock_global_identifier
-      Fog::UUID.uuid
-    end
-
-    def self.valid_request?(required, passed)
-      required.all? {|k| k = k.to_sym; passed.key?(k) and !passed[k].nil?}
-    end
-
-    # CGI.escape, but without special treatment on spaces
-    def self.escape(str,extra_exclude_chars = '')
-      str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
-        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-      end
-    end
-
-    def self.stringify_keys(obj)
-      return obj.inject({}){|memo,(k,v)| memo[k.to_s] =  stringify_keys(v); memo} if obj.is_a? Hash
-      return obj.inject([]){|memo,v    | memo         << stringify_keys(v); memo} if obj.is_a? Array
-      obj
-    end
-  end
-
-end
-
-unless {}.respond_to? :deep_merge
-  class Hash
-    def deep_merge(second)
-      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-      self.merge(second, &merger)
-    end
-  end
-end
-
-## some helpers for some dirty work
-class String
-  def softlayer_camelize
-    self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
-  end
-
-  def fix_convention_exceptions
-    # SLAPI WHY U No Follow Own Convention!?
-    self.gsub!(/ipaddress/i, 'IpAddress')
-    self.gsub!(/loadbalancer/i, 'LoadBalancer')
-  end
-
-  def softlayer_underscore
-    self.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-  end
-end
-