fog-core 1.25.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def08d856fbf1d998e280ccc63e9ccc45fb6bb2b
-  data.tar.gz: 490a97b82c3fe8378ee7b7496eaacc81945e3a1d
+  metadata.gz: c63e18b70536c9da2257bd579c2d7aaf834f1081
+  data.tar.gz: c6bcac1c3a20c3b6a325d488e701fd2bf8d891ff
 SHA512:
-  metadata.gz: b8828bb2e949755b5a65205f91564adda96289b94c308fcfb90db64d2343d1d7b81afd54753eacdcbf50cb9ea6a5745c8b34bc95360d81090205866d71f0ecbc
-  data.tar.gz: 3c3664af4f43a084cbe344b57693161ffc9bd4da493743d055313637f562ee60bd0bb63037861da9773cfdfcce62c6e38bf48a53f86bfb176dd980e9f272a441
+  metadata.gz: 20a699bee434d0c5c8423a50f2130352b4ef5c81588ddc3c9caeedfecb1c32847ba6d7fc8c2cbfd9aef6a69805eeee9718f3b5bfc81bcd6df1537ccd45675965
+  data.tar.gz: a6179a545d2f40071227baba705e327ce24ee767bae4d94dbba501f2903eed00f7e46352c1468c5faa2e204ff9879d9f4fbe9d92abaef42000d661ca6fc779b0

data/.travis.yml

@@ -13,6 +13,8 @@ rvm:
   - jruby-19mode
   - jruby-head
 
+sudo: false
+
 script: bundle exec rake travis
 
 matrix:
@@ -52,4 +54,4 @@ notifications:
     - "[#%{build_number}] %{compare_url}"
     on_success: always
     on_failure: always
-    use_notice: false
+    use_notice: false

data/CONTRIBUTORS.md

@@ -1,12 +1,21 @@
 * Anatol <anatol.pomozov@gmail.com>
+* Bryan Paxton <starbelly@pobox.com>
 * Chris Johnson <wchrisjohnson@gmail.com>
+* Chris Sinjakli <chris@sinjakli.co.uk>
 * Dominic Cleal <dcleal@redhat.com>
 * Evan Light <evan@tripledogdare.net>
+* Jake Bell <jake@theunraveler.com>
+* Josh Kalderimis <josh.kalderimis@gmail.com>
+* Kevin Menard <kevin@nirvdrum.com>
+* Matt Bostock <matt@mattbostock.com>
+* Matt Darby <darby@mittdarko.com>
+* Matt Darby <matt.darby@rackspace.com>
 * Mike Hagedorn <mike@silverchairsolutions.com>
 * Naoto TAKAHASHI <tnaoto@gmail.com>
 * Paul Thornthwaite <paul@brightbox.co.uk>
 * Paul Thornthwaite <tokengeek@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * Wesley Beary <geemus+github@gmail.com>
+* Wesley Beary <geemus@gmail.com>
 * geemus <geemus@gmail.com>
 * mountkin <moutkin@gmail.com>

data/changelog.md

@@ -1,3 +1,20 @@
+1.27.0 12/12/2014
+==========================================================
+
+return fog/bin stuff to fog/fog
+add support for multiple request/model load paths
+
+
+1.26.0 12/02/2014
+==========================================================
+
+remove rackspace logic
+use new travis builds
+fix error handling around credential fetch
+move fog/bin stuff to fog-core
+fix circular reference in collection.rb
+
+
 1.25.0 11/18/2014
 ==========================================================
 

data/lib/fog/core/collection.rb

@@ -141,10 +141,10 @@ module Fog
   # Base class for collection classes whose 'all' method returns only a single page of results and passes the
   # 'Marker' option along as self.filters[:marker]
   class PagedCollection < Collection
-    def each(filters = filters)
+    def each(collection_filters = filters)
       if block_given?
         begin
-          page = all(filters)
+          page = all(collection_filters)
           # We need to explicitly use the base 'each' method here on the page, otherwise we get infinite recursion
           base_each = Fog::Collection.instance_method(:each)
           base_each.bind(page).call { |item| yield item }

data/lib/fog/core/service.rb

@@ -120,7 +120,7 @@ module Fog
       def fetch_credentials(_options)
         # attempt to load credentials from config file
         Fog.credentials.reject { |key, _value| !(recognized | requirements).include?(key) }
-      rescue LoadError
+      rescue ::Fog::Errors::LoadError
         # if there are no configured credentials, do nothing
         {}
       end
@@ -145,10 +145,15 @@ module Fog
         @model_path = new_path
       end
 
-      def collection(new_collection)
+      def collection(new_collection, path = nil)
+        collection_files << [path, new_collection]
         collections << new_collection
       end
 
+      def collection_files
+        @collection_files ||= []
+      end
+
       def collections
         @collections ||= []
       end
@@ -177,8 +182,13 @@ module Fog
         @mocked_requests ||= []
       end
 
-      def model(new_model)
-        models << new_model
+      def model(new_model, path = nil)
+        models_files << [path, new_model]
+        models << [new_model]
+      end
+
+      def model_files
+        @model_files ||= []
       end
 
       def models
@@ -189,8 +199,8 @@ module Fog
         @request_path = new_path
       end
 
-      def request(new_request)
-        requests << new_request
+      def request(new_request, path = nil)
+        requests << [path, new_request]
       end
 
       def requests
@@ -261,17 +271,15 @@ module Fog
 
       # This will attempt to require all model files declared by the service using fog"s DSL
       def require_models
-        models.each do |model|
-          require File.join(@model_path, model.to_s)
-        end
+        model_files.each { |model| require_item(model, @model_path) }
       end
 
       def require_collections_and_define
-        collections.each do |collection|
-          require File.join(@model_path, collection.to_s)
-          constant = camel_case_collection_name(collection)
+        collection_files.each do |collection|
+          require_item(collection, @model_path)
+          constant = camel_case_collection_name(collection.last)
           service::Collections.module_eval <<-EOS, __FILE__, __LINE__
-            def #{collection}(attributes = {})
+            def #{collection.last}(attributes = {})
               #{service}::#{constant}.new({ :service => self }.merge(attributes))
             end
           EOS
@@ -290,18 +298,31 @@ module Fog
       # This will attempt to require all request files declared in the service using fog"s DSL
       def require_requests_and_mock
         requests.each do |request|
-          require File.join(@request_path, request.to_s)
-          if service::Mock.method_defined?(request)
-            mocked_requests << request
+          require_item(request, @request_path)
+          if service::Mock.method_defined?(request.last)
+            mocked_requests << request.last
           else
             service::Mock.module_eval <<-EOS, __FILE__, __LINE__
-              def #{request}(*args)
+              def #{request.last}(*args)
                 Fog::Mock.not_implemented
               end
             EOS
           end
         end
       end
+
+      # Requires the correct file for an item (collection, model, or request).
+      #
+      # @param [Array] item
+      #   An item to require. Should be an array in the form of [path, file].
+      # @param [String] fallback_dir
+      #   The directory to look for the file in if the first element of `item`
+      #   is nil.
+      # @return [Boolean] Returns the same as `Kernel#require`.
+      def require_item(item, fallback_dir)
+        path, file = item
+        require File.join(path || fallback_dir, file.to_s)
+      end
     end
   end
 end

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.25.0"
+    VERSION = "1.27.0"
   end
 end

data/lib/fog/test_helpers/mock_helper.rb

@@ -13,9 +13,6 @@ if Fog.mock?
     :aws_secret_access_key            => "aws_secret_access_key",
     :ia_access_key_id                 => "aws_access_key_id",
     :ia_secret_access_key             => "aws_secret_access_key",
-    :atmos_storage_token              => "atmos_token",
-    :atmos_storage_secret             => "atmos_secret",
-    :atmos_storage_endpoint           => "http://atmos.is.cool:1000/test1.0",
     :bluebox_api_key                  => "bluebox_api_key",
     :bluebox_customer_id              => "bluebox_customer_id",
     :brightbox_client_id              => "brightbox_client_id",
@@ -34,9 +31,6 @@ if Fog.mock?
     :dnsimple_password                => "dnsimple_password",
     :dnsmadeeasy_api_key              => "dnsmadeeasy_api_key",
     :dnsmadeeasy_secret_key           => "dnsmadeeasy_secret_key",
-    :ecloud_username                  => "ecloud_username",
-    :ecloud_password                  => "ecloud_password",
-    :ecloud_versions_uri              => "http://ecloud.versions.uri",
     :glesys_username                  => "glesys_username",
     :glesys_api_key                   => "glesys_api_key",
     :go_grid_api_key                  => "go_grid_api_key",
@@ -77,8 +71,6 @@ if Fog.mock?
     :rackspace_username               => "rackspace_username",
     :riakcs_access_key_id             => "riakcs_access_key_id",
     :riakcs_secret_access_key         => "riakcs_secret_access_key",
-    :storm_on_demand_username         => "storm_on_demand_username",
-    :storm_on_demand_password         => "storm_on_demand_password",
     :vcloud_host                      => "vcloud_host",
     :vcloud_password                  => "vcloud_password",
     :vcloud_username                  => "vcloud_username",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder