gitsflow 0.4.4 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a896fc7052e8ace506cdf627ac7a363f66a9068f402d21807e7e313434c938d
-  data.tar.gz: b0772c6a843648bed8cb146d6ce2b8b8aee7ea75e4de3f4dd289801733447f2e
+  metadata.gz: 04c67c4563202b190f6486858af820186e7c9e2eb1806d75f1be5c59f2223467
+  data.tar.gz: 853643113dc3d9d09a78958b1e1dd2488251fe16ab0dd50519de6ed2bd2223d0
 SHA512:
-  metadata.gz: fe964902e7c689caed7e96733df753a8b686bc003e7320f3712bd07b148b221016e91a240ce8aa80bec0cc7ba5dc64cb2ce459c07c7ed2217fe5ab1be4340693
-  data.tar.gz: 99d2cb65cc0b32e3f890df51283dd4776e9dd51dbf04bb00b222dbcbb4b4c5a2657e13ed42cb0c3101c125c95db3b06a634db0bae6dac67b18e6af6286097169
+  metadata.gz: '008803af2e130b03178420aea6d3155fc24b3a1945d2214a6f4c52ba0f0560c9569f41e07b77fbbd800352787573cfde8b54ea79bfeafc6cbd75e7014942c118'
+  data.tar.gz: ee3294c8a10de03e446816178f6b9c75eb44a7e4e9cc63a30e313259508a1b4aff295651d1e98da5f057e39280d7d4e81f7252c8a8a0ecb0d0bd05bd8a455af3

data/Gemfile.lock

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

data/README.md

@@ -9,14 +9,6 @@ GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspi
 gem 'gitsflow',  group: :development
 ```
 
-1 - Add this line to your application's Gemfile:
-
-    $ bundle install
-    $ sflow install
-    -> It will install the git alias
-
-2 -  install it yourself as:
-
     $ gem install gitsflow
 
 And in your application's:
@@ -46,6 +38,9 @@ GITLAB_NEXT_RELEASE_LIST=Next Release
 GIT_BRANCH_MASTER=master
 GIT_BRANCH_DEVELOP=develop
 GIT_BRANCHES_STAGING=staging_1,staging_2
+SFLOW_TEMPLATE_RELEASE=Version {version} - {date}
+SFLOW_TEMPLATE_RELEASE_DATE_FORMAT=Y/m/d
+    
 ```
 
 ## Usage
@@ -67,9 +62,10 @@ List of commands:
 8. git sflow bugfix staging BUGFIX_BRANCH
 9. git sflow hotfix start HOTFIX DESCRIPTION
 10. git sflow hotfix [reintegration|finish] HOTFIX_BRANCH
-11. git sflow release start RELEASE
-12. git sflow release finish RELEASE
-13. git sflow push origin BRANCH
+11. git sflow hotfix staging HOTFIX_BRANCH
+12. git sflow release start RELEASE
+13. git sflow release finish RELEASE
+14. git sflow push origin BRANCH or git sflow push
 
 
 
@@ -78,8 +74,6 @@ List of commands:
     or 
     $ sflow uninstall
 
-TODO: Write usage instructions here
-
 
 ## Get a GitLab Token
 

data/lib/Git/git.rb

@@ -1,20 +1,44 @@
 module Git
-  def self.checkout branch
-    self.fetch branch
+  def self.checkout(branch, options = :with_fetch)
+    fetch(branch) if options == :with_fetch
     print "checkout: ".yellow
     print "#{branch}\n\n".green
-    system "git checkout #{branch}"
+    execute {"git checkout #{branch}"}
     self.pull branch
   end
   
   def self.merge from, to
     # self.checkout(from)
-    self.checkout(to)
+    checkout(to, :local)
     print "Merge ".yellow
     print "#{from} ".green
     print "into ".yellow
     print "#{to} \n\n".green
-    execute {"git pull origin #{from}"}
+    processs, stderr , stdout= Open3.popen3("git pull origin #{from}") do |i, o, stderr, wait_thr|
+      [wait_thr.value, stderr.read, o.read] 
+    end
+    if processs.success?
+      return stdout
+    else
+      print "Conflicts on merge!".yellow.bg_red
+      print "\n\nResolve conflicts and commit. \n"
+      print "After type '1' for to continue or '0' for abort\n".yellow
+      choice = STDIN.gets.chomp
+      print "\n#{choice}, "
+      print "ok!\n".green
+
+      case choice
+      when '1'
+        print "Continuing...\n\n"
+      else
+        print "Aborting merge...\n\n"
+        system ('git merge --abort')
+        raise 'Aborting...'
+      end
+
+    end
+
+    # execute {"git pull origin #{from}"}
   end
 
   def self.delete_branch branch
@@ -25,10 +49,9 @@ module Git
 
   def self.reset_hard from, to
     self.fetch from
-    self.fetch to
     self.checkout(to)
     print "Reset --hard:  #{to} is equal: ".yellow
-    print "#{from}\n".green
+    print "origin/#{from}\n".green
     system "git reset --hard origin/#{from}\n\n"
   end
   
@@ -56,7 +79,7 @@ module Git
 
   def self.fetch branch
     print "Fetch: ".yellow
-    print "#{branch}\n\n".green
+    print "origin/#{branch}\n\n".green
     system "git fetch origin #{branch}"
   end
 
@@ -77,13 +100,11 @@ module Git
 
   def self.execute
     processs, stderr , stdout= Open3.popen3(yield) do |i, o, stderr, wait_thr|
-        [wait_thr.value, stderr.read, o.read] 
+      [wait_thr.value, stderr.read, o.read] 
     end
     if processs.success?
       return stdout
-    else
-        raise "#{stderr}"
     end
+    raise "#{stderr}"
   end
-
 end

data/lib/GitLab/gitlab.rb

@@ -14,6 +14,8 @@ module GitLab
     req['PRIVATE-TOKEN'] = $GITLAB_TOKEN 
     req.set_form_data(params)
     res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) {|http| http.request(req) } 
+    check_authorized res
+    check_errors_404 res
     JSON.parse(res.body)
   end
 
@@ -24,6 +26,8 @@ module GitLab
     req['PRIVATE-TOKEN'] = $GITLAB_TOKEN 
     req.set_form_data(params)
     res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) {|http| http.request(req) } 
+    check_authorized res
+    check_errors_404 res
     JSON.parse(res.body)
   end
   
@@ -33,10 +37,22 @@ module GitLab
     req = Net::HTTP::Get.new(uri) 
     req['PRIVATE-TOKEN'] = $GITLAB_TOKEN
     res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) {|http| http.request(req) } 
+    check_authorized res
+    check_errors_404 res
     JSON.parse(res.body)
   end
 
+  def self.check_errors_404 res
+    if res.code == "404"
+      raise "Project: #{$GITLAB_PROJECT_ID} \n#{JSON.parse(res.body)['message']}"
+    end
+  end
 
+  def self.check_authorized res
+    if res.code == "401"
+      raise "Unauthorized. Check GITLAB_TOKEN and file .env"
+    end
+  end
 
   def self.create_labels
     url = "projects/#{$GITLAB_PROJECT_ID}/labels"
@@ -50,6 +66,7 @@ module GitLab
       {name: 'bugfix', color: "#D9534F"},
       {name: 'changelog', color: "#0033CC"},
       {name: 'Staging', color: "#FAD8C7"},
+      {name: 'tasks', color: "#F0AD4E"},
       ]
     $GIT_BRANCHES_STAGING.each do |staging|
       params << {name: staging, color: '#FAD8C7'}
@@ -62,6 +79,5 @@ module GitLab
     end
 
   end
-
    
 end

data/lib/GitLab/issue.rb

