gitlab-housekeeper 0.1.0.codechallenge.3c718d.pre → 0.1.0.codechallenge.4eada1e.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8df72541c3c16730fc0e2b3537ca0eab3ee820fc4039e662b098567c6a1dea2
-  data.tar.gz: 37893d59abb0a19eb9fc03528273f2b1b475e47af40923f372dcdcaa50869de4
+  metadata.gz: 020c21d5518ddc149e309829db1620ca0714e6b95f111d8f704b6854c6d6fa76
+  data.tar.gz: 597930e33694bef637116a8bbe547c8ff31f46380c12e9d064c5f77a787296c0
 SHA512:
-  metadata.gz: a6d10df326d70b9b9001c3b101a5c4f877159d99d7aeb8774b0d820045ab4352b2869551e528abb51c01d8d8ba9e7db67b572848af54faffbecfb206f28e4ad9
-  data.tar.gz: a2c679dda31d5aceffa7b45ef9a7c8921b9f893f7a1fcf120fef244643477d737a229a6d9e8d7193921ad4a02eac70e45b2a52874261ba70815ca19c71380ede
+  metadata.gz: 662890ec680ec7df000f3389d13df32f709713a5e96a8d14b7bcf30b72de9e6dabf2c42e7eab1175ed48b7261a6b593044f53de0c626418ccf9486d4c42a8d73
+  data.tar.gz: fa9337b123899e797e35da8e7457a4b1d5ee97c89b402e03a69100d6fd57cceec12cff1b48374cde412cd40878a0172230cd865c36d50d0c5f2bf60006fdbea9

data/bin/gitlab-housekeeper

@@ -8,10 +8,6 @@ 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

@@ -15,11 +15,10 @@ require 'digest'
 module Gitlab
   module Housekeeper
     class Runner
-      def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [], target_branch: 'master')
+      def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [])
         @max_mrs = max_mrs
         @dry_run = dry_run
         @logger = Logger.new($stdout)
-        @target_branch = target_branch
         require_keeps
 
         @keeps = if keeps
@@ -127,7 +126,7 @@ module Gitlab
         end
 
         puts '=> Diff:'
-        puts Shell.execute('git', '--no-pager', 'diff', '--color=always', @target_branch, branch_name, '--',
+        puts Shell.execute('git', '--no-pager', 'diff', '--color=always', 'master', branch_name, '--',
           *change.changed_files)
         puts
       end
@@ -136,7 +135,7 @@ module Gitlab
         non_housekeeper_changes = gitlab_client.non_housekeeper_changes(
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: @target_branch,
+          target_branch: 'master',
           target_project_id: housekeeper_target_project_id
         )
 
@@ -148,7 +147,7 @@ module Gitlab
           change: change,
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: @target_branch,
+          target_branch: 'master',
           target_project_id: housekeeper_target_project_id,
           update_title: !non_housekeeper_changes.include?(:title),
           update_description: !non_housekeeper_changes.include?(:description),
@@ -161,7 +160,7 @@ module Gitlab
         gitlab_client.get_existing_merge_request(
           source_project_id: housekeeper_fork_project_id,
           source_branch: branch_name,
-          target_branch: @target_branch,
+          target_branch: 'master',
           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.codechallenge.3c718d.pre
+  version: 0.1.0.codechallenge.4eada1e.pre
 platform: ruby
 authors:
 - group::tenant-scale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport