gitlabci-bundle-update-mr 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a13cdd08c861aabacc9b6b6f4a4776800b88fba42e6fd9725c9f261684be55ef
-  data.tar.gz: 2db4957efe87e12d4e7e7e71619e474821e2e6de61986d51c876c4a749955932
+  metadata.gz: d607680fe4d0fa78918da62e4777d8be1db5421949306682d83602bc538b3516
+  data.tar.gz: 692a716488d0553385164b0b8ad8a3ba78094764e72aad2608d6153aa073c242
 SHA512:
-  metadata.gz: 73b22faf854e49fd0a66eb5f2bcbc77218c0447f916474fe1376592bea708c50d34bdfa0e31a95fce8c4fbf5e920793551270f87dda5d0e1c977ff1737aad536
-  data.tar.gz: 788ba9a965cb5a228233265250744a827886e9a1f74481499dc8c4d4972d6dbd00dbb31147a66a8d33fd0ee7bc1172cd46a04d1184825eae8b3d6adf97e35444
+  metadata.gz: 7fea1ef7556ef71806db573a3205c84689723641c0c9feb9279f0915601d2e0ab76ac8d38367e97335e6de27915bbdcbfbaecf77dd5dfe1a8bb88731d40d95b7
+  data.tar.gz: 735ea90e2f2cb29bf35a17490bbc8a074d13bee45f0de44f5df825a3371070b220569f029b2c140e89ba5902775ae56ffcc599cc7e4397f014d9ceb52263b2e2

data/.gitlab-ci.yml

@@ -46,12 +46,26 @@ test:2.6:
 
   image: ruby:2.6
 
+test:trunk:
+  <<: *test
+
+  image: rubylang/ruby:trunk-nightly-bionic
+  allow_failure: true
+
 continuous_bundle_update:
   stage: build
 
   image: ruby
 
+  cache:
+    key: "$CI_BUILD_NAME"
+    paths:
+      - vendor/bundle/
+
   before_script:
+    - bundle install --path vendor/bundle
+    - bundle clean
+
     # Set timezone to Asia/Tokyo
     - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
@@ -61,7 +75,7 @@ continuous_bundle_update:
 
   only:
     - schedules
-    - web
+    - web # Test for topic branch
 
 pages:
   <<: *default

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.1...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.2.0...HEAD)
+
+## v0.2.0
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.1...v0.2.0)
+
+### Features
+* Don't update `BUNDLED WITH` section when ` budnle update` [!25](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/25) *@sue445*
+
+### Others
+* Add screenshot [!22](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/22) *@sue445*
+* Refactor continuous_bundle_update job [!23](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/23) *@sue445*
 
 ## v0.1.1
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.0...v0.1.1)

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (0.1.1)
+    gitlabci-bundle-update-mr (0.2.0)
       bundler
       compare_linker (>= 1.4.3)
       gitlab (>= 4.0.0)
