fog-core 1.24.0 → 1.25.0

data/lib/fog/test_helpers/model_helper.rb

@@ -1,7 +1,5 @@
 def model_tests(collection, params = {}, mocks_implemented = true)
-
-  tests('success') do
-
+  tests("success") do
     @instance = collection.new(params)
 
     tests("#save").succeeds do
@@ -9,27 +7,21 @@ def model_tests(collection, params = {}, mocks_implemented = true)
       @instance.save
     end
 
-    if block_given?
-      yield
-    end
+    yield if block_given?
 
     tests("#destroy").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       @instance.destroy
     end
-
   end
-
 end
 
 # Generates a unique identifier with a random differentiator.
-# Useful when rapidly re-running tests, so we don't have to wait
+# Useful when rapidly re-running tests, so we don"t have to wait
 # serveral minutes for deleted objects to disappear from the API
-# E.g. 'fog-test-1234'
-def uniq_id(base_name = 'fog-test')
+# E.g. "fog-test-1234"
+def uniq_id(base_name = "fog-test")
   # random_differentiator
-  suffix = rand(65536).to_s(16).rjust(4, '0')
-  [base_name, suffix] * '-'
+  suffix = rand(65_536).to_s(16).rjust(4, "0")
+  [base_name, suffix].join("-")
 end
-
-

data/lib/fog/test_helpers/responds_to_helper.rb

@@ -1,13 +1,11 @@
 module Shindo
   class Tests
-
     def responds_to(method_names)
-      for method_name in [*method_names]
+      method_names.each do |method_name|
         tests("#respond_to?(:#{method_name})").returns(true) do
           @instance.respond_to?(method_name)
         end
       end
     end
-
   end
 end

data/lib/fog/test_helpers/succeeds_helper.rb

@@ -1,11 +1,9 @@
 module Shindo
   class Tests
-
     def succeeds
-      test('succeeds') do
+      test("succeeds") do
         !!instance_eval(&Proc.new)
       end
     end
-
   end
 end

data/lib/fog/volume.rb

@@ -1,25 +1,22 @@
 module Fog
   module Volume
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
-      if self.providers.include?(provider)
+      if providers.include?(provider)
         require "fog/#{provider}/volume"
         return Fog::Volume.const_get(Fog.providers[provider]).new(attributes)
       end
 
-      raise ArgumentError.new("#{provider} has no identity service")
+      raise ArgumentError, "#{provider} has no identity service"
     end
 
     def self.providers
       Fog.services[:volume]
     end
-
   end
 end
-

data/lib/fog/vpn.rb

@@ -1,8 +1,7 @@
 module Fog
   module VPN
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
@@ -10,16 +9,15 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require 'fog/storm_on_demand/vpn'
+        require "fog/storm_on_demand/vpn"
         Fog::VPN::StormOnDemand.new(attributes)
       else
-        raise ArgumentError.new("#{provider} has no vpn service")
+        raise ArgumentError, "#{provider} has no vpn service"
       end
     end
 
     def self.providers
       Fog.services[:vpn]
     end
-
   end
 end

data/lib/tasks/test_task.rb

@@ -4,7 +4,6 @@ require "rake/tasklib"
 module Fog
   module Rake
     class TestTask < ::Rake::TaskLib
-
       def initialize
         desc "Run the mocked tests"
         task :test do
@@ -33,14 +32,11 @@ module Fog
             }
           end
         end
-        threads.each do |thread|
-          thread.join
-        end
-        Formatador.display_table(Thread.main[:results].sort {|x,y| x[:provider] <=> y[:provider]})
+        threads.each(&:join)
+        Formatador.display_table(Thread.main[:results].sort { |x, y| x[:provider] <=> y[:provider] })
         Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
         Formatador.display_line
       end
-
     end
   end
 end

data/spec/compute_spec.rb

@@ -1,9 +1,8 @@
-require 'spec_helper'
-
+require "spec_helper"
 
 module Fog
   module Compute
-    def self.require(*args); end
+    def self.require(*_args); end
   end
 end
 
@@ -12,14 +11,14 @@ describe "Fog::Compute" do
     module Fog
       module TheRightWay
         extend Provider
-        service(:compute, 'Compute')
+        service(:compute, "Compute")
       end
     end
 
     module Fog
       module Compute
         class TheRightWay
-          def initialize(args); end
+          def initialize(_args); end
         end
       end
     end
@@ -29,18 +28,17 @@ describe "Fog::Compute" do
       assert_instance_of(Fog::Compute::TheRightWay, compute)
     end
 
-
     module Fog
       module TheWrongWay
         extend Provider
-        service(:compute, 'Compute')
+        service(:compute, "Compute")
       end
     end
 
     module Fog
       module TheWrongWay
         class Compute
-          def initialize(args); end
+          def initialize(_args); end
         end
       end
     end
@@ -53,14 +51,14 @@ describe "Fog::Compute" do
     module Fog
       module BothWays
         extend Provider
-        service(:compute, 'Compute')
+        service(:compute, "Compute")
       end
     end
 
     module Fog
       module BothWays
         class Compute
-          def initialize(args); end
+          def initialize(_args); end
         end
       end
     end
@@ -82,16 +80,16 @@ describe "Fog::Compute" do
         assert_instance_of(Fog::Compute::BothWays, compute)
       end
     end
-    
+
     it "passes the supplied keyword args less :provider to Fog::Compute::<Provider>#new" do
       compute = Fog::Compute.new(:provider => :bothways, :extra => :stuff)
-      assert_equal({:extra => :stuff}, compute.args)
+      assert_equal({ :extra => :stuff }, compute.args)
     end
 
     it "raises ArgumentError when given a :provider where a Fog::Compute::Provider that does not exist" do
       assert_raises(ArgumentError) do
         Fog::Compute.new(:provider => :wat)
       end
-    end    
+    end
   end
 end

data/spec/connection_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe Fog::Core::Connection do 
+describe Fog::Core::Connection do
   it "raises ArgumentError when no arguments given" do
     assert_raises(ArgumentError) do
       Fog::Core::Connection.new
@@ -14,10 +14,20 @@ describe Fog::Core::Connection do
     end
   end
 
-  it "writes the Fog::VERSION to the User-Agent header" do
+  it "writes the Fog::Core::VERSION to the User-Agent header" do
     connection = Fog::Core::Connection.new("http://example.com")
-    assert_equal "fog/#{Fog::VERSION}", 
-      connection.instance_variable_get(:@excon).data[:headers]["User-Agent"]
+    assert_equal "fog-core/#{Fog::Core::VERSION}",
+                 connection.instance_variable_get(:@excon).data[:headers]["User-Agent"]
+  end
+
+  describe "when Fog is installed" do
+    it "writes the Fog::VERSION to the User-Agent header" do
+      Fog::VERSION = 'Version'
+      connection = Fog::Core::Connection.new("http://example.com")
+      assert_equal "fog/Version fog-core/#{Fog::Core::VERSION}",
+                   connection.instance_variable_get(:@excon).data[:headers]["User-Agent"]
+      Fog.send(:remove_const, :VERSION)
+    end
   end
 
   it "doesn't error when persistence is enabled" do
@@ -34,9 +44,9 @@ describe Fog::Core::Connection do
   describe ":path_prefix" do
     it "does not emit a warning when provided this argument in the initializer" do
       $stderr = StringIO.new
-      
+
       Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
-      
+
       assert_empty($stderr.string)
     end
 
@@ -61,24 +71,24 @@ describe Fog::Core::Connection do
         end
 
         Object.stub_const("Excon", spy) do
-          c = Fog::Core::Connection.new("http://example.com", false, :path => "bar")
+          Fog::Core::Connection.new("http://example.com", false, :path => "bar")
           assert_equal("bar", spy.params[:path])
         end
       end
     end
 
     describe "with path_prefix supplied to the initializer" do
-      let(:spy) {
-        Object.new.tap { |spy|
+      let(:spy) do
+        Object.new.tap do |spy|
           spy.instance_eval do
-            def new(*args); self; end
+            def new(*_args); self; end
             def params; @params; end
             def request(params)
               @params = params
             end
           end
-        }
-      }
+        end
+      end
 
       it "uses the initializer-supplied :path_prefix arg with #request :arg to formulate a path to send to Excon.request" do
         Object.stub_const("Excon", spy) do
@@ -87,7 +97,7 @@ describe Fog::Core::Connection do
           assert_equal("foo/bar", spy.params[:path])
         end
       end
-      
+
       it "does not introduce consecutive '/'s into the path if 'path' starts with a '/'" do
         Object.stub_const("Excon", spy) do
           c = Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")

data/spec/credentials_spec.rb

@@ -1,19 +1,19 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "credentials" do
   before do
-    @old_home = ENV['HOME']
-    @old_rc   = ENV['FOG_RC']
-    @old_credential = ENV['FOG_CREDENTIAL']
+    @old_home = ENV["HOME"]
+    @old_rc   = ENV["FOG_RC"]
+    @old_credential = ENV["FOG_CREDENTIAL"]
     @old_credentials = Fog.credentials
