gitlab_mr_release 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b7126c1aca9a96bb04c081db7e50c0609a78990d792f55eb1c8cfdc4688d5c
-  data.tar.gz: 1033a6b4d36af3ae5e31568b0d88ead48eabc4a38fc40947b29ea249c67c0771
+  metadata.gz: 6de841c4b12ce12ed5b0d7324278798fe4177f4e7860118b2b176a4121e339f3
+  data.tar.gz: 7f6bb8105457e098a9d875522e6be1daf93f81d4ece33eb4a3ddccaf68b387ad
 SHA512:
-  metadata.gz: 5a4d2b7496f4fc07530d91325c4c2134f24040f811ee52f757fee8833434be323e800a578ff55bc677a902ffe35d213fe91decf9382c5fe479e8b3ab898ab2ec
-  data.tar.gz: 69d575164e5fed8d72a39b5d0308e359cb8a9dd98cfe0987b6f7646634100821e6c62e38d01cbdea72dd0cc933274a5905870d21f49d13049211b0890c06ebd8
+  metadata.gz: 8faf002ea5e45facaebf255b61aea94ab130334f7135c91e9ee4521e7bd99926810d8c37db0a6e04fe3345d6f92e7425e3289fd0c11a9e935dd5cfd07e8c17f9
+  data.tar.gz: 9c6ca29b8bd2e8dce4c7160231cd6c118a3465d78135e41ec560c5f059ac4fb3010c55db5d6f38b31069311326a333f2901ab8cc950b839f00a863037a9e01c5

data/.github/workflows/test.yml

@@ -2,6 +2,8 @@ name: test
 
 on:
   push:
+    branches:
+      - master
   pull_request:
     types:
       - opened

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.0...master)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.1...master)
+
+## v1.1.1
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.0...v1.1.1)
+
+* Preserve checkbox statuses on update
+  * https://github.com/sue445/gitlab_mr_release/pull/45
 
 ## v1.1.0
 [full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.1...v1.1.0)

data/Gemfile

@@ -10,13 +10,6 @@ if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
   end
 end
 
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.0")
-  group :development do
-    # NOTE: byebug 9.1.0+ requires ruby 2.2.0+
-    gem "byebug", "< 9.1.0", group: :test
-  end
-end
-
 if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
   # NOTE: unparser v0.3.0+ requires Ruby 2.5+
   gem "unparser", "< 0.3.0"

data/bin/console

@@ -9,14 +9,11 @@ require "gitlab_mr_release"
 require "dotenv"
 Dotenv.load(".env.gitlab", "~/.env.gitlab")
 
-clean_room = Object.new
-clean_room.instance_eval do
-  @project = GitlabMrRelease::Project.new(
-    api_endpoint:  ENV["GITLAB_API_ENDPOINT"],
-    private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
-    project_name:  ENV["GITLAB_PROJECT_NAME"],
-  )
-end
+@project = GitlabMrRelease::Project.new(
+  api_endpoint:  ENV["GITLAB_API_ENDPOINT"],
+  private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
+  project_name:  ENV["GITLAB_PROJECT_NAME"],
+)
 
-require "pry"
-Pry.start(clean_room)
+require "irb"
+IRB.start

data/gitlab_mr_release.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", ">= 1.10"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-parameterized"

data/lib/gitlab_mr_release/project.rb

@@ -56,7 +56,7 @@ module GitlabMrRelease
       else
         options = {
           title: title,
-          description: description
+          description: apply_checkbox_statuses(description, mr.description)
         }
         Gitlab.update_merge_request(@project_name, mr.iid, options)
       end
@@ -68,5 +68,19 @@ module GitlabMrRelease
         mr.source_branch == source_branch && mr.target_branch == target_branch
       end
     end
+
+    def apply_checkbox_statuses(new_desc, old_desc)
+      checked_iids = old_desc.split("\n").select{ |line| line.include?("[x]") }.map{ |line| /\!\d+/.match(line).to_a.first }.compact
+
+      applied_lines = new_desc.split("\n").map do |line|
+        iid = /\!\d+/.match(line).to_a.first
+        if !iid.nil? && checked_iids.include?(iid)
+          line.gsub(/^( *)(\d+?\.|-|\*) \[ \]/) { "#{$1}#{$2} [x]" }
+        else
+          line
+        end
+      end
+      applied_lines.join("\n")
+    end
   end
 end

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_release
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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: rake
   requirement: !ruby/object:Gem::Requirement