bibliothecary 8.8.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1780d8940244ee5e96aab6ad08266b28f1bfac65eabb9ae2fc811712ddbbb3a
-  data.tar.gz: ac03558d5e3f9f127664c8420f31273b3eacfefccc4c193c1aa6830f2b54f749
+  metadata.gz: 5ee8f5b235766985dfe5ebab204d9102ab1ccaaa9d554bfe554717e5714a4d6a
+  data.tar.gz: 7c151adfd305c726b1fb071e057499b6db8e9ed23af5cae870faed1237ca3f12
 SHA512:
-  metadata.gz: 0ba1a48525ff6a464715b4d8210d5edf6269a31a785d2038f9228e5b591e83c128ff9adb33bc12d427da134afafb5e1b3808092f272105a7896e1db8895e67f6
-  data.tar.gz: 3737f2812866ea2d79f94d5c1dfecfcfb822ec2496d8eb013319d72d3218e8e4deb988232b046886ee616688f9cebd6c5c131186f8db2289bd3b372eb3dd8a67
+  metadata.gz: 23631d08bd943cf601e1304bcc4dfc02eb61dc23813919e5f3c3fc46c747ebb38d827f11ae559f80004c47751e74adc4aa98792d0176bec0ff3edff239018827
+  data.tar.gz: 3216f53aa721364f9f0209cb30a8b6a000e672a7ba874f4b5d2282a100611c5f1a26d9c921020fd3c4bf3e39ee0cb89ccbd63d91bfe462967ac85c28cd5b5e79

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/pypi.rb

@@ -9,8 +9,8 @@ module Bibliothecary
       # Optional Group 2 is [extras].
       # Capture Group 3 is Version
       REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)(?:\[.*?\])*([><=\w\.,]+)?/
-
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
+
       MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip|in)$/
       # TODO: can this be a more specific regexp so it doesn't match something like ".yarn/cache/create-require-npm-1.0.0.zip"?
       PIP_COMPILE_REGEXP = /.*require.*$/
@@ -45,6 +45,10 @@ module Bibliothecary
             kind: "lockfile",
             parser: :parse_requirements_txt,
           },
+          match_filename("pip-dependency-graph.json") => { # Exported from pipdeptree --json
+            kind: "lockfile",
+            parser: :parse_dependency_tree_json,
+          },
           match_filename("setup.py") => {
             kind: "manifest",
             parser: :parse_setup_py,
@@ -226,6 +230,18 @@ module Bibliothecary
       # should be treated as.
       NoEggSpecified = Class.new(ArgumentError)
 
+      def self.parse_dependency_tree_json(file_contents, options: {})
+        JSON.parse(file_contents)
+          .map do |pkg|
+            {
+                name: pkg.dig("package", "package_name"),
+                requirement: pkg.dig("package", "installed_version"),
+                type: "runtime",
+              }
+          end
+          .uniq
+      end
+
       # Parses a requirements.txt file, following the
       # https://pip.pypa.io/en/stable/cli/pip_install/#requirement-specifiers
       # and https://pip.pypa.io/en/stable/topics/vcs-support/#git.
@@ -252,10 +268,7 @@ module Bibliothecary
             deps << result.merge(
               type: type
             )
-          else
-            match = line.delete(" ").match(REQUIREMENTS_REGEXP)
-            next unless match
-
+          elsif (match = line.delete(" ").match(REQUIREMENTS_REGEXP))
             deps << {
               name: match[1],
               requirement: match[-1] || "*",
@@ -263,7 +276,8 @@ module Bibliothecary
             }
           end
         end
-        deps
+
+        deps.uniq
       end
 
       def self.parse_requirements_txt_url(url)

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.8.0"
+  VERSION = "9.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.8.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Find and parse manifests