@@ -87,7 +87,7 @@ class GitLab::Issue
       issue = GitLab::Issue.new
       issue.set_data issue_json
     else
-      raise "Issue not found #{branch}"
+      raise "Issue not found #{branch}. \nCheck if exist the label default_branch in the body description"
     end
   end 
 
@@ -96,6 +96,11 @@ class GitLab::Issue
     GitLab.request_get(url)
   end
 
+  def self.ping
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?"
+    issue_json = GitLab.request_get(url)&.first
+  end
+
   def self.from_list(list_name)
     url = "projects/#{$GITLAB_PROJECT_ID}/issues?labels=#{list_name}&state=opened"
     issues = []
@@ -119,6 +124,11 @@ class GitLab::Issue
     description.match(/\* \~changelog .*\n?/).to_s.gsub('* ~changelog ', '') rescue nil
   end
 
+  def list_tasks
+    # a.description.match(/(\* \~changelog .*\n)+/).to_a
+    description.match(/\* \~tasks .*\n?/).to_s.gsub('* ~tasks ', '') rescue nil
+  end
+
   def add_comment note
     comment = GitLab::Comment.new(issue_iid: @iid, body: note)
     @comments << comment

data/lib/GitLab/user.rb

@@ -1,20 +1,21 @@
-class GitLab::User 
+class GitLab::User
   attr_accessor :id, :email, :name
 
   def initialize(params = {})
     @name = params[:name]
   end
 
-  def self.me 
-    GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/users?search=#{$GITLAB_EMAIL}")[0]
+  def self.me
+    user = GitLab.request_get('user')
+
+    return user if user
+
+    raise "Who are you?! \nVerify your data em .env"
   end
 
   def self.all
     GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/users")
   end
 
-  def to_s
-  end
-
-
-end
+  def to_s; end
+end

data/lib/config.rb

@@ -1,4 +1,3 @@
-
 begin
   require 'dotenv'
   Dotenv.load(File.join( Dir.pwd, ".env"))
@@ -8,9 +7,11 @@ end
 $GITLAB_PROJECT_ID = ENV['GITLAB_PROJECT_ID']
 $GITLAB_TOKEN = ENV['GITLAB_TOKEN']
 $GITLAB_URL_API = ENV['GITLAB_URL_API']
-$GITLAB_EMAIL = ENV['GITLAB_EMAIL'] == "" ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
+$GITLAB_EMAIL = ENV['GITLAB_EMAIL'].to_s.empty? ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
 $GITLAB_LISTS = ENV['GITLAB_LISTS'].split(',') rescue nil
 $GITLAB_NEXT_RELEASE_LIST = ENV['GITLAB_NEXT_RELEASE_LIST']
 $GIT_BRANCH_MASTER= ENV["GIT_BRANCH_MASTER"]
 $GIT_BRANCH_DEVELOP= ENV["GIT_BRANCH_DEVELOP"]
-$GIT_BRANCHES_STAGING= ENV["GIT_BRANCHES_STAGING"].split(',') rescue nil
+$GIT_BRANCHES_STAGING= ENV["GIT_BRANCHES_STAGING"].split(',') rescue nil
+$SFLOW_TEMPLATE_RELEASE= ENV["SFLOW_TEMPLATE_RELEASE"].to_s.empty? ? "Release version {version} - {date}" : ENV["SFLOW_TEMPLATE_RELEASE"]
+$SFLOW_TEMPLATE_RELEASE_DATE_FORMAT= ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].to_s.empty? ? 'Y/m/d': ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'] 

data/lib/sflow.rb

@@ -8,6 +8,7 @@ end
 require 'net/http'
 
 require "open3"
+require "date"
 require 'uri'
 load 'config.rb'
 load 'string.rb'
@@ -17,7 +18,7 @@ load 'Git/git.rb'
 # require './lib/gitlab/issue.rb'
 # require './lib/gitlab/merge_request.rb'
 class SFlow