+      restore_bundled_with
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +24,7 @@ GEM
     dotenv (2.7.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    git (1.5.0)
     gitlab (4.10.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
@@ -52,6 +54,9 @@ GEM
       pry (~> 0.10)
     public_suffix (3.0.3)
     rake (10.5.0)
+    restore_bundled_with (1.0.0)
+      git
+      thor
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -103,6 +108,3 @@ DEPENDENCIES
   simplecov
   webmock
   yard
-
-BUNDLED WITH
-   1.17.3

data/README.md

@@ -1,9 +1,16 @@
 # Gitlabci::Bundle::Update::Mr
+[![Gem Version](https://badge.fury.io/rb/gitlabci-bundle-update-mr.svg)](https://badge.fury.io/rb/gitlabci-bundle-update-mr)
+
 Create MergeRequest of bundle update in GitLab CI
 
+![gitlabci-bundle-update-mr](img/gitlabci-bundle-update-mr.png)
+
 This is inspired by [circleci-bundle-update-pr](https://github.com/masutaka/circleci-bundle-update-pr)
 
-[![Gem Version](https://badge.fury.io/rb/gitlabci-bundle-update-mr.svg)](https://badge.fury.io/rb/gitlabci-bundle-update-mr)
+## Requirements
+* GitLab v9.0.0+
+* GitLab API v4
+* git
 
 ## Installation
 ```bash
@@ -17,7 +24,6 @@ The application on which you want to run continuous bundle update must be config
 ### Get GitHub personal access token
 1. Go to [your account's settings page](https://github.com/settings/tokens/new?description=gitlabci-bundle-update-mr%20token)
 2. Generate a personal access token with `repo` scope
-3. Save environment variables as `OCTOKIT_ACCESS_TOKEN` to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/settings/ci_cd`
 
 ![github_access_token](img/github_access_token.png)
 
@@ -25,12 +31,11 @@ The application on which you want to run continuous bundle update must be config
 1. Go to `https://YOUR-GITLAB/profile/personal_access_tokens`
     * e.g. https://gitlab.com/profile/personal_access_tokens
 2. Generate a personal access token with `api` scope
-3. Save environment variables as `GITLAB_API_PRIVATE_TOKEN` to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/settings/ci_cd`
 
 ![gitlab_access_token](img/gitlab_access_token.png)
 
 ### Save CI environment variables 
-1. Go to `https://https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/settings/ci_cd`
+1. Go to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/settings/ci_cd`
 2. Save environment variables
     * `GITLAB_API_ENDPOINT` : GitLab API endpoint (e.g. `https://gitlab.com/api/v4`)
     * `GITLAB_API_PRIVATE_TOKEN` : GitLab personal access token
@@ -48,9 +53,17 @@ stages:
 continuous_bundle_update:
   stage: build
 
-  image: rubylang/ruby:2.6-bionic
+  image: ruby
+
+  cache:
+    key: "$CI_BUILD_NAME"
+    paths:
+      - vendor/bundle/
 
   before_script:
+    - bundle install --path vendor/bundle
+    - bundle clean
+
     # Set timezone to Asia/Tokyo
     - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
@@ -60,7 +73,6 @@ continuous_bundle_update:
 
   only:
     - schedules
-    - web
 ```
 
 And register scheduler to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/pipeline_schedules`
@@ -73,8 +85,9 @@ $ gitlabci-bundle-update-mr --help
 Usage: gitlabci-bundle-update-mr [options]
         --email EMAIL                git email address (default. `git config user.email`)
         --user USER                  git username (default. `git config user.name`)
-    -d, --duplicate                  Make MR even if it has already existed
+    -d, --duplicate                  Make MR even if it has already existed (default. false)
     -l, --labels 'In Review, Update' Add labels to the MR
+        --update-bundled-with        Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)
 ```
 
 ## Development

data/exe/gitlabci-bundle-update-mr

@@ -9,11 +9,13 @@ author_email = `git config user.email`.strip
 author_name = `git config user.name`.strip
 allow_dup_mr = false
 mr_labels = []
+update_bundled_with = false
 
 opt.on("--email EMAIL", "git email address (default. `git config user.email`)") { |v| author_email = v }
 opt.on("--user USER", "git username (default. `git config user.name`)") { |v| author_name = v }
-opt.on("-d", "--duplicate", "Make MR even if it has already existed") { |v| allow_dup_mr = v }
+opt.on("-d", "--duplicate", "Make MR even if it has already existed (default. false)") { |v| allow_dup_mr = v }
 opt.on("-l", "--labels 'In Review, Update'", Array, "Add labels to the MR") { |v| mr_labels = v.map(&:strip) }
+opt.on("--update-bundled-with", "Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)") { |v| p v }
 
 opt.parse!(ARGV)
 
@@ -28,4 +30,4 @@ client = Gitlabci::Bundle::Update::Mr::Client.new(
   author_name:              author_name,
 )
 
-client.perform(allow_dup_mr: allow_dup_mr, mr_labels: mr_labels)
+client.perform(allow_dup_mr: allow_dup_mr, mr_labels: mr_labels, update_bundled_with: update_bundled_with)

data/gitlabci-bundle-update-mr.gemspec

@@ -41,6 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bundler"
   spec.add_dependency "compare_linker", ">= 1.4.3"
   spec.add_dependency "gitlab", ">= 4.0.0"
+  spec.add_dependency "restore_bundled_with"
 
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "gitlab_awesome_release"

data/lib/gitlabci/bundle/update/mr.rb

@@ -3,6 +3,8 @@ require "gitlabci/bundle/update/mr/client"
 require "gitlab"
 require "compare_linker"
 require "bundler"
+require "restore_bundled_with"
+require "restore_bundled_with/cli"
 
 module Gitlabci
   module Bundle

data/lib/gitlabci/bundle/update/mr/client.rb

@@ -23,7 +23,8 @@ module Gitlabci
 
           # @param allow_dup_mr [Boolean]
           # @param mr_labels [Array<String>]
-          def perform(allow_dup_mr:, mr_labels:)
+          # @param update_bundled_with [Boolean]
+          def perform(allow_dup_mr:, mr_labels:, update_bundled_with:)
             if !allow_dup_mr && exists_bundle_update_mr?
               puts "Skip because it has already existed."
               return
@@ -34,6 +35,8 @@ module Gitlabci
             system!("bundle update")
             system!("bundle update --ruby")
 
+            restore_bundled_with unless update_bundled_with
+
             new_lockfile = File.read(lockfile_name)
 
             if old_lockfile == new_lockfile
@@ -90,6 +93,8 @@ module Gitlabci
 
           # @param old_lockfile [String]
           # @param new_lockfile [String]
+          #
+          # @return [String]
           def merge_request_description(old_lockfile, new_lockfile)
             compare_linker = CompareLinker.new("dummy", "dummy")
             compare_linker.formatter = CompareLinker::Formatter::Markdown.new
@@ -114,6 +119,16 @@ module Gitlabci
             raise "`#{command}` is failed" unless ret
           end
 
+          def restore_bundled_with
+            RestoreBundledWith::CLI.new.invoke(
+              :restore,
+              [],
+              {
+                lockfile: lockfile_name,
+              },
+              )
+          end
+
           def gemfile_name
             return @gemfile_name if @gemfile_name
 

data/lib/gitlabci/bundle/update/mr/version.rb

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "0.1.1"
+        VERSION = "0.2.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: restore_bundled_with
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement