unwrappr 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac46367aac21e83d32adc4e911daae5b8048f65a8939895e47de3e5ae94e7faf
-  data.tar.gz: 7e3ad4f274d8dea952ddbbb2012256f90da27dae015974b3df19fd17d8fa5f6a
+  metadata.gz: 197b63d85c71cc3d7701f8f22cd1a0c305bf07a6eade0c5e7c8ca52ec0538bb3
+  data.tar.gz: 07546ef3c1f66c5a6e9dd632d0f1ac07a5bae6c56897ec6908b9f5ae360dc682
 SHA512:
-  metadata.gz: e837150f75105603329e612b5f351c358aee257e898cdcb2f402de7df1b451f5427d44e005f2d0923c696ef5914d42e62b5d1d9ccfd44bb9d62138f5aa51e485
-  data.tar.gz: 450af0d234ca5dc144553c17a76a43f3e3a025ffe30ba0c8e6d9dc5e4a75abbcfbd0bc6c452c995ac25f93aa46a73aaeda5eec4b081f54e429e476786eefa20b
+  metadata.gz: c0eb4bed6b570378cc213667250f9fbca23e3a25ac84779d8ec2d54ebe4c7fb1cd601c1bac84a92ebff2861a52950f9c048f7c79fb947001c259289ca54272bd
+  data.tar.gz: 2ccbd4e9c68b2d38746b5a88bd37730f1bd211d65d94ceed575b6573e151d733cc7dae0dc4331dd9381d1b8084a05d92d932ad6800d83e726ed456dc4bcce2f1

data/CHANGELOG.md

