fog 1.21.0 → 1.22.0

data/CONTRIBUTORS.md

@@ -1,5 +1,6 @@
 * Aaron Bell <aarontbell@gmail.com>
 * Aaron Suggs <aaron@ktheory.com>
+* Abhishek Chanda <abhishek.becs@gmail.com>
 * Adam Bozanich <adam.boz@gmail.com>
 * Adam Greene <adam@sweetspotdiabetes.com>
 * Adam Heinz <amh@metricwise.net>
@@ -63,6 +64,7 @@
 * Arthur Gunawan <acgun3@gmail.com>
 * Arvid Andersson <arvid@winstondesign.se>
 * Ash Wilson <ash.wilson@rackspace.com>
+* Ash Wilson <smashwilson@gmail.com>
 * Athir Nuaimi <anuaimi@devfoundry.com>
 * Avrohom Katz <iambpentameter@gmail.com>
 * BK Box <bk@theboxes.org>
@@ -74,6 +76,7 @@
 * Ben Hundley <ben.hundley@gmail.com>
 * Ben Turley <ben@scan.me>
 * Benjamin Manns <benmanns@gmail.com>
+* Benson Kalahar <bensonk42@gmail.com>
 * Benton Roberts <benton@bentonroberts.com>
 * Benton Roberts <broberts@mdsol.com>
 * Blake Gentry <blakesgentry@gmail.com>
@@ -88,6 +91,7 @@
 * Bradley Schaefer <bradley.schaefer@gmail.com>
 * Brandon Dunne <bdunne@redhat.com>
 * Brendan Fosberry <brendan.fosberry@rackspace.com>
+* Brett Porter <brett@apache.org>
 * Brian D. Burns <iosctr@gmail.com>
 * Brian Dorry <bdorry@Brian-Dorrys-MacBook-Pro.local>
 * Brian Hartsock <brian.hartsock@gmail.com>
@@ -102,6 +106,7 @@
 * Carl Allen <callen@book.com>
 * Carl Caum <carl@carlcaum.com>
 * Carl Hicks <carl.hicks@gmail.com>
+* Carl Loa Odin <carl.loa.odin@klarna.com>
 * Carl Woodward <carl@88cartell.com>
 * Carl Woodward <carl@Carls-MacBook-Pro.local>
 * Carlos Sanchez <csanchez@maestrodev.com>
@@ -117,10 +122,12 @@
 * Chris Frederick <chris@maginatics.com>
 * Chris Hasenpflug <github@chris.hasenpflug.us>
 * Chris Howe <howech@infochimps.com>
+* Chris Kershaw <ckershaw@6fusion.com>
 * Chris Mague <github@mague.com>
 * Chris Roberts <chrisroberts.code@gmail.com>
 * Chris Wuest <chris.wuest@rackspace.com>
 * Chris Wuest <chris@chriswuest.com>
+* Christian Berendt <berendt@b1-systems.de>
 * Christian Paredes <cp@redbluemagenta.com>
 * Christoph Schiessl <chs@proactive.cc>
 * Christoph Witzany <christoph@web.crofting.com>
@@ -128,6 +135,7 @@
 * Christopher Meiklejohn <christopher.meiklejohn@gmail.com>
 * Christopher Oliver <coliver@coliverlaptop.(none)>
 * Christopher Oliver <coliver@datapipe.com>
+* Christopher Snell <chris.snell@gmail.com>
 * Claudio Poli <masterkain@gmail.com>
 * Coby Randquist <randquistcp@gmail.com>
 * Cody Herriges <c.a.herriges@gmail.com>
@@ -186,11 +194,13 @@
 * Eric Hankins <ehankins@rednovalabs.com>
 * Eric Herot <eric.github@herot.com>
 * Eric Hodel <drbrain@segment7.net>
+* Eric Johnson <erjohnso@google.com>
 * Eric Lindvall <eric@5stops.com>
 * Eric Stonfer <ericstonfer@yahoo.com>
 * Eric Stonfer <estonfer@gmail.com>
 * Eric Stonfer <estonfer_ldap@ccppup-ae-a001-p.ae.ccp.cable.comcast.com>
 * Eric Wong <ericsyw@gmail.com>
+* Erik Mackdanz <erik@infochimps.com>
 * Erik Michaels-Ober <sferik@gmail.com>
 * Erik Terpstra <erterpstra@gmail.com>
 * Eugene Howe & Josh Lane <ehowe@engineyard.com>
