diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..30ba1df --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +** + +!/Gemfile +!/Gemfile.lock +!/dtext_rb.gemspec +!/lib/dtext/version.rb diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index ef538c2..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.1.2 diff --git a/Dockerfile b/Dockerfile index daceba1..4649a66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:3.1.3-alpine3.17 RUN apk --no-cache add build-base ragel -COPY Gemfile Gemfile.lock ./ +COPY . . RUN gem install bundler:2.4.1 && \ bundle install -j$(nproc) diff --git a/Gemfile b/Gemfile index efdbecc..b4e2a20 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ -# A sample Gemfile source "https://rubygems.org" -gem "minitest", "~> 5.10", group: :development -gem "rake-compiler", "~> 1.0", group: :development +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index cd5c36e..231b30f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,8 @@ +PATH + remote: . + specs: + dtext_rb (1.10.21) + GEM remote: https://rubygems.org/ specs: @@ -10,6 +15,7 @@ PLATFORMS ruby DEPENDENCIES + dtext_rb! minitest (~> 5.10) rake-compiler (~> 1.0) diff --git a/VERSION b/VERSION deleted file mode 100644 index 9de0552..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.10.21 diff --git a/bin/dtext b/bin/dtext deleted file mode 100755 index 05f524e..0000000 --- a/bin/dtext +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ruby - -require 'dtext' - -puts DText.parse(ARGF.read) diff --git a/dtext_rb.gemspec b/dtext_rb.gemspec index 2a88d57..70e1e21 100644 --- a/dtext_rb.gemspec +++ b/dtext_rb.gemspec @@ -1,40 +1,27 @@ # frozen_string_literal: true -Gem::Specification.new do |s| - s.name = "dtext_rb" - s.version = "1.10.21" +require_relative "lib/dtext/version" - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.require_paths = ["lib"] - s.authors = ["r888888888"] - s.date = "2021-07-08" - s.description = "Compiled DText parser" - s.email = "r888888888@gmail.com" - s.executables = ["dtext"] - s.extensions = ["ext/dtext/extconf.rb"] - s.extra_rdoc_files = [ - "README.md" - ] - s.files = [ - "bin/dtext", +Gem::Specification.new do |spec| + spec.name = "dtext_rb" + spec.version = DText::VERSION + spec.authors = ["r888888888", "evazion", "earlopain"] + + spec.summary = "E621 DText parser" + spec.homepage = "http://github.com/e621ng/dtext_rb" + spec.license = "MIT" + spec.required_ruby_version = ">= 3.0.0" + spec.extensions = ["ext/dtext/extconf.rb"] + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + spec.files = [ "lib/dtext.rb", "lib/dtext/dtext.so", - "lib/dtext_ruby.rb" + "lib/dtext/version.rb", ] - s.homepage = "http://github.com/r888888888/dtext_rb" - s.licenses = ["MIT"] - s.rubygems_version = "3.3.20" - s.summary = "Compiled DText parser" - if s.respond_to? :specification_version then - s.specification_version = 4 - end - - if s.respond_to? :add_runtime_dependency then - s.add_development_dependency(%q, ["~> 5.10"]) - s.add_development_dependency(%q, ["~> 1.0"]) - else - s.add_dependency(%q, ["~> 5.10"]) - s.add_dependency(%q, ["~> 1.0"]) - end + spec.add_development_dependency(%q, ["~> 5.10"]) + spec.add_development_dependency(%q, ["~> 1.0"]) end diff --git a/lib/dtext.rb b/lib/dtext.rb index a3c538f..1890753 100644 --- a/lib/dtext.rb +++ b/lib/dtext.rb @@ -1,4 +1,5 @@ require "dtext/dtext" +require "dtext/version" class DText class Error < StandardError; end diff --git a/lib/dtext/version.rb b/lib/dtext/version.rb new file mode 100644 index 0000000..9dcb0ec --- /dev/null +++ b/lib/dtext/version.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class DText + VERSION = "1.10.21" +end diff --git a/test/dtext_test.rb b/test/dtext_test.rb index cf97480..d1ca3fa 100644 --- a/test/dtext_test.rb +++ b/test/dtext_test.rb @@ -1,5 +1,5 @@ require 'minitest/autorun' -require 'dtext/dtext' +require 'dtext' class DTextTest < Minitest::Test def assert_parse_id_link(class_name, url, input, display: input)