git-trend 1.2.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c515ab8268a8e8e5f67f8a17931e813d5989dabd94f33395583286662bc0b791
-  data.tar.gz: d6937ec921f004f2d951a9d5da9d410c72982440cb824ad92abe095361c10165
+  metadata.gz: e0747b72131e24ecb5c876c337ce33be1941683110562847152189e4ddbb5c72
+  data.tar.gz: 47412945f045abb2cd8af2d959ca9cb01547649d7904b5eeec0a3791f5476be6
 SHA512:
-  metadata.gz: 6950a80e2186bf6742702f7f00261ef1c643ce893db17f2000def3f647407804b4de6f0ea5cf398027f8aa5e842672e4d1b6c22810cf791bf9ea04ffa15acc0a
-  data.tar.gz: 719d208ea9cf6e008667007dce28838197d06ff8cdb5360c146195760e2158b4376a77a95ea9dc68cb10e0bec07afb765084e68ee3bfa50b43dd6c5f71664fb8
+  metadata.gz: 8a55d7452c04a64ad860e52e19a9673dedd0ef585b9615e1ad2e385100892540cff76209b807ae81087665436379219c351546f9f05115df006e93783050c09a
+  data.tar.gz: 041bb27a4b62b0114231b6d0d66cf285ca0dd7b2326d8dee5c3faa31667506960300e7bfb59e05c5e06eb46b81e0c5a14f189ab14a4c3fb466347061a7a9fbe3

data/.github/workflows/ci.yml

@@ -0,0 +1,82 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  ruby27:
+    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: '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'
+          bundler-cache: true
+
+      - name: Show ruby version
+        run: ruby -v
+
+      - name: Run tests
+        run: bundle exec rspec
+
+      - name: Run lint
+        run: bundle exec rubocop
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./coverage/.resultset.json
+          token: ${{ secrets.CODECOV_TOKEN }}

data/.rubocop.yml

@@ -1,5 +1,88 @@
-inherit_from:
-  - https://raw.githubusercontent.com/rails/rails/master/.rubocop.yml
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 2.7
+  Exclude:
+    - '**/tmp/**/*'
+    - '**/vendor/**/*'
+  NewCops: enable
+
+# ドキュメントの無い public class を許可する
+Style/Documentation:
+  Enabled: false
+
+# special_inside_parentheses (default) と比べて
+# * 横に長くなりづらい
+# * メソッド名の長さが変わったときに diff が少ない
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+# private/protected は一段深くインデントする
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+
+Layout/LineLength:
+  Exclude:
+    - "spec/**/*.rb"
+  Max: 160
+
+Metrics/BlockLength:
+  Exclude:
+    - "Rakefile"
+    - "**/*.rake"
+    - "spec/**/*.rb"
+    - "Gemfile"
+    - "*.gemspec"
+
+Metrics/MethodLength:
+  Max: 20
+  Exclude:
+    - "spec/**/*.rb"
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Style/BlockComments:
+  Enabled: false
+
+# namespace 付きのクラスはかなり頻繁に作るので簡単に書きたい。
+Style/ClassAndModuleChildren:
+  Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+# 無指定だと StandardError を rescue するのは常識の範疇なので。
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+
+# * 式展開したい場合に書き換えるのが面倒
+# * 文章ではダブルクォートよりもシングルクォートの方が頻出する
+# ことから EnforcedStyle: double_quotes 推奨
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# 複数行の場合はケツカンマを入れる(Arrayリテラル)
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+# 複数行の場合はケツカンマを入れる(Hashリテラル)
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+RSpec/NestedGroups:
+  Max: 5
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,15 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-12-10 21:11:24 UTC using RuboCop version 1.58.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Exclude:
+    - 'lib/git_trend/formatters/text_formatter.rb'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.4.0 (Mon Mar 13 2023)
+
+- Drop support of Ruby 2.6 and earlier [41e871e]
+
+## v1.3.0 (Mon Mar 13 2023)
+
+- Fix changing HTML structure [8de4920]
+
 ## v1.2.9 (Mon Mar 13 2023)
 
 - Upgrade gem [3f79648]
@@ -20,11 +28,11 @@
 
 ## v1.2.4 (Mon Mar 2 2020)
 
-- Fix languages without linefeeds [ecc63af]
+- Fix languages without linefeed [ecc63af]
 
 ## v1.2.3 (Mon Mar 2 2020)
 
-- Fix wrong interger format of star [dbdc344]
+- Fix wrong integer format of star [dbdc344]
 
 ## v1.2.2 (Sun Dec 15 2019)
 
@@ -40,7 +48,7 @@
 
 ## v1.1.9 (Sat Mar 16 2017)
 
-- Fix lagungage result is zero (#24) [9bb8785]
+- Fix language result is zero (#24) [9bb8785]
 
 ## v1.1.8 (Sat Jul 22 2017)
 
@@ -94,7 +102,7 @@
 - Update gems [29bc2a9]
 
 ## v0.2.1 (Sun Dec 6 2015)
-- Fix #6 redundancy line feeds when including multibyte characters [61fd81c]
+- Fix #6 redundancy line feeds when including multi-byte characters [61fd81c]
 - Update gems [ea5a018]
 
 ## v0.2.0 (Tue Dec 3 2015)
@@ -121,7 +129,7 @@
 - Add number option #3 [7cff5b4]
 
 ## v0.1.3
-- The `descript` option of `list` command was changed into the default. [3602272]
+- The `description` option of `list` command was changed into the default. [3602272]
 
 ## v0.1.2
 - Fix travis ci error #24 [6752e1d]
@@ -152,7 +160,7 @@ Add a magic comment for ruby1.9 #2
 - Fix lack of addressable gem when installing [54ca275]
 
 ## v0.0.4
-- Implement descrition option [4587e56]
+- Implement description option [4587e56]
 
 ## v0.0.3
 - Implement since option [04f1978]

data/Gemfile

@@ -2,3 +2,14 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in git-trend.gemspec
 gemspec
+
+gem "rake"
+gem "rubocop", require: false
+gem "rubocop-performance", require: false
+gem "rubocop-rake", require: false
+gem "rubocop-rspec", require: false
+
+gem "irb", require: false
+gem "rspec", require: false
+gem "simplecov", require: false
+gem "webmock", require: false

data/README.md

@@ -1,6 +1,4 @@
-[![Build Status](https://travis-ci.com/rochefort/git-trend.svg?branch=master)](https://travis-ci.com/rochefort/git-trend)
-[![Coverage Status](https://coveralls.io/repos/github/rochefort/git-trend/badge.svg?branch=master)](https://coveralls.io/github/rochefort/git-trend?branch=master)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/rochefort/git-trend.svg)](https://codeclimate.com/github/rochefort/git-trend/maintainability)
+[![codecov](https://codecov.io/gh/rochefort/git-trend/graph/badge.svg?token=rbh4fONhKx)](https://codecov.io/gh/rochefort/git-trend)
 [![Gem Version](http://img.shields.io/gem/v/git-trend.svg?style=flat)](http://badge.fury.io/rb/git-trend)
 
 
@@ -20,7 +18,7 @@ And this also work as a command line utility.
 
 ## Requirements
 
-Ruby versions is 2.4 or later.
+Ruby versions is 2.7 or later.
 
 ## Installation
 Add this line to your application's Gemfile:

data/git-trend.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "git_trend/version"
 
@@ -17,33 +17,20 @@ 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.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   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.9.0"
+  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_development_dependency "bundler"
-  spec.add_development_dependency "rake",    "~> 13.0.0"
-
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rails"
-
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rspec",     "~> 3.12.0"
-  spec.add_development_dependency "simplecov", "~>0.16.1"
-  spec.add_development_dependency "webmock",   "~> 3.18.1"
-
-  spec.add_development_dependency "coveralls", "~> 0.8.23"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/git-trend.rb

@@ -1 +1 @@
-require "git_trend"
+require "git_trend" # rubocop:disable Naming/FileName

data/lib/git_trend/cli.rb

@@ -1,9 +1,9 @@
 require "thor"
 
+# rubocop:disable Metrics/AbcSize
 module GitTrend
   class CLI < Thor
-    map "-v"              => :version,
-        "--version"       => :version
+    map "-v" => :version, "--version" => :version
 
     default_command :list
     class_option :verbose, type: :boolean
@@ -28,19 +28,20 @@ module GitTrend
     option :help,        aliases: "-h", required: false, type: :boolean
     def list
       help(:list) && return if options[:help]
+
       scraper = Scraper.new
       projects = scraper.get(options[:language], options[:since], options[:number])
       formatter = Formatter.new(options[:format])
       formatter.print(projects, enable_description: !!options[:description])
     rescue => e
       say "An unexpected #{e.class} has occurred.", :red
-      say e.message unless e.class.to_s == e.message
+      say e.message unless e.instance_of?(e.message) # エラー内容がクラス名の場合は表示しない
 
       puts exception.backtrace if options[:verbose]
     end
 
     desc :languages, "Show selectable languages"
-    option :format,      aliases: "-f", required: false, default: "text", desc: "Choose a formatter as text or json. Enable: [t, text, j, json]"
+    option :format, aliases: "-f", required: false, default: "text", desc: "Choose a formatter as text or json. Enable: [t, text, j, json]"
     def languages
       scraper = Scraper.new
       languages = scraper.languages
@@ -49,3 +50,4 @@ module GitTrend
     end
   end
 end
+# rubocop:enable Metrics/AbcSize

data/lib/git_trend/formatter.rb

@@ -13,6 +13,7 @@ module GitTrend
     end
 
     private
+
       def formatter_class(key)
         case key
         when "j", "json" then Formatters::JsonFormatter

data/lib/git_trend/formatters/json_formatter.rb

@@ -2,8 +2,8 @@ require "json"
 
 module GitTrend::Formatters
   class JsonFormatter
-    def print(projects, options)
-      puts projects.map { |project| project.to_h }.to_json
+    def print(projects, options) # rubocop:disable Lint/UnusedMethodArgument
+      puts projects.map(&:to_h).to_json
     end
 
     def print_languages(languages)

data/lib/git_trend/formatters/text_formatter.rb

@@ -2,8 +2,8 @@ require "mb_string"
 
 module GitTrend::Formatters
   class TextFormatter
-    HEADER_COLUMNS = %w(no. name lang star description)
-    DEFAULT_COLUMNS_SIZES = [3, 40, 10, 6, 20]
+    HEADER_COLUMNS = %w[no. name lang star description].freeze
+    DEFAULT_COLUMNS_SIZES = [3, 40, 10, 6, 20].freeze
 
     def print(projects, options)
       if projects.empty?
@@ -27,6 +27,7 @@ module GitTrend::Formatters
     end
 
     private
+
       def render_zero
         puts "It looks like we don’t have any trending repositories."
         puts
@@ -42,7 +43,7 @@ module GitTrend::Formatters
 
       def rule_max_description_size
         terminal_width, _terminal_height = detect_terminal_size
-        description_width = terminal_width - @columns_sizes[0..-2].inject(&:+) - (@columns_sizes.size - 1)
+        description_width = terminal_width - @columns_sizes[0..-2].sum - (@columns_sizes.size - 1)
         if description_width >= DEFAULT_COLUMNS_SIZES.last
           @columns_sizes[-1] = description_width
         else
@@ -71,6 +72,7 @@ module GitTrend::Formatters
         puts fmt % @columns_sizes.map { |column| "-" * column }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def render_body(projects)
         f = @columns_sizes
         fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
@@ -87,12 +89,14 @@ module GitTrend::Formatters
           puts result.rstrip
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def render_footer
         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]
@@ -104,6 +108,7 @@ module GitTrend::Formatters
       rescue
         nil
       end
+      # rubocop:enable all
 
       def command_exists?(command)
         ENV["PATH"].split(File::PATH_SEPARATOR).any? { |d| File.exist? File.join(d, command) }

data/lib/git_trend/scraper.rb

@@ -3,8 +3,8 @@ require "addressable/uri"
 
 module GitTrend
   class Scraper
-    BASE_HOST = "https://github.com"
-    BASE_URL = "#{BASE_HOST}/trending"
+    BASE_HOST = "https://github.com".freeze
+    BASE_URL = "#{BASE_HOST}/trending".freeze
 
     def initialize
       @agent = Mechanize.new
@@ -28,19 +28,19 @@ module GitTrend
     end
 
     private
+
       def generate_url(language, since)
         url = BASE_URL.dup
         url << "/#{language}" if language
         uri = Addressable::URI.parse(url)
         since = convert_url_param_since(since)
-        if since
-          uri.query_values = { since: since }.delete_if { |_k, v| v.nil? }
-        end
+        uri.query_values = { since: since }.compact if since
         uri.to_s
       end
 
       def convert_url_param_since(since)
         return unless since
+
         case since.to_sym
         when :d, :day,   :daily   then "daily"
         when :w, :week,  :weekly  then "weekly"
@@ -49,11 +49,12 @@ module GitTrend
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       def generate_project(page)
         page.search(".Box-row").map do |content|
           icon_area = content.search(".f6.color-fg-muted.mt-2")
           Project.new(
-            name: content.search("h1 a").attr("href").to_s.sub(/\A\//, ""),
+            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,
             lang: content.search('span[itemprop="programmingLanguage"]').text.strip,
             all_star_count: comma_to_i(icon_area.search("a:has(svg.octicon-star)").text.strip),
@@ -62,6 +63,7 @@ module GitTrend
           )
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def comma_to_i(obj)
         obj.to_s.delete(",").to_i

data/lib/git_trend/version.rb

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