gitlab_mr_release 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67432e6eaa9cbf873418013842f565e4f946376b
-  data.tar.gz: 5df2a6e6d2b040de83fea5ab0b7fc2017cf0c925
+  metadata.gz: cc48c402abe1f670c8c18c04c576c255a9cc1ec8
+  data.tar.gz: d8b9de1a425fb13cb90385c06276bb974b52dcc3
 SHA512:
-  metadata.gz: 52f485ef55eb97ff5f945b3bcc003f0e518a37b0d12ae88ddd61b75b0774b4e888c62ca2fff0e93c98776c09bdef2e35d548a4c3d92f94b7bf411a3860eecba5
-  data.tar.gz: ac6c1b1e4bc9b10ebc89d9d21a53637c5784709bf56b4b3146a7a1c800dcda60e541e6510862173353dde856b5223140fc87682da5fdd4e91e31f7c66bae20b0
+  metadata.gz: 1b78fb3343cdc42a95edbf9c1880e02f87c3f1f9b8591a86fb9dceb9308dae684d7744cc5e02aa77cad4408c62e1cd6e4bc677baee67cda937322c605bedc86c
+  data.tar.gz: 1db0224850457c577ab8367766f9c76229bf5dae3a5c55424264f009394cd9e1a4ade55b97f3edc3f5441c25616c84ce9931f93b99b07aa0dceb67a19407fe45

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.4.0...master)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.0...master)
+
+## v1.0.0
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.4.0...v1.0.0)
+
+* Drop GitLab API v3 supports
+  * https://github.com/sue445/gitlab_mr_release/pull/21
+* Reduced API calls at `gitlab_mr_release create`
+  * https://github.com/sue445/gitlab_mr_release/pull/23
 
 ## v0.4.0
 [full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.3.1...v0.4.0)

data/Gemfile

@@ -7,3 +7,8 @@ if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
   # NOTE: activesupport 5.x supports only ruby 2.2.2+
   gem "activesupport", "< 5.0.0"
 end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.0")
+  # NOTE: byebug 9.1.0+ requires ruby 2.2.0+
+  gem "byebug", "< 9.1.0"
+end

data/README.md

@@ -13,7 +13,8 @@ This is inspired by the [git-pr-release](https://github.com/motemen/git-pr-relea
 ## Requirements
 
 * Ruby v2.1+
-* GitLab v7.11.0+
+* GitLab v8.17.0+
+* GitLab API v4+
 
 ## Installation
 

data/gitlab_mr_release.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock", ">= 3.0.0"
 end

data/lib/gitlab_mr_release.rb

@@ -2,5 +2,5 @@ require "gitlab_mr_release/version"
 require "gitlab_mr_release/project"
 
 module GitlabMrRelease
-  # Your code goes here...
+  class InvalidApiVersionError < StandardError; end
 end

data/lib/gitlab_mr_release/cli.rb

@@ -48,6 +48,10 @@ module GitlabMrRelease
         project_name:  ENV["GITLAB_PROJECT_NAME"],
       )
 
+      unless project.api_version >= 4
+        raise InvalidApiVersionError, "'#{ENV["GITLAB_API_ENDPOINT"]}' seems not to be GitLab API v4+. gitlab_mr_release requires GitLab API v4+"
+      end
+
       mr = project.create_merge_request(
         source_branch: source_branch,
         target_branch: target_branch,

data/lib/gitlab_mr_release/project.rb

@@ -14,6 +14,11 @@ module GitlabMrRelease
       @project_name = project_name
     end
 
+    def api_version
+      @api_endpoint =~ %r(/api/v([0-9]+)/?)
+      $1.to_i
+    end
+
     def web_url
       @web_url ||= Gitlab.project(@project_name).web_url
     end
@@ -30,21 +35,8 @@ module GitlabMrRelease
       end.compact.map(&:to_i)
     end
 
-    # find MergeRequest with iid
-    def merge_request(iid)
-      if api_v4?
-        # API v4
-        Gitlab.merge_request(@project_name, iid)
-      else
-        # API v3
-        mr = Gitlab.merge_requests(@project_name, iid: iid).first
-        assert_merge_request_iid(mr, iid) if mr
-        mr
-      end
-    end
-
     def generate_description(iids, template)
-      merge_requests = iids.map { |iid| merge_request(iid) }
+      merge_requests = Gitlab.merge_requests(@project_name, iids: iids)
       ERB.new(template, nil, "-").result(binding).strip
     end
 
@@ -58,16 +50,5 @@ module GitlabMrRelease
       }
       Gitlab.create_merge_request(@project_name, title, options)
     end
-
-    private
-
-    def assert_merge_request_iid(mr, iid)
-      # NOTE: MR is found, but server is old GitLab?
-      raise "MergeRequest iid does not match (expected #{iid}, but #{mr.iid})" unless iid == mr.iid
-    end
-
-    def api_v4?
-      @api_endpoint =~ %r(/api/v4/?)
-    end
   end
 end

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_release
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement