git-trend 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a5d08b3b8f8d009ba85dd7ab54217e4d16adcb0aaa96451022849913adc835
-  data.tar.gz: 3de4819956a0e80b90c22fda6f16bb6372b7d7df663bcb59cf6d212f8698414c
+  metadata.gz: e0c6af8c115c7e95f285ed7dfbe9d984ab0027b3408ca2be9e59e3d06e0a704a
+  data.tar.gz: 15455086c781a10e6d796246e96b840cf72c73b3ce3984a7d1002bb1102f5b3a
 SHA512:
-  metadata.gz: 4367a719bb7ed8f6bdb4c84f9ae0f646d625bba405f8cee7dde2ec61da4af83e16a899755eb2754f71dc7071f8e9f45c7cf07668b74a7500f1138eed0f6e67e9
-  data.tar.gz: 26163edd6624b21eb092e432f32fc7fc8819744c2a8f6f9fe87697d2c8b1eee068583ffd97b756f972deda931aacbd5fe2c5e6597610468ab65243a665fa8df7
+  metadata.gz: 0eb3f104aab30a8d551d51e965baaf06381f522905c81ea9817e33f72bc22e9c766650ef519e0595d2d58cf25b583114c85e38f6c3e590dc28cb7ed16f60ddb6
+  data.tar.gz: 8c9b103328283c9ff4c4011f7f400f94488aa30aab52e214f88b23bf96d9dad3046d72772540e20cda7f27f128da7a00826bfb30bb5bee377dea94752d272088

data/.github/workflows/smoke.yml

@@ -0,0 +1,24 @@
+name: Smoke test
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  smoke:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4.12'
+          bundler-cache: true
+
+      - name: Run smoke test against github.com
+        run: bundle exec rake smoke

data/.rspec

@@ -2,3 +2,4 @@
 --warnings
 --require spec_helper
 --format doc
+--order random

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.4.3 (Wed Nov 4 2026)
+
+- Fix changing HTML structure: descriptions were always empty [3003619]
+- Fix NameError when showing backtrace with --verbose [3266694]
+- Fix crash when the terminal width cannot be detected [a51276c]
+- Fix load path in exe/git-trend [4827161]
+- Fix misaligned descriptions containing multi-byte characters such as "é" or emoji by using unicode-display_width [f7a3e7a]
+- Exclude spec files from the gem package [f5b6ddc]
+- Fix typos [db9877b]
+
 ## v1.4.2 (Tue Nov 3 2026)
 
 - Security fixes [aea1049, 08e02ee]

data/Rakefile

@@ -17,3 +17,23 @@ task :update_fixtures do
   sh "curl -o spec/fixtures/trending?since=weekly https://github.com/trending?since=weekly"
   sh "curl -o spec/fixtures/trending?since=monthly https://github.com/trending?since=monthly"
 end
+
+desc "check that scraping works against the live GitHub trending page"
+task :smoke do
+  require_relative "lib/git_trend"
+
+  projects = GitTrend.get
+  errors = []
+  errors << "no projects" if projects.empty?
+  errors << "invalid names" unless projects.all? { |p| p.name.match?(%r{\A[\w.-]+/[\w.-]+\z}) }
+  errors << "no descriptions" if projects.none? { |p| !p.description.empty? }
+  errors << "no languages" if projects.none? { |p| !p.lang.empty? }
+  errors << "no all star counts" unless projects.all? { |p| p.all_star_count.positive? }
+  errors << "no fork counts" if projects.none? { |p| p.fork_count.positive? }
+  errors << "no star counts" if projects.none? { |p| p.star_count.positive? }
+  errors << "no selectable languages" if GitTrend.languages.empty?
+
+  abort "Smoke test failed: #{errors.join(', ')}" unless errors.empty?
+
+  puts "Smoke test passed: #{projects.size} projects"
+end

data/exe/git-trend

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path("/../lib", __dir__))
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 
 require "git_trend"
 

data/git-trend.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 3.3.0"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("spec/") }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable", "~> 2.9", ">= 2.9.1"
   spec.add_dependency "mechanize",   ">= 2.14.1", "< 2.15.0"
-  spec.add_dependency "thor",        ">= 0.20.0", "< 1.4.0"
+  spec.add_dependency "thor",        ">= 0.20.0", "< 1.6.0"
+  spec.add_dependency "unicode-display_width", "~> 3.2"
 
   spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/git_trend/cli.rb

@@ -22,7 +22,7 @@ module GitTrend
     desc :list, "\033[32m(DEFAULT COMMAND)\e[0m List Trending repository on github [-l, -s, -d]"
     option :language,    aliases: "-l", required: false, desc: "Specify a language"
     option :since,       aliases: "-s", required: false, desc: "Enable: [d, day, daily, w, week, weekly, m, month, monthly]"
-    option :description, aliases: "-d", required: false, default: true, type: :boolean, desc: "\033[32m(DEFAULT OPTION)\e[0m Dislpay descriptions"
+    option :description, aliases: "-d", required: false, default: true, type: :boolean, desc: "\033[32m(DEFAULT OPTION)\e[0m Display descriptions"
     option :format,      aliases: "-f", required: false, default: "text", desc: "Choose a formatter as text or json. Enable: [t, text, j, json]"
     option :number,      aliases: "-n", required: false, type: :numeric, desc: "Number of lines"
     option :help,        aliases: "-h", required: false, type: :boolean
@@ -37,7 +37,7 @@ module GitTrend
       say "An unexpected #{e.class} has occurred.", :red
       say e.message unless e.message == e.class.to_s # エラー内容がクラス名の場合は表示しない
 
-      puts exception.backtrace if options[:verbose]
+      puts e.backtrace if options[:verbose]
     end
 
     desc :languages, "Show selectable languages"

data/lib/git_trend/display_text.rb

@@ -0,0 +1,31 @@
+require "unicode/display_width"
+
+module GitTrend
+  module DisplayText
+    ELLIPSIS = "...".freeze
+
+    module_function
+
+    def width(str)
+      Unicode::DisplayWidth.of(str)
+    end
+
+    def truncate(str, truncate_at)
+      return str if width(str) <= truncate_at
+      return ELLIPSIS if truncate_at <= ELLIPSIS.length
+
+      max_width = truncate_at - ELLIPSIS.length
+      result = +""
+      current_width = 0
+      str.each_grapheme_cluster do |char|
+        char_width = width(char)
+        break if current_width + char_width > max_width
+
+        result << char
+        current_width += char_width
+      end
+
+      "#{result}#{ELLIPSIS}"
+    end
+  end
+end

data/lib/git_trend/formatters/text_formatter.rb

@@ -1,7 +1,10 @@
+require "io/console"
+
 module GitTrend::Formatters
   class TextFormatter
     HEADER_COLUMNS = %w[no. name lang star description].freeze
     DEFAULT_COLUMNS_SIZES = [3, 40, 10, 6, 20].freeze
+    DEFAULT_TERMINAL_WIDTH = 80
 
     def print(projects, options)
       if projects.empty?
@@ -20,7 +23,7 @@ module GitTrend::Formatters
       puts
       puts "#{languages.size} languages"
       puts "you can get only selected language list with '-l' option."
-      puts "if languages is unknown, you can specify 'unkown'."
+      puts "if languages is unknown, you can specify 'unknown'."
       puts
     end
 
@@ -40,8 +43,7 @@ module GitTrend::Formatters
       end
 
       def rule_max_description_size
-        terminal_width, _terminal_height = detect_terminal_size
-        description_width = terminal_width - @columns_sizes[0..-2].sum - (@columns_sizes.size - 1)
+        description_width = detect_terminal_width - @columns_sizes[0..-2].sum - (@columns_sizes.size - 1)
         if description_width >= DEFAULT_COLUMNS_SIZES.last
           @columns_sizes[-1] = description_width
         else
@@ -78,9 +80,9 @@ module GitTrend::Formatters
         projects.each_with_index do |project, i|
           data = [i + 1, [project.name, project.lang, project.star_count.to_s]].flatten
           if @enable_description
-            description = project.description.mb_truncate(f.last)
+            description = GitTrend::DisplayText.truncate(project.description, f.last)
             data << description
-            mb_char_size = description.display_width - description.size
+            mb_char_size = GitTrend::DisplayText.width(description) - description.size
             description_fmt = " %-#{f.last - mb_char_size}s"
           end
           result = "#{fmt}#{description_fmt}" % data
@@ -92,23 +94,12 @@ module GitTrend::Formatters
         puts
       end
 
-      # https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L61-71
-      # rubocop:disable all
-      def detect_terminal_size
-        if (ENV["COLUMNS"] =~ /^\d+$/) && (ENV["LINES"] =~ /^\d+$/)
-          [ENV["COLUMNS"].to_i, ENV["LINES"].to_i]
-        elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV["TERM"])) && command_exists?("tput")
-          [`tput cols`.to_i, `tput lines`.to_i]
-        elsif STDIN.tty? && command_exists?("stty")
-          `stty size`.scan(/\d+/).map(&:to_i).reverse
-        end
-      rescue
-        nil
-      end
-      # rubocop:enable all
+      def detect_terminal_width
+        return ENV["COLUMNS"].to_i if ENV["COLUMNS"]&.match?(/\A\d+\z/)
 
-      def command_exists?(command)
-        ENV["PATH"].split(File::PATH_SEPARATOR).any? { |d| File.exist? File.join(d, command) }
+        IO.console&.winsize&.last || DEFAULT_TERMINAL_WIDTH
+      rescue SystemCallError
+        DEFAULT_TERMINAL_WIDTH
       end
   end
 end

data/lib/git_trend/scraper.rb

@@ -55,7 +55,7 @@ module GitTrend
           icon_area = content.search(".f6.color-fg-muted.mt-2")
           Project.new(
             name: content.search("h2 a").attr("href").to_s.delete_prefix("/"),
-            description: content.search(".col-9.color-fg-muted.my-1.pr-4").text.strip,
+            description: content.search("p.col-9").text.strip,
             lang: content.search('span[itemprop="programmingLanguage"]').text.strip,
             all_star_count: comma_to_i(icon_area.search("a:has(svg.octicon-star)").text.strip),
             fork_count: comma_to_i(icon_area.search("a:has(svg.octicon-repo-forked)").text.strip),

data/lib/git_trend/version.rb

@@ -1,3 +1,3 @@
 module GitTrend
-  VERSION = "1.4.2".freeze
+  VERSION = "1.4.3".freeze
 end

data/lib/git_trend.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-trend
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - rochefort
@@ -58,7 +58,7 @@ dependencies:
         version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,21 @@ dependencies:
         version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: CLI-Based tool that show Trending repository on github
 email:
 - terasawan@gmail.com
@@ -80,6 +94,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/codeql.yml"
+- ".github/workflows/smoke.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -96,28 +111,13 @@ files:
 - lib/git-trend.rb
 - lib/git_trend.rb
 - lib/git_trend/cli.rb
-- lib/git_trend/core_ext/string.rb
+- lib/git_trend/display_text.rb
 - lib/git_trend/formatter.rb
 - lib/git_trend/formatters/json_formatter.rb
 - lib/git_trend/formatters/text_formatter.rb
 - lib/git_trend/project.rb
 - lib/git_trend/scraper.rb
 - lib/git_trend/version.rb
-- note.txt
-- spec/fixtures/trending/alloy
-- spec/fixtures/trending/index
-- spec/fixtures/trending/ruby
-- spec/fixtures/trending/ruby?since=weekly
-- spec/fixtures/trending?since=
-- spec/fixtures/trending?since=daily
-- spec/fixtures/trending?since=monthly
-- 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
 homepage: https://github.com/rochefort/git-trend
 licenses:
 - MIT

data/lib/git_trend/core_ext/string.rb

@@ -1,27 +0,0 @@
-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/note.txt

@@ -1,8 +0,0 @@
-wget https://github.com/trending
-wget https://github.com/trending\?l=ruby
-wget https://github.com/trending\?l=objective-c%2B%2B
-wget https://github.com/trending\?since=weekly
-wget https://github.com/trending\?since=
-wget https://github.com/trending\?since=daily
-wget https://github.com/trending\?since=monthly
-wget https://github.com/trending\?l\=ruby\&since\=weekly