gitlab-housekeeper 0.1.0.codechallenge5e4fde.pre → 0.1.0.codechallenge.f84720.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dac9bbc0d3bf745638e3c3497cec5195d05522400a14418f8e4ff91e51a0bc0
-  data.tar.gz: 0340674107e33efb3024db10af1ddfcdbdebc6b36e4d337486ec5497573bfc2d
+  metadata.gz: ee74498546758970e74d4aaa6468311860ee32a4ae63352f2ead5eb530b9af99
+  data.tar.gz: 81073133134ebde88ddf70ce8dee21b1cc9adcbc1c48778ab456fe4635fa1dc2
 SHA512:
-  metadata.gz: 8c78a8437a5d77429cd6caf4ee2890dc0e3616f44ceb234d4245959296f6d6667f389327daa5a6c5f719d5501929312ee0c77c5193d63e4a29687418d426cba7
-  data.tar.gz: adbf96a9a14d3bd57af90439defee3136a3233bd22a1f074218781cf22caf750d1fbe7f2061432a4b37c9c470c03cf0a0c975fbff074f13177fde62d84df7dbc
+  metadata.gz: 65450889ea2fd69a70f9474b46aca3494257bcb07863cb4cb3045df20cd983ed0aa78a49eef7b0842b1cf0a7c4445bbfbc36150537e16b9046b19f84432bd37b
+  data.tar.gz: 734b4504e7980932f4d8dc3d5410cf7abb20b035eb4e0bd0b8f8d02eabd2010ed5ba55d6f7e16bbc9f47394135c95d91e55b0ab4793bbc8de9822f4c2c3fb8ce

data/bin/gitlab-housekeeper

@@ -8,6 +8,10 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = 'Creates merge requests that can be inferred from the current state of the codebase'
 
+  opts.on('-b=BRANCH', '--target-branch=BRANCH', String, 'Target branch to use. Defaults to master.') do |branch|
+    options[:target_branch] = branch
+  end
+
   opts.on('-m=M', '--max-mrs=M', Integer, 'Limit of MRs to create. Defaults to 1.') do |m|
     options[:max_mrs] = m
   end

data/lib/gitlab/housekeeper/runner.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/core_ext/string'
+require 'active_support/core_ext'
 require 'gitlab/housekeeper/keep'
 require 'gitlab/housekeeper/keeps/rubocop_fixer'
 require 'gitlab/housekeeper/keeps/upgrade_dependency'
@@ -15,10 +15,11 @@ require 'digest'
 module Gitlab
   module Housekeeper
     class Runner
-      def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [])
+      def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [], target_branch: 'master')
         @max_mrs = max_mrs
         @dry_run = dry_run
         @logger = Logger.new($stdout)
+        @target_branch = target_branch
         require_keeps
 
         @keeps = if keeps
@@ -97,7 +98,7 @@ module Gitlab
       end
 
       def git
-        @git ||= ::Gitlab::Housekeeper::Git.new(logger: @logger)
+        @git ||= ::Gitlab::Housekeeper::Git.new(logger: @logger, branch_from: @target_branch)
       end
 
       def require_keeps
@@ -126,7 +127,7 @@ module Gitlab
         end
 
         puts '=> Diff:'
-        puts Shell.execute('git', '--no-pager', 'diff', '--color=always', 'master', branch_name, '--',
+        puts Shell.execute('git', '--no-pager', 'diff', '--color=always', @target_branch, branch_name, '--',
           *change.changed_files)
         puts
       end
@@ -135,7 +136,7 @@ module Gitlab
         non_housekeeper_changes = gitlab_client.non_housekeeper_changes(
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: 'master',
+          target_branch: @target_branch,
           target_project_id: housekeeper_target_project_id
         )
 
@@ -147,7 +148,7 @@ module Gitlab
           change: change,
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: 'master',
+          target_branch: @target_branch,
           target_project_id: housekeeper_target_project_id,
           update_title: !non_housekeeper_changes.include?(:title),
           update_description: !non_housekeeper_changes.include?(:description),
@@ -160,7 +161,7 @@ module Gitlab
         gitlab_client.get_existing_merge_request(
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: 'master',
+          target_branch: @target_branch,
           target_project_id: housekeeper_target_project_id
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-housekeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.0.codechallenge5e4fde.pre
+  version: 0.1.0.codechallenge.f84720.pre
 platform: ruby
 authors:
 - group::tenant-scale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport