git-trend 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0747b72131e24ecb5c876c337ce33be1941683110562847152189e4ddbb5c72
-  data.tar.gz: 47412945f045abb2cd8af2d959ca9cb01547649d7904b5eeec0a3791f5476be6
+  metadata.gz: 48d85d080f7f9e48254ad02bbdb327ac0e4c811ce2db883a8b6f712119892028
+  data.tar.gz: 8f083dfb30dc9af3aefd6c1a33facebbd77cf5704cdd534c867260d84affd829
 SHA512:
-  metadata.gz: 8a55d7452c04a64ad860e52e19a9673dedd0ef585b9615e1ad2e385100892540cff76209b807ae81087665436379219c351546f9f05115df006e93783050c09a
-  data.tar.gz: 041bb27a4b62b0114231b6d0d66cf285ca0dd7b2326d8dee5c3faa31667506960300e7bfb59e05c5e06eb46b81e0c5a14f189ab14a4c3fb466347061a7a9fbe3
+  metadata.gz: b4d7b80c1f86a6e8756854c08d86c3047d717438e8fe7a162bf18a7d1f0835604424cf50edf51cfba690778b5be258a1cf9ff8cb2a45daea6ffa4176f0c9b9d8
+  data.tar.gz: 1bcae8a943eeeeb5f2185b156cfc7f26e2b5165d84712de3619a199d25c786f4656097e048a74c826fbadfc3721bda74da6d46ca5afbc23c14d9d537c4d7e5e1

data/.github/workflows/ci.yml

@@ -5,65 +5,24 @@ on:
   pull_request:
 
 jobs:
-  ruby27:
+  test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    strategy:
+      matrix:
+        ruby-version: ['3.2.9', '3.3.9', '3.4.7']
+        include:
+          - ruby-version: '3.4.7'
+            upload-coverage: true
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7.5'
-          bundler-cache: true
-
-      - name: Show ruby version
-        run: ruby -v
-
-      - name: Run tests
-        run: bundle exec rspec
-
-      - name: Run lint
-        run: bundle exec rubocop
-
-
-  ruby31:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.1.3'
-          bundler-cache: true
-
-      - name: Show ruby version
-        run: ruby -v
-
-      - name: Run tests
-        run: bundle exec rspec
-
-      - name: Run lint
-        run: bundle exec rubocop
-
-  ruby32:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2.2'
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - name: Show ruby version
@@ -76,6 +35,7 @@ jobs:
         run: bundle exec rubocop
 
       - name: Upload coverage reports to Codecov
+        if: matrix.upload-coverage
         uses: codecov/codecov-action@v3
         with:
           files: ./coverage/.resultset.json

data/.rubocop.yml

@@ -1,12 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
-require:
+plugins:
   - rubocop-performance
   - rubocop-rake
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
   Exclude:
     - '**/tmp/**/*'
     - '**/vendor/**/*'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.4.1 (Tue Oct 14 2025)
+- Drop support of Ruby 3.1 and earlier [d2b4080]
+
 ## v1.4.0 (Mon Mar 13 2023)
 
 - Drop support of Ruby 2.6 and earlier [41e871e]

data/README.md

@@ -7,6 +7,10 @@
 `git-trend` is a gem that fetches [Trending repositories on GitHub](https://github.com/trending).
 And this also work as a command line utility.
 
+## Buy me a coffee
+
+If you can contribute or you want to, feel free to do it at [__Buy me a coffee! :coffee:__](https://www.buymeacoffee.com/rochefort), I will be really thankfull for anything even if it is a coffee or just a kind comment towards my work, because that helps me a lot. Whenever you contribute with a donation, I will read your message and it will be shown in my main site.
+
 # TOC
  * [Requirements](#requirements)
  * [Installation](#installation)
@@ -18,7 +22,7 @@ And this also work as a command line utility.
 
 ## Requirements
 
-Ruby versions is 2.7 or later.
+Ruby versions is 3.2 or later.
 
 ## Installation
 Add this line to your application's Gemfile:

data/git-trend.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/rochefort/git-trend"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.bindir        = "exe"
@@ -27,10 +27,9 @@ Gem::Specification.new do |spec|
   spec.post_install_message = install_message
 
   spec.add_dependency "addressable", "~> 2.8"
-  spec.add_dependency "mb_string"
-  spec.add_dependency "mechanize",   ">= 2.8.5", "< 2.10.0"
-  spec.add_dependency "thor",        ">= 0.20.0", "< 1.3.0"
-  spec.add_dependency "unicode-display_width"
+  spec.add_dependency "mechanize",   ">= 2.8.5", "< 2.11.0"
+  spec.add_dependency "thor",        ">= 0.20.0", "< 1.4.0"
 
+  # FIXME: mfa
   spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/git_trend/cli.rb

@@ -35,7 +35,7 @@ module GitTrend
       formatter.print(projects, enable_description: !!options[:description])
     rescue => e
       say "An unexpected #{e.class} has occurred.", :red
-      say e.message unless e.instance_of?(e.message) # エラー内容がクラス名の場合は表示しない
+      say e.message unless e.message == e.class.to_s # エラー内容がクラス名の場合は表示しない
 
       puts exception.backtrace if options[:verbose]
     end

data/lib/git_trend/core_ext/string.rb

@@ -0,0 +1,27 @@
+class String
+  def mb_truncate(truncate_at)
+    return self if display_width <= truncate_at
+
+    ellipsis = "..."
+    return ellipsis if truncate_at <= ellipsis.length
+
+    max_width = truncate_at - ellipsis.length
+    result = ""
+    current_width = 0
+    each_char do |char|
+      char_width = char.bytesize == 1 ? 1 : 2
+      break if current_width + char_width > max_width
+
+      result += char
+      current_width += char_width
+    end
+
+    "#{result}#{ellipsis}"
+  rescue
+    self
+  end
+
+  def display_width
+    each_char.sum { |char| char.bytesize == 1 ? 1 : 2 }
+  end
+end

data/lib/git_trend/formatters/text_formatter.rb

@@ -1,5 +1,3 @@
-require "mb_string"
-
 module GitTrend::Formatters
   class TextFormatter
     HEADER_COLUMNS = %w[no. name lang star description].freeze

data/lib/git_trend/version.rb

@@ -1,3 +1,3 @@
 module GitTrend
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.1".freeze
 end

data/lib/git_trend.rb

@@ -1,4 +1,5 @@
 require "git_trend/cli"
+require "git_trend/core_ext/string"
 require "git_trend/formatter"
 require "git_trend/formatters/text_formatter"
 require "git_trend/formatters/json_formatter"

data/spec/git_trend/cli_spec.rb

@@ -1,6 +1,6 @@
-RSpec.describe GitTrend::CLI do
-  include GitTrend
+require "git_trend/scraper"
 
+RSpec.describe GitTrend::CLI do
   shared_examples "since daily ranking" do |since|
     it "display daily ranking" do
       expect { cli.invoke(:list, [], since: since, description: false) }.to output(dummy_result_without_description).to_stdout
@@ -20,7 +20,7 @@ RSpec.describe GitTrend::CLI do
   end
 
   describe "#list" do
-    let(:cli) { CLI.new }
+    let(:cli) { described_class.new }
 
     describe "with -n option" do
       context "with 3" do
@@ -112,22 +112,22 @@ RSpec.describe GitTrend::CLI do
       context "with no option" do
         before { stub_request_get("trending?since=") }
 
-        include_examples "since daily ranking", ""
+        it_behaves_like "since daily ranking", ""
       end
 
       describe "since daily" do
         before { stub_request_get("trending?since=daily") }
 
         context "with d" do
-          include_examples "since daily ranking", "d"
+          it_behaves_like "since daily ranking", "d"
         end
 
         context "with day" do
-          include_examples "since daily ranking", "day"
+          it_behaves_like "since daily ranking", "day"
         end
 
         context "with daily" do
-          include_examples "since daily ranking", "daily"
+          it_behaves_like "since daily ranking", "daily"
         end
       end
 
@@ -135,15 +135,15 @@ RSpec.describe GitTrend::CLI do
         before { stub_request_get("trending?since=weekly") }
 
         context "with w" do
-          include_examples "since weekly ranking", "w"
+          it_behaves_like "since weekly ranking", "w"
         end
 
         context "with week" do
-          include_examples "since weekly ranking", "week"
+          it_behaves_like "since weekly ranking", "week"
         end
 
         context "with weekly" do
-          include_examples "since weekly ranking", "weekly"
+          it_behaves_like "since weekly ranking", "weekly"
         end
       end
 
@@ -151,15 +151,15 @@ RSpec.describe GitTrend::CLI do
         before { stub_request_get("trending?since=monthly") }
 
         context "with m" do
-          include_examples "since monthly ranking", "m"
+          it_behaves_like "since monthly ranking", "m"
         end
 
         context "with month" do
-          include_examples "since monthly ranking", "month"
+          it_behaves_like "since monthly ranking", "month"
         end
 
         context "with monthly" do
-          include_examples "since monthly ranking", "monthly"
+          it_behaves_like "since monthly ranking", "monthly"
         end
       end
     end
@@ -247,7 +247,7 @@ RSpec.describe GitTrend::CLI do
   describe "#languages" do
     before { stub_request_get("trending") }
 
-    let(:cli) { CLI.new }
+    let(:cli) { described_class.new }
 
     context "with no option" do
       it "display languages" do
@@ -259,7 +259,7 @@ RSpec.describe GitTrend::CLI do
   private
 
     def stub_request_get(stub_url_path, stub_file_name = nil)
-      url = Scraper::BASE_HOST.dup
+      url = GitTrend::Scraper::BASE_HOST.dup
       url << "/#{stub_url_path}" if stub_url_path
       uri = URI.parse(url)
       stub_file = stub_file_name || stub_url_path

data/spec/git_trend/core_ext/string_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+RSpec.shared_examples_for "without_options" do |examples|
+  examples.each do |example|
+    input = example[:inputs]
+    it "#{example[:object].inspect}.mb_truncate(#{input}) should return #{example[:expected].inspect}" do
+      expect(example[:object].send(:mb_truncate, input)).to eq example[:expected]
+    end
+  end
+end
+
+RSpec.describe String do
+  describe "#mb_truncate" do
+    context "ascii strings" do
+      examples = [
+        { object: "abc",   inputs: 2, expected: "..." },
+        { object: "abc",   inputs: 3, expected: "abc" },
+        { object: "abcde", inputs: 3, expected: "..." },
+        { object: "abcde", inputs: 4, expected: "a..." },
+        { object: "abcde", inputs: 5, expected: "abcde" },
+      ]
+      it_behaves_like "without_options", examples
+    end
+
+    context "multi-bytes strings" do
+      examples = [
+        { object: "あいう", inputs: 2, expected: "..." },
+        { object: "あいう", inputs: 3, expected: "..." },
+        { object: "あいう", inputs: 4, expected: "..." },
+        { object: "あいう", inputs: 5, expected: "あ..." },
+        { object: "あいう", inputs: 6, expected: "あいう" },
+      ]
+      it_behaves_like "without_options", examples
+    end
+  end
+end

data/spec/git_trend/scraper_spec.rb

@@ -1,4 +1,5 @@
 include GitTrend # rubocop:disable Style/MixinUsage
+
 RSpec.describe GitTrend::Scraper do
   let(:scraper) { Scraper.new }
 

data/spec/git_trend_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe GitTrend do
   include described_class
+
   let(:scraper_mock) { instance_double(Scraper) }
 
   before do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-trend
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - rochefort
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: mb_string
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +32,7 @@ dependencies:
         version: 2.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +42,7 @@ dependencies:
         version: 2.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +52,7 @@ dependencies:
         version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,21 +62,7 @@ dependencies:
         version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: unicode-display_width
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 description: CLI-Based tool that show Trending repository on github
 email:
 - terasawan@gmail.com
@@ -119,6 +90,7 @@ files:
 - lib/git-trend.rb
 - lib/git_trend.rb
 - lib/git_trend/cli.rb
+- lib/git_trend/core_ext/string.rb
 - lib/git_trend/formatter.rb
 - lib/git_trend/formatters/json_formatter.rb
 - lib/git_trend/formatters/text_formatter.rb
@@ -136,6 +108,7 @@ files:
 - spec/fixtures/trending?since=monthly.html
 - spec/fixtures/trending?since=weekly
 - spec/git_trend/cli_spec.rb
+- spec/git_trend/core_ext/string_spec.rb
 - spec/git_trend/scraper_spec.rb
 - spec/git_trend_spec.rb
 - spec/spec_helper.rb
@@ -152,15 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: CLI-Based tool that show Trending repository on github
 test_files: []