gem_collector 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36194b17fc2fa5c04f8ef352b3b5104eb3ddad6c092ada41cf345ce10c54beff
-  data.tar.gz: 30e9448687f5d3590a1fcf8a3dbc81e9372be51fe0bb8ace5d1d74d0c01ee640
+  metadata.gz: f62c3065898613d6ad21af8ceee702138929a5016a1f36baa3f8944491eca5ab
+  data.tar.gz: 414aef8ebb73504c71ef93ab3091d8b9ae1ebbc6c113fb548358483fa3f543bf
 SHA512:
-  metadata.gz: 822ce5abdc809653d0a2de9bfdd28206c8abba90815095890fe7abf90f74b55379bc76da959722c8256acf1943ec6777c45a0073737126a87856c6b34a96fa2e
-  data.tar.gz: 84582ae7409da59b2097ea1c9bd1adc72b770da216e82331bf37462a8ebf8b800996ce8d501e66338d2c6ac35c1bf57731b126a9ada603d0cefa156c9d71b078
+  metadata.gz: 64a6c803cd6a95402b0adf9724d6c48d33b3a3d33b66e2f2fd6625597c95a6e41ca2b777381d43ad1619115a93869f82b6207fbeebc5ecd08560f2392278bc91
+  data.tar.gz: 1a1b404f03b8a5c592eb2d7bc02076b69e34d437ae8e158d31244a7da74e425600fbd0a38f4bb56b8f1557bcfb6e2b01e3c1d375e9973e918394737c60fc5c87

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,10 @@
 module GemCollector::OctokitProvider
   def self.get(site)
-    conf = Rails.application.config.octokit.fetch(site)
+    conf = Rails.application.config.octokit.fetch(site.to_sym)
     Octokit::Client.new(
-      api_endpoint: conf['api_endpoint'],
-      web_endpoint: conf['web_endpoint'],
-      access_token: conf['access_token'],
+      api_endpoint: conf[:api_endpoint],
+      web_endpoint: conf[:web_endpoint],
+      access_token: conf[:access_token],
     )
   end
 end

data/app/services/gem_collector/update_gemfile.rb

@@ -55,7 +55,15 @@ 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)

data/lib/gem_collector/version.rb

@@ -1,3 +1,3 @@
 module GemCollector
-  VERSION = '1.1.1'
+  VERSION = '1.2.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.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement