fog 1.41.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 829e5ef73eff833c9d38e2133d28d8d47771812f
-  data.tar.gz: 73097280f69981f019fcae7a9fb4084340af30a3
+SHA256:
+  metadata.gz: 95b9f7c695f3decf7ef8baffd30aa09d3dc6737f5a9c2969990a559681ba7d8a
+  data.tar.gz: becfb632718737aa4b72a682731cc2ed4c42eecce48286374d6601e40712b67f
 SHA512:
-  metadata.gz: 6ed7fe7cbd1f522376d2ab935abad73a90b489ea2edca3b418d6b7e7b9d214837404834c015e564f6118b21619096af4a9c25c1fc175a6d200264d4b7e9ad186
-  data.tar.gz: 69a6552cc360e8f8bf4a05e473b31ff3e8230f481f6c857a4f6da662d9497c044a965999d83429dba2e4fcb4558bb9a06727a288493cdc0d7d383e0dd773a04b
+  metadata.gz: ee525a39207685911b2e63c02eb084484bd03d6a66819d52f5ce032a6917bb7e2ee61d6c0aba378cbc94322d2874d750c1e5348a8ffa778ce45a34cf7ff3d98d
+  data.tar.gz: 5e2aa711a0131cd58a9e4c7e18e47fd376ef4f1b7640c93f107c4ce31d6b238bf928080949b59d819f45da3778c7715944096ed132274f2b09fda146ea22219d

data/.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked stale due to inactivity.
+  It will be closed if no further activity occurs.
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - jruby-head
 
 gemfile:
@@ -21,14 +22,6 @@ matrix:
   allow_failures:
     - rvm: jruby-head
   include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-1.9
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-edge-1.9
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile-1.9
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile-edge-1.9
     - rvm: 2.0
       gemfile: gemfiles/Gemfile-2.0
     - rvm: 2.0

data/CHANGELOG.md

@@ -1,3 +1,81 @@
+## 2.1.0 11/12/2018
+*Hash* adc3d36e1c47976a1ec2630bd4577e082593c884
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1545
+Open Issues   | 7
+Watchers      | 4168
+
+**MVP!** Akira Matsuda
+
+#### [cloudstack]
+*   Allow specifying the size of root volume. thanks Takashi Kokubun
+
+#### [misc]
+*   GitHub is https by default. thanks Akira Matsuda
+*   Remove BlueBox Blocks. thanks Chris Lundquist
+*   Add SemVer stability badge to README. thanks Grey Baker
+*   Upgrade google dependency. thanks Nat Welch
+*   Fix whitespace in gemspec. thanks Nat Welch
+*   unpin mime-types. thanks Nat Welch
+*   Removing leftovers from extraction of fog-ovirt. thanks Ori Rabin
+*   Make CloudSigma snapshot tests pending. thanks Paul Thornthwaite
+*   Rescue `opennebula` loading issues. thanks Paul Thornthwaite
+*   "Fix" incorrect `Compute` provider credential test. thanks Paul Thornthwaite
+*   Tweak CloudSigma testing schema. thanks Paul Thornthwaite
+*   Fix Cloudstack `#connection` deprecation warning. thanks Paul Thornthwaite
+*   Remove tests for deprecated binary `#[]`. thanks Paul Thornthwaite
+*   Enable Ruby 2.5 in CI. thanks Pavel Valena
+*   lib/fog/linode: Add Tokyo2 to avail_datacenters. thanks Penny
+*   Fix compatibility with fog-brightbox 1.0.0+. thanks t Ondruch
+*   v2.0.0. thanks geemus
+*   add stale bot config. thanks geemus
+*   remove tests around deprecated usage. thanks geemus
+
+
+## 2.0.0 03/06/2018
+*Hash* ff9fe270cd23627f748dd37e9bf2800640187f60
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1553
+Open Issues   | 41
+Watchers      | 4102
+
+**MVP!** Tinguely Pierre
+
+#### [misc]
+*   Drop Zerigo. thanks Paulo Ribeiro
+*   add id in xml only if present. Else an id is generated from xsd generation. thanks Tinguely Pierre
+*   make network optionnal for instantiate request. thanks Tinguely Pierre
+*   implement the put api to configure the network section in vapp. thanks Tinguely Pierre
+*   Drop Ruby<2 support. thanks Tomer Brisker
+*   bump rubocop dep. thanks geemus
+
+
+## 1.42.0 09/29/2017
+*Hash* 41a38068d34237b9639ac045f99a4b48160834a9
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1556
+Open Issues   | 45
+Watchers      | 4060
+
+**MVP!** swamp09
+
+#### [misc]
+*   Upgrade JSON to ~> 2.0. thanks Denis Defreyne
+*   Removing ovirt provider. thanks Ori Rabin
+*   fix changelog task. thanks geemus
+*   Suppress `warning: ambiguous first argument; put parentheses or a space even after `/' operator`. thanks swamp09
+*   Suppress `warning: mismatched indentations at 'end' with 'class'`. thanks swamp09
+
+
 ## 1.41.0 08/01/2017
 *Hash* e5d3672e804149d38f91ccdfdaf7cfd7be52b75b
 

data/README.md

@@ -7,9 +7,9 @@ fog is the Ruby cloud services library, top to bottom:
 * Mocks make testing and integrating a breeze.
 
 [![Build Status](https://secure.travis-ci.org/fog/fog.svg?branch=master)](http://travis-ci.org/fog/fog)
-[![Dependency Status](https://gemnasium.com/fog/fog.svg)](https://gemnasium.com/fog/fog)
 [![Code Climate](https://codeclimate.com/github/fog/fog/badges/gpa.svg)](https://codeclimate.com/github/fog/fog)
 [![Gem Version](https://badge.fury.io/rb/fog.svg)](http://badge.fury.io/rb/fog)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=fog&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=fog&package-manager=bundler&version-scheme=semver)
 
 ## Dependency Notice
 
@@ -17,12 +17,11 @@ Currently all fog providers are getting separated into metagems to lower the
 load time and dependency count.
 
 If there's a metagem available for your cloud provider, e.g. `fog-aws`,
-you should be using it instead of requiring the full fog collection to avoid 
+you should be using it instead of requiring the full fog collection to avoid
 unnecessary dependencies.
 
-'fog' should be required explicitly only if:  
-- The provider you use doesn't yet have a metagem available.
-- You require Ruby 1.9.3 support.
+'fog' should be required explicitly only if the provider you use doesn't yet
+have a metagem available.
 
 ## Getting Started
 

data/Rakefile

@@ -73,9 +73,6 @@ namespace :test do
   task :openvz do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
   end
-  task :ovirt do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
-  end
   task :cloudstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
   end

data/fog.gemspec

@@ -11,8 +11,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.41.0"
-  s.date              = "2017-08-01"
+  s.version           = "2.1.0"
+  s.date              = "2018-11-11"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["geemus (Wesley Beary)"]
   s.email    = "geemus@gmail.com"
-  s.homepage = "http://github.com/fog/fog"
+  s.homepage = "https://github.com/fog/fog"
   s.license  = "MIT"
 
   ## This sections is only necessary if you have C extensions.
@@ -44,12 +44,13 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
+  s.required_ruby_version = '>= 2.0.0'
+
   s.add_dependency("fog-core", "~> 1.45")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
-  
-  # JSON locked for Ruby 1.9, remove once deprecated
-  s.add_dependency("json", ">= 1.8", "< 2.0")
+
+  s.add_dependency("json", "~> 2.0")
   s.add_dependency("ipaddress", "~> 0.5")
 
   # Modular providers (please keep sorted)
@@ -62,11 +63,12 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-dnsimple", "~> 1.0")
   s.add_dependency("fog-dynect", "~> 0.0.2")
   s.add_dependency("fog-ecloud", "~> 0.1")
-  s.add_dependency("fog-google", "<= 0.1.0")
+  s.add_dependency("fog-google", "~> 1.0")
   s.add_dependency("fog-internet-archive")
   s.add_dependency("fog-joyent")
   s.add_dependency("fog-local")
   s.add_dependency("fog-openstack")
+  s.add_dependency("fog-ovirt")
   s.add_dependency("fog-powerdns", ">= 0.1.1")
   s.add_dependency("fog-profitbricks")
   s.add_dependency("fog-rackspace")
@@ -84,15 +86,14 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("docker-api", ">= 1.13.6")
   s.add_development_dependency("fission")
-  s.add_development_dependency("mime-types", "<=2.99.1")
+  s.add_development_dependency("mime-types")
   s.add_development_dependency("minitest")
   s.add_development_dependency("minitest-stub-const")
   s.add_development_dependency("opennebula")
   s.add_development_dependency("pry")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rbovirt", "0.1.3")
   s.add_development_dependency("rbvmomi")
-  s.add_development_dependency("rubocop", "0.41.2")
+  s.add_development_dependency("rubocop", "0.52.1")
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("thor")
@@ -114,9 +115,8 @@ If there's a metagem available for your cloud provider, e.g. `fog-aws`,
 you should be using it instead of requiring the full fog collection to avoid
 unnecessary dependencies.
 
-'fog' should be required explicitly only if:
-- The provider you use doesn't yet have a metagem available.
-- You require Ruby 1.9.3 support.
+'fog' should be required explicitly only if the provider you use doesn't yet
+have a metagem available.
 ------------------------------
   POSTINST
 

data/lib/fog/bin/brightbox.rb

@@ -3,9 +3,9 @@ class Brightbox < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Brightbox
+        Fog::Brightbox::Compute
       when :storage
-        Fog::Storage::Brightbox
+        Fog::Brightbox::Storage
       else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end

data/lib/fog/bin.rb

@@ -53,7 +53,6 @@ end
 
 require 'fog/bin/atmos'
 require 'fog/bin/aws'
-require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
 require 'fog/bin/cloudstack'
 require 'fog/bin/clodo'
@@ -91,7 +90,6 @@ require 'fog/bin/vmfusion'
 require 'fog/bin/vsphere'
 require 'fog/bin/voxel'
 require 'fog/bin/xenserver'
-require 'fog/bin/zerigo'
 require 'fog/bin/cloudsigma'
 require 'fog/bin/openvz'
 require 'fog/bin/opennebula'

data/lib/fog/cloudstack/models/compute/server.rb

@@ -40,6 +40,7 @@ module Fog
         attribute :nics,                   :type => :array, :aliases => 'nic'
         attribute :job_id,                                  :aliases => 'jobid'   # only on create
         attribute :size,                   :type => :integer
+        attribute :root_disk_size,         :type => :integer
 
         attr_accessor :network_ids, :disk_offering_id, :ip_address, :ip_to_network_list
         attr_writer :security_group_ids
@@ -132,6 +133,7 @@ module Fog
             'size'              => size,
           }
 
+          options.merge!('rootdisksize' => root_disk_size) if root_disk_size
           options.merge!('networkids' => network_ids) if network_ids
           options.merge!('securitygroupids' => security_group_ids) unless security_group_ids.empty?
 

data/lib/fog/linode/requests/compute/avail_datacenters.rb

@@ -32,6 +32,7 @@ module Fog
               { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8,  "ABBR" => "tokyo" },
               { "LOCATION" => "Singapore, SGP",      "DATACENTERID" => 9,  "ABBR" => "singapore" },
               { "LOCATION" => "Frankfurt, DE",       "DATACENTERID" => 10, "ABBR" => "frankfurt" },
+              { "LOCATION" => "Tokyo 2, JP",         "DATACENTERID" => 11, "ABBR" => "tokyo2" },
             ],
             "ACTION" => "avail.datacenters"
           }

data/lib/fog/opennebula/compute.rb

@@ -98,7 +98,12 @@ module Fog
           @opennebula_endpoint = options[:opennebula_endpoint]
           @opennebula_username = options[:opennebula_username]
           @opennebula_password = options[:opennebula_password]
-          require 'opennebula'
+
+          begin
+            require "opennebula"
+          rescue LoadError
+            raise Fog::Errors::LoadError, "To use OpenNebula provider, you must load 'opennebula' gem"
+          end
         end
 
         def client

data/lib/fog/opennebula/requests/compute/OpenNebulaVNC.rb

@@ -20,7 +20,11 @@
 
 require 'rubygems'
 require 'json'
-require 'opennebula'
+begin
+  require "opennebula"
+rescue LoadError
+  raise Fog::Errors::LoadError, "To use OpenNebula provider, you must load 'opennebula' gem"
+end
 
 
 #if !ONE_LOCATION

data/lib/fog/vcloud_director/compute.rb

@@ -267,6 +267,7 @@ module Fog
       request :put_vapp_template_metadata_item_metadata
       request :put_vm
       request :put_vm_capabilities
+      request :put_config_network_section_vapp
 
       class Model < Fog::Model
         def initialize(attrs={})
@@ -701,9 +702,9 @@ module Fog
                 :name => org_name,
                 :uuid => uuid
               },
-              
+
               :tags => {},
-              
+
               :tasks => {},
 
               :vapps => {

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -165,7 +165,7 @@ module Fog
                 xml.NatRule {
                   xml.RuleType rule[:RuleType]
                   xml.IsEnabled rule[:IsEnabled]
-                  xml.Id rule[:Id]
+                  xml.Id rule[:Id] if rule[:Id]
                   gateway_nat_rule = rule[:GatewayNatRule]
                   xml.GatewayNatRule {
                     xml.Interface(:name => gateway_nat_rule[:Interface][:name], :href => gateway_nat_rule[:Interface][:href])
@@ -211,7 +211,7 @@ module Fog
               xml.LogDefaultAction firewall_config[:LogDefaultAction] if firewall_config.key?(:LogDefaultAction)
               firewall_config[:FirewallRule].each do |rule|
                 xml.FirewallRule {
-                  xml.Id rule[:Id]
+                  xml.Id rule[:Id] if rule[:Id]
                   xml.IsEnabled rule[:IsEnabled] if rule.key?(:IsEnabled)
                   xml.MatchOnTranslate rule[:MatchOnTranslate] if rule.key?(:MatchOnTranslate)
                   xml.Description rule[:Description] if rule.key?(:Description)

data/lib/fog/vcloud_director/generators/compute/network_config_section.rb

@@ -0,0 +1,68 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/NetworkConfigSectionType.html
+        class NetworkConfigSection
+          attr_reader :options
+
+          def initialize(options={})
+            @options = options
+          end
+
+          def generate_xml
+            body = Nokogiri::XML::Builder.new do |xml|
+              attrs = {
+                :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+                'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1'
+              }
+              xml.NetworkConfigSection(attrs){
+                xml['ovf'].Info
+                options[:NetworkConfig].each do |network_config|
+                  network_name = {networkName: network_config[:networkName]} if network_config[:networkName]
+                  xml.NetworkConfig(network_name){
+                    xml.Description network_config[:Description]
+                    if configuration = network_config[:Configuration]
+                      xml.Configuration {
+                        if ipScopes = configuration[:IpScopes]
+                          xml.IpScopes {
+                            if ipScope = ipScopes[:IpScope]
+                              xml.IpScope {
+                                xml.IsInherited ipScope[:IsInherited]
+                                xml.Gateway ipScope[:Gateway]
+                                xml.Netmask ipScope[:Netmask]
+                                xml.Dns1 ipScope[:Dns1] if ipScope[:Dns1]
+                                xml.Dns2 ipScope[:Dns2] if ipScope[:Dns2]
+                                xml.IsEnabled ipScope[:IsEnabled] if ipScope[:IsEnabled]
+                                if ipRanges = ipScope[:IpRanges]
+                                  xml.IpRanges {
+                                    if ipRange = ipRanges[:IpRange]
+                                      xml.IpRange {
+                                        xml.StartAddress ipRange[:StartAddress]
+                                        xml.EndAddress ipRange[:EndAddress]
+                                      }
+                                    end
+                                  }
+                                end
+                              }
+                            end
+                          }
+                        end
+                        if parent_network = configuration[:ParentNetwork]
+                          xml.ParentNetwork({href: parent_network[:href], id: parent_network[:id], name: parent_network[:name]})
+                        end
+                        xml.FenceMode configuration[:FenceMode] if configuration[:FenceMode]
+                        xml.RetainNetInfoAcrossDeployments configuration[:RetainNetInfoAcrossDeployments] if configuration[:RetainNetInfoAcrossDeployments]
+                      }
+                    end #Configuraton
+                    xml.IsDeployed configuration[:IsDeployed] if configuration[:IsDeployed]
+                  }
+                end
+              }
+            end.to_xml
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/get_vapp.rb

@@ -116,10 +116,6 @@ module Fog
           child_vms = data[:vms].select do |vm_id, vm_details|
             vm_details[:parent_vapp] == id
           end
-          if RUBY_VERSION.to_f < 1.9
-            # 1.8 Hash.select returns an Array of [k,v] pairs.
-            child_vms = Hash[child_vms]
-          end
           child_vms.keys.collect do |vm_id|
             get_mock_vm_body(vm_id)
           end

data/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb

@@ -44,18 +44,18 @@ module Fog
           options
         end
 
-        def generate_instantiate_vapp_template_request(options ={})        
-          
+        def generate_instantiate_vapp_template_request(options ={})
+
           #overriding some params so they work with new standardised generator
-          options[:InstantiationParams] = 
+          options[:InstantiationParams] =
           {
-            :NetworkConfig => 
+            :NetworkConfig =>
               [{
               :networkName => options[:network_name],
               :networkHref => options[:network_uri],
               :fenceMode => 'bridged'
               }]
-          } unless options[:InstantiationParams]
+          } unless options[:InstantiationParams] || !options[:network_uri]
           options[:name] = options.delete(:vapp_name) if options[:vapp_name]
           options[:Description] = options.delete(:description) unless options[:Description]
           if options[:vms_config] then
@@ -63,10 +63,10 @@ module Fog
             options[:source_vms].each_with_index {|vm, i|options[:source_vms][i][:StorageProfileHref] = options[:source_vms][i].delete(:storage_profile_href) }
           end
           options[:Source] = options.delete(:template_uri) if options[:template_uri]
-            
-              
 
-          
+
+
+
           Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(options).generate_xml
 
 
@@ -98,10 +98,10 @@ module Fog
           end_point
         end
       end
-      
+
       class Mock
         # Assume the template is a single VM with one network interface and one disk.
-        def instantiate_vapp_template(vapp_name, template_id, options={})          
+        def instantiate_vapp_template(vapp_name, template_id, options={})
           unless data[:catalog_items].values.find {|i| i[:template_id] == template_id}
             raise Fog::Compute::VcloudDirector::Forbidden.new(
               'No such template.'
@@ -112,7 +112,7 @@ module Fog
               'No such VDC.'
             )
           end
-          
+
           vapp_uuid = uuid
           vapp_id   = "vapp-#{vapp_uuid}"
           owner = {

data/lib/fog/vcloud_director/requests/compute/post_power_on_vapp.rb

@@ -65,7 +65,7 @@ module Fog
             :body => body
           )
         end
-        end
+      end
     end
   end
 end

data/lib/fog/vcloud_director/requests/compute/put_config_network_section_vapp.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        require 'fog/vcloud_director/generators/compute/network_config_section'
+        # Update the network config section of a vApp.
+        #
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/PUT-NetworkConfigSection-vApp.html
+        # @since vCloud API version 0.9
+        def put_config_network_section_vapp(id, options={})
+          body = Fog::Generators::Compute::VcloudDirector::NetworkConfigSection.new(options).generate_xml
+
+          request(
+            :body => body,
+            :expects => 202,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.networkConfigSection+xml'},
+            :method => 'PUT',
+            :parser => Fog::ToHashDocument.new,
+            :path => "vApp/#{id}/networkConfigSection"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.41.0'
+  VERSION = '2.1.0'
 end

data/lib/fog.rb

@@ -21,7 +21,6 @@ require 'fog/core/deprecated_connection_accessors'
 # they all depend on fog/core for shared functionality.
 require 'fog/atmos'
 require 'fog/aws'
-require 'fog/bluebox'
 require 'fog/brightbox'
 require 'fog/cloudstack'
 require 'fog/clodo'
@@ -59,7 +58,6 @@ require 'fog/vmfusion'
 require 'fog/vsphere'
 require 'fog/voxel'
 require 'fog/xenserver'
-require 'fog/zerigo'
 require 'fog/cloudsigma'
 require 'fog/openvz'
 require 'fog/opennebula'

data/lib/tasks/changelog_task.rb

@@ -103,6 +103,7 @@ Watchers      | #{watchers}
       def former_mvp?(committer)
          [
            'Aaron Suggs',
+           'Akira Matsuda',
            'ller', #"Achim Ledermüller" UTF-8 fail?
            'Ash Wilson',
            'Benson Kalahar',
@@ -148,7 +149,9 @@ Watchers      | #{watchers}
            'Rodrigo Estebanez',
            'Rupak Ganguly',
            'Stepan G. Fedorov',
+           'swamp09',
            'TerryHowe',
+           'Tinguely Pierre',
            'Wesley Beary'
          ].include?(committer)
       end
@@ -177,7 +180,7 @@ Watchers      | #{watchers}
       end
 
       def committer_match
-        current_line.match /([-\w\s]+)\s+\(\d+\)/
+        @current_line.match (/([-\w\s]+)\s+\(\d+\)/)
       end
 
       def last_release_sha

data/lib/tasks/github_release_task.rb

@@ -47,7 +47,7 @@ module Fog
       end
 
       def release_match
-        @current_line.match /## (\d+\.\d+\.\d+) \d+\/\d+\d+/
+        @current_line.match (/## (\d+\.\d+\.\d+) \d+\/\d+\d+/)
       end
 
       def github

data/spec/fog/bin/atmos_spec.rb

@@ -20,14 +20,4 @@ describe Atmos do
       end
     end
   end
-
-  describe "#[]" do
-    describe "when requesting storage service" do
-      it "returns instance" do
-        Fog::Storage::Atmos.stub(:new, "instance") do
-          assert_equal "instance", Atmos[:storage]
-        end
-      end
-    end
-  end
 end

data/spec/fog/bin/aws_spec.rb

@@ -77,22 +77,4 @@ describe AWS do
       end
     end
   end
-
-  describe "#[]" do
-    describe "when service is recognised" do
-      it "returns correct instance" do
-        KEY_CLASS_MAPPING.each do |key, klass|
-          klass.stub(:new, "#{klass} instance") do
-            assert_equal "#{klass} instance", AWS[key]
-          end
-        end
-      end
-    end
-
-    describe "when service is not recognised" do
-      it "raises ArgumentError" do
-        assert_raises(ArgumentError) { AWS[:bad_service] }
-      end
-    end
-  end
 end