fog-core 1.44.3 → 1.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2d0f2a4c1abf23f1de5b3262514fd535952c1f
-  data.tar.gz: 9da4fc2f995f4e9ef3a427ed034205aaa045a023
+  metadata.gz: 52a37f8e1b168c74d0d23ab2748a5217a99e2686
+  data.tar.gz: 97606f8e95a6969a93b597e4018d73a28476a966
 SHA512:
-  metadata.gz: 598f0910ce96d1d1d6b0e2554cff115fd149b18f7c3e62ab6419e59f4952feea6c6c01eca051ff470161c90c0bfb9fd9cb1ee787e8e35fec86bd1bf3468b59b0
-  data.tar.gz: ebd7184fb227d880707992edb5bd00357f1c6cceeb9f6770327d484e4f19f98c71c2a760efe777ba0ce6488b5a4de10034e7d88317375b8bd50b65f0d1b8475a
+  metadata.gz: d9f52e3fd097a95f90d8a9419499fd1ce5cb013c1ee2816aafacc150eb9903684eb72db7fe41243fa49fa7be43e2eba8f5d23282b3fa3e4eb8fdc773b7e1c528
+  data.tar.gz: 5133413d6aa3dc0004a70448ba63dc7042769cfb8609e8bcab0155ce2df7e02d0fa00c31672f64304029426a73011f8390a4145f07ac008ea04600c83b928845

data/.travis.yml

@@ -23,7 +23,7 @@ matrix:
       gemfile: Gemfile.1.9.3
     - rvm: jruby-19mode
       gemfile: Gemfile.1.9.3
-    - rvm: 2.1.0
+    - rvm: 2.1
       gemfile: Gemfile
       env: COVERAGE=true
     - rvm: jruby-head

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-

data/Gemfile.1.9.3

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
 
-gem "net-ssh", "< 3.0"
-
 gemspec
+
+gem 'net-ssh', '< 3.0'
+gem 'rubocop', '~> 0.41.2'
+gem 'term-ansicolor', '~> 1.3.2'
+gem 'tins', '~> 1.6.0'

data/changelog.md

@@ -1,3 +1,21 @@
+1.45.0 08/01/2017
+==========================================================
+
+remove xmlrpc requirement/usage
+fix for nested const across ruby versions
+remove array#sample usage for legacy ruby compatibility
+simplify uniq for cache and fix for legacy ruby
+remove debugging puts from cache
+tweak tins version for 1.9
+loosen 2.1.x travis config to 2.1
+add 1.9 compatible term-ansicolor
+fix rubocop for 1.9.3
+enable metadata for cache
+add specs for server#sshable
+add exponential backoff for server#sshable?
+add server#ready? to base server for clarity
+bump excon dependency
+
 1.44.3 05/25/2017
 ==========================================================
 

data/fog-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("builder")
-  spec.add_dependency("excon", "~> 0.49")
+  spec.add_dependency("excon", "~> 0.58")
   spec.add_dependency("formatador", "~> 0.2")
 
   # https://github.com/fog/fog-core/issues/206

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

@@ -3,6 +3,8 @@ require "fog/core/model"
 module Fog
   module Compute
     class Server < Fog::Model
+      INITIAL_SSHABLE_TIMEOUT = 8
+
       attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path, :ssh_port, :ssh_options
       # Sets the proc used to determine the IP Address used for ssh/scp interactions.
       # @example
@@ -87,10 +89,45 @@ module Fog
       end
 
       def sshable?(options = {})
-        ready? && !ssh_ip_address.nil? && !!Timeout.timeout(8) { ssh("pwd", options) }
-      rescue SystemCallError, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Timeout::Error
+        result = ready? && !ssh_ip_address.nil? && !!Timeout.timeout(sshable_timeout) { ssh("pwd", options) }
+        @sshable_timeout = nil
+        result
+      rescue SystemCallError
+        false
+      rescue Net::SSH::AuthenticationFailed, Net::SSH::Disconnect
+        @sshable_timeout = nil
+        false
+      rescue Timeout::Error
+        increase_sshable_timeout
+        false
+      end
+
+      # Is the server ready to receive connections?
+      #
+      # Returns false by default.
+      #
+      # Subclasses should implement #ready? appropriately.
+      def ready?
         false
       end
+
+      private
+
+      def sshable_timeout
+        @sshable_timeout ||= increase_sshable_timeout
+      end
+
+      def increase_sshable_timeout
+        if defined?(@sshable_timeout) && @sshable_timeout
+          if @sshable_timeout >= 40
+            @sshable_timeout = 60
+          else
+            @sshable_timeout *= 1.5
+          end
+        else
+          @sshable_timeout = INITIAL_SSHABLE_TIMEOUT
+        end
+      end
     end
   end
 end

data/lib/fog/core/cache.rb

@@ -109,16 +109,21 @@ module Fog
 
       raise CacheNotFound if cache_files.empty?
 
-      loaded = cache_files.map do |path|
-        model_klass = Object.const_get(load_cache(path)[:model_klass])
-        model_klass.new(load_cache(path)[:attrs])
-      end
+      # collection_klass and model_klass should be the same across all instances
+      # choose a valid cache record from the dump to use as a sample to deterine
+      # which collection/model to instantiate.
+      sample_path = cache_files.detect{ |path| valid_for_load?(path) }
+      model_klass = const_get_compat(load_cache(sample_path)[:model_klass])
+      collection_klass = const_get_compat(load_cache(sample_path)[:collection_klass]) if load_cache(sample_path)[:collection_klass]
 
-      collection_klass = load_cache(cache_files.sample)[:collection_klass] &&
-                         Object.const_get(load_cache(cache_files.sample)[:collection_klass])
+      # Load the cache data into actual ruby instances
+      loaded = cache_files.map do |path|
+          model_klass.new(load_cache(path)[:attrs]) if valid_for_load?(path)
+      end.compact
 
+      # Set the collection and service so they can be reloaded/connection is set properly.
+      # See https://github.com/fog/fog-aws/issues/354#issuecomment-286789702
       loaded.each do |i|
-        # See https://github.com/fog/fog-aws/issues/354#issuecomment-286789702
         i.collection = collection_klass.new(:service => service) if collection_klass
         i.instance_variable_set(:@service, service)
       end
@@ -126,7 +131,7 @@ module Fog
       # uniqe-ify based on the total of attributes. duplicate cache can exist due to
       # `model#identity` not being unique. but if all attributes match, they are unique
       # and shouldn't be loaded again.
-      uniq_loaded = loaded.uniq { |i| i.attributes }
+      uniq_loaded = uniq_w_block(loaded) { |i| i.attributes }
       if uniq_loaded.size != loaded.size
         Fog::Logger.warning("Found duplicate items in the cache. Expire all & refresh cache soon.")
       end
@@ -137,6 +142,40 @@ module Fog
       uniq_loaded
     end
 
+    # :nodoc: compatability for 1.8.7 1.9.3
+    def self.const_get_compat(strklass)
+      # https://stackoverflow.com/questions/3163641/get-a-class-by-name-in-ruby
+      strklass.split('::').inject(Object) do |mod, class_name|
+        mod.const_get(class_name)
+      end
+    end
+
+    # :nodoc: compatability for 1.8.7 1.9.3
+    def self.uniq_w_block(arr)
+      ret, keys = [], []
+      arr.each do |x|
+        key = block_given? ? yield(x) : x
+        unless keys.include? key
+          ret << x
+          keys << key
+        end
+      end
+      ret
+    end
+
+    # method to determine if a path can be loaded and is valid fog cache format.
+    def self.valid_for_load?(path)
+      data = load_cache(path)
+      if data && data.is_a?(Hash)
+        if [:identity, :model_klass, :collection_klass, :attrs].all? { |k| data.keys.include?(k) }
+          return true
+        else
+          Fog::Logger.warning("Found corrupt items in the cache: #{path}. Expire all & refresh cache soon.\n\nData:#{File.read(path)}")
+          return false
+        end
+      end
+    end
+
     # creates on-disk cache of this specific +model_klass+ and +@service+
     def self.create_namespace(model_klass, service)
       FileUtils.mkdir_p(self.namespace(model_klass, service))
@@ -148,6 +187,12 @@ module Fog
       FileUtils.rm_rf(namespace(model_klass, service))
     end
 
+    # cleans the `SANDBOX` - specific any resource cache of any namespace,
+    # and any metadata associated to any.
+    def self.clean!
+      FileUtils.rm_rf(SANDBOX)
+    end
+
     # loads yml cache from path on disk, used
     # to initialize Fog models.
     def self.load_cache(path)
@@ -164,6 +209,41 @@ module Fog
       @namespace_prefix
     end
 
+    # write any metadata - +hash+ information - specific to the namespaced cache in the session.
+    #
+    # you can retrieve this in other sessions, as long as +namespace_prefix+ is set
+    # you can overwrite metadata over time. see test cases as examples.
+    def self.write_metadata(h)
+      if namespace_prefix.nil?
+        raise CacheDir.new("Must set an explicit identifier/name for this cache. Example: 'serviceX-regionY'") unless namespace_prefix
+      elsif !h.is_a?(Hash)
+        raise CacheDir.new("metadta must be a hash of information like {:foo => 'bar'}")
+      end
+
+      mpath = File.join(SANDBOX, namespace_prefix, "metadata.yml")
+      to_write = if File.exist?(mpath)
+                YAML.dump(YAML.load(File.read(mpath)).merge!(h))
+              else
+                YAML.dump(h)
+              end
+
+      mdir = File.join(SANDBOX, namespace_prefix)
+      FileUtils.mkdir_p(mdir) if !File.exist?(mdir)
+
+      File.open(mpath, "w") { |f| f.write(to_write) }
+    end
+
+    # retrive metadata for this +namespace+ of cache. returns empty {} if none found.
+    def self.metadata
+      mpath = File.join(SANDBOX, namespace_prefix, "metadata.yml")
+      if File.exist?(mpath)
+        metadata = YAML.load(File.read(mpath))
+        return metadata
+      else
+        return {}
+      end
+    end
+
     # The path/namespace where the cache is stored for a specific +model_klass+ and +@service+.
     def self.namespace(model_klass, service)
 
@@ -204,7 +284,7 @@ module Fog
       # this means cache duplication is possible.
       #
       # see "dumping two models that have duplicate identity" test case.
-      name = "#{self.class.namespace(model.class, model.service)}/#{model.identity}-#{SecureRandom.hex}.yml"
+      "#{self.class.namespace(model.class, model.service)}/#{model.identity}-#{SecureRandom.hex}.yml"
     end
   end
 end

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.44.3"
+    VERSION = "1.45.0"
   end
 end

data/spec/compute/models/server_spec.rb

