From f27600ce16b71308c8ddbd182640dacf674b6ec4 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sun, 12 Dec 2021 15:59:25 +0100 Subject: [PATCH] Gemfile updated, Rakefile/gemspec modernized. --- Gemfile | 18 ++------ Gemfile.lock | 78 ++++++++++++++------------------- README.md | 2 +- Rakefile | 48 +-------------------- timeout-interrupt.gemspec | 91 +++++++++++---------------------------- 5 files changed, 63 insertions(+), 174 deletions(-) diff --git a/Gemfile b/Gemfile index f30cf21..274ea6c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,3 @@ -source "http://rubygems.org" - -gem 'ffi-libc' - -# Add dependencies to develop your gem here. -# Include everything needed to run rake, tests, features, etc. -group :development do - gem "shoulda" - gem "yard" - gem "redcarpet" - gem "rdoc" - gem "bundler" - gem "jeweler" - gem "simplecov" -end +source "https://rubygems.org" +gemspec +gem "rake", "~> 12" diff --git a/Gemfile.lock b/Gemfile.lock index 627102e..ee0f49e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,52 +1,38 @@ -GEM - remote: http://rubygems.org/ +PATH + remote: . specs: - activesupport (3.2.12) - i18n (~> 0.6) - multi_json (~> 1.0) - bourne (1.1.2) - mocha (= 0.10.5) - ffi (1.1.0) - ffi-libc (0.0.5) - ffi (>= 0.6.0, <= 1.1.0) - git (1.2.5) - i18n (0.6.4) - jeweler (1.8.4) - bundler (~> 1.0) - git (>= 1.2.5) - rake - rdoc - json (1.7.7) - metaclass (0.0.1) - mocha (0.10.5) - metaclass (~> 0.0.1) - multi_json (1.6.1) - rake (10.0.3) - rdoc (4.0.0) - json (~> 1.4) - redcarpet (2.2.2) - shoulda (3.3.2) - shoulda-context (~> 1.0.1) - shoulda-matchers (~> 1.4.1) - shoulda-context (1.0.2) - shoulda-matchers (1.4.2) - activesupport (>= 3.0.0) - bourne (~> 1.1.2) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - yard (0.8.5.2) + timeout-interrupt (0.4.0) + ffi-libc + +GEM + remote: https://rubygems.org/ + specs: + diff-lcs (1.4.4) + ffi (1.15.4) + ffi-libc (0.1.1) + ffi (~> 1.0) + rake (12.3.3) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) PLATFORMS ruby DEPENDENCIES - bundler - ffi-libc - jeweler - rdoc - redcarpet - shoulda - simplecov - yard + rake (~> 12) + rspec (~> 3.2) + timeout-interrupt! + +BUNDLED WITH + 2.2.25 diff --git a/README.md b/README.md index 2ff58c5..c5ebb09 100644 --- a/README.md +++ b/README.md @@ -67,4 +67,4 @@ And same problem you have with ruby's `Timeout.timeout`. Copyleft ========= -Copyright (c) 2013 Denis Knauf. See LICENSE.txt for further details. +Copyright (c) 2021 Denis Knauf. See LICENSE.txt for further details. diff --git a/Rakefile b/Rakefile index ae04298..43022f7 100644 --- a/Rakefile +++ b/Rakefile @@ -1,46 +1,2 @@ -# encoding: utf-8 - -require 'rubygems' -require 'bundler' -begin - Bundler.setup(:default, :development) -rescue Bundler::BundlerError => e - $stderr.puts e.message - $stderr.puts "Run `bundle install` to install missing gems" - exit e.status_code -end -require 'rake' - -require 'jeweler' -Jeweler::Tasks.new do |gem| - # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options - gem.name = "timeout-interrupt" - gem.homepage = "http://github.com/DenisKnauf/ruby-timeout-interrupt" - gem.license = "LGPLv3" - gem.summary = %Q{"Interrupts systemcalls too."} - gem.description = %Q{Timeout-lib, which interrupts everything, also systemcalls. It uses libc-alarm.} - gem.email = "Denis.Knauf@gmail.com" - gem.authors = ["Denis Knauf"] - # dependencies defined in Gemfile -end -Jeweler::RubygemsDotOrgTasks.new - -require 'rake/testtask' -Rake::TestTask.new(:test) do |test| - test.libs << 'lib' << 'test' - test.pattern = 'test/**/test_*.rb' - test.verbose = true -end - -#require 'simplecov' -#Rcov::RcovTask.new do |test| - #test.libs << 'test' - #test.pattern = 'test/**/test_*.rb' - #test.verbose = true - #test.rcov_opts << '--exclude "gems/*"' -#end - -task :default => :test - -require 'yard' -YARD::Rake::YardocTask.new +require "bundler/gem_tasks" +task :default => :spec diff --git a/timeout-interrupt.gemspec b/timeout-interrupt.gemspec index 904de4f..ccdc70e 100644 --- a/timeout-interrupt.gemspec +++ b/timeout-interrupt.gemspec @@ -1,71 +1,30 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' -# -*- encoding: utf-8 -*- +Gem::Specification.new do |spec| + spec.name = "timeout-interrupt" + spec.version = "0.4.0" -Gem::Specification.new do |s| - s.name = "timeout-interrupt" - s.version = "0.3.0" + spec.authors = ["Denis Knauf"] + spec.description = "Timeout-lib, which interrupts everything, also systemcalls. It uses libc-alarm." + spec.summary = "\"Interrupts systemcalls too.\"" + spec.licenses = ["LGPLv3"] - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Denis Knauf"] - s.date = "2013-03-14" - s.description = "Timeout-lib, which interrupts everything, also systemcalls. It uses libc-alarm." - s.email = "Denis.Knauf@gmail.com" - s.extra_rdoc_files = [ - "LICENSE.txt", - "README.md" - ] - s.files = [ - ".document", - "Gemfile", - "Gemfile.lock", - "LICENSE.txt", - "README.md", - "Rakefile", - "VERSION", - "lib/timeout_interrupt.rb", - "test/helper.rb", - "test/test_ruby-timeout-interrupt.rb", - "timeout-interrupt.gemspec" - ] - s.homepage = "http://github.com/DenisKnauf/ruby-timeout-interrupt" - s.licenses = ["LGPLv3"] - s.require_paths = ["lib"] - s.rubygems_version = "1.8.11" - s.summary = "\"Interrupts systemcalls too.\"" + spec.homepage = "https://git.denkn.at/deac/ruby-timeout-interrupt" + spec.required_ruby_version = Gem::Requirement.new(">= 2.1.0") - if s.respond_to? :specification_version then - s.specification_version = 3 + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + spec.metadata["changelog_uri"] = spec.homepage - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end + spec.add_development_dependency "rspec", "~> 3.2" + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "bin" + spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] + spec.require_paths = ["lib"] + + spec.add_runtime_dependency %q end -