bumperok 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a3f09aa044e1b288cb6eef67f7b589722d0cd7
-  data.tar.gz: e920b1996de34603d56fb40e30ffa391e03e4999
+  metadata.gz: 191317a2c2af1287ada492de6cf8ea7e9aa414f6
+  data.tar.gz: e5fa07162bc94467af350e1804a05a60e7308790
 SHA512:
-  metadata.gz: 76e66bcb9cc1f5cd5d853f9b71ae98b9ae124f172d98659242a310f1e7155228cb7865d8db577c5c048cf5a3e1bcb2c4d569357e0289763fd96ed0a449c06969
-  data.tar.gz: a97f8754e11e231fb7a17408087f3edab04742fdfb45291a7c2f1ffffd8dcdae8af13dcd891daac95918ea588710806145b4fe8907bb2ef79623495be7f2fa5b
+  metadata.gz: 728396fafb038ba1f106e220bd23302b33441a9aa1144e63c01d5780b3e036ebb68327d11e3bfed39a084455a5b18eae1171607ab284d2736381f0c5754021f0
+  data.tar.gz: d97112cc6510ea048cbe5bb3ad2d58b7dc8854ce28e90da4c94104b4f5eefa0472adc0522de549a6881f6d749318da2a5930026ccbc0b60d22b9d3018c63606d

data/bin/bumper

@@ -45,6 +45,11 @@ OptionParser.new do |opts|
     options.endpoint = e
   end
 
+  opts.on("-tTARGET_PROJECT_ID", "--target-project-id=TARGET_PROJECT_ID", "Project id for gitlab") do |p|
+    options.target_project_id = p
+  end
+
+
 end.parse!
 
 case options.cmd
@@ -63,11 +68,11 @@ when 'submodule'
     Bumper.submodule_update_version("#{options.git_submodule[0].upcase}#{options.git_submodule[1..-1]}", options.git_submodule, options.git_url)
   end
 when 'merge'
-  if options.git_url and options.git_submodule and options.project_id
+  if options.git_url and options.git_submodule and options.project_id and options.target_project_id
     if options.endpoint
-      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.key, options.endpoint)
+      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.target_project_id, options.key, options.endpoint)
     else
-      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.key)
+      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.target_project_id, options.key)
     end
   end
 else

data/lib/bumper.rb

@@ -5,7 +5,7 @@ require 'jenkins_api_client'
 require 'gitlab'
 
 class Bumper
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 
   def self.tag git_path, tag_name
     wrapper = GitSSHWrapper.with_wrapper(private_key_path: '~/.ssh/bumber_at_sibext', log_level: 'ERROR') do |w|
@@ -40,17 +40,17 @@ class Bumper
     end
   end
 
-  def self.create_merge_request_from_submodule submodule_name, git, gitlab_project_id, gitlab_key, gitlab_url='http://src.sibext.com/api/v3'
+  def self.create_merge_request_from_submodule submodule_name, git, from_project_id, to_project_id, gitlab_key, gitlab_url='http://src.sibext.com/api/v3'
     Gitlab.endpoint=gitlab_url
     Gitlab.private_token=gitlab_key
     begin
-      merge = Gitlab.merge_requests(gitlab_project_id).sort { |a,b| a.created_at <=> b.created_at }.last
+      merge = Gitlab.merge_requests(from_project_id).sort { |a,b| a.created_at <=> b.created_at }.last
     rescue Gitlab::Error::NotFound => e
       merge = nil 
     end
     if merge
       submodule_update_feature submodule_name, git, merge.source_branch
-      Gitlab.create_merge_request gitlab_project_id, merge.title, source_branch: merge.source_branch, target_branch: 'master'
+      Gitlab.create_merge_request to_project_id, merge.title, source_branch: merge.source_branch, target_branch: 'master'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumperok
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nikolay Moskvin