@@ -0,0 +1,229 @@
+require "spec_helper"
+require "fog/compute/models/server"
+
+describe Fog::Compute::Server do
+  before do
+    @server = Fog::Compute::Server.new
+  end
+
+  describe "#sshable?" do
+    describe "when the server is not ready" do
+      it "is false" do
+        @server.stub(:ready?, false) do
+          refute @server.sshable?
+        end
+      end
+    end
+
+    describe "when the server is ready" do
+      describe "when the ssh_ip_address is nil" do
+        it "is false" do
+          @server.stub(:ready?, true) do
+            @server.stub(:ssh_ip_address, nil) do
+              refute @server.sshable?
+            end
+          end
+        end
+      end
+
+
+      describe "when the ssh_ip_address exists" do
+        # Define these constants which would be imported by net-ssh once loaded
+        module Net
+          module SSH
+            class AuthenticationFailed  < RuntimeError
+            end
+            class Disconnect < RuntimeError
+            end
+          end
+        end
+
+        describe "and ssh times out" do
+          it "is false" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raises_timeout = lambda { |_time| raise Timeout::Error.new }
+                Timeout.stub(:timeout, raises_timeout) do
+                  refute @server.sshable?
+                end
+              end
+            end
+          end
+        end
+
+        describe "and it raises Net::SSH::AuthenticationFailed" do
+          it "is false" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                @server.stub(:ssh, raise_error) do
+                  refute @server.sshable?
+                end
+              end
+            end
+          end
+
+          it "resets SSH timeout" do
+            @server.instance_variable_set(:@sshable_timeout, 8)
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                @server.stub(:ssh, raise_error) do
+                  @server.sshable?
+                  assert_nil @server.instance_variable_get(:@sshable_timeout), nil
+                end
+              end
+            end
+          end
+        end
+
+        describe "and it raises Net::SSH::Disconnect" do
+          it "is false" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                @server.stub(:ssh, raise_error) do
+                  refute @server.sshable?
+                end
+              end
+            end
+          end
+
+          it "resets SSH timeout" do
+            @server.instance_variable_set(:@sshable_timeout, 8)
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                @server.stub(:ssh, raise_error) do
+                  @server.sshable?
+                  assert_nil @server.instance_variable_get(:@sshable_timeout), nil
+                end
+              end
+            end
+          end
+        end
+
+        describe "and it raises SystemCallError" do
+          it "is false" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                @server.stub(:ssh, raise_error) do
+                  refute @server.sshable?
+                end
+              end
+            end
+          end
+
+          it "does not increase SSH timeout" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                @server.stub(:ssh, raise_error) do
+                  @server.sshable?
+                  assert_equal @server.instance_variable_get(:@sshable_timeout), 8
+                end
+              end
+            end
+          end
+        end
+
+        describe "and ssh completes within the designated timeout" do
+          it "is true" do
+            @server.stub(:ready?, true) do
+              @server.stub(:ssh_ip_address, "10.0.0.1") do
+                @server.stub(:ssh, "datum") do
+                  assert @server.sshable?
+                end
+              end
+            end
+          end
+        end
+
+        describe "when called successively" do
+          describe "and ssh times out" do
+            it "increases the timeout factor by 1.5" do
+              @server.stub(:ready?, true) do
+                @server.stub(:ssh_ip_address, "10.0.0.1") do
+                  raises_timeout = lambda do |time|
+                    assert(time == 8)
+                    raise Timeout::Error.new
+                  end
+                  Timeout.stub(:timeout, raises_timeout) do
+                    refute @server.sshable?
+                  end
+
+                  raises_timeout = lambda do |time|
+                    assert_equal(12, time)
+                    raise Timeout::Error.new
+                  end
+                  Timeout.stub(:timeout, raises_timeout) do
+                    refute @server.sshable?
+                  end
+                end
+              end
+            end
+
+            it "does not increase timeout beyond 60s" do
+              @server.stub(:ready?, true) do
+                @server.stub(:ssh_ip_address, "10.0.0.1") do
+                  raises_timeout = lambda { |_time| raise Timeout::Error.new }
+                  Timeout.stub(:timeout, raises_timeout) do
+                    5.times { refute @server.sshable? }
+                  end
+
+                  raises_timeout = lambda do |time|
+                    assert_equal(60, time)
+                    raise Timeout::Error.new
+                  end
+                  Timeout.stub(:timeout, raises_timeout) do
+                    refute @server.sshable?
+                  end
+
+                  raises_timeout = lambda do |time|
+                    assert_equal(60, time)
+                    raise Timeout::Error.new
+                  end
+                  Timeout.stub(:timeout, raises_timeout) do
+                    refute @server.sshable?
+                  end
+                end
+              end
+            end
+
+            describe "when ssh eventually succeeds" do
+              it "resets the timeout to the initial value" do
+                @server.stub(:ready?, true) do
+                  @server.stub(:ssh_ip_address, "10.0.0.1") do
+                    raises_timeout = lambda do |time|
+                      assert(time == 8)
+                      raise Timeout::Error.new
+                    end
+                    Timeout.stub(:timeout, raises_timeout) do
+                      refute @server.sshable?
+                    end
+
+                    @server.stub(:ssh, "datum") do
+                      assert @server.sshable?
+                    end
+
+                    raises_timeout = lambda do |time|
+                      assert_equal(8, time)
+                      raise Timeout::Error.new
+                    end
+                    Timeout.stub(:timeout, raises_timeout) do
+                      refute @server.sshable?
+                    end
+                  end
+                end
+              end
+            end
+
+          end
+        end
+
+      end
+    end
+
+  end
+end

data/spec/core/cache_spec.rb

@@ -35,11 +35,61 @@ describe Fog::Cache do
     example_cache = File.expand_path(Fog::Cache.namespace(Fog::SubFogTestModel, @service)).downcase
     expected_namespace = File.expand_path("~/.fog-cache/for-service-user-region-foo").downcase
 
-    puts example_cache
-    puts expected_namespace
     assert_equal example_cache.include?(expected_namespace), true
   end
 
+  it "has metadata associated to the namespace that you can save to" do
+    Fog::Cache.clean!
+    Fog::Cache.namespace_prefix = "for-service-user-region-foo"
+    # nothing exists, nothing comes back
+    assert_equal Fog::Cache.metadata, {}
+    # write/read
+    Fog::Cache.write_metadata({:last_dumped => "Tuesday, November 8, 2016"})
+    assert_equal Fog::Cache.metadata[:last_dumped], "Tuesday, November 8, 2016"
+
+    # diff namespace, diff metadata
+    Fog::Cache.namespace_prefix = "different-namespace"
+    assert_nil Fog::Cache.metadata[:last_dumped]
+    # still accessible per namespace
+    Fog::Cache.namespace_prefix = "for-service-user-region-foo"
+    assert_equal Fog::Cache.metadata[:last_dumped],  "Tuesday, November 8, 2016"
+    # can overwrite
+    Fog::Cache.write_metadata({:last_dumped => "Diff date"})
+    assert_equal Fog::Cache.metadata[:last_dumped],  "Diff date"
+
+    # can't write a non-hash/data entry.
+    assert_raises Fog::Cache::CacheDir do
+      Fog::Cache.write_metadata("boo")
+    end
+
+    # namespace must be set as well.
+    assert_raises Fog::Cache::CacheDir do
+      Fog::Cache.namespace_prefix = nil
+      Fog::Cache.write_metadata({:a => "b"})
+    end
+
+ end
+
+  it "can load cache data from disk" do
+    path = File.expand_path("~/.fog-cache-test-#{Time.now.to_i}.yml")
+    data = "--- ok\n...\n"
+    File.open(path, "w") { |f|
+      f.write(data)
+    }
+
+    assert_equal "ok", Fog::Cache.load_cache(path)
+  end
+
+  it "load bad cache data - empty file, from disk" do
+    path = File.expand_path("~/.fog-cache-test-2-#{Time.now.to_i}.yml")
+    data = ""
+    File.open(path, "w") { |f|
+      f.write(data)
+    }
+
+    assert_equal false, Fog::Cache.load_cache(path)
+  end
+
   it "must have a namespace_prefix configurable" do
     Fog::Cache.namespace_prefix = nil
     assert_raises Fog::Cache::CacheDir do
@@ -63,6 +113,24 @@ describe Fog::Cache do
     end
   end
 
+  it "Fog cache ignores bad cache data - empty file, from disk" do
+    Fog::Cache.expire_cache!(Fog::SubFogTestModel, @service)
+    id = SecureRandom.hex
+    a = Fog::SubFogTestModel.new(:id => id, :service => @service)
+    a.cache.dump
+
+    # input bad data
+    path_dir = File.expand_path(Fog::Cache.namespace(Fog::SubFogTestModel, @service))
+    path = File.join(path_dir, "foo.yml")
+    data = ""
+    File.open(path, "w") { |f|
+      f.write(data)
+    }
+
+    assert_equal 1, Fog::Cache.load(Fog::SubFogTestModel, @service).size
+  end
+
+
   it "can be dumped and reloaded back in" do
 
     Fog::Cache.expire_cache!(Fog::SubFogTestModel, @service)
@@ -85,7 +153,7 @@ describe Fog::Cache do
 
     id = SecureRandom.hex
 
-    # security gruops on aws for eg can have the same identity group name 'default'.
+    # security groups on aws for eg can have the same identity group name 'default'.
     # there are no restrictions on `identity` fog attributes to be uniq.
     a = Fog::SubFogTestModel.new(:id => id, :service => @service, :bar => 'bar')
     b = Fog::SubFogTestModel.new(:id => id, :service => @service, :foo => 'foo')
@@ -103,7 +171,7 @@ describe Fog::Cache do
 
     id = SecureRandom.hex
 
-    # security gruops on aws for eg can have the same identity group name 'default'.
+    # security groups on aws for eg can have the same identity group name 'default'.
     # there are no restrictions on `identity` fog attributes to be uniq.
     a = Fog::SubFogTestModel.new(:id => id, :service => @service, :bar => 'bar')
     b = Fog::SubFogTestModel.new(:id => id, :service => @service, :foo => 'foo')

data/spec/fog_attribute_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "xmlrpc/datetime"
 
 class Service
   def single_associations
@@ -114,12 +113,6 @@ describe "Fog::Attributes" do
       model.merge_attributes(:time => string)
       assert_equal Time.parse(string), model.time
     end
-
-    it "returns a Time object when passed a XMLRPC::DateTime object" do
-      now = XMLRPC::DateTime.new(2000, 7, 8, 10, 20, 34)
-      model.merge_attributes(:time => now)
-      assert_equal now.to_time, model.time
-    end
   end
 
   describe ":type => :boolean" do
@@ -238,7 +231,7 @@ describe "Fog::Attributes" do
 
   describe ":default => 'default_value'" do
     it "should return nil when default is not defined on a new object" do
-      assert_equal model.bool, nil
+      assert_nil model.bool
     end
 
     it "should return the value of the object when default is not defined" do
@@ -266,18 +259,18 @@ describe "Fog::Attributes" do
 
     it "should return nil on a persisted object without a value" do
       model.merge_attributes(:id => "some-crazy-id")
-      assert_equal model.default, nil
+      assert_nil model.default
     end
 
     it "should return nil when an attribute with default value is setted to nil" do
       model.default = nil
-      assert_equal model.default, nil
+      assert_nil model.default
     end
   end
 
   describe ".has_one" do
     it "should create an instance_variable to save the association object" do
-      assert_equal model.one_object, nil
+      assert_nil model.one_object
     end
 
     it "should create a getter to save the association model" do
@@ -299,7 +292,7 @@ describe "Fog::Attributes" do
 
   describe ".has_one_identity" do
     it "should create an instance_variable to save the association identity" do
-      assert_equal model.one_identity, nil
+      assert_nil model.one_identity
     end
 
     it "should create a getter to load the association model" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.44.3
+  version: 1.45.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.58'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.58'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ files:
 - lib/fog/volume.rb
 - lib/fog/vpn.rb
 - lib/tasks/test_task.rb
+- spec/compute/models/server_spec.rb
 - spec/compute_spec.rb
 - spec/connection_spec.rb
 - spec/core/cache_spec.rb
@@ -322,11 +323,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.
 test_files:
+- spec/compute/models/server_spec.rb
 - spec/compute_spec.rb
 - spec/connection_spec.rb
 - spec/core/cache_spec.rb