bibliothecary 8.8.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9dd3ee94e4de1a66c6dabac392832a1ba6805dbef22398665697a85bc8a420
-  data.tar.gz: 800a427c7e9fbe6d12d116c1c0e57373136421dd99b6fc272218fad3c47db72d
+  metadata.gz: 663746258869345c2ab91235203d083b8c20862ceacc435726e0e903a5924a2c
+  data.tar.gz: d675d548e6c34bb985895087948753f43a132c09c28608a56d3cfce5cc14b0fa
 SHA512:
-  metadata.gz: d8da425a16d0378c3a73658df752804af3f9c78d31eccb7a26e0abf0b469f0dfa9c8a1d17f907c77255015499e9f947b1b63823641762be161cb4248afb8a2b6
-  data.tar.gz: 16d78e7dc17c53d79a6b634dde2ca7b73d8cccaa9db4435956ef752de6fa7c73a6d92a8486576beab838bc12a328016274ca850f2b54ed7e875110c1e38f0a74
+  metadata.gz: 65b0c2930fd92537908a604c94e2a12852e5cc5167838f3fb7c86325a16fc930479b746096a063506f01174c9eb40a792e7f88e1aacefce0f657059b630297a6
+  data.tar.gz: 1b29d13ee41d4a6aabe54854ebe316f1f17cea1be88ba9a73a290c645f3cad4853e2cc6497f419dff474809e1905c1ad851d1d214a58373eee013774830a23e6

data/.circleci/config.yml

@@ -1,37 +1,45 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.1.2
+  ruby: circleci/ruby@2.1.3
 
 executors:
   bibliothecary:
     docker:
-      - image: cimg/ruby:2.7.1
+      - image: cimg/ruby:3.0.7
     working_directory: ~/bibliothecary
 
+
+commands:
+  setup-ruby-env:
+    description: "Some requirements to ensure that the ruby orb install-deps works"
+    steps:
+      - run:
+          name: Prep ruby
+          command: |
+            touch /tmp/ruby-project-lockfile
+            bundle lock --add-platform x86_64-linux
+      - ruby/install-deps:
+          bundler-version: "2.3"
+
+
 jobs:
   test:
     executor: bibliothecary
     steps:
     - checkout
-    - run:
-        name: Which bundler?
-        command: bundle -v
-    - ruby/bundle-install
+    - setup-ruby-env
     - run:
         name: Run specs
         command: bundle exec rake spec
     - run:
         name: CodeClimate
-        command: bundle exec codeclimate-test-reporter
+        command: bundle exec codeclimate-test-reporter  
 
   lint:
     executor: bibliothecary
     steps:
     - checkout
-    - run:
-        name: Which bundler?
-        command: bundle -v
-    - ruby/bundle-install
+    - setup-ruby-env
     - run:
         name: Run specs
         command: bundle exec rake lint

data/.rubocop.yml

@@ -2,7 +2,7 @@
 
 AllCops:
   DisabledByDefault: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 
 Metrics/BlockLength:

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.7

data/README.md

@@ -7,7 +7,7 @@ Dependency manifest parsing library for https://libraries.io
 
 ## Installation
 
-Requires Ruby 2.7 or above.
+Requires Ruby 3.0 or above.
 
 Add this line to your application's Gemfile:
 

data/lib/bibliothecary/parsers/go.rb

@@ -7,13 +7,13 @@ module Bibliothecary
       include Bibliothecary::Analyser
 
       GPM_REGEXP = /^(.+)\s+(.+)$/
+      GOMOD_COMMENT_REGEXP = /(\/\/(.*))/
       GOMOD_REPLACEMENT_SEPARATOR_REGEXP = /\s=>\s/
-      GOMOD_DEP_REGEXP = /(?<name>\S+)\s?(?<requirement>[^\s=>]+)?/ # the " =>" negative character class is to make sure we don't capture the delimiter for "replace" deps
+      GOMOD_DEP_REGEXP = /(?<name>\S+)\s?(?<requirement>[^\s=>]+)?\s*(?<indirect>\/\/\s+indirect)?/ # the " =>" negative character class is to make sure we don't capture the delimiter for "replace" deps
       GOMOD_SINGLELINE_DEP_REGEXP = /^(?<category>require|exclude|replace|retract)\s+#{GOMOD_DEP_REGEXP}.*$/
       GOMOD_MULTILINE_DEP_REGEXP = /^#{GOMOD_DEP_REGEXP}.*$/
       GOMOD_MULTILINE_START_REGEXP = /^(?<category>require|exclude|replace|retract)\s+\(/
       GOMOD_MULTILINE_END_REGEXP = /^\)/
-      GOMOD_COMMENT_REGEXP = /(\/\/(.*))/
       GOSUM_REGEXP = /^(.+)\s+(.+)\s+(.+)$/
 
       def self.mapping
@@ -158,8 +158,8 @@ module Bibliothecary
         }
         file_contents
           .lines
+          .map(&:strip)
           .reject { |line| line =~ /^#{GOMOD_COMMENT_REGEXP}/ } # ignore comment lines
-          .map { |line| line.strip.gsub(GOMOD_COMMENT_REGEXP, "") } # strip out trailing comments
           .each do |line|
             if line.match(GOMOD_MULTILINE_END_REGEXP) # detect the end of a multiline
               current_multiline_category = nil
@@ -227,6 +227,7 @@ module Bibliothecary
             name: replacement_match[:name],
             requirement: replacement_match[:requirement] || "*",
             type: "runtime",
+            direct: !match[:indirect],
           }
         when "retract"
           {
@@ -234,12 +235,14 @@ module Bibliothecary
             requirement: match[:requirement] || "*",
             type: "runtime",
             deprecated: true,
+            direct: !match[:indirect],
           }
         else
           {
             name: match[:name],
             requirement: match[:requirement] || "*",
             type: "runtime",
+            direct: !match[:indirect],
           }
         end
       end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.8.1"
+  VERSION = "9.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.8.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -248,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andrewnez@gmail.com
 executables:
@@ -326,7 +326,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,8 +341,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Find and parse manifests
 test_files: []