From 6f1bb10ed47de8c6820a9f0803dd51813d344bb9 Mon Sep 17 00:00:00 2001 From: Josef Stribny Date: Mon, 25 Aug 2014 08:48:30 +0200 Subject: [PATCH] Update to 1.2.2 --- .gitignore | 1 + rubygem-tzinfo-minitest5.patch | 473 --------------------------------- rubygem-tzinfo.spec | 11 +- sources | 2 +- 4 files changed, 7 insertions(+), 480 deletions(-) delete mode 100644 rubygem-tzinfo-minitest5.patch diff --git a/.gitignore b/.gitignore index 12ce6be..3341fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /rubygem-tzinfo-0.3.37-1.fc20.src.rpm /tzinfo-0.3.37.gem /tzinfo-1.1.0.gem +/tzinfo-1.2.2.gem diff --git a/rubygem-tzinfo-minitest5.patch b/rubygem-tzinfo-minitest5.patch deleted file mode 100644 index 7481f95..0000000 --- a/rubygem-tzinfo-minitest5.patch +++ /dev/null @@ -1,473 +0,0 @@ -diff --git a/test/tc_country.rb b/test/tc_country.rb -index 0b6dc5b..eace943 100644 ---- a/test/tc_country.rb -+++ b/test/tc_country.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCCountry < Test::Unit::TestCase -+class TCCountry < Minitest::Test - def setup - @orig_data_source = DataSource.get - Country.send :init_countries -diff --git a/test/tc_country_index_definition.rb b/test/tc_country_index_definition.rb -index bedf843..8dbcbc8 100644 ---- a/test/tc_country_index_definition.rb -+++ b/test/tc_country_index_definition.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCCountryIndexDefinition < Test::Unit::TestCase -+class TCCountryIndexDefinition < Minitest::Test - - module CountriesTest1 - include CountryIndexDefinition -diff --git a/test/tc_country_info.rb b/test/tc_country_info.rb -index a954c8f..af948e8 100644 ---- a/test/tc_country_info.rb -+++ b/test/tc_country_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCCountryInfo < Test::Unit::TestCase -+class TCCountryInfo < Minitest::Test - - def test_code - ci = CountryInfo.new('ZZ', 'Zzz') {|c| } -diff --git a/test/tc_country_timezone.rb b/test/tc_country_timezone.rb -index 5a48ede..8d0cabc 100644 ---- a/test/tc_country_timezone.rb -+++ b/test/tc_country_timezone.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCCountryTimezone < Test::Unit::TestCase -+class TCCountryTimezone < Minitest::Test - def test_identifier - ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16) - assert_equal('Europe/London', ct.identifier) -diff --git a/test/tc_data_source.rb b/test/tc_data_source.rb -index 511ba31..7e43597 100644 ---- a/test/tc_data_source.rb -+++ b/test/tc_data_source.rb -@@ -25,7 +25,7 @@ require 'tmpdir' - - include TZInfo - --class TCDataSource < Test::Unit::TestCase -+class TCDataSource < Minitest::Test - class InitDataSource < DataSource - end - -diff --git a/test/tc_data_timezone.rb b/test/tc_data_timezone.rb -index e4d71b7..a248212 100644 ---- a/test/tc_data_timezone.rb -+++ b/test/tc_data_timezone.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCDataTimezone < Test::Unit::TestCase -+class TCDataTimezone < Minitest::Test - - class TestTimezoneInfo < TimezoneInfo - attr_reader :utc -diff --git a/test/tc_data_timezone_info.rb b/test/tc_data_timezone_info.rb -index aac5e48..a5afce1 100644 ---- a/test/tc_data_timezone_info.rb -+++ b/test/tc_data_timezone_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCDataTimezoneInfo < Test::Unit::TestCase -+class TCDataTimezoneInfo < Minitest::Test - - def test_identifier - ti = DataTimezoneInfo.new('Test/Zone') -diff --git a/test/tc_info_timezone.rb b/test/tc_info_timezone.rb -index deb5521..cc6070c 100644 ---- a/test/tc_info_timezone.rb -+++ b/test/tc_info_timezone.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCInfoTimezone < Test::Unit::TestCase -+class TCInfoTimezone < Minitest::Test - - class TestInfoTimezone < InfoTimezone - attr_reader :setup_info -diff --git a/test/tc_linked_timezone.rb b/test/tc_linked_timezone.rb -index 560e508..e33cd14 100644 ---- a/test/tc_linked_timezone.rb -+++ b/test/tc_linked_timezone.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCLinkedTimezone < Test::Unit::TestCase -+class TCLinkedTimezone < Minitest::Test - - class TestTimezone < Timezone - attr_reader :utc_period -diff --git a/test/tc_linked_timezone_info.rb b/test/tc_linked_timezone_info.rb -index fdc48b0..4222bd1 100644 ---- a/test/tc_linked_timezone_info.rb -+++ b/test/tc_linked_timezone_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCLinkedTimezoneInfo < Test::Unit::TestCase -+class TCLinkedTimezoneInfo < Minitest::Test - - def test_identifier - lti = LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked') -diff --git a/test/tc_offset_rationals.rb b/test/tc_offset_rationals.rb -index a787585..03d02d2 100644 ---- a/test/tc_offset_rationals.rb -+++ b/test/tc_offset_rationals.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCOffsetRationals < Test::Unit::TestCase -+class TCOffsetRationals < Minitest::Test - def test_rational_for_offset - [0,1,2,3,4,-1,-2,-3,-4,30*60,-30*60,61*60,-61*60,14*60*60,-14*60*60,20*60*60,-20*60*60].each {|seconds| - assert_equal(Rational(seconds, 86400), OffsetRationals.rational_for_offset(seconds)) -diff --git a/test/tc_ruby_core_support.rb b/test/tc_ruby_core_support.rb -index e59608f..158b49f 100644 ---- a/test/tc_ruby_core_support.rb -+++ b/test/tc_ruby_core_support.rb -@@ -26,7 +26,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCRubyCoreSupport < Test::Unit::TestCase -+class TCRubyCoreSupport < Minitest::Test - def test_rational_new! - assert_equal(Rational(3,4), RubyCoreSupport.rational_new!(3,4)) - end -diff --git a/test/tc_ruby_country_info.rb b/test/tc_ruby_country_info.rb -index 39ae029..c67e8d7 100644 ---- a/test/tc_ruby_country_info.rb -+++ b/test/tc_ruby_country_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCRubyCountryInfo < Test::Unit::TestCase -+class TCRubyCountryInfo < Minitest::Test - - def test_code - ci = RubyCountryInfo.new('ZZ', 'Zzz') {|c| } -diff --git a/test/tc_ruby_data_source.rb b/test/tc_ruby_data_source.rb -index 9104449..9fd9f04 100644 ---- a/test/tc_ruby_data_source.rb -+++ b/test/tc_ruby_data_source.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCRubyDataSource < Test::Unit::TestCase -+class TCRubyDataSource < Minitest::Test - def setup - @data_source = RubyDataSource.new - end -diff --git a/test/tc_time_or_datetime.rb b/test/tc_time_or_datetime.rb -index 4e21877..657b4ca 100644 ---- a/test/tc_time_or_datetime.rb -+++ b/test/tc_time_or_datetime.rb -@@ -25,7 +25,7 @@ require 'rational' - - include TZInfo - --class TCTimeOrDateTime < Test::Unit::TestCase -+class TCTimeOrDateTime < Minitest::Test - def test_initialize_time - assert_nothing_raised do - TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)) -diff --git a/test/tc_timezone.rb b/test/tc_timezone.rb -index 9a3725b..afb9457 100644 ---- a/test/tc_timezone.rb -+++ b/test/tc_timezone.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezone < Test::Unit::TestCase -+class TCTimezone < Minitest::Test - - class BlockCalled < StandardError - end -diff --git a/test/tc_timezone_definition.rb b/test/tc_timezone_definition.rb -index 8635940..ea1e125 100644 ---- a/test/tc_timezone_definition.rb -+++ b/test/tc_timezone_definition.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneDefinition < Test::Unit::TestCase -+class TCTimezoneDefinition < Minitest::Test - - module DataTest - include TimezoneDefinition -diff --git a/test/tc_timezone_index_definition.rb b/test/tc_timezone_index_definition.rb -index 446c0c9..fb21910 100644 ---- a/test/tc_timezone_index_definition.rb -+++ b/test/tc_timezone_index_definition.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneIndexDefinition < Test::Unit::TestCase -+class TCTimezoneIndexDefinition < Minitest::Test - - module TimezonesTest1 - include TimezoneIndexDefinition -diff --git a/test/tc_timezone_info.rb b/test/tc_timezone_info.rb -index 5f9262a..7102282 100644 ---- a/test/tc_timezone_info.rb -+++ b/test/tc_timezone_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneInfo < Test::Unit::TestCase -+class TCTimezoneInfo < Minitest::Test - - def test_identifier - ti = TimezoneInfo.new('Test/Zone') -diff --git a/test/tc_timezone_london.rb b/test/tc_timezone_london.rb -index 861446b..e3575b1 100644 ---- a/test/tc_timezone_london.rb -+++ b/test/tc_timezone_london.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneLondon < Test::Unit::TestCase -+class TCTimezoneLondon < Minitest::Test - def test_2004 - #Europe/London Sun Mar 28 00:59:59 2004 UTC = Sun Mar 28 00:59:59 2004 GMT isdst=0 gmtoff=0 - #Europe/London Sun Mar 28 01:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 BST isdst=1 gmtoff=3600 -diff --git a/test/tc_timezone_melbourne.rb b/test/tc_timezone_melbourne.rb -index 854666e..24e3ef2 100644 ---- a/test/tc_timezone_melbourne.rb -+++ b/test/tc_timezone_melbourne.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneMelbourne < Test::Unit::TestCase -+class TCTimezoneMelbourne < Minitest::Test - def test_2004 - #Australia/Melbourne Sat Mar 27 15:59:59 2004 UTC = Sun Mar 28 02:59:59 2004 EST isdst=1 gmtoff=39600 - #Australia/Melbourne Sat Mar 27 16:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 EST isdst=0 gmtoff=36000 -diff --git a/test/tc_timezone_new_york.rb b/test/tc_timezone_new_york.rb -index c341e3d..4258313 100644 ---- a/test/tc_timezone_new_york.rb -+++ b/test/tc_timezone_new_york.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneNewYork < Test::Unit::TestCase -+class TCTimezoneNewYork < Minitest::Test - def test_2004 - #America/New_York Sun Apr 4 06:59:59 2004 UTC = Sun Apr 4 01:59:59 2004 EST isdst=0 gmtoff=-18000 - #America/New_York Sun Apr 4 07:00:00 2004 UTC = Sun Apr 4 03:00:00 2004 EDT isdst=1 gmtoff=-14400 -diff --git a/test/tc_timezone_offset.rb b/test/tc_timezone_offset.rb -index d317c9a..6decf66 100644 ---- a/test/tc_timezone_offset.rb -+++ b/test/tc_timezone_offset.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneOffset < Test::Unit::TestCase -+class TCTimezoneOffset < Minitest::Test - - def test_utc_offset - o1 = TimezoneOffset.new(18000, 0, :TEST) -diff --git a/test/tc_timezone_period.rb b/test/tc_timezone_period.rb -index 77c21a9..c9d0caf 100644 ---- a/test/tc_timezone_period.rb -+++ b/test/tc_timezone_period.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezonePeriod < Test::Unit::TestCase -+class TCTimezonePeriod < Minitest::Test - - class TestTimezoneTransition < TimezoneTransition - def initialize(offset, previous_offset, at) -diff --git a/test/tc_timezone_proxy.rb b/test/tc_timezone_proxy.rb -index 34f02f8..6ad0491 100644 ---- a/test/tc_timezone_proxy.rb -+++ b/test/tc_timezone_proxy.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneProxy < Test::Unit::TestCase -+class TCTimezoneProxy < Minitest::Test - def test_not_exist - proxy = TimezoneProxy.new('Nothing/Special') - assert_equal('Nothing/Special', proxy.identifier) -diff --git a/test/tc_timezone_transition.rb b/test/tc_timezone_transition.rb -index 6ea510c..cfba48a 100644 ---- a/test/tc_timezone_transition.rb -+++ b/test/tc_timezone_transition.rb -@@ -25,7 +25,7 @@ require 'date' - - include TZInfo - --class TCTimezoneTransition < Test::Unit::TestCase -+class TCTimezoneTransition < Minitest::Test - - class TestTimezoneTransition < TimezoneTransition - def initialize(offset, previous_offset, at) -diff --git a/test/tc_timezone_transition_definition.rb b/test/tc_timezone_transition_definition.rb -index 5a1b006..7dcdd70 100644 ---- a/test/tc_timezone_transition_definition.rb -+++ b/test/tc_timezone_transition_definition.rb -@@ -25,7 +25,7 @@ require 'date' - - include TZInfo - --class TCTimezoneTransitionDefinition < Test::Unit::TestCase -+class TCTimezoneTransitionDefinition < Minitest::Test - def test_initialize_timestamp_only - assert_nothing_raised do - TimezoneTransitionDefinition.new(TimezoneOffset.new(3600, 3600, :TDT), -diff --git a/test/tc_timezone_utc.rb b/test/tc_timezone_utc.rb -index 2eff7a2..95b0fed 100644 ---- a/test/tc_timezone_utc.rb -+++ b/test/tc_timezone_utc.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTimezoneUTC < Test::Unit::TestCase -+class TCTimezoneUTC < Minitest::Test - def test_2004 - tz = Timezone.get('UTC') - -diff --git a/test/tc_transition_data_timezone_info.rb b/test/tc_transition_data_timezone_info.rb -index 168e434..2dcfc28 100644 ---- a/test/tc_transition_data_timezone_info.rb -+++ b/test/tc_transition_data_timezone_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCTransitionDataTimezoneInfo < Test::Unit::TestCase -+class TCTransitionDataTimezoneInfo < Minitest::Test - - def test_identifier - dti = TransitionDataTimezoneInfo.new('Test/Zone') -diff --git a/test/tc_zoneinfo_country_info.rb b/test/tc_zoneinfo_country_info.rb -index b00c8c0..176a488 100644 ---- a/test/tc_zoneinfo_country_info.rb -+++ b/test/tc_zoneinfo_country_info.rb -@@ -24,7 +24,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils') - - include TZInfo - --class TCZoneinfoCountryInfo < Test::Unit::TestCase -+class TCZoneinfoCountryInfo < Minitest::Test - - def test_code - ci = ZoneinfoCountryInfo.new('ZZ', 'Zzz', []) {|c| } -diff --git a/test/tc_zoneinfo_data_source.rb b/test/tc_zoneinfo_data_source.rb -index e74bd9c..66349f6 100644 ---- a/test/tc_zoneinfo_data_source.rb -+++ b/test/tc_zoneinfo_data_source.rb -@@ -27,7 +27,7 @@ require 'tmpdir' - - include TZInfo - --class TCZoneinfoDataSource < Test::Unit::TestCase -+class TCZoneinfoDataSource < Minitest::Test - ZONEINFO_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo').untaint - - def setup -diff --git a/test/tc_zoneinfo_timezone_info.rb b/test/tc_zoneinfo_timezone_info.rb -index 572e2a3..c9925c3 100644 ---- a/test/tc_zoneinfo_timezone_info.rb -+++ b/test/tc_zoneinfo_timezone_info.rb -@@ -29,7 +29,7 @@ require 'tempfile' - - include TZInfo - --class TCZoneinfoTimezoneInfo < Test::Unit::TestCase -+class TCZoneinfoTimezoneInfo < Minitest::Test - - begin - Time.at(-2147483649) -@@ -55,14 +55,14 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase - assert_equal(dst, period.dst?) - - if start_at -- assert_not_nil(period.utc_start_time) -+ refute_nil(period.utc_start_time) - assert_equal(start_at, period.utc_start_time) - else - assert_nil(period.utc_start_time) - end - - if end_at -- assert_not_nil(period.utc_end_time) -+ refute_nil(period.utc_end_time) - assert_equal(end_at, period.utc_end_time) - else - assert_nil(period.utc_end_time) -diff --git a/test/test_utils.rb b/test/test_utils.rb -index f46345d..8dc2a07 100644 ---- a/test/test_utils.rb -+++ b/test/test_utils.rb -@@ -31,7 +31,7 @@ $:.unshift(TZINFO_LIB_DIR) unless $:.include?(TZINFO_LIB_DIR) - # Add it to the load path. - $:.unshift(TZINFO_TEST_DATA_DIR) unless $:.include?(TZINFO_TEST_DATA_DIR) - --require 'test/unit' -+require 'minitest/autorun' - require 'tzinfo' - require 'fileutils' - require 'rbconfig' -@@ -133,4 +133,26 @@ module Kernel - assert_equal(expected_lines, actual_lines) - end - end -+ -+ def build_message(user_message, template_message, *args) -+ user_message ||= '' -+ user_message += ' ' unless user_message.empty? -+ msg = template_message.split(/<\?>/).zip(args.map { |o| o.inspect }) -+ user_message + msg.join -+ end -+ -+ def assert_nothing_raised _ = :ignored -+ yield -+ rescue => e -+ raise Minitest::Assertion, exception_details(e, "Exception raised:") -+ end -+ -+ def assert_not_same(expected, actual, message="") -+ msg = message(msg) { build_message(message, "with id expected to not be equal\\? towith id .", expected, expected.__id__, actual, actual.__id__) } -+ assert(!actual.equal?(expected), msg) -+ end -+ -+ def assert_block(*msgs) -+ assert yield, *msgs -+ end - end diff --git a/rubygem-tzinfo.spec b/rubygem-tzinfo.spec index 71d32af..6048a91 100644 --- a/rubygem-tzinfo.spec +++ b/rubygem-tzinfo.spec @@ -5,14 +5,12 @@ Summary: Daylight-savings aware timezone library Name: rubygem-%{gem_name} -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://tzinfo.github.io/ Source0: %{download_path}%{gem_name}-%{version}.gem -# https://github.com/tzinfo/tzinfo/pull/18 -Patch0: rubygem-tzinfo-minitest5.patch BuildRequires: rubygems-devel BuildRequires: ruby(release) BuildRequires: rubygem(thread_safe) @@ -39,8 +37,6 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p1 - %build gem build %{gem_name}.gemspec %gem_install @@ -73,6 +69,9 @@ popd %{gem_docdir} %changelog +* Mon Aug 25 2014 Josef Stribny - 1.2.2-1 +- Update to 1.2.2 + * Sun Jun 08 2014 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 1505398..8decb66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8ffb241f10a81eaa5e2f7c846d65238 tzinfo-1.1.0.gem +972fe2c6d57be47edb144c51340fd428 tzinfo-1.2.2.gem