bumperok 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd51fec075c5a221ac72f2ac49c1a5f645f1df98
-  data.tar.gz: f0d0fb2771667275f54375fb7fdfaddd91083663
+  metadata.gz: 228769945ea6cb431bb0315cc706d4278a924523
+  data.tar.gz: e525e97fc5556f3c4e9fae63e290af5837a8022a
 SHA512:
-  metadata.gz: 6f0385b1c312ee32a7b382f2e515b00bb7f00852bbf25a3a70d64e206bd09c6f5f327f25ffa46f745cdc4d878aaf739e82aa673824fcf77082a0ed93e789b382
-  data.tar.gz: 1caaa21255fe078f449b5381f2d1db471369004d86aea0b5c99b5b299b524dc88ca8eda787219ecce2485146412ee108ad5dda6e720fe49c04078197abf67bbf
+  metadata.gz: 088da4e585d4f6b64342db0a86b2e8a8584bfddeb4c66462ac8c4f01e9720a4f31c4073c37dc5bd7326311596da37a9d794f48cee5a148e5565b2d018ab1d84f
+  data.tar.gz: d4941c3cc17e5d6e615dd3dab87acd4b9330116a55a3704e91131fd1b54231aedf71b7979fa1557b8eea3d31e28b556d3695c50b90270459dd7f82010e559488

data/lib/bumper.rb

@@ -4,13 +4,13 @@ require 'git-ssh-wrapper'
 require 'jenkins_api_client'
 
 class Bumper
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   def self.tag git_path, tag_name
     wrapper = GitSSHWrapper.with_wrapper(private_key_path: '~/.ssh/bumber_at_sibext', log_level: 'ERROR') do |w|
       w.set_env
-      `git '--git-dir=#{git_path}/.git' '--work-tree=#{git_path}' tag '-f' '#{tag_name}' '-m tagged by Bumber'` # 2>&1
-      `git '--git-dir=#{git_path}/.git' '--work-tree=#{git_path}' push '--force' 'origin' 'refs/tags/#{tag_name}'`
+      `#{git(git_path)} tag '-f' '#{tag_name}' '-m tagged by Bumber'` # 2>&1
+      `#{git(git_path)} push '--force' 'origin' 'refs/tags/#{tag_name}'`
     end
   end 
   
@@ -25,16 +25,22 @@ class Bumper
   end
 
   def self.submodule_update_version display, name, git
+    project_path = 'git_with_submodule'
     wrapper = GitSSHWrapper.with_wrapper(private_key_path: '~/.ssh/bumber_at_sibext', log_level: 'ERROR') do |w|
       w.set_env
-      `rm -Rf git_with_submodule`
-      `git clone --recursive #{git} git_with_submodule`
-      `git submodule update --remote #{name} --work-tree=git_with_submodule`
-      `git checkout -b UpdateFrom#{display} --work-tree=git_with_submodule`
-      `git commit -am'New updates from #{display}' --work-tree=git_with_submodule`
-      `git push -f origin UpdateFrom#{display} --work-tree=git_with_submodule`
-      `git branch -D UpdateFrom#{display} --work-tree=git_with_submodule`
+      `rm -Rf #{project_path}`
+      `git clone --recursive #{git} #{project_path}`
+      `#{git(project_path)} submodule update --remote #{name}`
+      `#{git(project_path)} checkout -b UpdateFrom#{display}`
+      `#{git(project_path)} commit -am'New updates from #{display}'`
+      `#{git(project_path)} push --force origin UpdateFrom#{display}`
+      `#{git(project_path)} branch -D UpdateFrom#{display}`
     end
 
   end
+
+  def self.git git_path
+    "git '--git-dir=#{git_path}/.git' '--work-tree=#{git_path}'"
+  end
+
 end

metadata

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