modulesync 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b9f844d9a57ed46eb75c5a9848524dee4409b78c3c1c70576f1f1c9629d24a
-  data.tar.gz: db8bbd7ca58ef57bf981c1ca49c91655d757f49920e598085e67a5e42a78b7b2
+  metadata.gz: fc930ee899499173ce75a299885bee85d967c158b6cfc7cc4113a73b6b7c82bf
+  data.tar.gz: 86575cd8683f4c89035d0f5018838bd3690d6a625e15480b7683fdd34e966e07
 SHA512:
-  metadata.gz: 31d69cbe6c58f263a1bb9ba0c418d310505708bf52554d6145af1a9c3dd1ebbd06c987771fcc01c2c87d4e874f4fd918f46ca789342d802069969b196d6e5422
-  data.tar.gz: 89e4f8f54ba515b855060306d562663c1d2b6eed8ccdabc51ecec3ad5d234f3043b546d6263c24cb8086447df5544193e2ab31d90ef181f6ccaf6e5888faf77a
+  metadata.gz: 6759dc5e250c03c3bf157dfee1a4890dcbd1c986ab735bb01e996cb4e181aa0b901c91f7b5138129915496ed8f514a66e902a0fae44eb466bf125992ef44e03d
+  data.tar.gz: a13a5de75f58baae2a9ad16f958553bc158a9a045b88b2982348f921e3d084aca8f0df575395a8390ed8d7d8ba65c204c06911a8288e55a76ae664c02d4f9f74

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.1](https://github.com/voxpupuli/modulesync/tree/2.0.1) (2020-10-06)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.0.0...2.0.1)
+
+**Fixed bugs:**
+
+- Use remote\_branch for PRs when specified [\#194](https://github.com/voxpupuli/modulesync/pull/194) ([raphink](https://github.com/raphink))
+
+**Merged pull requests:**
+
+- Allow newer puppet-blacksmith versions [\#197](https://github.com/voxpupuli/modulesync/pull/197) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [2.0.0](https://github.com/voxpupuli/modulesync/tree/2.0.0) (2020-08-18)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/1.3.0...2.0.0)

data/lib/modulesync/pr/github.rb

@@ -15,13 +15,14 @@ module ModuleSync
 
       def manage(namespace, module_name, options)
         repo_path = File.join(namespace, module_name)
-        head = "#{namespace}:#{options[:branch]}"
+        branch = options[:remote_branch] || options[:branch]
+        head = "#{namespace}:#{branch}"
         target_branch = options[:pr_target_branch] || 'master'
 
         if options[:noop]
           $stdout.puts \
             "Using no-op. Would submit PR '#{options[:pr_title]}' to #{repo_path} " \
-            "- merges #{options[:branch]} into #{target_branch}"
+            "- merges #{branch} into #{target_branch}"
           return
         end
 
@@ -31,19 +32,19 @@ module ModuleSync
                                            :head => head)
         unless pull_requests.empty?
           # Skip creating the PR if it exists already.
-          $stdout.puts "Skipped! #{pull_requests.length} PRs found for branch #{options[:branch]}"
+          $stdout.puts "Skipped! #{pull_requests.length} PRs found for branch #{branch}"
           return
         end
 
         pr_labels = ModuleSync::Util.parse_list(options[:pr_labels])
         pr = @api.create_pull_request(repo_path,
                                       target_branch,
-                                      options[:branch],
+                                      branch,
                                       options[:pr_title],
                                       options[:message])
         $stdout.puts \
           "Submitted PR '#{options[:pr_title]}' to #{repo_path} " \
-          "- merges #{options[:branch]} into #{target_branch}"
+          "- merges #{branch} into #{target_branch}"
 
         # We only assign labels to the PR if we've discovered a list > 1. The labels MUST
         # already exist. We DO NOT create missing labels.

data/lib/modulesync/pr/gitlab.rb

@@ -15,13 +15,14 @@ module ModuleSync
 
       def manage(namespace, module_name, options)
         repo_path = File.join(namespace, module_name)
-        head = "#{namespace}:#{options[:branch]}"
+        branch = options[:remote_branch] || options[:branch]
+        head = "#{namespace}:#{branch}"
         target_branch = options[:pr_target_branch] || 'master'
 
         if options[:noop]
           $stdout.puts \
             "Using no-op. Would submit MR '#{options[:pr_title]}' to #{repo_path} " \
-            "- merges #{options[:branch]} into #{target_branch}"
+            "- merges #{branch} into #{target_branch}"
           return
         end
 
@@ -31,19 +32,19 @@ module ModuleSync
                                              :target_branch => target_branch)
         unless merge_requests.empty?
           # Skip creating the MR if it exists already.
-          $stdout.puts "Skipped! #{merge_requests.length} MRs found for branch #{options[:branch]}"
+          $stdout.puts "Skipped! #{merge_requests.length} MRs found for branch #{branch}"
           return
         end
 
         mr_labels = ModuleSync::Util.parse_list(options[:pr_labels])
         mr = @api.create_merge_request(repo_path,
                                        options[:pr_title],
-                                       :source_branch => options[:branch],
+                                       :source_branch => branch,
                                        :target_branch => target_branch,
                                        :labels => mr_labels)
         $stdout.puts \
           "Submitted MR '#{options[:pr_title]}' to #{repo_path} " \
-          "- merges #{options[:branch]} into #{target_branch}"
+          "- merges #{branch} into #{target_branch}"
 
         return if mr_labels.empty?
         $stdout.puts "Attached the following labels to MR #{mr.iid}: #{mr_labels.join(', ')}"

data/modulesync.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '2.0.0'
+  spec.version               = '2.0.1'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'git', '~>1.3'
   spec.add_runtime_dependency 'gitlab', '~>4.0'
   spec.add_runtime_dependency 'octokit', '~>4.0'
-  spec.add_runtime_dependency 'puppet-blacksmith', '~>3.0'
+  spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 7'
   spec.add_runtime_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -126,16 +126,22 @@ dependencies:
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement