Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
os: [ubuntu-latest]
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
ruby: ['3.4', '4.0']
include:
# Necessary for testing the different shell and sub-shell behavior
- os: macos-latest
ruby: '4.0'
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins:

AllCops:
NewCops: enable
TargetRubyVersion: 3.4
TargetRubyVersion: 3.2
Exclude:
- "lib/template/*.spec"
- "vendor/**/*"
Expand Down
7 changes: 2 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
PATH
remote: .
specs:
tetra (2.0.7)
tetra (2.0.8)
clamp (~> 1.3.2)
erb (~> 6.0)
json_pure (>= 2.6.3, < 2.9.0)
rexml (>= 3.2.9, < 3.5.0)
rubyzip (~> 3.2)
Expand Down Expand Up @@ -51,7 +50,6 @@ GEM
cucumber-tag-expressions (8.1.0)
diff-lcs (1.6.2)
docile (1.4.1)
erb (6.0.1)
ffi (1.17.3)
ffi (1.17.3-aarch64-linux-gnu)
ffi (1.17.3-aarch64-linux-musl)
Expand Down Expand Up @@ -181,7 +179,6 @@ CHECKSUMS
cucumber-tag-expressions (8.1.0) sha256=9bd8c4b6654f8e5bf2a9c99329b6f32136a75e50cd39d4cfb3927d0fa9f52e21
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5
ffi (1.17.3) sha256=0e9f39f7bb3934f77ad6feab49662be77e87eedcdeb2a3f5c0234c2938563d4c
ffi (1.17.3-aarch64-linux-gnu) sha256=28ad573df26560f0aedd8a90c3371279a0b2bd0b4e834b16a2baa10bd7a97068
ffi (1.17.3-aarch64-linux-musl) sha256=020b33b76775b1abacc3b7d86b287cef3251f66d747092deec592c7f5df764b2
Expand Down Expand Up @@ -226,7 +223,7 @@ CHECKSUMS
simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
sys-uname (1.4.1) sha256=ed2278ec670ee8af5eb5420d3a98e22188051f6241180db7c779993db2739a16
tetra (2.0.7)
tetra (2.0.8)
text (1.3.1) sha256=2fbbbc82c1ce79c4195b13018a87cbb00d762bda39241bb3cdc32792759dd3f4
thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See [MOTIVATION.md](MOTIVATION.md) for further information.

## Prerequisites

- [Ruby 3.4](https://www.ruby-lang.org) or later;
- [Ruby 3.2](https://www.ruby-lang.org) or later;
- [git](https://git-scm.com) with your credentials set in `~/.gitconfig` (name and email);
- some basic Unix commands: `bash`, `unzip`, `tar`;
- a JDK > 8 that can compile whatever software you need to package;
Expand All @@ -25,7 +25,7 @@ See [MOTIVATION.md](MOTIVATION.md) for further information.
You can install `tetra` via RubyGems or by building and installing it yourself.

```bash
# via RubyGems (currently version 2.0.6 from 02/2020)
# via RubyGems
gem install tetra

# from source
Expand Down
2 changes: 1 addition & 1 deletion lib/tetra/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
# base module for tetra
module Tetra
VERSION = "2.0.7"
VERSION = "2.0.8"
end
6 changes: 3 additions & 3 deletions spec/lib/coarse/generate_all_subcommand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
expect(last_command_started.output).to include("Checking for tetra project")

# first generate-all, all normal
run_command_and_stop("tetra generate-all", exit_timeout: 120)
run_command_and_stop("tetra generate-all", exit_timeout: 300)

expect(last_command_started.output).to include("commons-collections-kit.spec generated")
expect(last_command_started.output).to include("commons-collections-kit.tar.xz generated")
Expand All @@ -50,7 +50,7 @@

expect(last_command_started.output).to include("[INFO] BUILD SUCCESS")

run_command_and_stop("tetra generate-all --very-very-verbose", exit_timeout: 120)
run_command_and_stop("tetra generate-all --very-very-verbose", exit_timeout: 300)

expect(last_command_started.output).to include("commons-collections-kit.spec generated")
expect(last_command_started.output).to include("commons-collections-kit.tar.xz generated")
Expand Down Expand Up @@ -124,7 +124,7 @@

expect(last_command_started.output).to include("[INFO] BUILD SUCCESS")

run_command_and_stop("tetra generate-all", exit_timeout: 120)
run_command_and_stop("tetra generate-all", exit_timeout: 300)

expect(last_command_started.output).to include("commons-collections-kit.spec generated")
expect(last_command_started.output).to include("commons-collections-kit.tar.xz generated")
Expand Down
79 changes: 43 additions & 36 deletions tetra.gemspec
Original file line number Diff line number Diff line change
@@ -1,50 +1,57 @@
# frozen_string_literal: true

$LOAD_PATH.unshift(File.join(__dir__, "lib"))
require "tetra/version"
require_relative "lib/tetra/version"

Gem::Specification.new do |s|
s.name = "tetra"
s.version = Tetra::VERSION
s.authors = ["Dominik Gedon", "Silvio Moioli"]
s.email = "dgedon@suse.de"
s.homepage = "https://github.com/uyuni-project/tetra"
s.summary = "A tool to package Java projects"
s.description = <<~TEXT
Gem::Specification.new do |spec|
spec.name = "tetra"
spec.version = Tetra::VERSION
spec.authors = ["Dominik Gedon", "Silvio Moioli"]
spec.email = ["dominik.gedon@suse.com"]
spec.homepage = "https://github.com/uyuni-project/tetra"
spec.summary = "A tool to package Java projects"
spec.description = <<~TEXT
Tetra simplifies the creation of spec files and archives
to distribute Java projects in RPM format
to distribute Java projects in RPM format.
TEXT

s.license = "MIT"
s.metadata = {
spec.license = "MIT"
spec.metadata = {
"bug_tracker_uri" => "https://github.com/uyuni-project/tetra/issues",
"homepage_uri" => s.homepage,
"homepage_uri" => spec.homepage,
"source_code_uri" => "https://github.com/uyuni-project/tetra",
"rubygems_mfa_required" => "true"
"rubygems_mfa_required" => "true",
"allowed_push_host" => "https://rubygems.org"
}

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
s.require_paths = ["lib"]
s.rdoc_options << "--exclude=lib/template/bundled"
spec.required_ruby_version = ">= 3.2"
spec.files = Dir.glob(
[
"bin/*",
"lib/**/*",
"*.md",
"LICENSE",
"COPYING"
]
).select { |f| File.file?(f) }

s.required_ruby_version = ">= 3.4.0"
spec.executables = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.rdoc_options << "--exclude=lib/template/bundled"

s.add_development_dependency "aruba", "~> 2.3"
s.add_development_dependency "rake", "~> 13.3"
s.add_development_dependency "rspec", "~> 3.13"
s.add_development_dependency "rubocop", "~> 1.82.1"
s.add_development_dependency "rubocop-performance", "~> 1.26"
s.add_development_dependency "rubocop-rake", "~> 0.7.1"
s.add_development_dependency "rubocop-rspec", "~> 3.9.0"
s.add_development_dependency "simplecov", "~> 0.22"
s.add_development_dependency "simplecov-cobertura", "~> 3.1"
# Dependencies
spec.add_runtime_dependency "clamp", "~> 1.3.2"
spec.add_runtime_dependency "json_pure", ">= 2.6.3", "< 2.9.0"
spec.add_runtime_dependency "rexml", ">= 3.2.9", "< 3.5.0"
spec.add_runtime_dependency "rubyzip", "~> 3.2"
spec.add_runtime_dependency "text", "~> 1.3.1"

s.add_runtime_dependency "clamp", "~> 1.3.2"
s.add_runtime_dependency "erb", "~> 6.0"
s.add_runtime_dependency "json_pure", ">= 2.6.3", "< 2.9.0"
s.add_runtime_dependency "rexml", ">= 3.2.9", "< 3.5.0"
s.add_runtime_dependency "rubyzip", "~> 3.2"
s.add_runtime_dependency "text", "~> 1.3.1"
spec.add_development_dependency "aruba", "~> 2.3"
spec.add_development_dependency "rake", "~> 13.3"
spec.add_development_dependency "rspec", "~> 3.13"
spec.add_development_dependency "rubocop", "~> 1.82.1"
spec.add_development_dependency "rubocop-performance", "~> 1.26"
spec.add_development_dependency "rubocop-rake", "~> 0.7.1"
spec.add_development_dependency "rubocop-rspec", "~> 3.9.0"
spec.add_development_dependency "simplecov", "~> 0.22"
spec.add_development_dependency "simplecov-cobertura", "~> 3.1"
end