bumperok 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3302f875a41afa1a6c2fefb262bb245eebf074ce
-  data.tar.gz: b28da6abfbd4916ba63a9a0ea70d0bad8609270f
+  metadata.gz: 83feb89e71b699deb3abb1c4f9c3cac01b200283
+  data.tar.gz: d9052d093bd51d89cd932da8538da9491530b9c3
 SHA512:
-  metadata.gz: ca4852c7e486634267e4e8a5c13e17cd6dfacb25e049532a63cf79ddaf0b46aed7f7428634884b3edb7814e440a5a316dde2fe4914823fecb318e3e107d47dd2
-  data.tar.gz: 4eb9b94a81d75936cc8f50f28f2d3615fe8c70e743d3a772e4883c0c6eb83c2325fc49a057f540e45fb58babbd397d15455d3423099a56923f1364c7b8c56def
+  metadata.gz: b5f1adfed5f9ff9d30720f2eec8baf16c7c53d82ff63f1778654e5a019211cdd86d205c877dd142787e92b6c6f38d146d282c278618ec8fd06e3cd3b01bbbd9e
+  data.tar.gz: e1ac64360f42f7221b8b2202a8ebce40c5f48c25aaad551989e1e34b033a6e7040540810c97961de7a139a2a971c27275213c70b33728c4caf99a3614d1be429

data/Rakefile

@@ -17,6 +17,7 @@ Hoe.spec "bumperok" do
   dependency 'git', '~> 1.2'
   dependency 'git-ssh-wrapper', '~> 0.2'
   dependency 'jenkins_api_client', '~> 0.2'
+  dependency 'gitlab', '~> 3.4'
 end
 
 # vim: syntax=ruby

data/bin/bumper

@@ -33,6 +33,18 @@ OptionParser.new do |opts|
     options.git_submodule = m
   end
 
+  opts.on("-iPROJECT_ID", "--project-id=PROJECT_ID", "Project id for gitlab") do |p|
+    options.project_id = p
+  end
+
+  opts.on("-kKEY", "--key=KEY", "User key for gitlab") do |k|
+    options.key = k
+  end
+
+  opts.on("-eENDPOINT", "--endpoint=ENDPOINT", "Endpoint url for gitlab") do |e|
+    options.endpoint = e
+  end
+
 end.parse!
 
 case options.cmd
@@ -50,6 +62,14 @@ when 'submodule'
   if options.git_url and options.git_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.endpoint
+      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.key, options.endpoint)
+    else
+      Bumper.create_merge_request_from_submodule(options.git_submodule, options.git_url, options.project_id, options.key)
+    end
+  end
 else
   raise "#{options.cmd} is unsupported command"
 end

data/lib/bumper.rb

@@ -2,9 +2,10 @@ require 'git'
 require 'logger'
 require 'git-ssh-wrapper'
 require 'jenkins_api_client'
+require 'gitlab'
 
 class Bumper
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   def self.tag git_path, tag_name
     wrapper = GitSSHWrapper.with_wrapper(private_key_path: '~/.ssh/bumber_at_sibext', log_level: 'ERROR') do |w|
@@ -37,11 +38,46 @@ class Bumper
       `#{git(project_path)} checkout master`
       `#{git(project_path)} branch -D UpdateFrom#{display}`
     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'
+    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
+    rescue Gitlab::Error::NotFound => e
+      merge = nil 
+    end
+    if merge
+      submodule_update_feature submodule_name, git, merge.source_branch
+      Gitlab.create_merge_request project_id, merge.title, source_branch: merge.source_branch, target_branch: 'master'
+    end
   end
 
+  private
+
   def self.git git_path
     "git '--git-dir=#{git_path}/.git' '--work-tree=#{git_path}'"
   end
 
+  def self.bumper_ssh &block
+    GitSSHWrapper.with_wrapper(private_key_path: '~/.ssh/bumber_at_sibext', log_level: 'ERROR', block)
+  end
+
+  def self.submodule_update_feature name, git, branch
+    project_path = 'git_with_submodule'
+    bumper_ssh do |w|
+      w.set_env
+      `rm -Rf #{project_path}`
+      `git clone --recursive #{git} #{project_path}`
+      `#{git(project_path)} checkout -b #{branch}`
+      `cd #{project_path} && git submodule update --remote #{name}`
+      `#{git(project_path)} commit -am'New updates from #{name}'`
+      `#{git(project_path)} push --force origin #{branch}`
+      `#{git(project_path)} checkout master`
+      `#{git(project_path)} branch -D #{branch}`
+    end
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumperok
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nikolay Moskvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: gitlab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement