fog-terremark 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a64a4dc8465dbef97566ac40df9eadf55082645
-  data.tar.gz: 51fe44d6f759172319b639f7a82346378f2dcc5e
+  metadata.gz: e34b03eb966c2bff4765e3a09fdb7c5b1acc922f
+  data.tar.gz: 07830710067565af142020e0c489ba13e5d71e4f
 SHA512:
-  metadata.gz: ddef7490923c5fccb39199805cdc90c8e838a22142a84ffe01ba96cae45b2f69367c272d6c387f7e003fbad0ccb0731897114847c193fe24718a9c5e5c3810c9
-  data.tar.gz: 3f1c094464eeeb8857560e2a7c88586777f31f9d5c4eb9ee85070510fa5ff3f8343593115d0eadc845fd2b9f0f1909c1ad26299c11dd8c57980d689cd8e32047
+  metadata.gz: f05d7f1cc4d1b922dc7b57dfbb9a64d74642d89ef7c50fd86b048e3ac0710e29083ec3d6034b22ec74cb4a11b91c47a392104d1870ce12ae0109ca2ec9e7f89f
+  data.tar.gz: 0dc74bdeb681d33d5cf7aa88c43db11af1ca720b31b4c692e1e56c545c2526ad17f7bd8f8e47377f7ba7c980083ece4ac212e51a572eb6dc25f422ce65645a71

data/.hound.yml

@@ -0,0 +1,20 @@
+Metrics/LineLength:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+
+Style/FormatString:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/CONTRIBUTORS.md

@@ -5,6 +5,7 @@
 * James Herdman <james.herdman@me.com>
 * Juris Galang <jurisgalang@gmail.com>
 * marios <marios@redhat.com>
+* Nathan Buesgens <nathan@natb1.com>
 * Paul Thornthwaite <tokengeek@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * Wesley Beary <geemus@gmail.com>

data/README.md

@@ -1,5 +1,7 @@
 # Fog::Terremark
 
