fog-core 1.32.1 → 1.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afdce5d9207a895da4a113cf11456fe1118083df
-  data.tar.gz: 830b638596caa985de0903912f4dc00690582bae
+  metadata.gz: 7d605204f5bd63a3aa0464c11805b8fe50bbbb37
+  data.tar.gz: b4ede19d6cdea2dc37e5ab35bc06a3e2929d0f91
 SHA512:
-  metadata.gz: 08105b0a526766ba9fe9808bd4c84c9aa4119998ab1136ff6f5e0fc8b46b49e01121610547f472c1decc268c8ac2f5d8d1553376e1ca9b56229539fbe154b2b3
-  data.tar.gz: 7ad4e9e0c2f031ed72b00e899d5b18a2e07ee5fc15bae1824c09cd38d88d9b701876b738aac6464f1dbdbe44695d24adf589e64097779b6c5cfe718fba68d573
+  metadata.gz: d96a35c48dcd91b5c3281d8456896e7877974d15118bb5998fd192fec9a5498e6df3c169dbca503f106030ba5c01c71135f1fcddda2fc205e1579c9210f87fef
+  data.tar.gz: 431f8b1309f00ec1580197aebabbf14554730602d11c060b300af5f26757c3417c8d47c102d5d53cede28c6152462269d51e98c84c5f5a40b3e46d51a24b0632

data/.travis.yml

@@ -2,15 +2,11 @@ language: ruby
 
 gemfile:
   - Gemfile
-  - Gemfile.1.8.7
 
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
-  - jruby-18mode
-  - jruby-19mode
+  - 2.2.0
+  - jruby9k
   - jruby-head
 
 sudo: false
@@ -22,26 +18,9 @@ matrix:
     - rvm: 2.1.0
       gemfile: Gemfile
       env: COVERAGE=true
-  exclude:
-    - rvm: 1.8.7
-      gemfile: Gemfile
-    - rvm: 1.9.2
-      gemfile: Gemfile.1.8.7
-    - rvm: 1.9.3
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.0.0
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.1.0
-      gemfile: Gemfile.1.8.7
-    - rvm: jruby-18mode
-      gemfile: Gemfile
-    - rvm: jruby-19mode
-      gemfile: Gemfile.1.8.7
-    - rvm: jruby-head
-      gemfile: Gemfile.1.8.7
-
   allow_failures:
     - rvm: jruby-head
+    - rvm: jruby9k
 
 notifications:
   email: false

data/CONTRIBUTORS.md

@@ -1,6 +1,9 @@
 * Aaron Patterson <aaron.patterson@gmail.com>
 * Akira Matsuda <ronnie@dio.jp>
 * Anatol <anatol.pomozov@gmail.com>
+* Artem <temikus@google.com>
+* Artem Yakimenko <temikus@google.com>
+* Brandon Dunne <bdunne@redhat.com>
 * Bryan Paxton <starbelly@pobox.com>
 * Chris Johnson <wchrisjohnson@gmail.com>
 * Chris Sinjakli <chris@sinjakli.co.uk>

data/README.md

@@ -4,6 +4,13 @@ Shared classes and tests for fog providers and services.
 
 [![Build Status](https://secure.travis-ci.org/fog/fog-core.png?branch=master)](http://travis-ci.org/fog/fog-core)
 
+## Ruby version
+
+Fog-core requires Ruby `2.0.0` or later.
+
+Ruby `1.8` and `1.9` support was dropped in `fog-v2.0.0` as a backwards incompatible
+change. Please use the later fog `1.x` versions if you require `1.8.7` or `1.9.x` support.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/fog-core.gemspec

@@ -17,13 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 1.9'
 
   spec.add_dependency("builder")
   spec.add_dependency("excon", "~> 0.45")
   spec.add_dependency("formatador", "~> 0.2")
   spec.add_dependency("mime-types")
-  spec.add_dependency("net-scp", "~> 1.1")
-  spec.add_dependency("net-ssh", ">= 2.1.3")
 
   spec.add_development_dependency("coveralls")
   spec.add_development_dependency("minitest")

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

@@ -65,7 +65,6 @@ module Fog
       end
 
       def scp(local_path, remote_path, upload_options = {})
-        require "net/scp"
         requires :ssh_ip_address, :username
 
         Fog::SCP.new(ssh_ip_address, username, ssh_options).upload(local_path, remote_path, upload_options)
@@ -74,14 +73,12 @@ module Fog
       alias_method :scp_upload, :scp
 
       def scp_download(remote_path, local_path, download_options = {})
-        require "net/scp"
         requires :ssh_ip_address, :username
 
         Fog::SCP.new(ssh_ip_address, username, ssh_options).download(remote_path, local_path, download_options)
       end
 
       def ssh(commands, options = {}, &blk)
-        require "net/ssh"
         requires :ssh_ip_address, :username
 
         options = ssh_options.merge(options)

data/lib/fog/core/scp.rb

@@ -40,7 +40,12 @@ module Fog
 
     class Real
       def initialize(address, username, options)
-        require "net/scp"
+        begin
+          require "net/scp"
+        rescue LoadError
+          Fog::Logger.warning("'net/ssh' missing, please install and try again.")
+          exit(1)
+        end
 
         key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
 

data/lib/fog/core/ssh.rb

@@ -34,7 +34,12 @@ module Fog
 
     class Real
       def initialize(address, username, options)
-        require "net/ssh"
+        begin
+          require "net/ssh"
+        rescue LoadError
+          Fog::Logger.warning("'net/ssh' missing, please install and try again.")
+          exit(1)
+        end
 
         key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
 

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.32.1"
+    VERSION = "1.33.0"
   end
 end

data/lib/fog/test_helpers/collection_helper.rb

@@ -30,7 +30,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
     tests("Enumerable") do
       pending if Fog.mocking? && !mocks_implemented
 
-      methods = %w(all any? find detect collect map find_index flat_map
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.32.1
+  version: 1.33.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -67,34 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +193,6 @@ files:
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
-- Gemfile.1.8.7
 - LICENSE.md
 - README.md
 - Rakefile
@@ -334,7 +305,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -342,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.

data/Gemfile.1.8.7

@@ -1,13 +0,0 @@
-source "https://rubygems.org"
-
-gem 'nokogiri', '~>1.5.11'
-gem 'mime-types', '~>1.16'
-gem 'rest-client', '~> 1.6.7'
-
-group :development, :test do
-  gem 'rake', '~> 10.1.0'
-  # This is here because gemspec doesn't support require: false
-  gem 'coveralls', :require => false
-end
-
-gemspec