@@ -6,7 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/envato/unwrappr/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/envato/unwrappr/compare/v0.6.0...HEAD
+
+## [0.6.0] 2021-05-12
+
+### Add
+- Allow specification of Gemfile lock files to annotate. ([#86])
+
+[0.6.0]: https://github.com/envato/unwrappr/compare/v0.5.0..v0.6.0
+[#86]: https://github.com/envato/unwrappr/pull/86
 
 ## [0.5.0] 2021-01-04
 

data/lib/unwrappr/cli.rb

@@ -17,6 +17,13 @@ module Unwrappr
            DESCRIPTION
            attribute_name: :base_branch)
 
+    option ['-f', '--lock-file'],
+           'LOCK_FILE1 [-f LOCK_FILE2] [-f LOCK_FILE3] [-f ...]',
+           'The Gemfile.lock files to annotate. Useful when working with multiple lock files.',
+           multivalued: true,
+           default: ['Gemfile.lock'],
+           attribute_name: :lock_files
+
     option ['-v', '--version'], :flag, 'Show version' do
       puts "unwrappr v#{Unwrappr::VERSION}"
       exit(0)
@@ -25,7 +32,7 @@ module Unwrappr
     subcommand 'all', 'run bundle update, push to github, '\
                       'create a pr and annotate changes' do
       def execute
-        Unwrappr.run_unwapper_in_pwd(base_branch: base_branch)
+        Unwrappr.run_unwapper_in_pwd(base_branch: base_branch, lock_files: lock_files)
       end
     end
 
@@ -42,7 +49,8 @@ module Unwrappr
       def execute
         LockFileAnnotator.annotate_github_pull_request(
           repo: repo,
-          pr_number: pr.to_i
+          pr_number: pr.to_i,
+          lock_files: lock_files
         )
       end
     end
@@ -68,24 +76,24 @@ module Unwrappr
             )
           end
 
-          Dir.chdir(repo) { Unwrappr.run_unwapper_in_pwd(base_branch: base_branch) }
+          Dir.chdir(repo) { Unwrappr.run_unwapper_in_pwd(base_branch: base_branch, lock_files: lock_files) }
         end
       end
     end
   end
 
-  def self.run_unwapper_in_pwd(base_branch:)
-    return unless lockfile_present?
+  def self.run_unwapper_in_pwd(base_branch:, lock_files:)
+    return unless any_lockfile_present?(lock_files)
 
     puts "Doing the unwrappr thing in #{Dir.pwd}"
 
     GitCommandRunner.create_branch!(base_branch: base_branch)
     BundlerCommandRunner.bundle_update!
     GitCommandRunner.commit_and_push_changes!
-    GitHub::Client.make_pull_request!
+    GitHub::Client.make_pull_request!(lock_files)
   end
 
-  def self.lockfile_present?
-    GitCommandRunner.file_exist?('Gemfile.lock')
+  def self.any_lockfile_present?(lock_files)
+    lock_files.any? { |lock_file| GitCommandRunner.file_exist?(lock_file) }
   end
 end

data/lib/unwrappr/github/client.rb

@@ -12,8 +12,8 @@ module Unwrappr
           @github_token = nil
         end
 
-        def make_pull_request!
-          create_and_annotate_pull_request
+        def make_pull_request!(lock_files)
+          create_and_annotate_pull_request(lock_files)
         rescue Octokit::ClientError => e
           raise "Failed to create and annotate pull request: #{e}"
         end
@@ -27,7 +27,7 @@ module Unwrappr
           [m[:org], m[:repo]].join('/')
         end
 
-        def create_and_annotate_pull_request
+        def create_and_annotate_pull_request(lock_files)
           pr = git_client.create_pull_request(
             repo_name_and_org,
             repo_default_branch,
@@ -35,7 +35,7 @@ module Unwrappr
             'Automated Bundle Update',
             pull_request_body
           )
-          annotate_pull_request(pr.number)
+          annotate_pull_request(pr.number, lock_files)
         end
 
         def repo_default_branch
@@ -50,10 +50,11 @@ module Unwrappr
           BODY
         end
 
-        def annotate_pull_request(pr_number)
+        def annotate_pull_request(pr_number, lock_files)
           LockFileAnnotator.annotate_github_pull_request(
             repo: repo_name_and_org,
             pr_number: pr_number,
+            lock_files: lock_files,
             client: git_client
           )
         end

data/lib/unwrappr/github/pr_source.rb

@@ -9,9 +9,10 @@ module Unwrappr
     # Implements the `lock_file_diff_source` interface as defined by the
     # LockFileAnnotator.
     class PrSource
-      def initialize(repo, pr_number, client)
+      def initialize(repo, pr_number, lock_files, client)
         @repo = repo
         @pr_number = pr_number
+        @lock_files = lock_files
         @client = client
       end
 
@@ -33,7 +34,7 @@ module Unwrappr
         @lock_file_diffs ||= @client
                              .pull_request_files(@repo, @pr_number)
                              .select do |file|
-                               File.basename(file.filename) == 'Gemfile.lock'
+                               @lock_files.include?(File.basename(file.filename))
                              end
       end
 

data/lib/unwrappr/lock_file_annotator.rb

@@ -18,10 +18,10 @@ module Unwrappr
   class LockFileAnnotator
     # rubocop:disable Metrics/MethodLength
     def self.annotate_github_pull_request(
-      repo:, pr_number:, client: Octokit.client
+      repo:, pr_number:, lock_files:, client: Octokit.client
     )
       new(
-        lock_file_diff_source: Github::PrSource.new(repo, pr_number, client),
+        lock_file_diff_source: Github::PrSource.new(repo, pr_number, lock_files, client),
         annotation_sink: Github::PrSink.new(repo, pr_number, client),
         annotation_writer: Writers::Composite.new(
           Writers::Title,
@@ -54,6 +54,8 @@ module Unwrappr
 
     def annotate
       @lock_file_diff_source.each_file do |lock_file_diff|
+        puts "Annotating #{lock_file_diff.filename}"
+
         lock_file_diff.each_gem_change do |gem_change|
           gem_change_info = @gem_researcher.research(gem_change, {})
           message = @annotation_writer.write(gem_change, gem_change_info)

data/lib/unwrappr/lock_file_comparator.rb

@@ -21,7 +21,9 @@ module Unwrappr
       private
 
       def specs_versions(lock_file)
-        Hash[lock_file.specs.map { |s| [s.name.to_sym, s.version.to_s] }]
+        lock_file.specs.each_with_object({}) do |s, memo|
+          memo[s.name.to_sym] = s.version.to_s
+        end
       end
     end
   end

data/lib/unwrappr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Unwrappr
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unwrappr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Emilyn Escabarte
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.7'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: A tool to unwrap your gems and see what's changed easily