-    Fog.instance_variable_set('@credential_path', nil) # kill memoization
-    Fog.instance_variable_set('@credential', nil) # kill memoization
+    Fog.instance_variable_set("@credential_path", nil) # kill memoization
+    Fog.instance_variable_set("@credential", nil) # kill memoization
   end
 
   after do
-    ENV['HOME'] = @old_home
-    ENV['FOG_RC'] = @old_rc
-    ENV['FOG_CREDENTIAL'] = @old_credential
+    ENV["HOME"] = @old_home
+    ENV["FOG_RC"] = @old_rc
+    ENV["FOG_CREDENTIAL"] = @old_credential
     Fog.credentials = @old_credentials
   end
 
@@ -35,33 +35,33 @@ describe "credentials" do
 
   describe "credentials_path"  do
     it "has FOG_RC takes precedence over HOME" do
-      ENV['HOME'] = '/home/path'
-      ENV['FOG_RC'] = '/rc/path'
+      ENV["HOME"] = "/home/path"
+      ENV["FOG_RC"] = "/rc/path"
 
-      assert_equal '/rc/path', Fog.credentials_path
+      assert_equal "/rc/path", Fog.credentials_path
     end
 
     it "properly expands paths" do
-      ENV['FOG_RC'] = '/expanded/subdirectory/../path'
-      assert_equal '/expanded/path', Fog.credentials_path
+      ENV["FOG_RC"] = "/expanded/subdirectory/../path"
+      assert_equal "/expanded/path", Fog.credentials_path
     end
 
     it "falls back to home path if FOG_RC not set" do
-      ENV.delete('FOG_RC')
-      assert_equal File.join(ENV['HOME'], '.fog'), Fog.credentials_path
+      ENV.delete("FOG_RC")
+      assert_equal File.join(ENV["HOME"], ".fog"), Fog.credentials_path
     end
 
     it "ignores home path if it does not exist" do
-      ENV.delete('FOG_RC')
-      ENV['HOME'] = '/no/such/path'
+      ENV.delete("FOG_RC")
+      ENV["HOME"] = "/no/such/path"
       assert_nil Fog.credentials_path
     end
 
     it "File.expand_path raises because of non-absolute path" do
-      ENV.delete('FOG_RC')
-      ENV['HOME'] = '.'
+      ENV.delete("FOG_RC")
+      ENV["HOME"] = "."
 
-      if RUBY_PLATFORM == 'java'
+      if RUBY_PLATFORM == "java"
         Fog::Logger.warning("Stubbing out non-absolute path credentials test due to JRuby bug: https://github.com/jruby/jruby/issues/1163")
       else
         assert_nil Fog.credentials_path
@@ -69,8 +69,8 @@ describe "credentials" do
     end
 
     it "returns nil when neither FOG_RC or HOME are set" do
-      ENV.delete('HOME')
-      ENV.delete('FOG_RC')
+      ENV.delete("HOME")
+      ENV.delete("FOG_RC")
       assert_nil Fog.credentials_path
     end
   end

data/spec/current_machine_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Fog::CurrentMachine do
   before do
@@ -19,16 +19,16 @@ describe Fog::CurrentMachine do
 
   describe "ip_address" do
     it "should be thread safe" do
-      Excon.stub({:method => :get, :path => "/"}, {:body => ""})
+      Excon.stub({ :method => :get, :path => "/" }, { :body => "" })
 
-      (1..10).map {
+      (1..10).map do
         Thread.new { Fog::CurrentMachine.ip_address }
-      }.each{ |t| t.join }
+      end.each(&:join)
     end
 
     it "should remove trailing endline characters" do
-      Excon.stub({:method => :get,  :path => "/"}, {:body => "192.168.0.1\n"})
+      Excon.stub({ :method => :get, :path => "/" }, { :body => "192.168.0.1\n" })
       assert_equal "192.168.0.1", Fog::CurrentMachine.ip_address
     end
-  end  
+  end
 end

data/spec/fake_app/fake_service.rb

@@ -0,0 +1,18 @@
+class FakeService < Fog::Service
+  class Real
+    def initialize(_options)
+    end
+  end
+
+  class Mock
+    def initialize(_options)
+    end
+  end
+
+  model_path File.join(File.dirname(__FILE__), "models")
+  model :model
+  collection :collection
+
+  request_path File.join(File.dirname(__FILE__), "requests")
+  request :request
+end