gitlabci-bundle-update-mr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e90b7314c57a24908145a4208f5ebbd6f52c747147a5f5992b0aa0e0fa39a41
-  data.tar.gz: c2b804789f4290b40e7f08764d2c6135326eae908fcc54a4d85fd4e9d61c955d
+  metadata.gz: a13cdd08c861aabacc9b6b6f4a4776800b88fba42e6fd9725c9f261684be55ef
+  data.tar.gz: 2db4957efe87e12d4e7e7e71619e474821e2e6de61986d51c876c4a749955932
 SHA512:
-  metadata.gz: d809b816ae17336303434c881946ed4b702e3bbe48a4f2a9a2a24e4ea7fedf7c296db4ca27d1f14563bc2695e91a55b17ffcc10685f161820a82195c69ba97f5
-  data.tar.gz: 72742581d2fc375363c1e357449170d1898aa76cafb1910c762aae7db13f035ddeec466d685e393699c092d0a78294b7f81e5f2e48caa911cb94f56cf0af2e40
+  metadata.gz: 73b22faf854e49fd0a66eb5f2bcbc77218c0447f916474fe1376592bea708c50d34bdfa0e31a95fce8c4fbf5e920793551270f87dda5d0e1c977ff1737aad536
+  data.tar.gz: 788ba9a965cb5a228233265250744a827886e9a1f74481499dc8c4d4972d6dbd00dbb31147a66a8d33fd0ee7bc1172cd46a04d1184825eae8b3d6adf97e35444

data/.env.gitlab

@@ -0,0 +1,2 @@
+GITLAB_API_ENDPOINT=https://gitlab.com/api/v4
+GITLAB_PROJECT_NAME=sue445/gitlabci-bundle-update-mr

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 .env
+public/

data/.gitlab-ci.yml

@@ -1,9 +1,8 @@
 stages:
   - build
+  - deploy
 
-.test: &test
-  stage: build
-
+.default: &default
   cache:
     key: "$CI_BUILD_NAME"
     paths:
@@ -13,44 +12,44 @@ stages:
     - bundle install --path vendor/bundle
     - bundle clean
 
-  script:
-    - bundle exec rspec
-    - bundle exec ./exe/gitlabci-bundle-update-mr --help
-
   except:
     - schedules
     - web
+    - tags
+
+.test: &test
+  <<: *default
+
+  stage: build
+
+  script:
+    - bundle exec rspec
+    - bundle exec ./exe/gitlabci-bundle-update-mr --help
 
 test:2.3:
   <<: *test
 
-  image: rubylang/ruby:2.3-bionic
+  image: ruby:2.3
 
 test:2.4:
   <<: *test
 
-  image: rubylang/ruby:2.4-bionic
+  image: ruby:2.4
 
 test:2.5:
   <<: *test
 
-  image: rubylang/ruby:2.5-bionic
+  image: ruby:2.5
 
 test:2.6:
   <<: *test
 
-  image: rubylang/ruby:2.6-bionic
-
-test:trunk:
-  <<: *test
-
-  image: rubylang/ruby:trunk-nightly-bionic
-  allow_failure: true
+  image: ruby:2.6
 
 continuous_bundle_update:
   stage: build
 
-  image: rubylang/ruby:2.6-bionic
+  image: ruby
 
   before_script:
     # Set timezone to Asia/Tokyo
@@ -58,8 +57,23 @@ continuous_bundle_update:
 
   script:
     - gem install --no-doc gitlabci-bundle-update-mr
-    - gitlabci-bundle-update-mr --user="GitLab CI" --email="gitlabci@example.com"
+    - gitlabci-bundle-update-mr --user="GitLab CI" --email="gitlabci@example.com" --labels="bundle update"
 
   only:
     - schedules
     - web
+
+pages:
+  <<: *default
+
+  stage: deploy
+
+  image: ruby
+
+  script:
+    - bundle exec yard
+  artifacts:
+    paths:
+      - public
+  only:
+    - master

data/.yardopts

@@ -0,0 +1,3 @@
+--markup markdown
+--no-private
+--output-dir public

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.0...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.1...HEAD)
+
+## v0.1.1
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.1.0...v0.1.1)
+
+### Refactorings
+* Print MR url after created [!20](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/20) *@sue445*
+* Search only bundle update MR [!21](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/21) *@sue445*
+
+### Others
+* Fixed unstable bundle update [!16](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/16) *@sue445*
+* Setup simplecov [!17](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/17) *@sue445*
+* Setup yard [!18](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/18) *@sue445*
+* Rewrite spec [!19](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/19) *@sue445*
 
 ## v0.1.0
 * first release
+
+*This Change Log was automatically generated by [gitlab_awesome_release](https://gitlab.com/sue445/gitlab_awesome_release)*

data/Gemfile

@@ -2,3 +2,8 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in gitlabci-bundle-update-mr.gemspec
 gemspec
+
+# FIXME: following gems are often downgraded when `bundle update`
+gem "faraday", ">= 0.15.4"
+gem "octokit", ">= 4.13.0"
+gem "sawyer", ">= 0.8.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (0.1.0)
+    gitlabci-bundle-update-mr (0.1.1)
       bundler
       compare_linker (>= 1.4.3)
       gitlab (>= 4.0.0)
@@ -19,6 +19,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
+    docile (1.3.1)
     dotenv (2.7.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
@@ -34,6 +35,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
+    json (2.2.0)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -69,6 +71,11 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
@@ -77,19 +84,25 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    yard (0.9.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dotenv
+  faraday (>= 0.15.4)
   gitlab_awesome_release
   gitlabci-bundle-update-mr!
+  octokit (>= 4.13.0)
   pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
   rspec-temp_dir
+  sawyer (>= 0.8.1)
+  simplecov
   webmock
+  yard
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -3,6 +3,8 @@ Create MergeRequest of bundle update in GitLab CI
 
 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)
+
 ## Installation
 ```bash
 gem install gitlabci-bundle-update-mr
@@ -54,7 +56,7 @@ continuous_bundle_update:
 
   script:
     - gem install --no-doc gitlabci-bundle-update-mr
-    - gitlabci-bundle-update-mr --user="GitLab CI" --email="gitlabci@example.com"
+    - gitlabci-bundle-update-mr --user="GitLab CI" --email="gitlabci@example.com" --labels="bundle update"
 
   only:
     - schedules
@@ -65,6 +67,16 @@ And register scheduler to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/pipeline_sche
 
 ![gitlab_scheduler](img/gitlab_scheduler.png)
 
+## CLI command references
+```bash
+$ 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
+    -l, --labels 'In Review, Update' Add labels to the MR
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/console

@@ -12,7 +12,16 @@ Dotenv.load
 author_email = `git config user.email`.strip
 author_name = `git config user.name`.strip
 
-@client = Gitlabci::Bundle::Update::Mr::Client.new(author_email: author_email, author_name: author_name)
+Gitlabci::Bundle::Update::Mr.assert_env_keys
+
+@client = Gitlabci::Bundle::Update::Mr::Client.new(
+  gitlab_api_endpoint:      ENV["GITLAB_API_ENDPOINT"],
+  gitlab_api_private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
+  project_name:             ENV["CI_PROJECT_PATH"],
+  branch:                   ENV["CI_COMMIT_REF_NAME"],
+  author_email:             author_email,
+  author_name:              author_name,
+)
 
 require "pry"
 Pry.start

data/exe/gitlabci-bundle-update-mr

@@ -17,5 +17,15 @@ opt.on("-l", "--labels 'In Review, Update'", Array, "Add labels to the MR") { |v
 
 opt.parse!(ARGV)
 
-client = Gitlabci::Bundle::Update::Mr::Client.new(author_email: author_email, author_name: author_name)
+Gitlabci::Bundle::Update::Mr.assert_env_keys
+
+client = Gitlabci::Bundle::Update::Mr::Client.new(
+  gitlab_api_endpoint:      ENV["GITLAB_API_ENDPOINT"],
+  gitlab_api_private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
+  project_name:             ENV["CI_PROJECT_PATH"],
+  branch:                   ENV["CI_COMMIT_REF_NAME"],
+  author_email:             author_email,
+  author_name:              author_name,
+)
+
 client.perform(allow_dup_mr: allow_dup_mr, mr_labels: mr_labels)

data/gitlabci-bundle-update-mr.gemspec

@@ -48,5 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-temp_dir"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "yard"
 end

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

@@ -11,6 +11,23 @@ module Gitlabci
         class Error < StandardError; end
 
         class MissingKeyError < Error; end
+
+        def self.assert_env_keys
+          %w(
+              OCTOKIT_ACCESS_TOKEN
+              GITLAB_API_ENDPOINT
+              GITLAB_API_PRIVATE_TOKEN
+              CI_PROJECT_PATH
+              CI_COMMIT_REF_NAME
+            ).each do |key|
+            assert_env_key(key)
+          end
+        end
+
+        def self.assert_env_key(key)
+          raise MissingKeyError, "#{key} is required" if !ENV[key] || ENV[key].empty?
+        end
+        private_class_method :assert_env_key
       end
     end
   end

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

@@ -6,14 +6,17 @@ module Gitlabci
           BRANCH_PREFIX = "bundle-update-"
           TITLE_PREFIX  = "bundle update at "
 
-          # @param check_env_keys [Boolean] Check whether env is correct
+          # @param gitlab_api_endpoint [String]
+          # @param gitlab_api_private_token [String]
+          # @param project_name [String]
+          # @param branch [String]
           # @param author_email [String]
           # @param author_name [String]
-          def initialize(check_env_keys: true, author_email:, author_name:)
-            assert_env_keys if check_env_keys
-
-            @project_name = ENV["CI_PROJECT_PATH"]
-            @branch = ENV["CI_COMMIT_REF_NAME"]
+          def initialize(gitlab_api_endpoint:, gitlab_api_private_token:,
+                         project_name:, branch:, author_email:, author_name:)
+            @gitlab = Gitlab.client(endpoint: gitlab_api_endpoint, private_token: gitlab_api_private_token)
+            @project_name = project_name
+            @branch = branch
             @author_email = author_email
             @author_name = author_name
           end
@@ -40,12 +43,14 @@ module Gitlabci
 
             commit_gemfile_lock(new_lockfile)
             description = merge_request_description(old_lockfile, new_lockfile)
-            create_merge_request(description: description, mr_labels: mr_labels)
+
+            mr = create_merge_request(description: description, mr_labels: mr_labels)
+            puts "MR is created: #{mr.web_url}"
           end
 
           # @param lockfile [String]
           def commit_gemfile_lock(lockfile)
-            gitlab.create_commit(
+            @gitlab.create_commit(
               @project_name,
               new_branch,
               "$ bundle update && bundle update --ruby",
@@ -76,7 +81,7 @@ module Gitlabci
               params[:labels] = mr_labels.join(",")
             end
 
-            gitlab.create_merge_request(
+            @gitlab.create_merge_request(
               @project_name,
               "#{TITLE_PREFIX}#{current_time.strftime("%Y-%m-%d %H:%M:%S %Z")}",
               params,
@@ -103,26 +108,10 @@ module Gitlabci
 
           private
 
-          def assert_env_keys
-            %w(
-              OCTOKIT_ACCESS_TOKEN
-              GITLAB_API_ENDPOINT
-              GITLAB_API_PRIVATE_TOKEN
-              CI_PROJECT_PATH
-              CI_COMMIT_REF_NAME
-            ).each do |key|
-              assert_env_key(key)
-            end
-          end
-
-          def assert_env_key(key)
-            raise MissingKeyError, "#{key} is required" if !ENV[key] || ENV[key].empty?
-          end
-
           def system!(command)
             # NOTE: system(exception: true) requires Ruby 2.6+
             ret = system(command)
-            raise unless ret
+            raise "`#{command}` is failed" unless ret
           end
 
           def gemfile_name
@@ -141,10 +130,6 @@ module Gitlabci
             "#{gemfile_name}.lock"
           end
 
-          def gitlab
-            @gitlab ||= Gitlab.client(endpoint: ENV["GITLAB_API_ENDPOINT"], private_token: ENV["GITLAB_API_PRIVATE_TOKEN"])
-          end
-
           def current_time
             @current_time ||= Time.now
           end
@@ -154,7 +139,7 @@ module Gitlabci
           end
 
           def exists_bundle_update_mr?
-            merge_requests = gitlab.merge_requests(@project_name, state: "opened", target_branch: @branch)
+            merge_requests = @gitlab.merge_requests(@project_name, state: "opened", target_branch: @branch, search: TITLE_PREFIX.strip)
             merge_requests.any? { |mr| mr.title.start_with?(TITLE_PREFIX) && mr.source_branch.start_with?(BRANCH_PREFIX) }
           end
         end

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

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "0.1.0"
+        VERSION = "0.1.1"
       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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create MergeRequest of bundle update in GitLab CI
 email:
 - sue445@sue445.net
@@ -159,9 +187,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".env.example"
+- ".env.gitlab"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock