fog-core 1.45.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a37f8e1b168c74d0d23ab2748a5217a99e2686
-  data.tar.gz: 97606f8e95a6969a93b597e4018d73a28476a966
+  metadata.gz: e97b9e09ecd256672d64f6609d4a944ee0b467b9
+  data.tar.gz: 753439fe39482319e541798a52fd380fc969d3fb
 SHA512:
-  metadata.gz: d9f52e3fd097a95f90d8a9419499fd1ce5cb013c1ee2816aafacc150eb9903684eb72db7fe41243fa49fa7be43e2eba8f5d23282b3fa3e4eb8fdc773b7e1c528
-  data.tar.gz: 5133413d6aa3dc0004a70448ba63dc7042769cfb8609e8bcab0155ce2df7e02d0fa00c31672f64304029426a73011f8390a4145f07ac008ea04600c83b928845
+  metadata.gz: 451e3d2b4ed1feac5f73e24e26135fce90e65d7524529d62e768c9425910e3200c6f05c93e0d71e6e3a4bf3d035f4ce4a4aaa6b2e3c18db40278b4ea5b6d0a55
+  data.tar.gz: 3ff83ee817b848e7ff858bbf5f0c99ea922dd0d9e8b28c2a1726cccef5bc95f1b2f23ba3bc52dd521fe399ed9474d41cf21f979db28e0ef21c16a78861d380b2

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.0
   - 2.1
   - 2.2
   - 2.3
@@ -15,14 +16,6 @@ script: bundle exec rake travis
 matrix:
   fast_finish: true
   include:
-    - rvm: 1.8.7
-      gemfile: Gemfile.1.8.7
-    - rvm: jruby-18mode
-      gemfile: Gemfile.1.8.7
-    - rvm: 1.9.3
-      gemfile: Gemfile.1.9.3
-    - rvm: jruby-19mode
-      gemfile: Gemfile.1.9.3
     - rvm: 2.1
       gemfile: Gemfile
       env: COVERAGE=true

data/README.md

@@ -25,17 +25,6 @@ Or install it yourself as:
 
     $ gem install fog-core
 
-### Ruby 1.9.3
-
-Some of `fog-core`'s dependencies have dropped support for Ruby 1.9.3 in later
-versions. Rather than limit all `fog` users to older but compatible versions,
-if you are using 1.9.3 you will need to declare a compatible version in your
-application's `Gemfile` like:
-
-    gem "net-ssh", "< 3.0"
-
-See `Gemfile.1.9.3` for the definitive list as tested by Travis.
-
 ## Usage
 
 TODO: Write usage instructions here

data/changelog.md

@@ -1,3 +1,11 @@
+2.0.0 01/03/2017
+==========================================================
+
+fix association reload
+drop ruby <2 support
+fix net-ssh usage
+add mime-type dependency
+
 1.45.0 08/01/2017
 ==========================================================
 

data/fog-core.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0.0'
+
   spec.add_dependency("builder")
+  spec.add_dependency("mime-types")
   spec.add_dependency("excon", "~> 0.58")
   spec.add_dependency("formatador", "~> 0.2")
 
@@ -31,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("minitest-stub-const")
   spec.add_development_dependency("pry")
   spec.add_development_dependency("rake")
-  spec.add_development_dependency("rubocop") if RUBY_VERSION.to_s >= "1.9.3"
+  spec.add_development_dependency("rubocop")
   spec.add_development_dependency("thor")
   spec.add_development_dependency("yard")
 end

data/lib/fog/core/model.rb

@@ -44,17 +44,13 @@ module Fog
     def reload
       requires :identity
 
-      data = begin
-        collection.get(identity)
-      rescue Excon::Errors::SocketError
-        nil
-      end
+      object = collection.get(identity)
 
-      return unless data
+      merge_attributes(object.all_associations_and_attributes)
 
-      new_attributes = data.attributes
-      merge_attributes(new_attributes)
       self
+    rescue Excon::Errors::SocketError
+      nil
     end
 
     def to_json(_options = {})

data/lib/fog/core/scp.rb

@@ -64,7 +64,7 @@ module Fog
 
         @address  = address
         @username = username
-        @options  = { :paranoid => false }.merge(options)
+        @options  = { :paranoid => false, :verify_host_key => false }.merge(options)
       end
 
       def upload(local_path, remote_path, upload_options = {}, &block)

data/lib/fog/core/services_mixin.rb

@@ -36,13 +36,8 @@ module Fog
       Fog.const_get(provider_name).const_get(*const_get_args(service_name))
     end
 
-    # Ruby 1.8 does not support the second 'inherit' argument to #const_get
     def const_get_args(*args)
-      if RUBY_VERSION < '1.9'
-        args
-      else
-        args + [false]
-      end
+      args + [false]
     end
 
     def service_name

data/lib/fog/core/ssh.rb

@@ -58,7 +58,7 @@ module Fog
 
         @address  = address
         @username = username
-        @options  = { :paranoid => false }.merge(options)
+        @options  = { :paranoid => false, :verify_host_key => false }.merge(options)
       end
 
       def run(commands, &blk)

data/lib/fog/core/version.rb

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

data/lib/fog/storage.rb

@@ -1,20 +1,15 @@
+begin
+  # Use mime/types/columnar if available, for reduced memory usage
+  require 'mime/types/columnar'
+rescue LoadError
+  require 'mime/types'
+end
+
 module Fog
   module Storage
     extend Fog::ServicesMixin
 
     def self.new(orig_attributes)
-      begin
-        # Use mime/types/columnar if available, for reduced memory usage
-        require 'mime/types/columnar'
-      rescue LoadError
-        begin
-          require 'mime/types'
-        rescue LoadError
-          Fog::Logger.warning("'mime-types' missing, please install and try again.")
-          raise
-        end
-      end
-
       attributes = orig_attributes.dup # prevent delete from having side effects
       case attributes.delete(:provider).to_s.downcase.to_sym
       when :internetarchive

data/lib/fog/test_helpers/collection_helper.rb

@@ -33,12 +33,6 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       methods = %w(all? any? find detect collect map find_index flat_map
                    collect_concat group_by none? one?)
 
-      # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
-      # https://github.com/jruby/jruby/issues/1265
-      if RUBY_PLATFORM == "java" && JRUBY_VERSION =~ /1\.7\.[5-8]/
-        methods.delete("all?")
-      end
-
       methods.each do |enum_method|
         next unless collection.respond_to?(enum_method)
         tests("##{enum_method}").succeeds do

data/spec/storage_spec.rb

@@ -96,15 +96,10 @@ describe "Fog::Storage" do
 
   describe ".get_body_size" do
     it "doesn't alter the encoding of the string passed to it" do
-      # Ruby 1.8 doesn't support string encodings, so we can't test that
-      if RUBY_VERSION >= "1.9.3"
-        body = "foo".encode("UTF-8")
-        Fog::Storage.get_body_size(body)
+      body = "foo".encode("UTF-8")
+      Fog::Storage.get_body_size(body)
 
-        assert_equal("UTF-8", body.encoding.to_s)
-      else
-        skip
-      end
+      assert_equal("UTF-8", body.encoding.to_s)
     end
 
     it "respects frozen strings" do
@@ -116,4 +111,4 @@ describe "Fog::Storage" do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -193,8 +207,6 @@ files:
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
-- Gemfile.1.8.7
-- Gemfile.1.9.3
 - LICENSE.md
 - README.md
 - Rakefile
@@ -315,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -323,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.

data/Gemfile.1.8.7

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rake', '~> 10.1.1'

data/Gemfile.1.9.3

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