@@ -221,6 +231,7 @@
 * Glenn Tweedie <glenn.tweedie@agworld.com.au>
 * Greg Blomquist <gblomqui@redhat.com>
 * Greg Sutcliffe <greg.Sutcliffe@gmail.com>
+* Greg Sutcliffe <gsutclif@redhat.com>
 * Grégory Karékinian <greg@karekinian.com>
 * Grzesiek Kolodziejczyk <gkolodziejczyk@gmail.com>
 * Gustavo Villalta <gvillalta99@gmail.com>
@@ -254,6 +265,7 @@
 * James Stremick <james.stremick@gmail.com>
 * James W. Brinkerhoff <jwb@paravolve.net>
 * Jamie H <jamie@limetree.org>
+* Jamie Paton <jamiep@activestate.com>
 * Jason Faulkner <jay@jvf.cc>
 * Jason Hansen & Josh Lane <jhansen@engineyard.com>
 * Jason Montleon <jmontleo@redhat.com>
@@ -262,6 +274,7 @@
 * Jay Faulkner <jay.faulkner@rackspace.com>
 * Jay Perry <jperry@brightcove.com>
 * Jeff McCune <jeff@puppetlabs.com>
+* Jeffrey C. Ollie <jeff@ocjtech.us>
 * Jens Braeuer <jens@numberfour.eu>
 * Jeremy Deininger <jeremy@rightscale.com>
 * Jesse Davis <jdavis@vcharge-energy.com>
@@ -269,6 +282,7 @@
 * Jesse Proudman <jesse.proudman@blueboxgrp.com>
 * Jesse Proudman <jproudman@nova.(none)>
 * Jesse Scott <jesse.c.scott@gmail.com>
+* Jim Berlage <jberlage@mdsol.com>
 * Jim Salinas <jim.salinas@rackspace.com>
 * Joachim Nolten <joachim@viewbook.com>
 * Joe Kinsella <joe.kinsella@gmail.com>
@@ -304,11 +318,13 @@
 * Josh Kearney <josh@jk0.org>
 * Josh Lane & Ines Sombra <jlane@engineyard.com>
 * Josh Lane & Jason Hansen <jlane@engineyard.com>
+* Josh Lane & Thom Mahoney <jlane@engineyard.com>
 * Josh Lane <jlane@engineyard.com>
 * Josh Lane <lane.joshlane@gmail.com>
 * Josh Lane <me@joshualane.com>
 * Josh Pasqualetto <josh.pasqualetto@sonian.net>
 * Josh Yotty <jyotty@bluebox.net>
+* Joshua Garnett <josh@kixeye.com>
 * Joshua Gross <joshua@surfeasy.com>
 * Joshua Krall <joshuakrall@pobox.com>
 * Joshua Napoli <jnapoli@swipely-napoli.home>
@@ -336,14 +352,18 @@
 * Kevin McFadden <kmcfadden@gmail.com>
 * Kevin Menard <nirvdrum@gmail.com>
 * Kevin Moore <kevin@thinkpixellab.com>
+* Kevin Olbrich <kolbrich@6fusion.com>
 * Konstantin Haase <konstantin.mailinglists@googlemail.com>
+* Konstantinos Natsakis <k.natsakis@xe.gr>
 * Kunal Parikh <kunal@techthumb.in>
+* Kunal Thakar <kthakar@twilio.com>
 * Kyla Kolb <kkolb@mitre.org>
 * Kyle Drake <kyledrake@gmail.com>
 * Kyle Rames <kyle.rames@rackspace.com>
 * Kyle Rames <kyle@rames.org>
 * Lance Carlson <lancecarlson@gmail.com>
 * Lance Ivy <lance@cainlevy.net>
+* Larry Gilbert <larry@l2g.to>
 * Larry Wright <larrywright@gmail.com>
 * Lars Pind <lars@pinds.com>
 * Laurent Bigonville <bigon@bigon.be>
@@ -374,6 +394,7 @@
 * Mark Phillips <mark.phillips2@bskyb.com>
 * Mark Rushakoff <mark.rushakoff@gmail.com>
 * Mark Turner <mark@amerine.net>
+* Markus Schwed <maschwed@anynines.com>
 * Marshall Yount <marshall@yountlabs.com>
 * Martin Emde <martin.emde@gmail.com>
 * Martin Englund <martin@englund.nu>
@@ -408,6 +429,7 @@
 * Michael Keirnan <mgk@noteflight.com>
 * Michael Linderman <mlinderm@stanford.edu>
 * Michael Rykov <mrykov@gmail.com>
+* Michael Sprauer <Sprauer@Inline.de>
 * Michael Zeng <michaelzeng@swipely.com>
 * Michał Krzyżanowski <michal.krzyzanowski+github@gmail.com>
 * Michiel Sikkes <michiel.sikkes@gmail.com>
@@ -416,6 +438,7 @@
 * Mike Gehard <mgehard@pivotallabs.com>
 * Mike Hagedorn <mike@silverchairsolutions.com>
 * Mike Manewitz <mike.manewitz@gmail.com>
+* Mike Marion <mike.marion@gmail.com>
 * Mike Moore <mike@blowmage.com>
 * Mike Pountney <Mike.Pountney@gmail.com>
 * Ming Jin <skyairmj@gmail.com>
@@ -463,6 +486,7 @@
 * Paul Vudmaska <Paul.Vudmaska@Rackspace.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * Pavel Repin <prepin@gmail.com>
+* Pedro Belo <pedro@heroku.com>
 * Pedro Nascimento <pnascimento@gmail.com>
 * Pedro Perez <pedro@bvox.net>
 * Peter Bonnell <peter@circuitllc.com>
@@ -488,6 +512,7 @@
 * Pratik Naik <pratiknaik@gmail.com>
 * Rad Gruchalski <radek@gruchalski.com>
 * Raphael Costa <raphael@raphaelcosta.net>
+* Reda NOUSHI <reda_noushi@yahoo.com>
 * Reinaldo Junior <juniorz@gmail.com>
 * Rich Lane <rlane@club.cc.cmu.edu>
 * Rick Bradley <rick@rickbradley.com>
@@ -502,6 +527,7 @@
 * Ruben Koster <ruben.koster@innovationfactory.eu>
 * Rupak Ganguly <rupakg@gmail.com>
 * Rusty Geldmacher <rgeldmacher@sermo.com>
+* Ryan Davies <ryan@ryandavies.co.nz>
 * Ryan Richard <ryanrichard07@gmail.com>
 * Ryan Stout <ryanstout@gmail.com>
 * Sairam <sairam@kunala.com>
@@ -514,6 +540,7 @@
 * Samuel Merritt <spam@andcheese.org>
 * Sarah Vessels <sarah.vessels@cirrusmio.com>
 * Sascha Korth <sascha.korth@zweitag.de>
+* Scott Carleton <scott@artsicle.com>
 * Scott Gonyea <me@aitrus.org>
 * Sean Caffery <sean.caffery@c3businesssolutions.com>
 * Sean Handley <sean.handley@gmail.com>
@@ -573,16 +600,19 @@
 * Toby Hede <tobyhede@info-architects.net>
 * Todd Willey <todd@rubidine.com>
 * Todd Willey <xtoddx@gmail.com>
+* Tom Hulihan <hulihan.tom159@gmail.com>
 * Tom Mornini <tmornini@engineyard.com>
 * Tom Stuart <tom@experthuman.com>
 * Tomasz Bak <tomasz.bak@nsn.com>
 * Tomokazu Hirai <tomokazu.hirai@kddi-web.com>
+* Toni Stjepanovic <toni.stjepanovic@gmail.com>
 * Topper Bowers <topper@toppingdesign.com>
 * Tor-Ake Fransson <torakef@gmail.com>
 * Trae Robrock <trobrock@gmail.com>
 * Trevor Bramble <inbox@trevorbramble.com>
 * Trevor Bramble <tbramble@bluebox.net>
 * Trotter Cashion <cashion@gmail.com>
+* Tõnis Simo <anton.estum@gmail.com>
 * Ulf Mansson <ulf.mansson@recordedfuture.com>
 * Vadim Spivak <vspivak@vmware.com>
 * Viktor Petersson <vpetersson@wireload.net>
@@ -603,6 +633,7 @@
 * William Lawson <lawson.bj@gmail.com>
 * Wyatt Walter <wyattwalter@gmail.com>
 * Xavier Fontrodona <xavier.fontrodona@safelayer.com>
+* Yann Hamon <Yann@trailburning.com>
 * Yauheni Kryudziuk <yauheni.kryudziuk@xing.com>
 * Your Name <seanhart@funzio.com>
 * Zachary Danger Campbell <zacharydangercampbell@gmail.com>
@@ -612,6 +643,7 @@
 * Zuhaib M Siddique <zuhaib@hipchat.com>
 * Zuhaib Siddique <zuhaib.siddique@leapfile.com>
 * aabes <a_abes@yahoo.com>
+* abenari <abenari@redhat.com>
 * alex <alex@alex-HP-ProBook-4510s.(none)>
 * althras <althras@gmail.com>
 * angus <ags@sdx.com.au>
@@ -627,6 +659,7 @@
 * bonkydog <bonkydog@bonkydog.com>
 * brookemckim <brooke.mckim@gmail.com>
 * bugagazavr <kirik910@gmail.com>
+* caryp <cary@rightscale.com>
 * ccloes <chad_cloes@intuit.com>
 * coliver <coliver@datapipe.com>
 * crazed <cr4z3d@gmail.com>
@@ -656,6 +689,7 @@
 * jc00ke <jesse@jc00ke.com>
 * jimworm <jimworm@gmail.com>
 * joe <jmorgan@rednovalabs.com>
+* joe morgan <jmorgan@rednovalabs.com>
 * joewilliams <joe@der-dieb.local>
 * jordangbull <jordangbull@gmail.com>
 * jschneiderhan <jon-erik.schneiderhan@meyouhealth.com>
@@ -663,6 +697,7 @@
 * kbockmanrs <kevin@rightscale.com>
 * kfafel <keith.fafel@gmail.com>
 * leehuffman <lhuffman@bluebox.net>
+* leonidlm <leonidlm@gmail.com>
 * lostboy <paul.crabtree@gmail.com>
 * marios <marios@marios.(none)>
 * marios <marios@redhat.com>
@@ -677,10 +712,12 @@
 * phillc <spyyderz@gmail.com>
 * questionnet <zacccp@mail.ru>
 * radekg <radek@gruchalski.com>
+* rebelagentm <rebelagentm@yahoo.com>
 * ronen barzel <ronen@barzel.org>
 * rsalm <rs@iki.fi>
 * ryanlower <rpjlower@gmail.com>
 * sashap <sasha@mythictechnologies.com>
+* sawanoboly <sawanoboriyu@higanworks.com>
 * seanhandley <seanhandley@hackmanchester.com>
 * seeingidog <ian@ruby-code.com>
 * thattommyhall <thattommyhall@gmail.com>

data/Gemfile

@@ -3,6 +3,8 @@ source "https://rubygems.org"
 group :development, :test do
   # This is here because gemspec doesn't support require: false
   gem 'coveralls', :require => false
+  gem "netrc", :require => false
+  gem "octokit", :require => false
 end
 
 gemspec

data/RELEASE.md

@@ -21,7 +21,7 @@ To request a new release please raise an issue.
 services)
 * Ensure working on **master**
 * Update the version number (`lib/fog/version.rb`)
-* Run `rake changelog` to update `changelog.txt`
+* Run `rake changelog` to update `CHANGELOG.md`
 * Run `rake release` to prepare the release which does:
   * Prepares the release (`rake release:prepare`)
     * Builds the gem
@@ -30,6 +30,7 @@ services)
   * Publishes the release (`rake release:publish`)
     * Pushes commit and tag to Github (Requires Credentials)
     * Pushes gem to Rubygems (Requires Credentials)