+![Gem Version](https://badge.fury.io/rb/fog-terremark.svg) [![Build Status](https://travis-ci.org/fog/fog-terremark.svg?branch=master)](https://travis-ci.org/fog/fog-terremark) [![Dependency Status](https://gemnasium.com/fog/fog-terremark.svg)](https://gemnasium.com/fog/fog-terremark) [![Coverage Status](https://img.shields.io/coveralls/fog/fog-terremark.svg)](https://coveralls.io/r/fog/fog-terremark?branch=master) [![Code Climate](https://codeclimate.com/github/fog/fog-terremark.png)](https://codeclimate.com/github/fog/fog-terremark)
+
 Module for the 'fog' gem to support Terremark vCloud
 
 ## Help Needed

data/fog-terremark.gemspec

@@ -1,22 +1,25 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fog/terremark/version'
+require "fog/terremark/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "fog-terremark"
   spec.version       = Fog::Terremark::VERSION
   spec.authors       = ["Paulo Henrique Lopes Ribeiro"]
   spec.email         = ["plribeiro3000@gmail.com"]
-  spec.summary       = %q{Module for the 'fog' gem to support Terremark vCloud.}
-  spec.description   = %q{This library can be used as a module for `fog` or as standalone provider
-                        to use the Terremark vCloud in applications.}
+  spec.summary       = "Module for the 'fog' gem to support Terremark vCloud."
+  spec.description   = <<-EOS
+                         This library can be used as a module for `fog` or
+                         as standalone provider to use the Terremark vCloud in
+                         applications.
+                       EOS
   spec.homepage      = ""
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fog-core"
@@ -26,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "turn"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "vcr"
 
   if RUBY_VERSION.to_f > 1.9
     spec.add_development_dependency "coveralls"

data/lib/fog/compute/terremark/common.rb

@@ -1,12 +1,13 @@
 module Fog
   module Compute
     class Terremark
+      # doc stub
       module Common
         def default_organization_id
           @default_organization_id ||= begin
-            org_list = get_organizations.body['OrgList']
+            org_list = organizations.body["OrgList"]
             if org_list.length == 1
-              org_list.first['href'].split('/').last.to_i
+              org_list.first["href"].split("/").last.to_i
             else
               nil
             end

data/lib/fog/compute/terremark/real.rb

@@ -1,6 +1,7 @@
 module Fog
   module Compute
     class Terremark
+      # documentation stub
       class Real
         include Common
 
@@ -12,18 +13,28 @@ module Fog
         private
 
         def auth_token
-          response = @connection.request({
-                                             :expects   => 200,
-                                             :headers   => {
-                                                 'Authorization' => "Basic #{Base64.encode64("#{@terremark_username}:#{@terremark_password}").chomp!}",
-                                                 'Content-Type'  => "application/vnd.vmware.vcloud.orgList+xml"
-                                             },
-                                             :host      => @host,
-                                             :method    => 'POST',
-                                             :parser    => Fog::Parsers::Terremark::GetOrganizations.new,
-                                             :path      => "#{@path}/login"
-                                         })
-          response.headers['Set-Cookie']
+          response = @connection.request(
+              :expects   => 200,
+              :headers   => auth_headers,
+              :host      => @host,
+              :method    => "POST",
+              :parser    => Fog::Parsers::Terremark::GetOrganizations.new,
+              :path      => "#{@path}/login"
+          )
+          response.headers["Set-Cookie"]
+        end
+
+        def auth_headers
+          credentials = "#{@terremark_username}:#{@terremark_password}"
+          encoded_credentials = Base64.encode64(credentials)
+          # remove newlines because strict_encode64 is not compatible with 1.8
+          encoded_credentials = encoded_credentials.gsub(/\n/, "")
+          {
+            "Authorization" => "Basic #{encoded_credentials}",
+            # Terremark said they're going to remove passing in the
+            # Content-Type to login in a future release
+            "Content-Type"  => "application/vnd.vmware.vcloud.orgList+xml"
+          }
         end
 
         def reload
@@ -31,9 +42,7 @@ module Fog
         end
 
         def request(params)
-          unless @cookie
-            @cookie = auth_token
-          end
+          @cookie ||= auth_token
           begin
             do_request(params)
           rescue Excon::Errors::Unauthorized
@@ -43,30 +52,35 @@ module Fog
         end
 
         def do_request(params)
+          @connection.request(
+            :body     => params[:body],
+            :expects  => params[:expects],
+            :headers  => make_headers(params),
+            :host     => @host,
+            :method   => params[:method],
+            :parser   => params[:parser],
+            :path     => make_path(params)
+          )
+        end
+
+        def make_headers(params)
           headers = {}
-          if @cookie
-            headers.merge!('Cookie' => @cookie)
-          end
+          headers.merge!("Cookie" => @cookie) if @cookie
+          headers.merge!(params[:headers] || {})
+        end
+
+        def make_path(params)
           if params[:path]
             if params[:override_path] == true
-              path = params[:path]
+              params[:path]
             else
-              path = "#{@path}/#{params[:path]}"
+              "#{@path}/#{params[:path]}"
             end
           else
-            path = "#{@path}"
+            "#{@path}"
           end
-          @connection.request({
-                                  :body     => params[:body],
-                                  :expects  => params[:expects],
-                                  :headers  => headers.merge!(params[:headers] || {}),
-                                  :host     => @host,
-                                  :method   => params[:method],
-                                  :parser   => params[:parser],
-                                  :path     => path
-                              })
         end
       end
     end
   end
-end
+end

data/lib/fog/compute/terremark/requests/get_organizations.rb

@@ -1,6 +1,7 @@
 module Fog
   module Compute
     class Terremark
+      # doc stub
       class Real
         # Get list of organizations
         #
@@ -10,34 +11,34 @@ module Fog
         #     * 'description'<~String> - Description of organization
         #     * 'links'<~Array> - An array of links to entities in the organization
         #     * 'name'<~String> - Name of organization
-        def get_organizations
-          request({
-                      :expects  => 200,
-                      :headers  => {
-                          'Authorization' => "Basic #{Base64.encode64("#{@terremark_username}:#{@terremark_password}").chomp!}",
-                          # Terremark said they're going to remove passing in the Content-Type to login in a future release
-                          'Content-Type'  => "application/vnd.vmware.vcloud.orgList+xml"
-                      },
-                      :method   => 'POST',
-                      :parser   => Fog::Parsers::Terremark::GetOrganizations.new,
-                      :path     => 'login'
-                  })
+        def organizations
+          request(
+            :expects => 200,
+            :headers => auth_headers,
+            :method => "POST",
+            :parser => Fog::Parsers::Terremark::GetOrganizations.new,
+            :path => "login"
+          )
         end
       end
 
+      # doc stub
       class Mock
-        def get_organizations
+        def organizations
           response = Excon::Response.new
-          org_list = self.data[:organizations].map do |organization|
+          response.body = { "OrgList" => org_fixture }
+          response.status = 200
+          response.headers = Fog::Compute::Terremark::Mock.headers(response.body, "application/vnd.vmware.vcloud.orgList+xml")
+          response
+        end
+
+        def org_fixture
+          data[:organizations].map do |organization|
             { "name" => organization[:info][:name],
               "href" => "#{@base_url}/org/#{organization[:info][:id]}",
               "type" => "application/vnd.vmware.vcloud.org+xml"
             }
           end
-          response.body = { "OrgList" => org_list }
-          response.status = 200
-          response.headers = Fog::Compute::Terremark::Mock.headers(response.body, "application/vnd.vmware.vcloud.orgList+xml")
-          response
         end
       end
     end

data/lib/fog/terremark/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Terremark
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/cassettes/get_login_token.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/login
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.25.0
+      Authorization:
+      - Basic CREDENTIALS
+      Content-Type:
+      - application/vnd.vmware.vcloud.orgList+xml
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Cache-Control:
+      - private
+      Content-Length:
+      - '328'
+      Content-Type:
+      - application/vnd.vmware.vcloud.orgList+xml
+      Server:
+      - Microsoft-IIS/7.0
+      X-AspNet-Version:
+      - 4.0.30319
+      Set-Cookie:
+      - vcloud-token=TOKEN; path=/
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Mon, 24 Nov 2014 20:39:30 GMT
+    body:
+      encoding: UTF-8
+      string: |-
+        <OrgList xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <Org href="https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/org/ORG_ID" type="application/vnd.vmware.vcloud.org+xml" name="TERREMARK_VCLOUD_USERNAME"/>
+        </OrgList>
+    http_version: 
+  recorded_at: Mon, 24 Nov 2014 20:39:30 GMT
+recorded_with: VCR 2.9.3

data/spec/credentials_spec.rb

@@ -1,9 +1,14 @@
-require 'minitest_helper'
+require "minitest_helper"
 
-describe Fog::Compute::Terremark do
-  it 'authenticates' do
-    Fog::Compute::Terremark.new(
-        :terremark_vcloud_username => 'test@example.com',
-        :terremark_vcloud_password => '123456')
+describe Fog::Terremark::Vcloud do
+
+  it "gets a login token" do
+    VCR.use_cassette("get_login_token") do
+      service = Fog::Terremark::Vcloud.new(
+        :terremark_vcloud_username => "test@example.com",
+        :terremark_vcloud_password => "123456")
+      service.send(:auth_token)
+    end
   end
-end
+
+end

data/spec/minitest_helper.rb

@@ -1,6 +1,7 @@
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'turn'
+require "minitest/spec"
+require "minitest/autorun"
+require "turn"
+require "vcr"
 
 Turn.config do |c|
   # use one of output formats:
@@ -17,15 +18,21 @@ Turn.config do |c|
   c.natural = true
 end
 
-if ENV['COVERAGE']
-  require 'coveralls'
-  require 'simplecov'
+VCR.configure do |c|
+  c.cassette_library_dir = "spec/cassettes"
+  c.hook_into :excon
+  c.debug_logger = $stderr
+end
+
+if ENV["COVERAGE"]
+  require "coveralls"
+  require "simplecov"
 
   SimpleCov.start do
-    add_filter '/spec/'
+    add_filter "/spec/"
   end
 end
 
-require File.join(File.dirname(__FILE__), '../lib/fog/terremark.rb')
+require File.join(File.dirname(__FILE__), "../lib/fog/terremark.rb")
 
-Coveralls.wear! if ENV['COVERAGE']
+Coveralls.wear! if ENV["COVERAGE"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-terremark
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +136,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  This library can be used as a module for `fog` or as standalone provider
-                          to use the Terremark vCloud in applications.
+description: |2
+                           This library can be used as a module for `fog` or
+                           as standalone provider to use the Terremark vCloud in
+                           applications.
 email:
 - plribeiro3000@gmail.com
 executables: []
@@ -132,6 +147,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -223,6 +239,7 @@ files:
 - lib/fog/terremark/vcloud/mock.rb
 - lib/fog/terremark/vcloud/real.rb
 - lib/fog/terremark/version.rb
+- spec/cassettes/get_login_token.yml
 - spec/credentials_spec.rb
 - spec/minitest_helper.rb
 homepage: ''
@@ -250,5 +267,6 @@ signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Terremark vCloud.
 test_files:
+- spec/cassettes/get_login_token.yml
 - spec/credentials_spec.rb
 - spec/minitest_helper.rb