circleci-bundle-update-pr 1.17.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b7ab3dbfc72e9b9324188c265d8d8157125777980c0df23374100b782bb551
-  data.tar.gz: a331c2a3ef23c8d28a59403f202d1bb5dfe81e569ffd385a11b8070bcf66d62e
+  metadata.gz: 1d5cc504a8708bd911a1547a56cf6734dc9280a1abb914c1e1028c27f4d79dc5
+  data.tar.gz: 47dbf8ecf966463318a76f43795a8fcba8e253e42900739efe3f01ad2bf60905
 SHA512:
-  metadata.gz: 29ea5efb9b178ad57a080f78da124fb520e28ce06e418e4ad6a63a1ff1edceaa80597a7871f05467c6e314522cd107a56a460ca918caa1d9c87f4feda39584dd
-  data.tar.gz: a1924bb344553c2f8176676d401534048a5d2bbcfbd16affef4cba96a6c9e40d757e70dcb2ea11eaa99c5435a9d80286821b024e9c8c7be77e57c74f5ae21fb1
+  metadata.gz: 1f79769e8e306cfb43d985a0db49a5a264e5542e07993ca359d66bda2d783b4510d045a77e5dd54520f920a9eb71da878d271f92db9e3003f48d6c618a7e4076
+  data.tar.gz: e898ecce0b82c6d9901e8a8e7a904e0bfb7677839b3b5002f64a7965c03e79375f38b33eaf240b5c8415197fb88f92e1aaa17f5e2e539376754e1c79854babde

data/.circleci/config.yml

@@ -5,7 +5,7 @@ executors:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.3', '2.4', '2.5', '2.6']
+        enum: ['2.3', '2.4', '2.5', '2.6', '2.7']
     docker:
       - image: ruby:<< parameters.ruby_version >>-alpine
     working_directory: /work
@@ -26,7 +26,7 @@ commands:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.3', '2.4', '2.5', '2.6']
+        enum: ['2.3', '2.4', '2.5', '2.6', '2.7']
     steps:
       - restore_cache:
           name: Restore bundle cache
@@ -37,7 +37,7 @@ commands:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.3', '2.4', '2.5', '2.6']
+        enum: ['2.3', '2.4', '2.5', '2.6', '2.7']
     steps:
       - save_cache:
           name: Save bundle cache
@@ -50,7 +50,7 @@ jobs:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.3', '2.4', '2.5', '2.6']
+        enum: ['2.3', '2.4', '2.5', '2.6', '2.7']
     executor:
       name: default
       ruby_version: << parameters.ruby_version >>
@@ -59,11 +59,14 @@ jobs:
       - checkout
       - restore_bundle_cache:
           ruby_version: << parameters.ruby_version >>
+      - run:
+          name: install bundler
+          command: gem install -N bundler:1.17.2 # same version as Gemfile.lock
       - run:
           name: bundle install
           command: |
             bundle check || bundle install --jobs=4 --retry=3
-            bundle clean
+            bundle clean --force
       - save_bundle_cache:
           ruby_version: << parameters.ruby_version >>
       - run: rubocop
@@ -71,12 +74,12 @@ jobs:
   continuous_bundle_update:
     executor:
       name: default
-      ruby_version: '2.6'
+      ruby_version: '2.7'
     steps:
       - setup_requirements
       - checkout
       - restore_bundle_cache:
-          ruby_version: '2.6'
+          ruby_version: '2.7'
       - run:
           name: Install edge circleci-bundle-update-pr
           command: |
@@ -102,10 +105,13 @@ workflows:
       - build:
           name: ruby-2.6
           ruby_version: '2.6'
+      - build:
+          name: ruby-2.7
+          ruby_version: '2.7'
   nightly:
     triggers:
       - schedule:
-          cron: "00 10 * * 5"
+          cron: "00 10 * * 2"
           filters:
             branches:
               only: master

data/.rubocop.yml

@@ -5,12 +5,18 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
 
+Layout/LineLength:
+  Enabled: false
+
 Metrics:
   Enabled: false
 
 RSpec/DescribedClass:
   Enabled: false
 
+RSpec/NamedSubject:
+  Enabled: false
+
 Style/BlockComments:
   Exclude:
     - 'spec/spec_helper.rb'

data/.rubocop_todo.yml

@@ -1,4 +1,4 @@
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - 'lib/circleci/bundle/update/pr.rb'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (1.17.0)
+    circleci-bundle-update-pr (1.19.0)
       compare_linker (>= 1.4.0)
       octokit
 
@@ -15,52 +15,54 @@ GEM
       httpclient
       octokit
     diff-lcs (1.3)
-    faraday (0.15.4)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     httpclient (2.8.3)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.4)
     multipart-post (2.1.1)
-    octokit (4.14.0)
+    octokit (4.15.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.71.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.33.0)
-      rubocop (>= 0.60.0)
+    rubocop-rspec (1.37.1)
+      rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
   x86_64-darwin-16
   x86_64-darwin-17
   x86_64-darwin-18
+  x86_64-darwin-19
 
 DEPENDENCIES
   bundler

data/README.md

@@ -189,7 +189,7 @@ jobs:
         run: |
           set -x
 
-          export CIRCLE_BRANCH=$(echo $GITHUB_BRANCH | sed -e 's!refs/heads/!!g')
+          export CIRCLE_BRANCH=$(echo $GITHUB_REF | sed -e 's!refs/heads/!!g')
           export CIRCLE_PROJECT_USERNAME=$(echo $GITHUB_REPOSITORY | cut -d "/" -f 1)
           export CIRCLE_PROJECT_REPONAME=$(echo $GITHUB_REPOSITORY | cut -d "/" -f 2)
 
@@ -198,8 +198,6 @@ jobs:
           circleci-bundle-update-pr "${GIT_USER_NAME}" "${GIT_USER_EMAIL}"
         env:
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_BRANCH:       ${{ github.ref }}
-          GITHUB_REPOSITORY:   ${{ github.repository }}
           GIT_USER_NAME:       "your name"
           GIT_USER_EMAIL:      "ci@example.com"
 ```

data/lib/circleci/bundle/update/pr.rb

@@ -117,7 +117,7 @@ module Circleci
             repo_full_name,
             [
               {
-                path: 'Gemfile.lock',
+                path: lockfile_path,
                 mode: '100644',
                 type: 'blob',
                 sha: lockfile_blob_sha
@@ -236,6 +236,19 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
           @now ||= Time.now
         end
         private_class_method :now
+
+        # Get Gemfile.lock path relative to workdir
+        #
+        # @return [String]
+        def self.lockfile_path
+          workdir_env = ENV['CIRCLE_WORKING_DIRECTORY']
+          return 'Gemfile.lock' unless workdir_env
+
+          workdir = Pathname.new(workdir_env).expand_path
+          gemfile_lock = Pathname.new(File.expand_path('Gemfile.lock'))
+          gemfile_lock.relative_path_from(workdir).to_s
+        end
+        private_class_method :lockfile_path
       end
     end
   end

data/lib/circleci/bundle/update/pr/version.rb

@@ -4,7 +4,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        VERSION = '1.17.0'
+        VERSION = '1.19.0'
       end
     end
   end

data/spec/circleci/bundle/update/pr_spec.rb

@@ -52,4 +52,65 @@ describe Circleci::Bundle::Update::Pr do
       it { is_expected.to be_falsy }
     end
   end
+
+  describe '.lockfile_path' do
+    subject { Circleci::Bundle::Update::Pr.send(:lockfile_path) }
+
+    let(:workdir_env) { Dir.getwd }
+
+    around do |e|
+      ENV['CIRCLE_WORKING_DIRECTORY'] = workdir_env
+      e.run
+      ENV['CIRCLE_WORKING_DIRECTORY'] = nil
+    end
+
+    context 'when Gemfile.lock is in the working dir' do
+      it { is_expected.to eq 'Gemfile.lock' }
+    end
+
+    context "when ENV['CIRCLE_WORKING_DIRECTORY'] is not set" do
+      let(:workdir_env) {}
+
+      it { is_expected.to eq 'Gemfile.lock' }
+    end
+
+    context "when ENV['CIRCLE_WORKING_DIRECTORY'] is relative path" do
+      let(:workdir_env) do
+        project_dir = Pathname.getwd.to_s
+        home_dir = Pathname.new(ENV['HOME']).to_s
+        project_dir.sub(home_dir, '~')
+      end
+      let(:src_dir) { 'spec/tmp' }
+
+      around do |e|
+        FileUtils.mkdir_p(src_dir)
+        FileUtils.touch("#{src_dir}/Gemfile.lock")
+        e.run
+        FileUtils.rm_rf(src_dir)
+      end
+
+      it 'is "spec/tmp/Gemfile.lock"' do
+        Dir.chdir(src_dir) do
+          expect(subject).to eq 'spec/tmp/Gemfile.lock'
+        end
+      end
+    end
+
+    context 'when Gemfile.lock is in a nested dir' do
+      let(:src_dir) { 'spec/tmp' }
+
+      around do |e|
+        FileUtils.mkdir_p(src_dir)
+        FileUtils.touch("#{src_dir}/Gemfile.lock")
+        e.run
+        FileUtils.rm_rf(src_dir)
+      end
+
+      it 'is "spec/tmp/Gemfile.lock"' do
+        Dir.chdir(src_dir) do
+          expect(subject).to eq 'spec/tmp/Gemfile.lock'
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circleci-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compare_linker
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provide continues bundle update using CircleCI