From adefe6b805c569dcd599666f6ceeecdc00af55bb Mon Sep 17 00:00:00 2001 From: "yuanxin.qiu" Date: Thu, 13 Oct 2016 14:39:15 +0800 Subject: [PATCH 1/5] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index cbd7f97..428f543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ rvm: - 1.8.7 - 1.9.2 +- 2.1 +- 2.2 gemfile: - Gemfile env: From 72b208ce32a9bc196c4423e36fc2bbf7b4e76978 Mon Sep 17 00:00:00 2001 From: "yuanxin.qiu" Date: Thu, 13 Oct 2016 14:41:29 +0800 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 428f543..553216d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 1.9.2 - 2.1 - 2.2 +- 2.3 gemfile: - Gemfile env: From 1dbf4edc4fb7994c37c4bb58c48f1f672e951dff Mon Sep 17 00:00:00 2001 From: "yuanxin.qiu" Date: Thu, 13 Oct 2016 15:45:10 +0800 Subject: [PATCH 3/5] Bugfix the gemspec and travis --- .travis.yml | 11 +++++------ Gemfile.lock | 7 +++++++ Rakefile | 11 ----------- uuid.gemspec | 4 +++- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 553216d..ce2dca2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ rvm: -- 1.8.7 -- 1.9.2 -- 2.1 -- 2.2 -- 2.3 + - 1.9.2 + - 2.1 + - 2.2 + - 2.3 gemfile: -- Gemfile + - Gemfile env: notifications: recipients: diff --git a/Gemfile.lock b/Gemfile.lock index 618f71e..d17e9c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,8 +10,11 @@ GEM macaddr (1.6.7) systemu (~> 2.6.2) mocha (0.9.12) + power_assert (0.3.1) rake (0.8.7) systemu (2.6.4) + test-unit (3.1.9) + power_assert yard (0.6.7) PLATFORMS @@ -20,5 +23,9 @@ PLATFORMS DEPENDENCIES mocha rake + test-unit (~> 3.1.8) uuid! yard + +BUNDLED WITH + 1.13.3 diff --git a/Rakefile b/Rakefile index 35d05a7..29a6be6 100644 --- a/Rakefile +++ b/Rakefile @@ -1,13 +1,10 @@ require 'rake/testtask' -#require 'rake/rdoctask' - spec = Gem::Specification.load(File.expand_path("uuid.gemspec", File.dirname(__FILE__))) desc "Default Task" task :default => :test - desc "Run all test cases" Rake::TestTask.new do |test| test.verbose = true @@ -15,14 +12,6 @@ Rake::TestTask.new do |test| test.warning = true end -# Create the documentation. -#Rake::RDocTask.new do |rdoc| -# rdoc.rdoc_files.include "README.rdoc", "lib/**/*.rb" -# rdoc.options = spec.rdoc_options -#end - - - desc "Push new release to rubyforge and git tag" task :push do sh "git push" diff --git a/uuid.gemspec b/uuid.gemspec index bd29a27..ee1afc3 100644 --- a/uuid.gemspec +++ b/uuid.gemspec @@ -19,5 +19,7 @@ EOF '--webcvs' << 'http://github.com/assaf/uuid' s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE'] - s.add_dependency 'macaddr', ['~>1.0'] + s.add_dependency 'macaddr', '~> 1.0' + s.add_development_dependency 'test-unit', '~> 3.1.8' + s.add_development_dependency 'mocha', '~> 1.2.0' end From fa566109b2ded3f9d7cb96b188a9b7fd05e59858 Mon Sep 17 00:00:00 2001 From: "yuanxin.qiu" Date: Thu, 13 Oct 2016 16:14:49 +0800 Subject: [PATCH 4/5] bugfix test cases --- .travis.yml | 1 + Gemfile | 10 +--------- Gemfile.lock | 18 ++++++++++-------- Rakefile | 10 +++++----- test/test-uuid.rb | 4 ++-- uuid.gemspec | 3 +++ 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce2dca2..991aed1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ rvm: - 1.9.2 + - 2.0 - 2.1 - 2.2 - 2.3 diff --git a/Gemfile b/Gemfile index a1886fe..17ca889 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,3 @@ source "https://rubygems.org" -gemspec - -group :development do - gem "rake" - gem "yard" -end -group :test do - gem "mocha" -end +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index d17e9c8..974db32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,25 +7,27 @@ PATH GEM remote: https://rubygems.org/ specs: - macaddr (1.6.7) + macaddr (1.7.1) systemu (~> 2.6.2) - mocha (0.9.12) + metaclass (0.0.4) + mocha (1.2.0) + metaclass (~> 0.0.1) power_assert (0.3.1) - rake (0.8.7) - systemu (2.6.4) + rake (10.5.0) + systemu (2.6.5) test-unit (3.1.9) power_assert - yard (0.6.7) + yard (0.6.8) PLATFORMS ruby DEPENDENCIES - mocha - rake + mocha (~> 1.2.0) + rake (~> 10.5.0) test-unit (~> 3.1.8) uuid! - yard + yard (~> 0.6.7) BUNDLED WITH 1.13.3 diff --git a/Rakefile b/Rakefile index 29a6be6..ad7b2b8 100644 --- a/Rakefile +++ b/Rakefile @@ -3,13 +3,13 @@ require 'rake/testtask' spec = Gem::Specification.load(File.expand_path("uuid.gemspec", File.dirname(__FILE__))) desc "Default Task" -task :default => :test +task default: :test desc "Run all test cases" -Rake::TestTask.new do |test| - test.verbose = true - test.test_files = ['test/*.rb'] - test.warning = true +Rake::TestTask.new do |t| + t.libs << 'test' + t.test_files = FileList['test/*.rb'] + t.verbose = true end desc "Push new release to rubyforge and git tag" diff --git a/test/test-uuid.rb b/test/test-uuid.rb index 335bb0d..7b6a215 100644 --- a/test/test-uuid.rb +++ b/test/test-uuid.rb @@ -4,10 +4,10 @@ # Copyright:: Copyright (c) 2005-2008 Assaf Arkin, Eric Hodel # License:: MIT and/or Creative Commons Attribution-ShareAlike -require 'test/unit' require 'rubygems' +require 'test/unit' +require 'mocha/test_unit' require 'uuid' -require 'mocha' class TestUUID < Test::Unit::TestCase diff --git a/uuid.gemspec b/uuid.gemspec index ee1afc3..b573a4c 100644 --- a/uuid.gemspec +++ b/uuid.gemspec @@ -20,6 +20,9 @@ EOF s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE'] s.add_dependency 'macaddr', '~> 1.0' + + s.add_development_dependency 'rake', '~> 10.5.0' s.add_development_dependency 'test-unit', '~> 3.1.8' s.add_development_dependency 'mocha', '~> 1.2.0' + s.add_development_dependency 'yard', '~> 0.6.7' end From 93636b66d99f11f6df36dcd0b4d16a5a356249e6 Mon Sep 17 00:00:00 2001 From: "yuanxin.qiu" Date: Thu, 13 Oct 2016 18:29:04 +0800 Subject: [PATCH 5/5] update --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 991aed1..3ef5a3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ rvm: - 1.9.2 - - 2.0 - - 2.1 - - 2.2 - - 2.3 + - 2.0.0 + - 2.1.9 + - 2.2.5 + - 2.3.1 gemfile: - Gemfile env: