gitsflow 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f98f39375bce585ccac7ecc133bc3b12534030449a90ce5157b784bdcb57b9c
-  data.tar.gz: 2a3c7c5d556fae0353f339a6505ef9258aa5d18b8132f84af24d887ef051759a
+  metadata.gz: ab581d802ba36fbbe4d333b427d5d2edfb2f94a17a7751a0c39e007653a7e5c4
+  data.tar.gz: 7a37a86e9265ab26a6e21f432610ca28dcd4d568a87d474f969a32832d218d24
 SHA512:
-  metadata.gz: de9b16e875d6b6e1320bdb2c6d357544be747a8343ad4fe5d7345ca822033c16e844761fda0cf112605960d51efa690f52e8387753c2f71bd478ccbb8da2540d
-  data.tar.gz: c668eeb23d3f568e0ed8512134abbe4d76ad37234b579cfeb6f10ec7f3ad5a6f1c4bd1e25e17ef491315be2965c41b1360e1793b2bbf192ae1c4b7638085cd54
+  metadata.gz: 8ad1d35eb966e4a404ece60ebea38261c55c949332bb3f7810efccfd02fe0a750fb3091bd6e85f000030aca6f6b38540347026c085e4e52fb1b95ce00beb09c8
+  data.tar.gz: f0e49b3325438b976178cf0bbe32cdba57ae8299f755b8f369817d375cebf8221ab584c08fc0910a4e433dbce24af5b7534eb719ef6133d91f80362ae836b094

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+.env
 
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -2,42 +2,30 @@
 GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow
 ## Installation
 
-Add this line to your application's Gemfile:
 
 ```ruby
 gem 'gitsflow',  group: :development
 ```
 
-And then execute:
+1 - Add this line to your application's Gemfile:
 
     $ bundle install
     $ sflow install
     -> It will install the git alias
 
-Or install it yourself as:
+2 -  install it yourself as:
 
     $ gem install gitsflow
+
+And in your application's:
+
     $ sflow install
     -> It will install the git alias
 
 
 ## Flow Sugestion
-```mermaid
-graph TB
-
-  SubGraph1 --> SubGraph1Flow
-  subgraph "SubGraph 1 Flow"
-  SubGraph1Flow(SubNode 1)
-  SubGraph1Flow -- Choice1 --> DoChoice1
-  SubGraph1Flow -- Choice2 --> DoChoice2
-  end
-
-  subgraph "Main Graph"
-  Node1[Node 1] --> Node2[Node 2]
-  Node2 --> SubGraph1[Jump to SubGraph1]
-  SubGraph1 --> FinalThing[Final Thing]
-end
-```
+
+
 ## Config
 
     $ git sflow config
@@ -51,6 +39,8 @@ GITLAB_PROJECT_ID=
 GITLAB_TOKEN=
 GITLAB_URL_API=https://gitlab.com/api/v4
 GITLAB_EMAIL=
+GITLAB_LISTS=To Do,Doing,Next Release,Staging
+GITLAB_NEXT_RELEASE_LIST=Next Release
 GIT_BRANCH_MASTER=master
 GIT_BRANCH_DEVELOP=develop
 GIT_BRANCHES_STAGING=staging_1,staging_2
@@ -72,10 +62,12 @@ List of commands:
 5. git sflow bugfix start BUGFIX DESCRIPTION
 6. git sflow bugfix [reintegration|finish] BUGFIX_BRANCH
 7. git sflow bugfix codereview BUGFIX_BRANCH
-8. git sflow hotfix start HOTFIX DESCRIPTION
-9. git sflow hotfix [reintegration|finish] HOTFIX_BRANCH
-10. git sflow release start RELEASE
-11. git sflow push BRANCH\
+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 BRANCH
 
 
 

data/lib/Git/git.rb

@@ -3,6 +3,7 @@ module Git
     print "checkout: ".yellow
     print "#{branch}\n\n".green
     system "git checkout #{branch}"
+    self.pull branch
   end
   
   def self.merge from, to

data/lib/GitLab/gitlab.rb

@@ -36,7 +36,28 @@ module GitLab
 
 
 
-  def self.exist_issue? (iid)
+  def self.create_labels
+    url = "projects/#{$GITLAB_PROJECT_ID}/labels"
+    params = [ 
+      {name: 'feature', color: "#5CB85C"},
+      {name: 'default_branch', color: "#34495E"},
+      {name: 'version', color: "#34495E"},
+      {name: 'hotfix', color: "#d9534f"},
+      {name: 'production', color: "#F45D43"},
+      {name: 'urgent', color: "#d9534f"},
+      {name: 'bugfix', color: "#D9534F"},
+      {name: 'changelog', color: "#0033CC"},
+      {name: 'Staging', color: "#FAD8C7"},
+      ]
+    $GIT_BRANCHES_STAGING.each do |staging|
+      params << {name: staging, color: '#FAD8C7'}
+    end
+    
+    params << {name: $GITLAB_NEXT_RELEASE_LIST, color: '#34495E'}
+    
+    params.each do |label_params|
+      self.request_post(url, label_params)
+    end
 
   end
 