-  VERSION = "0.4.4"
+  VERSION = "0.6.3"
   $TYPE   = ARGV[0]
   $ACTION = ARGV[1]
 
@@ -26,7 +27,11 @@ class SFlow
 
   def self.call
     begin
+      print "GitSflow #{VERSION}\n".green
       print "Loading...\n".yellow
+      git_branch = Git.execute { "git branch --show-current" }
+      print "\nYou are on branch:".yellow
+      print " #{git_branch}\n".green
       validates if !['config_', 'help_'].include? ("#{$TYPE}_#{$ACTION}")
       # 
       send("#{$TYPE}_#{$ACTION}")
@@ -107,6 +112,13 @@ class SFlow
     self.codereview()
   end
 
+  def self.hotfix_staging
+    if (!$PARAM1.match(/\-hotfix\//))
+      raise "This branch is not a hotfix"
+    end
+    self.staging
+  end
+
   def self.bugfix_staging
     if (!$PARAM1.match(/\-bugfix\//))
       raise "This branch is not a bugfix"
@@ -130,7 +142,7 @@ class SFlow
     issues_total = issues.size 
     
     if issues_total == 0
-      raise "Not exist issues ready for start release version" 
+      raise "Not exist ready issues for start release" 
     end
 
     issues_urgent = issues.select{|i| i.labels.include? 'urgent'}
@@ -140,7 +152,7 @@ class SFlow
     issue_release = GitLab::Issue.find_by(title: issue_title) rescue nil
     
     if issue_release
-      print "This issue already exists, do you want to continue using it? (y/n):".yellow.bg_red
+      print "This card was created previously. Do you want to continue using it? (y/n):".yellow.bg_red
       
       print"\n If you choose 'n', a new issue will be created!\n"
       print "\n"
@@ -191,13 +203,10 @@ class SFlow
         issues_urgent.each do |issue|
           print "  -> #{issue.title}\n"
         end
-  
         issues_urgent.each do |issue|
-  
           Git.merge(issue.branch, release_branch)
           changelogs << "* ~changelog #{issue.msg_changelog} \n"
           new_labels << 'hotfix'
-         
         end
         issues = issues_urgent
       when "1"
@@ -210,13 +219,15 @@ class SFlow
         issues.each do |issue|
           Git.merge(issue.branch, release_branch)
           changelogs << "* ~changelog #{issue.msg_changelog} \n"
-
         end
       else
         raise "option invalid!"
       end
       print "Changelog messages:\n\n".yellow
-      version_header = "Release version #{version}\n" 
+      d_split = $SFLOW_TEMPLATE_RELEASE_DATE_FORMAT.split('/')
+      date =  Date.today.strftime("%#{d_split[0]}/%#{d_split[1]}/%#{d_split[2]}")
+      version_header =  "#{$SFLOW_TEMPLATE_RELEASE.gsub("{version}", version).gsub("{date}",date)}\n"
+
       print version_header.blue
       msgs_changelog = []
       changelogs.each do |clog|
@@ -224,9 +235,10 @@ class SFlow
         msgs_changelog << msg_changelog
         print msg_changelog.light_blue
       end
+      msgs_changelog << "\n"
       print "\nSetting changelog message in CHANGELOG\n".yellow
       sleep 2
-     
+
       system('touch CHANGELOG')
       file_changelog = IO.read 'CHANGELOG'
       IO.write 'CHANGELOG', version_header + msgs_changelog.join('') + file_changelog
@@ -235,17 +247,43 @@ class SFlow
       system("git commit -m 'update CHANGELOG version #{version}'")
       Git.push release_branch
 
-      issue_release.description = "#{changelogs.join("")}\n * #{issues.map{|i| "##{i.iid},"}.join(' ')}"
+      issue_release.description = "#{changelogs.join("")}\n"
       
       issue_release.labels = ['ready_to_deploy', 'Next Release']
       issue_release.set_default_branch(release_branch)
-      issue_release.update
+
+
+
+      print "\n\nTasks list:\n\n".yellow
+
+      tasks = []
+      issues.each do |issue|
+        if issue.description.match(/(\* \~tasks .*)+/)
+          tasks << "* ~tasks #{issue.list_tasks} \n"
+        end
+      end
+
+      if tasks.size > 0 
+        new_labels << 'tasks'
+
+        tasks.each do |task|
+          task = "#{task.strip.chomp.gsub('* ~tasks ', '  - ')}\n"
+          print task.light_blue
+        end
+        issue_release.description += "#{tasks.join("")}\n"
+      end
+      
       issues.each do |issue|
         issue.labels  = (issue.labels + new_labels).uniq
         issue.close
       end
+      
       print "\nYou are on branch: #{release_branch}\n".yellow
       print "\nRelease #{version} created with success!\n\n".yellow
+      
+      issue_release.description += "* #{issues.map{|i| "##{i.iid},"}.join(' ')}"
+
+      issue_release.update
 
       
     rescue => exception
@@ -269,13 +307,12 @@ class SFlow
     Git.merge issue_release.branch, 'develop'
     Git.push 'develop'
 
-
     type =  issue_release.labels.include?('hotfix') ? 'hotfix' : nil
     mr_master = GitLab::MergeRequest.new(
       source_branch: issue_release.branch,
       target_branch: $GIT_BRANCH_MASTER,
       issue_iid: issue_release.iid,
-      title: "Reintegration release #{version}: #{issue_release.branch} into master",
+      title: "Reintegration release #{version}: #{issue_release.branch} into #{$GIT_BRANCH_MASTER}",
       description: "Closes ##{issue_release.iid}",
       type: type
       )
@@ -337,9 +374,13 @@ class SFlow
 
   end
 
+  def self.push_
+    self.push_origin
+  end
 
   def self.push_origin
-    branch = $PARAM1
+    branch = !$PARAM1 ?  Git.execute { 'git branch --show-current' } : $PARAM1
+    branch.delete!("\n")
     log_messages = Git.log_last_changes branch
     issue = GitLab::Issue.find_by_branch branch
     Git.push branch 
@@ -373,7 +414,9 @@ class SFlow
     print "GIT_BRANCH_MASTER=master\n".pink
     print "GIT_BRANCH_DEVELOP=develop\n".pink
     print "GIT_BRANCHES_STAGING=staging_1,staging_2\n".pink
-
+    print "SFLOW_TEMPLATE_RELEASE=Version {version} - {date}\n".pink
+    print "SFLOW_TEMPLATE_RELEASE_DATE_FORMAT=d/m/Y\n".pink
+    
   end
 
   def self.set_error(e)
@@ -382,7 +425,8 @@ class SFlow
     print "\n"
     print "#{e.message}".yellow.bg_red
     print "\n\n"
-    print "#{e.backtrace}".yellow.bg_red
+    e.backtrace.each { |line| print "#{line}\n"  }
+    
     print "\n\n"
   end
 
@@ -401,6 +445,9 @@ class SFlow
     branchs_validations = $GIT_BRANCHES_STAGING + [$GIT_BRANCH_MASTER, $GIT_BRANCH_DEVELOP]
     Git.exist_branch?(branchs_validations.join(' ')) rescue raise "You need to create branches #{branchs_validations.join(', ')}"
 
+    GitLab::Issue.ping
+
+
   end
 
   def self.help_
@@ -416,9 +463,10 @@ class SFlow
     print "8 - git sflow bugfix staging BUGFIX_BRANCH\n".yellow
     print "9 - git sflow hotfix start HOTFIX DESCRIPTION\n".yellow
     print "10 - git sflow hotfix [reintegration|finish] HOTFIX_BRANCH\n".yellow
-    print "11 - git sflow release start RELEASE\n".yellow
-    print "12 - git sflow release finish RELEASE\n".yellow
-    print "13 - git sflow push origin BRANCH\n".yellow
+    print "11 - git sflow hotfix staging HOTFIX_BRANCH\n".yellow
+    print "12 - git sflow release start RELEASE\n".yellow
+    print "13 - git sflow release finish RELEASE\n".yellow
+    print "14 - git sflow push origin BRANCH or git sflow push\n".yellow
 
     choice = -1
     question = "Choice a number for show a example or 0 for exit:\n\n".light_blue
@@ -443,14 +491,16 @@ class SFlow
     when '8'
       print "-> git sflow bugfix staging 12-bugfix/Ticket#9999\n"
     when '9'
-      print "-> git sflow hotfix start Ticket#9999 'Ticket#9999 Bug at production in...'\n\n"
+      print "-> git sflow hotfix start Ticket#9999 'Ticket#9999 Bug at production ...'\n\n"
     when '10'
-      print "-> git sflow hotfix reintegration Ticket#9999'\n\n"
+      print "-> git sflow hotfix reintegration 11-hotfix/Ticket#9999'\n\n"
     when '11'
-      print "-> git sflow release start v5.5.99'\n\n"
+      print "-> git sflow hotfix staging 11-hotfix/Ticket#9999'\n\n"
     when '12'
-      print "-> git sflow release finish v5.5.99'\n\n"
+      print "-> git sflow release start v9.9.99'\n\n"
     when '13'
+      print "-> git sflow release finish v9.9.99'\n\n"
+    when '14'
       print "-> git sflow push BRANCH\n\n"
     when '0'
     else
@@ -467,8 +517,10 @@ class SFlow
     # Git.pull ref_branch
     source_branch = $PARAM1
     issue = GitLab::Issue.find_by_branch(source_branch)
+
+    # Setting Changelog
     print "Title: #{issue.title}\n\n"
-    print "Changelog message:\n--> ".yellow
+    print "CHANGELOG message:\n--> ".yellow
     message_changelog = STDIN.gets.chomp
     print "\n ok!\n\n".green
     new_labels = []
@@ -491,6 +543,20 @@ class SFlow
     print "#{message_changelog}\n".green
     print "Moving issue to list: ".yellow 
     print "#{$GITLAB_NEXT_RELEASE_LIST}\n".green 
+
+    # Setting Tasks
+    print "\n\nIf there are any tasks to be run, list them below separated by spaces, otherwise press Enter:\n"
+    print "\n Tasks:\n--> ".yellow
+    tasks = STDIN.gets.chomp
+    print "\n ok!\n\n".green
+    if tasks != "" and tasks != nil
+      issue.description.gsub!(/\* \~tasks .*\n?/,'')
+      issue.description = "#{issue.description} \n* ~tasks #{tasks}"
+      print "Setting tasks: ".yellow
+    end
+    print "#{tasks}\n".green
+
+
     issue.update
     
   end
@@ -553,14 +619,22 @@ class SFlow
     print "\n#{option_merge}, "
     print "ok!\n".green
 
-    if option_merge == "0"
+    if option_merge == '0'
+      issues_staging  = GitLab::Issue.from_list(target_branch).select{|i| i.branch != branch}
+      issues_staging.each do |i|
+        i.labels.delete(target_branch)
+        i.labels.delete('Staging')
+        i.labels.push('Doing')
+        i.update
+      end
       Git.reset_hard branch, target_branch
       Git.push_force target_branch
-    elsif option_merge == "1"
+    elsif option_merge == '1'
+      Git.reset_hard target_branch, target_branch
       Git.merge branch, target_branch
       Git.push target_branch
     else
-      raise "Wrong choice"
+      raise 'Wrong choice'
     end
     
     new_labels = [target_branch, 'Staging']
@@ -571,6 +645,7 @@ class SFlow
     issue.update
 
     self.codereview
+    Git.checkout(branch)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.6.3
 platform: ruby
 authors:
 - Carlos Wherbet
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GitSFlow is a tool that integrate Git custom commands with GitLab and it's