gitsflow 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5818204c1eb2a69eca1d473833fc013b9953c96ea1965b2cf0772186ac8dce6
-  data.tar.gz: 92a9134f9d0477e706c029dd75e413d7a2abf198c054663194937eea5a6b7a92
+  metadata.gz: 1a896fc7052e8ace506cdf627ac7a363f66a9068f402d21807e7e313434c938d
+  data.tar.gz: b0772c6a843648bed8cb146d6ce2b8b8aee7ea75e4de3f4dd289801733447f2e
 SHA512:
-  metadata.gz: 9bfda5fb1d5ff0231ab6d3aefc917b9d047e7811f902d7bbf2dde1995e032f38ec25101a933f5192bbe374e974ab60a0409ec622821fe3c49224f4fafd2fcfce
-  data.tar.gz: 772591d70ee9fa7a06afed239634766ca9344e9019fc5b7cd17daf538df47c77f8b4941ee07d07b4254d1c7e14e11c16bda1555862aabf5ff225664d755edd9f
+  metadata.gz: fe964902e7c689caed7e96733df753a8b686bc003e7320f3712bd07b148b221016e91a240ce8aa80bec0cc7ba5dc64cb2ce459c07c7ed2217fe5ab1be4340693
+  data.tar.gz: 99d2cb65cc0b32e3f890df51283dd4776e9dd51dbf04bb00b222dbcbb4b4c5a2657e13ed42cb0c3101c125c95db3b06a634db0bae6dac67b18e6af6286097169

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitsflow (0.4.2)
+    gitsflow (0.4.3)
       dotenv (~> 2.7.5)
 
 GEM

data/lib/Git/git.rb

@@ -1,5 +1,6 @@
 module Git
   def self.checkout branch
+    self.fetch branch
     print "checkout: ".yellow
     print "#{branch}\n\n".green
     system "git checkout #{branch}"
@@ -37,6 +38,12 @@ module Git
     execute {"git push origin #{branch}"}
   end
 
+  def self.push_force branch
+    print "Push --force: ".yellow
+    print "#{branch}\n\n".green
+    execute {"git push origin #{branch} -f"}
+  end
+
   def self.log_last_changes branch
     execute {"git log origin/#{branch}..HEAD --oneline --format='%ad - %B'"}
   end

data/lib/sflow.rb

@@ -17,7 +17,7 @@ load 'Git/git.rb'
 # require './lib/gitlab/issue.rb'
 # require './lib/gitlab/merge_request.rb'
 class SFlow
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
   $TYPE   = ARGV[0]
   $ACTION = ARGV[1]
 
@@ -108,55 +108,17 @@ class SFlow
   end
 
   def self.bugfix_staging
-    self.feature_staging
+    if (!$PARAM1.match(/\-bugfix\//))
+      raise "This branch is not a bugfix"
+    end
+    self.staging
   end
 
   def self.feature_staging
-    branch = $PARAM1
-    issue = GitLab::Issue.find_by_branch(branch)
-
-    print "Staging branches list:\n\n".yellow
-    print "----------------------------\n".blue
-    $GIT_BRANCHES_STAGING.each_with_index do |staging, index|
-      print "#{index} - #{staging}\n".blue
-    end
-    print "----------------------------\n".blue
-    print "Choice number of target branch:\n".yellow
-    target_branch_id = STDIN.gets.chomp
-    print "\n#{target_branch_id}, "
-    target_branch = $GIT_BRANCHES_STAGING[target_branch_id.to_i]
-    if !$GIT_BRANCHES_STAGING.include?(target_branch)
-      raise "option invalid!"
-    end
-      print "ok!\n".green
-
-    
-    print "\nAttention: \n".yellow.bg_red
-    print "Do you want clean first the target branch or only merge?\n\n".yellow
-    print "----------------------------\n".blue
-    print "0 - Clean it first, then do merge #{branch} into #{target_branch}\n".blue
-    print "1 - Only Merge: Merge #{branch} into #{target_branch}\n".blue
-    print "----------------------------\n".blue
-    print "Choice number of target branch:\n".yellow
-    option_merge = STDIN.gets.chomp
-    print "\n#{option_merge}, "
-    print "ok!\n".green
-
-    if option_merge == "0"
-      Git.reset_hard branch, target_branch
-    elsif option_merge == "1"
-      Git.merge branch, target_branch
-    else
-      raise "Wrong choice"
+    if (!$PARAM1.match(/\-feature\//))
+      raise "This branch is not a feature"
     end
-    new_labels = [target_branch, 'Staging']
-    remove_labels =  $GITLAB_LISTS
-    old_labels = issue.obj_gitlab["labels"]
-    old_labels.delete_if{|label| remove_labels.include? label} 
-    issue.labels = (old_labels + new_labels).uniq
-    issue.update
-
-    self.codereview
+    self.staging
   end
 
   def self.release_start
@@ -534,12 +496,8 @@ class SFlow
   end
 
   def self.start branch, issue, ref_branch = "develop"
-    Git.fetch ref_branch
     Git.checkout ref_branch
-    Git.pull ref_branch
-
     description = "* ~default_branch #{branch}"
-    
     issue.description = description
     issue.update
 
@@ -550,9 +508,7 @@ class SFlow
   end
 
   def self.codereview
-    Git.fetch "develop"
     Git.checkout "develop"
-    Git.pull "develop"
     source_branch = $PARAM1
     issue = GitLab::Issue.find_by_branch(source_branch)
     # issue.move
@@ -565,5 +521,56 @@ class SFlow
     issue.labels = (issue.obj_gitlab["labels"] + ['code_review']).uniq
     issue.update
   end
+
+  def self.staging
+    branch = $PARAM1
+    issue = GitLab::Issue.find_by_branch(branch)
+
+    print "Staging branches list:\n\n".yellow
+    print "----------------------------\n".blue
+    $GIT_BRANCHES_STAGING.each_with_index do |staging, index|
+      print "#{index} - #{staging}\n".blue
+    end
+    print "----------------------------\n".blue
+    print "Choice number of target branch:\n".yellow
+    target_branch_id = STDIN.gets.chomp
+
+    print "\n#{target_branch_id}, "
+    target_branch = $GIT_BRANCHES_STAGING[target_branch_id.to_i]
+    if !$GIT_BRANCHES_STAGING.include?(target_branch)
+      raise "option invalid!"
+    end
+      print "ok!\n".green
+    
+    print "\nAttention: \n".yellow.bg_red
+    print "Do you want clean first the target branch or only merge?\n\n".yellow
+    print "----------------------------\n".blue
+    print "0 - Clean it first, then do merge #{branch} into #{target_branch}\n".blue
+    print "1 - Only Merge: Merge #{branch} into #{target_branch}\n".blue
+    print "----------------------------\n".blue
+    print "Choice number of target branch:\n".yellow
+    option_merge = STDIN.gets.chomp
+    print "\n#{option_merge}, "
+    print "ok!\n".green
+
+    if option_merge == "0"
+      Git.reset_hard branch, target_branch
+      Git.push_force target_branch
+    elsif option_merge == "1"
+      Git.merge branch, target_branch
+      Git.push target_branch
+    else
+      raise "Wrong choice"
+    end
+    
+    new_labels = [target_branch, 'Staging']
+    remove_labels =  $GITLAB_LISTS
+    old_labels = issue.obj_gitlab["labels"]
+    old_labels.delete_if{|label| remove_labels.include? label} 
+    issue.labels = (old_labels + new_labels).uniq
+    issue.update
+
+    self.codereview
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Carlos Wherbet