gem_collector 1.1.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36194b17fc2fa5c04f8ef352b3b5104eb3ddad6c092ada41cf345ce10c54beff
-  data.tar.gz: 30e9448687f5d3590a1fcf8a3dbc81e9372be51fe0bb8ace5d1d74d0c01ee640
+  metadata.gz: 6afb659e925c065367ff3c53185de814607b263ce55dd4ad0fba5ce6e39e8f6c
+  data.tar.gz: a89dec3aea75dee230bbfaa6f67e9d4ba7f4682884d2542b84c4a53e0d139fdb
 SHA512:
-  metadata.gz: 822ce5abdc809653d0a2de9bfdd28206c8abba90815095890fe7abf90f74b55379bc76da959722c8256acf1943ec6777c45a0073737126a87856c6b34a96fa2e
-  data.tar.gz: 84582ae7409da59b2097ea1c9bd1adc72b770da216e82331bf37462a8ebf8b800996ce8d501e66338d2c6ac35c1bf57731b126a9ada603d0cefa156c9d71b078
+  metadata.gz: 9ff0620a29e877a8e30d8d6d2665a6ef01b4a34ee15d32ce6730d00e673976238fd5799eaf81bc2d51b54ab6f95a3a8136a9b656dec2dbea67b1668b462e909f
+  data.tar.gz: 5f71e8c975aabe8afcc266e532cc880451e581543d754c7b4d3dbc1e96d9e37adf22dd70367f70576bcd42131e3852771738e94fe0e73784f7753c69f874089b

data/README.md

@@ -1,6 +1,6 @@
 # GemCollector
 [![Gem Version](https://badge.fury.io/rb/gem_collector.svg)](https://badge.fury.io/rb/gem_collector)
-[![Build Status](https://travis-ci.org/cookpad/gem_collector.svg?branch=master)](https://travis-ci.org/cookpad/gem_collector)
+[![Build Status](https://github.com/cookpad/gem_collector/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cookpad/gem_collector/actions/workflows/ci.yml)
 
 Collect gems used by applications.
 

data/app/controllers/gem_collector/api/v1/repositories_controller.rb

@@ -0,0 +1,23 @@
+class GemCollector::Api::V1::RepositoriesController < ActionController::API
+  def index
+    render json: GemCollector::Repository.all.map(&:as_json)
+  end
+
+  def show
+    repository = GemCollector::Repository.find(params[:id])
+    render json: {
+      gemfiles: repository.gems_with_version_point.group_by(&:path).map { |path, gems|
+        {
+          path: path,
+          gems: gems.map { |gem|
+            {
+              name: gem.name,
+              version: gem.version,
+              version_point: gem.version_point,
+            }
+          },
+        }
+      },
+    }
+  end
+end

data/app/controllers/gem_collector/repositories_controller.rb

@@ -61,7 +61,7 @@ class GemCollector::RepositoriesController < GemCollector::ApplicationController
 
   # https://developer.github.com/webhooks/securing/
   def has_valid_signature?(site)
-    secret = Rails.application.config.octokit.fetch(site)['webhook_secret']
+    secret = Rails.application.config.octokit.fetch(site.to_sym)[:webhook_secret]
     if secret
       request.body.rewind
       payload_body = request.body.read

data/app/models/gem_collector/octokit_provider.rb

@@ -1,10 +1,11 @@
 module GemCollector::OctokitProvider
   def self.get(site)
-    conf = Rails.application.config.octokit.fetch(site)
-    Octokit::Client.new(
-      api_endpoint: conf['api_endpoint'],
-      web_endpoint: conf['web_endpoint'],
-      access_token: conf['access_token'],
-    )
+    conf = Rails.application.config.octokit.fetch(site.to_sym)
+    options = {
+      api_endpoint: conf[:api_endpoint],
+      web_endpoint: conf[:web_endpoint],
+      access_token: conf[:access_token],
+    }.compact
+    Octokit::Client.new(options)
   end
 end

data/app/models/gem_collector/repository.rb

@@ -14,10 +14,14 @@ class GemCollector::Repository < GemCollector::ApplicationRecord
     "#{site}/#{full_name}"
   end
 
+  private_class_method def self.build_version_exp(column_or_exp)
+    "(regexp_split_to_array(regexp_replace(#{column_or_exp}, '\\.?[^0-9.]+$', ''), '[^0-9]+') :: bigint[])"
+  end
+
   POINTS_FOR_GEMS_SQL = <<-SQL.strip_heredoc
     select
       gems.repository_id, gems.path, gems.name, gems.version
-      , cume_dist() over (partition by gems.name order by regexp_split_to_array(regexp_replace(version, '\.[^0-9.]+$', ''), '[^0-9]+') :: bigint[]) as version_point
+      , cume_dist() over (partition by gems.name order by #{build_version_exp('version')}) as version_point
     from
       #{GemCollector::RepositoryGem.table_name} gems
   SQL
@@ -77,8 +81,4 @@ class GemCollector::Repository < GemCollector::ApplicationRecord
       , gems.path
     SQL
   end
-
-  private_class_method def self.build_version_exp(column_or_exp)
-    "(regexp_split_to_array(regexp_replace(#{column_or_exp}, '\.[^0-9.]+$', ''), '[^0-9]+') :: bigint[])"
-  end
 end

data/app/services/gem_collector/update_gemfile.rb

@@ -55,10 +55,19 @@ class GemCollector::UpdateGemfile
   end
 
   def update_gemfile_lock(repository, dir, path)
-    lockfile_parser = Bundler::LockfileParser.new(path.read)
+    content = path.read
+    lockfile_parser =
+      begin
+        Bundler::LockfileParser.new(content)
+      rescue Bundler::LockfileError
+        # Try to parse (possibly) incompatible lockfile
+        content.sub!(/(^BUNDLED WITH\n\s*)[0-9.]+$/) { "#{$1}#{Bundler::VERSION}" }
+        Bundler::LockfileParser.new(content)
+      end
     lock_path = path.relative_path_from(dir).to_s
-    records = lockfile_parser.specs.map do |spec|
-      repository.repository_gems.build(path: lock_path, name: spec.name, version: spec.version.to_s)
+    # uniq is required when spec.platforms is not ruby and contains multiple platforms like x86_64-darwin-20 and x86_64-linux.
+    records = lockfile_parser.specs.map { |spec| [spec.name, spec.version.to_s] }.uniq.map do |name, version|
+      repository.repository_gems.build(path: lock_path, name: name, version: version)
     end
     GemCollector::RepositoryGem.import(records)
   end

data/config/routes.rb

@@ -6,4 +6,10 @@ GemCollector::Engine.routes.draw do
   get '/gems/:name' => 'repository_gems#show', as: :repository_gem
   get '/gems/:name/new_issue' => 'gem_news#new', as: :new_gem_news
   post '/gems/:name/new_issue' => 'gem_news#create', as: :create_gem_news
+
+  namespace :api do
+    namespace :v1 do
+      resources :repositories, only: %i[index show]
+    end
+  end
 end

data/lib/gem_collector/version.rb

@@ -1,3 +1,3 @@
 module GemCollector
-  VERSION = '1.1.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_collector
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -86,16 +86,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: autodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,9 +146,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/gem_collector_manifest.js
-- app/assets/javascripts/gem_collector/application.js
-- app/assets/stylesheets/gem_collector/application.css
+- app/controllers/gem_collector/api/v1/repositories_controller.rb
 - app/controllers/gem_collector/application_controller.rb
 - app/controllers/gem_collector/gem_news_controller.rb
 - app/controllers/gem_collector/repositories_controller.rb
@@ -142,7 +154,6 @@ files:
 - app/helpers/gem_collector/application_helper.rb
 - app/jobs/gem_collector/application_job.rb
 - app/jobs/gem_collector/update_gemfile_job.rb
-- app/mailers/gem_collector/application_mailer.rb
 - app/models/gem_collector/application_record.rb
 - app/models/gem_collector/octokit_provider.rb
 - app/models/gem_collector/repository.rb
@@ -171,7 +182,7 @@ homepage: https://github.com/cookpad/gem_collector
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Collect gems used by applications
 test_files: []

data/app/assets/config/gem_collector_manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../javascripts/gem_collector .js
-//= link_directory ../stylesheets/gem_collector .css

data/app/assets/javascripts/gem_collector/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/app/assets/stylesheets/gem_collector/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/mailers/gem_collector/application_mailer.rb

@@ -1,6 +0,0 @@
-module GemCollector
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end