data/lib/GitLab/issue.rb

@@ -59,7 +59,7 @@ class GitLab::Issue
   end
 
   def self.find_by(search)
-    url = "issues?search=#{search.values[0]}&in=#{search.keys[0]}&state=opened"
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?search=#{search.values[0]}&in=#{search.keys[0]}&state=opened"
     issue_json = GitLab.request_get(url)[0]
     if issue_json
       issue = GitLab::Issue.new
@@ -70,7 +70,7 @@ class GitLab::Issue
   end 
 
   def self.find_by_branch(branch)
-    url = "issues?search=#{branch}"
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?search=#{branch}"
     issue_json = GitLab.request_get(url)[0]
     if issue_json
       issue = GitLab::Issue.new
@@ -81,13 +81,13 @@ class GitLab::Issue
   end 
 
   def self.all
-    url = "issues?state=opened"
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?state=opened"
     GitLab.request_get(url)
   end
 
 
   def self.from_list(list_name)
-    url = "issues?labels=#{list_name}&state=opened"
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?labels=#{list_name}&state=opened"
     issues = []
     issues_gitlab = GitLab.request_get(url)
     issues_gitlab.each do |obj|

data/lib/GitLab/list.rb

@@ -0,0 +1,22 @@
+class GitLab::List 
+  attr_accessor :id, :email, :name
+
+  def initialize(params = {})
+    @name = params[:name]
+  end
+
+  def self.get_next_release_list
+    self.all.select{|list| list["label"]["name"] == $GITLAB_NEXT_RELEASE_LIST}  end
+
+  def self.all
+    board_id = GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/boards")[0]["id"] rescue nil
+    if board_id
+        return GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/boards/#{board_id}/lists")
+    end
+  end
+
+  def to_s
+  end
+
+
+end

data/lib/sflow.rb

@@ -15,7 +15,7 @@ load 'Git/git.rb'
 # require './lib/gitlab/issue.rb'
 # require './lib/gitlab/merge_request.rb'
 class SFlow
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   $TYPE   = ARGV[0]
   $ACTION = ARGV[1]
   $PARAM1 = ARGV[2]
@@ -40,6 +40,7 @@ class SFlow
     self.start(branch, issue)
   end
 
+
   def self.bugfix_start
     title = $PARAM2 == "" ? $PARAM1 : $PARAM2
     issue = GitLab::Issue.new(title: title, labels: ['bugfix'])
@@ -89,18 +90,22 @@ class SFlow
     self.hotfix_reintegration
   end
 
-  def self.feature_code_review
+  def self.feature_codereview
     if (!$PARAM1.match(/\-feature\//))
       raise "This branch is not a feature"
     end
-    self.code_review()
+    self.codereview()
   end
 
-  def self.bugfix_code_review
+  def self.bugfix_codereview
     if (!$PARAM1.match(/\-bugfix\//))
       raise "This branch is not a bugfix"
     end
-    self.code_review()
+    self.codereview()
+  end
+
+  def bugfix_staging
+    self.feature_staging
   end
 
   def self.feature_staging
@@ -123,7 +128,7 @@ class SFlow
       print "ok!\n".green
 
     
-    print "\nAttention: \n".yellow.bg_cyan
+    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
@@ -141,14 +146,14 @@ class SFlow
     else
       raise "Wrong choice"
     end
-    new_labels = [target_branch]
+    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.code_review
+    self.codereview
   end
 
   def self.release_start
@@ -190,11 +195,9 @@ class SFlow
     release_branch = "#{issue_release.iid}-release/#{version}"
     print "Creating release version #{version}\n"
 
-
     begin
 
       Git.delete_branch(release_branch)
-      Git.fetch 'develop'
       Git.checkout 'develop'
       Git.new_branch release_branch
       
@@ -209,7 +212,7 @@ class SFlow
         print "\n\nChoose an option for merge:\n".yellow
         print "----------------------------\n".blue
         print "#{"0".ljust(10)} - Only #{issues_urgent_total} hotfix/urgent issues\n".blue if issues_urgent_total > 0
-        print "#{"1".ljust(10)} - All #{issues.size} issues\n".blue
+        print "#{"1".ljust(10)} - All #{issues_total} issues\n".blue
         print "----------------------------\n".blue
         print "Choice a number:\n".yellow
         option = STDIN.gets.chomp
@@ -229,30 +232,7 @@ class SFlow
           Git.merge(issue.branch, release_branch)
           changelogs << "* ~changelog #{issue.msg_changelog} \n"
           new_labels << 'hotfix'
-          # mr_master = GitLab::MergeRequest.new(
-          #   source_branch: issue.branch,
-          #   target_branch: 'master',
-          #   issue_iid: issue.iid,
-          #   title: "##{issue.iid} - #{version} - Reintegration  #{issue.branch} into master",
-          #   type: 'hotfix'
-          #   )
-          # mr_master.create
-          # mr_develop = GitLab::MergeRequest.new(
-          #   source_branch: issue.branch,
-          #   target_branch: 'develop',
-          #   issue_iid: issue.iid,
-          #   title: "##{issue.iid} - #{version} - Reintegration  #{issue.branch} into develop",
-          #   type: 'hotfix'
-          # )
-          # mr_develop.create
-  
-          # new_labels << 'merge_request'
-          # remove_labels = $GIT_BRANCHES_STAGING + $GITLAB_LISTS
-          # new_labels << $GITLAB_NEXT_RELEASE_LIST
-          # old_labels = issue.obj_gitlab["labels"]
-          # old_labels.delete_if{|label| remove_labels.include? label} 
-          # issue.labels = (old_labels + new_labels).uniq
-          # issue.update
+         
         end
         issues = issues_urgent
       when "1"
@@ -266,47 +246,29 @@ class SFlow
           Git.merge(issue.branch, release_branch)
           changelogs << "* ~changelog #{issue.msg_changelog} \n"
 
-          # mr_develop = GitLab::MergeRequest.new(
-          #   source_branch: issue.branch,
-          #   target_branch: 'develop',
-          #   issue_iid: issue.iid,
-          #   title: "##{issue.iid} - #{version} - Reintegration  #{issue.branch} into develop"
-          # )
-          # mr_develop.create
-  
-          # new_labels << 'merge_request'
-          # remove_labels = $GIT_BRANCHES_STAGING + $GITLAB_LISTS
-          # new_labels << $GITLAB_NEXT_RELEASE_LIST
-          # old_labels = issue.obj_gitlab["labels"]
-          # old_labels.delete_if{|label| remove_labels.include? label} 
-          # issue.labels = (old_labels + new_labels).uniq
-          # issue.update
         end
       else
         raise "option invalid!"
       end
       print "Changelog messages:\n\n".yellow
-      print "Release version #{version}\n".blue
+      version_header = "Release version #{version}\n" 
+      print version_header.blue
       msgs_changelog = []
       changelogs.each do |clog|
         msg_changelog = "#{clog.strip.chomp.gsub('* ~changelog ', '  - ')}\n"
         msgs_changelog << msg_changelog
         print msg_changelog.light_blue
       end
-      print "\nSetting changelog message in CHANGELOG.md\n".yellow
+      print "\nSetting changelog message in CHANGELOG\n".yellow
       sleep 2
-      # option = STDIN.gets.chomp
-
-      # if option != "ok"
-      #   raise "abort!"
-      # end
-
-      file_changelog = IO.read 'CHANGELOG.md'
-      IO.write 'CHANGELOG.md', msgs_changelog.join('') + file_changelog
+     
+      system('touch CHANGELOG')
+      file_changelog = IO.read 'CHANGELOG'
+      IO.write 'CHANGELOG', version_header + msgs_changelog.join('') + file_changelog
         
-      system('git add CHANGELOG.md')
+      system('git add CHANGELOG')
       system("git commit -m 'update CHANGELOG version #{version}'")
-      Git.push issue_release.branch
+      Git.push release_branch
 
       issue_release.description = "#{changelogs.join("")}\n * #{issues.map{|i| "##{i.iid},"}.join(' ')}"
       
@@ -327,8 +289,6 @@ class SFlow
 
       raise exception.message
     end
-
-   
    
   end
 
@@ -393,6 +353,7 @@ class SFlow
     puts "\n\nInstalling git alias\n\n".yellow
     print "      \u{1F611}   git sflow alias"
     print " (instaling...) \r".yellow
+    GitLab.create_labels
     sleep 2
     system("git config --local alias.sflow '!sh -c \" sflow $1 $2 $3 $4\" - '")
     print "    \u{1F601}\  git sflow alias"
@@ -406,6 +367,11 @@ class SFlow
 
   end
 
+
+  def push_
+
+  end
+
   private
 
   def self.config_
@@ -417,10 +383,12 @@ class SFlow
     print "GITLAB_TOKEN=\n".pink
     print "GITLAB_URL_API=\n".pink
     print "GITLAB_EMAIL=\n".pink
-    print "GITLAB_LISTS=Do\n".pink
+    print "GITLAB_LISTS=To Do,Doing,Next Release,Staging\n".pink
+    print "GITLAB_NEXT_RELEASE_LIST=Next Release\n".pink
     print "GIT_BRANCH_MASTER=master\n".pink
     print "GIT_BRANCH_DEVELOP=develop\n".pink
     print "GIT_BRANCHES_STAGING=staging_1,staging_2\n".pink
+
   end
 
   def self.set_error(e)
@@ -429,11 +397,12 @@ class SFlow
     print "\n"
     print "#{e.message}".yellow.bg_red
     print "\n\n"
+    print "#{e.backtrace}".yellow.bg_red
+    print "\n\n"
   end
 
   def self.validates
     print "Running validations... \n\n".yellow
-
     if !$GITLAB_PROJECT_ID || !$GITLAB_TOKEN || !$GITLAB_URL_API || 
       !$GIT_BRANCH_MASTER || !$GIT_BRANCH_DEVELOP  || !$GITLAB_LISTS || !$GITLAB_NEXT_RELEASE_LIST
       print "Variables not configured\n".yellow
@@ -459,10 +428,12 @@ class SFlow
     print "5 - git sflow bugfix start BUGFIX DESCRIPTION\n".yellow
     print "6 - git sflow bugfix [reintegration|finish] BUGFIX_BRANCH\n".yellow
     print "7 - git sflow bugfix codereview BUGFIX_BRANCH\n".yellow
-    print "8 - git sflow hotfix start HOTFIX DESCRIPTION\n".yellow
-    print "9 - git sflow hotfix [reintegration|finish] HOTFIX_BRANCH\n".yellow
-    print "10 - git sflow release start RELEASE\n".yellow
-    print "11 - git sflow push BRANCH\n".yellow
+    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 BRANCH\n".yellow
 
     choice = -1
     question = "Choice a number for show a example or 0 for exit:\n\n".light_blue
@@ -485,9 +456,17 @@ class SFlow
     when '7'
       print "-> git sflow bugfix codereview 12-bugfix/Ticket#9999\n"
     when '8'
-      print "-> git sflow hotfix start Ticket#9999 'Ticket#9999 Bug at production in...'\n\n"
+      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"
+    when '10'
       print "-> git sflow hotfix reintegration Ticket#9999'\n\n"
+    when '11'
+      print "-> git sflow release start v5.5.99'\n\n"
+    when '12'
+      print "-> git sflow release finish v5.5.99'\n\n"
+    when '13'
+      print "-> git sflow push BRANCH\n\n"
     when '0'
     else
     end
@@ -515,7 +494,7 @@ class SFlow
     else
       (!source_branch.match('feature') && !source_branch.match('bugfix'))  rescue  raise "invalid branch!"
     end
-    remove_labels = $GIT_BRANCHES_STAGING + $GITLAB_LISTS
+    remove_labels = $GIT_BRANCHES_STAGING + $GITLAB_LISTS + ['Staging']
     new_labels << 'changelog'
     new_labels << $GITLAB_NEXT_RELEASE_LIST
     old_labels = issue.obj_gitlab["labels"]
@@ -547,7 +526,7 @@ class SFlow
     print "\nYou are on branch: #{branch}\n\n".yellow
   end
 
-  def self.code_review
+  def self.codereview
     Git.fetch "develop"
     Git.checkout "develop"
     Git.pull "develop"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Carlos Wherbet
@@ -87,7 +87,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -100,6 +99,7 @@ files:
 - lib/Git/git.rb
 - lib/GitLab/gitlab.rb
 - lib/GitLab/issue.rb
+- lib/GitLab/list.rb
 - lib/GitLab/merge_request.rb
 - lib/GitLab/user.rb
 - lib/config.rb

data/.env

@@ -1,9 +0,0 @@
-GITLAB_PROJECT_ID=17864326
-GITLAB_TOKEN=LmbjqDbZ_hfNywSpLuUd
-GITLAB_URL_API=https://gitlab.com/api/v4
-GITLAB_EMAIL=
-GITLAB_LISTS=To Do,Doing,Next Release,Staging
-GITLAB_NEXT_RELEASE_LIST=Next Release
-GIT_BRANCH_MASTER=master
-GIT_BRANCH_DEVELOP=develop
-GIT_BRANCHES_STAGING=staging_1,staging_2