+* Run `rake github_release` to add release to [github release feed](https://github.com/fog/fog/releases.atom) (Requires Credentials)
 
 ## Announce the release
 

data/Rakefile

@@ -51,7 +51,7 @@ task :default => :test
 task :travis  => ['test', 'test:travis', 'coveralls_push_workaround']
 
 Rake::TestTask.new do |t|
-  t.pattern = File.join("**", "test", "**", "*_test.rb")
+  t.pattern = File.join("**", "spec", "**", "*_spec.rb")
 end
 
 namespace :test do
@@ -210,6 +210,9 @@ end
 require "tasks/changelog_task"
 Fog::Rake::ChangelogTask.new
 
+require "tasks/github_release_task"
+Fog::Rake::GithubReleaseTask.new
+
 task :coveralls_push_workaround do
   use_coveralls = (Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.9.2'))
   if (ENV['COVERAGE'] != 'false') && use_coveralls

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.21.0'
-  s.date              = '2014-03-18'
+  s.version           = '1.22.0'
+  s.date              = '2014-04-17'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -57,17 +57,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('yard')
   s.add_development_dependency('thor')
-  s.add_development_dependency('rbovirt', '>= 0.0.24')
+  s.add_development_dependency('rbovirt', '0.0.24')
   s.add_development_dependency('shindo', '~> 0.3.4')
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
-  s.add_development_dependency('unf')
 
   if ENV["FOG_USE_LIBVIRT"]
     s.add_development_dependency('ruby-libvirt','~> 0.5.0')
   end
 
-  s.files = `git ls-files`.split("\n")
+  s.files = `git ls-files`.split("\n") - `git ls-files -- providers/`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")
 end

data/gemfiles/Gemfile-edge

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+# Embedded provider gems
+gem "fog-brightbox", :path => "../providers/brightbox"
+
+# Shared components
+gem "fog-core", :github => "fog/fog-core"
+gem "fog-json", :github => "fog/fog-json"
+
+group :development, :test do
+  # This is here because gemspec doesn"t support require: false
+  gem "coveralls", :require => false
+  gem "netrc", :require => false
+  gem "octokit", :require => false
+end
+
+gemspec :path => "../"

data/{Gemfile.1.8.7 → gemfiles/Gemfile-ruby-1.8.7}

@@ -6,6 +6,9 @@ gem 'mime-types', '~>1.16'
 group :development, :test do
   # This is here because gemspec doesn't support require: false
   gem 'coveralls', :require => false
+  gem "netrc", :require => false
+  gem "octokit", '~> 2.7.2', :require => false
+  gem 'rake', '~> 10.1.0'
 end
 
-gemspec
+gemspec :path => "../"

data/lib/fog/aws/core.rb

@@ -89,15 +89,6 @@ module Fog
     end
 
     def self.escape(string)
-      unless @unf_loaded_or_warned
-        begin
-          require('unf/normalizer')
-        rescue LoadError
-          Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-        end
-        @unf_loaded_or_warned = true
-      end
-      string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
       string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }

data/lib/fog/aws/dynamodb.rb

@@ -112,7 +112,6 @@ module Fog
           # defaults for all dynamodb requests
           params.merge!({
             :expects  => 200,
-            :host     => @host,
             :method   => :post,
             :path     => '/'
           })

data/lib/fog/aws/iam.rb

@@ -3,6 +3,7 @@ require 'fog/aws/core'
 module Fog
   module AWS
     class IAM < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class EntityAlreadyExists < Fog::AWS::IAM::Error; end
       class KeyPairMismatch < Fog::AWS::IAM::Error; end
@@ -11,7 +12,7 @@ module Fog
       class ValidationError < Fog::AWS::IAM::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :instrumentor, :instrumentor_name
+      recognizes :host, :path, :port, :scheme, :persistent, :instrumentor, :instrumentor_name, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group
@@ -52,6 +53,7 @@ module Fog
       request :list_groups_for_user
       request :list_instance_profiles
       request :list_instance_profiles_for_role
+      request :list_mfa_devices
       request :list_roles
       request :list_role_policies
       request :list_server_certificates
@@ -93,6 +95,11 @@ module Fog
                 "Status" => "Active",
                 "AccessKeyId" => key
               }],
+              :devices => [{
+                :enable_date   => Time.now,
+                :serial_number => 'R1234',
+                :user_name     => 'Bob'
+              }],
               :users => Hash.new do |uhash, ukey|
                 uhash[ukey] = {
                   :user_id     => Fog::AWS::Mock.key_id,
@@ -125,7 +132,9 @@ module Fog
         end
 
         def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
+          @use_iam_profile = options[:use_iam_profile]
+          @aws_credentials_expire_at = Time::now + 20
+          setup_credentials(options)
         end
 
         def data
@@ -135,9 +144,14 @@ module Fog
         def reset_data
           self.class.data.delete(@aws_access_key_id)
         end
+
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
       end
 
       class Real
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
 
         # Initialize connection to IAM
         #
@@ -159,12 +173,11 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.iam'
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @host       = options[:host]        || 'iam.amazonaws.com'
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
@@ -179,7 +192,17 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -187,6 +210,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,