Merge pull request #14 from alindeman/matsubo-test-latest-ruby

Updates for latest Ruby versions, removes support for EOLed Ruby versions

.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - jruby-19mode
   - rbx-2

Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in zonebie.gemspec
 gemspec
 
-if RUBY_VERSION <= '1.9.2'
-  gem 'activesupport', '>=2.3', '<4.1'
-end
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

README.md

@@ -11,16 +11,16 @@ debug (more information below).
 
 ## Requirements
 
-* MRI (1.8.7, 1.9.2, 1.9.3, 2.0.0)
-* JRuby (1.6, 1.7)
-* Rubinius (1.2, 2.0)
+* MRI (2.0.x, 2.1.x, 2.2.x, 2.3.x)
+* JRuby (1.7)
+* Rubinius (2.0)
 
 ***
 
 And **either** of these gems which adds timezone support to Ruby:
 
-* `activesupport` >= 2.3 (Rails 2.3, 3.0, 3.1, 3.2, 4.0, 4.1)
-* `tzinfo` >= 0.3
+* `activesupport` >= 3.0 (Rails 3.0, 3.1, 3.2, 4.0, 4.1, 4.2)
+* `tzinfo` >= 1.2
 
 ## Installation
 

lib/zonebie.rb

@@ -1,31 +1,33 @@
-require File.expand_path("zonebie/version", File.dirname(__FILE__))
+require File.expand_path('zonebie/version', File.dirname(__FILE__))
 
 module Zonebie
   class << self
     attr_accessor :quiet
 
     def backend
       unless @backend
-        @backend = if @backends[:activesupport].usable?
-                     @backends[:activesupport]
-                   else
-                     @backends.values.detect(&:usable?)
-                   end
+        @backend = \
+          if @backends[:activesupport].usable?
+            @backends[:activesupport]
+          else
+            @backends.values.detect(&:usable?)
+          end
       end
 
       @backend
     end
 
     def backend=(backend)
-      case backend
-      when Symbol
-        @backend = @backends[backend]
-      else
-        @backend = backend
-      end
+      @backend = \
+        case backend
+        when Symbol
+          @backends[backend]
+        else
+          backend
+        end
 
       if !backend.nil? && @backend.nil?
-        raise ArgumentError, "Unsupported backend: #{backend}"
+        fail ArgumentError, "Unsupported backend: #{backend}"
       end
 
       @backend
@@ -37,17 +39,12 @@ def add_backend(backend)
     end
 
     def set_random_timezone
-      zone = ENV['ZONEBIE_TZ'] || random_timezone
+      zone = ENV['ZONEBIE_TZ'] || backend.zones.sample
 
       $stdout.puts("[Zonebie] Setting timezone: ZONEBIE_TZ=\"#{zone}\"") unless quiet
       backend.zone = zone
     end
-
-    def random_timezone
-      zones = backend.zones
-      zones[rand(zones.length)]
-    end
   end
 end
 
-require File.expand_path("zonebie/backends", File.dirname(__FILE__))
+require File.expand_path('zonebie/backends', File.dirname(__FILE__))

lib/zonebie/backends.rb

@@ -1,2 +1,2 @@
-require File.expand_path("backends/active_support", File.dirname(__FILE__))
-require File.expand_path("backends/tzinfo", File.dirname(__FILE__))
+require File.expand_path('backends/active_support', File.dirname(__FILE__))
+require File.expand_path('backends/tzinfo', File.dirname(__FILE__))

lib/zonebie/rspec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../zonebie", File.dirname(__FILE__))
+require File.expand_path('../zonebie', File.dirname(__FILE__))
 
 RSpec.configure do |c|
   c.before(:suite) do

lib/zonebie/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Zonebie
-  VERSION = "0.5.1"
+  VERSION = '0.5.1'.freeze
 end

spec/integrations/activesupport_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "active_support/time"
 
 describe Zonebie do
   before do

spec/lib/zonebie/backends/active_support_spec.rb

@@ -3,19 +3,18 @@
 describe Zonebie::Backends::ActiveSupport do
   describe "#name" do
     it "is :activesupport" do
-      described_class.name.should == :activesupport
+      expect(described_class.name).to eq :activesupport
     end
   end
 
   describe "#zones" do
     it "returns a list of zones provided by ActiveSupport" do
-      ::ActiveSupport::TimeZone.stubs(:all).
-        returns([
-          stub(:name => "Eastern Time (US & Canada)"),
-          stub(:name => "Central Time (US & Canada)")
-        ])
+      ::ActiveSupport::TimeZone.stubs(:all).returns([
+        stub(:name => "Eastern Time (US & Canada)"),
+        stub(:name => "Central Time (US & Canada)")
+      ])
 
-      described_class.zones.should =~ ["Eastern Time (US & Canada)", "Central Time (US & Canada)"]
+      expect(described_class.zones).to eq ["Eastern Time (US & Canada)", "Central Time (US & Canada)"]
     end
   end
 
@@ -29,14 +28,14 @@
 
   describe "usable?" do
     it "returns true if ActiveSupport is available" do
-      described_class.should be_usable
+      expect(described_class).to be_usable
     end
 
     it "returns false if ActiveSupport is unavailable" do
       old_active_support = ActiveSupport
       Object.send(:remove_const, :ActiveSupport)
       begin
-        described_class.should_not be_usable
+        expect(described_class).not_to be_usable
       ensure
         ActiveSupport = old_active_support
       end

spec/lib/zonebie/backends/tzinfo_spec.rb

@@ -3,19 +3,18 @@
 describe Zonebie::Backends::TZInfo do
   describe "#name" do
     it "is :tzinfo" do
-      described_class.name.should == :tzinfo
+      expect(described_class.name).to eq :tzinfo
     end
   end
 
   describe "#zones" do
     it "returns a list of zones provided by TZInfo" do
-      ::TZInfo::Timezone.stubs(:all).
-        returns([
-          stub(:identifier => "America/Chicago"),
-          stub(:identifier => "America/New York")
-        ])
+      ::TZInfo::Timezone.stubs(:all).returns([
+        stub(:identifier => "America/Chicago"),
+        stub(:identifier => "America/New York")
+      ])
 
-      described_class.zones.should =~ ["America/Chicago", "America/New York"]
+      expect(described_class.zones).to eq ["America/Chicago", "America/New York"]
     end
   end
 
@@ -28,14 +27,14 @@
 
   describe "usable?" do
     it "returns true if TZInfo is available" do
-      described_class.should be_usable
+      expect(described_class).to be_usable
     end
 
     it "returns false if TZInfo is unavailable" do
       old_tz_info = TZInfo
       Object.send(:remove_const, :TZInfo)
       begin
-        described_class.should_not be_usable
+        expect(described_class).not_to be_usable
       ensure
         TZInfo = old_tz_info
       end

spec/lib/zonebie_spec.rb

@@ -3,18 +3,18 @@
 describe Zonebie do
   describe "#backend" do
     it "defaults to the activesupport backend in the presence of activesupport" do
-      Zonebie.backend.name.should == :activesupport
+      expect(Zonebie.backend.name).to eq :activesupport
     end
 
     it "allows setting the backend to tzinfo" do
       Zonebie.backend = :tzinfo
-      Zonebie.backend.name.should == :tzinfo
+      expect(Zonebie.backend.name).to eq :tzinfo
     end
 
     it "defaults to tzinfo in the absense of activesupport" do
       Zonebie::Backends::ActiveSupport.stubs(:usable?).returns(false)
 
-      Zonebie.backend.name.should == :tzinfo
+      expect(Zonebie.backend.name).to eq :tzinfo
     end
 
     it "does not allow setting the backend to an unsupported value" do
@@ -90,8 +90,5 @@
       Zonebie.backend = :my_awesome_backend
     end
 
-    it "returns a random timezone" do
-      Zonebie.random_timezone.should == "Eastern Time (US & Canada)"
-    end
   end
 end

zonebie.gemspec

@@ -1,26 +1,30 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/zonebie/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'zonebie/version'
 
 Gem::Specification.new do |gem|
+  gem.name          = "zonebie"
+  gem.version       = Zonebie::VERSION
   gem.authors       = ['Andy Lindeman', 'Steven Harman', 'Patrick Van Stee']
   gem.email         = ['andy@andylindeman.com', 'steveharman@gmail.com', 'patrickvanstee@gmail.com']
   gem.description   = %q{Runs your tests in a random timezone}
   gem.summary       = %q{Zonebie prevents bugs in code that deals with timezones by randomly assigning a zone on every run}
   gem.homepage      = "https://github.com/alindeman/zonebie"
   gem.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "zonebie"
+  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|gem|features)/}) }
+  gem.bindir        = "exe"
+  gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.require_paths = ["lib"]
-  gem.version       = Zonebie::VERSION
+
+  gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~>2.14"
-  gem.add_development_dependency "mocha", "~>0.14.0"
+  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency "mocha", "~> 0.14.0"
 
-  gem.add_development_dependency "activesupport", ">=2.3"
-  gem.add_development_dependency "tzinfo", "~>1.0", ">= 1.0.1"
-  gem.add_development_dependency "tzinfo-data", ">= 1.2013.4"
+  gem.add_development_dependency "activesupport", "~> 3.0"
+  gem.add_development_dependency "tzinfo", "~> 1.2", ">= 1.2.2"
+  gem.add_development_dependency "tzinfo-data", ">= 1.2016.1"
 end