gitsflow 0.7.4.alfa → 0.8.2.alfa

data/lib/GitLab/issue.rb

@@ -1,27 +1,29 @@
+require 'tty_integration'
+class GitLab::Issue
+  include TtyIntegration
 
-class GitLab::Issue 
-  attr_accessor :title, :labels, :assignee_id, :description, :branch, :iid, :obj_gitlab, :status
-  @comments = [] 
-  @labels = [] 
+  attr_accessor :title, :labels, :assignee_id, :description, :branch, :iid, :obj_gitlab, :status, :web_url
 
-  def comments
-    @comments
-  end
+  @comments = []
+  @labels = []
+
+  attr_reader :comments
 
-  def comments=obj
+  def comments=(obj)
     @comments << obj
   end
 
   def initialize(params = {})
     @title = params[:title]
-    @labels = params[:labels] || [] 
+    @parent_branch_name = params[:parent_branch_name]
+    @labels = params[:labels] || []
     @description = params[:description]
     @branch = params[:branch]
     @comments = []
-    @assignee_id = GitLab::User.me["id"]
+    @assignee_id = GitLab::User.me['id']
   end
 
-  def set_default_branch branch
+  def set_default_branch(branch)
     @description = "* ~default_branch #{branch}\n" + @description
   end
 
@@ -31,15 +33,16 @@ class GitLab::Issue
     params.merge!(description: @description.to_s)
     params.merge!(labels: @labels.join(','))
     params.merge!(assignee_id: @assignee_id)
-    
+
     # label = params.fetch(:label) || ''
     # assignee_id = params.fetch(:assignee_id) || ''
-    print "\nCreate new GitLab issue \n\n".yellow
-    url = "projects/#{$GITLAB_PROJECT_ID}/issues" 
+    # print "\nCreate new GitLab issue \n\n".yellow
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues"
     issue_json = GitLab.request_post(url, params)
-    @iid = issue_json["iid"]
-    print "Issue created with success!\n".green
-    print "URL: #{issue_json["web_url"]}\n\n"
+    @iid = issue_json['iid']
+    @web_url = issue_json['web_url']
+    self
+    # success("Issue created with success!\nURL: #{issue_json["web_url"]}")
   end
 
   def close
@@ -48,10 +51,10 @@ class GitLab::Issue
     params.merge!(state_event: 'close')
     params.merge!(description: @description.to_s)
     params.merge!(labels: @labels.join(','))
-    
-    url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@iid}" 
+
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@iid}"
     GitLab.request_put(url, params)
-    print "Issue '#{@title}' closed with success!\n".green
+    # print "Issue '#{@title}' closed with success!\n".green
   end
 
   def update
@@ -60,36 +63,54 @@ class GitLab::Issue
     params.merge!(description: @description.to_s)
     params.merge!(labels: @labels.join(','))
     params.merge!(assignee_id: @assignee_id)
-    
+
     # label = params.fetch(:label) || ''
     # assignee_id = params.fetch(:assignee_id) || ''
-    print "\nUpdate GitLab issue\n\n".yellow
-    url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@iid}" 
+    # print "\nUpdate GitLab issue\n\n".yellow
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@iid}"
     GitLab.request_put(url, params)
-    print "Issue updated with success!\n".green
+    # prompt.say(pastel.cyan("\nIssue updated with success!"))
   end
 
   def self.find_by(search)
     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
-      issue.set_data issue_json
-    else
-      raise "Issue not found #{search.keys[0]}"
-    end
-  end 
+    raise "Issue not found #{search.keys[0]}" unless issue_json
+
+    issue = GitLab::Issue.new
+    issue.set_data issue_json
+  end
+
+  def self.find_by_id(id)
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?iids[]=#{id}"
+    issue_json = GitLab.request_get(url)[0]
+    raise "Issue not found #{search.keys[0]}" unless issue_json
+
+    issue = GitLab::Issue.new
+    issue.set_data issue_json
+  end
 
   def self.find_by_branch(branch)
-    url = "projects/#{$GITLAB_PROJECT_ID}/issues?search=#{branch}"
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?search='~default_branch #{branch}'"
+    issue_json = GitLab.request_get(URI::Generic::DEFAULT_PARSER.escape(url))[0]
+    unless issue_json
+      raise "Issue não encontrada #{branch}. \nVerifique se existe a label 'default_branch' na descrição da issue"
+    end
+
+    issue = GitLab::Issue.new
+    issue.set_data issue_json
+  end
+
+  def self.find_by_parent_branch(branch)
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues?search='~parent #{branch}'"
     issue_json = GitLab.request_get(url)[0]
-    if issue_json
-      issue = GitLab::Issue.new
-      issue.set_data issue_json
-    else
-      raise "Issue not found #{branch}. \nCheck if exist the label default_branch in the body description"
+    unless issue_json
+      raise "Issue não encontrada #{branch}. \nVerifique se existe a label 'default_branch' na descrição da issue"
     end
-  end 
+
+    issue = GitLab::Issue.new
+    issue.set_data issue_json
+  end
 
   def self.all
     url = "projects/#{$GITLAB_PROJECT_ID}/issues?state=opened"
@@ -106,7 +127,7 @@ class GitLab::Issue
     issues = []
     issues_gitlab = GitLab.request_get(url)
     issues_gitlab.each do |obj|
-      issue = self.new
+      issue = new
       issue.set_data(obj)
 
       issues << issue
@@ -121,33 +142,44 @@ class GitLab::Issue
 
   def msg_changelog
     # a.description.match(/(\* \~changelog .*\n)+/).to_a
-    description.match(/\* \~changelog .*\n?/).to_s.gsub('* ~changelog ', '') rescue nil
+
+    description.match(/\* ~changelog .*\n?/).to_s.gsub('* ~changelog ', '')
+  rescue StandardError
+    nil
   end
 
   def list_tasks
     # a.description.match(/(\* \~changelog .*\n)+/).to_a
-    description.match(/\* \~tasks .*\n?/).to_s.gsub('* ~tasks ', '') rescue nil
+
+    description.match(/\* ~tasks .*\n?/).to_s.gsub('* ~tasks ', '')
+  rescue StandardError
+    nil
   end
 
-  def add_comment note
+  def add_comment(note)
     comment = GitLab::Comment.new(issue_iid: @iid, body: note)
     @comments << comment
     comment.create
   end
 
-  def set_data obj
-    @iid          = obj["iid"]
-    @title        = obj["title"]
-    @labels       = obj["labels"]
-    @description  = obj["description"]
-    @assignee_id  = obj["assignees"][0]["id"]
-    @branch       = obj["description"].match(/\* \~default_branch .*\n?/).to_s.gsub('* ~default_branch ', '').chomp.strip rescue nil
-    @obj_gitlab   = obj
+  def set_data(obj)
+    @iid          = obj['iid']
+    @title        = obj['title']
+    @labels       = obj['labels']
+    @description  = obj['description']
+    @assignee_id  = obj['assignees'][0]['id']
+    @branch       = begin
+      obj['description'].match(/\* ~default_branch .*\n?/).to_s.gsub('* ~default_branch ',
+                                                                     '').chomp.strip
+    rescue StandardError
+      nil
+    end
+    @obj_gitlab = obj
     self
   end
 
-  def create_link_issue target_issue_iid
+  def create_link_issue(target_issue_iid)
     url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@iid}/links?target_project_id=#{$GITLAB_PROJECT_ID}&target_issue_iid=#{target_issue_iid}"
     GitLab.request_post(url, params)
   end
-end
+end

data/lib/GitLab/merge_request.rb

@@ -1,6 +1,11 @@
+require 'tty_integration'
+
 class GitLab::MergeRequest
+  include TtyIntegration
   @options = {}
-  attr_accessor :source_branch, :target_branch, :title, :options, :assignee_id, :labels, :issue_iid, :obj_gitlab, :type, :description
+  attr_accessor :source_branch, :target_branch, :title, :options, :assignee_id, :labels, :issue_iid, :obj_gitlab,
+                :type, :description
+
   @labels = []
   def initialize(params = {})
     @source_branch = params[:source_branch]
@@ -10,73 +15,87 @@ class GitLab::MergeRequest
     @issue_iid  = params[:issue_iid]
     @type       = params[:type]
     @description = params[:description]
-    @options    = params[:options]
+    @options = params[:options]
   end
 
   def create
-    print "Create Merge Request: ".yellow
-    print "#{@source_branch} into #{@target_branch}\n\n".green
-    assignee_id = GitLab::User.me["id"]
-    if type != 'hotfix'
-      users = GitLab::User.all
-      print "Users list:\n\n".yellow
-      print "----------------------------\n".blue
-      print "#{"0".ljust(10)} - Empty\n".blue
-      users.each do |user|
-        print "#{user['id'].to_s.ljust(10)} - #{user['name']}\n".blue
-      end
-      print "----------------------------\n".blue
-      print "Choice user ID for assignee:\n".yellow
-      assignee_id = STDIN.gets.chomp
-      print "\n#{assignee_id}, "
-      print "ok!\n".green
-    end
-    
-    url = "projects/#{$GITLAB_PROJECT_ID}/merge_requests" 
-    
+    # if type != 'hotfix'
+    #   users = GitLab::User.all
+    #   print "Users list:\n\n".yellow
+    #   print "----------------------------\n".blue
+    #   print "#{"0".ljust(10)} - Empty\n".blue
+    #   users.each do |user|
+    #     print "#{user['id'].to_s.ljust(10)} - #{user['name']}\n".blue
+    #   end
+    #   print "----------------------------\n".blue
+    #   print "Choice user ID for assignee:\n".yellow
+    #   assignee_id = STDIN.gets.chomp
+    #   print "\n#{assignee_id}, "
+    #   print "ok!\n".green
+    # end
+    users_list = GitLab::User.all.map { |u| "#{u['id']} - #{u['name']}" }
+    user_selected = prompt.select('Quem vai aprovar o MR?', users_list, symbols: { marker: '>' }, filter: true)
+    assignee_id = user_selected.delete("\n").split('-')[0].strip
+
+    url = "projects/#{$GITLAB_PROJECT_ID}/merge_requests"
+
     labels = ['merge_request']
     labels << type if type
     @obj_gitlab = GitLab.request_post(url, {
-      source_branch: @source_branch,
-      target_branch: @target_branch,
-      title: @title,
-      labels: labels.join(','),
-      description: @description,
-      assignee_id: assignee_id.to_i
-    })
-    
-    print "Merge request created with success!\n\n".green
-  end
+                                        source_branch: @source_branch,
+                                        target_branch: @target_branch,
+                                        title: @title,
+                                        labels: labels.join(','),
+                                        description: @description,
+                                        assignee_id: assignee_id.to_i,
+                                        squash: true,
+                                        squash_on_merge: true
 
+                                      })
+
+    prompt.say(pastel.cyan("Merge request criado com sucesso!\n\n"))
+  end
 
   def create_code_review
-    print "Create merge request for code review: ".yellow
-    print "#{@source_branch} into #{@target_branch}\n\n".green
+    # print "Create merge request for code review: ".yellow
+    # print "#{@source_branch} into #{@target_branch}\n\n".green
+    # users = GitLab::User.all
+    # print "Users list:\n\n".yellow
+    # print "----------------------------\n".blue
+    # print "#{"0".ljust(10)} - Empty\n".blue
+    # users.each do |user|
+    #  print "#{user['id'].to_s.ljust(10)} - #{user['name']}\n".blue
+    # end
+    # print "----------------------------\n".blue
+    # print "Choice user ID for assignee code review:\n".yellow
+    # assignee_id = STDIN.gets.chomp
+    # print "\n#{assignee_id}, "
+    # print "ok!\n".green
+
     users = GitLab::User.all
-    print "Users list:\n\n".yellow
-    print "----------------------------\n".blue
-    print "#{"0".ljust(10)} - Empty\n".blue
-    users.each do |user|
-      print "#{user['id'].to_s.ljust(10)} - #{user['name']}\n".blue
+    assignee_id = prompt.select('Quem vai fazer o codereview?', symbols: { marker: '>' }, filter: true) do |menu|
+      users.each do |user|
+        menu.choice  user['name'], user['id']
+      end
     end
-    print "----------------------------\n".blue
-    print "Choice user ID for assignee code review:\n".yellow
-    assignee_id = STDIN.gets.chomp
-    print "\n#{assignee_id}, "
-    print "ok!\n".green
-    
-    url = "projects/#{$GITLAB_PROJECT_ID}/merge_requests" 
-    title = "WIP: ##{@issue_iid} - Code review #{@source_branch}"
+
+    url = "projects/#{$GITLAB_PROJECT_ID}/merge_requests"
+    title = "Draft: ##{@issue_iid} - Code review #{@source_branch}"
+    description = 'Este Merge Request de codereview foi criado pelo gitsflow'
     @obj_gitlab = GitLab.request_post(url, {
-      source_branch: @source_branch,
-      target_branch: @target_branch,
-      title: title,
-      labels: @labels,
-      assignee_id: assignee_id.to_i
-    })
-    
-    print "Merge request for Code Review created with success!\n\n".green
-  end
+                                        source_branch: @source_branch,
+                                        target_branch: @target_branch,
+                                        title:,
+                                        description:,
+                                        labels: @labels,
+                                        assignee_id: GitLab::User.me['id'].to_i,
+                                        reviewer_ids: [assignee_id.to_i]
+                                      })
 
+    return error(@obj_gitlab.dig('message').join('.')) if @obj_gitlab.has_key? 'message'
 
-end
+    success("Code Review criado com sucesso!\n\n")
+
+    # print "Merge request for Code Review created with success!\n\n".green
+  end
+end

data/lib/GitLab/user.rb

@@ -1,3 +1,4 @@
+require 'tty_integration'
 class GitLab::User
   attr_accessor :id, :email, :name
 
@@ -7,14 +8,13 @@ class GitLab::User
 
   def self.me
     user = GitLab.request_get('user')
-
     return user if user
 
-    raise "Who are you?! \nVerify your data em .env"
+    raise "Quem é você? \nNão consegui localizar seu usuário no gitlab,\nTente novamente mais tarde ou verifique o arquivos de configuração."
   end
 
   def self.all
-    GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/users")
+    GitLab.request_get("projects/#{$GITLAB_PROJECT_ID}/users?per_page=100")
   end
 
   def to_s; end

data/lib/Utils/changelog.rb

@@ -0,0 +1,10 @@
+module Utils
+  class Changelog
+    # attr_accessor :file
+  
+    # def write
+  
+    # end
+  
+  end
+end

data/lib/Utils/putdotenv.rb

@@ -0,0 +1,3 @@
+class Putdotenv
+
+end

data/lib/command.rb

@@ -0,0 +1,19 @@
+require 'tty-option'
+class Command
+  include TTY::Option
+
+  usage do
+    program "sflow"
+
+    desc "Run a command in a new container"
+  end
+
+  flag :help do
+    short "-h"
+    long "--help"
+    desc "Print usage"
+  end
+
+end
+cmd = Command.new
+cmd.parse

data/lib/config.rb

@@ -1,18 +1,35 @@
 begin
   require 'dotenv'
   Dotenv.load(File.join( Dir.pwd, ".env"))
-  rescue LoadError
+rescue LoadError
   # Gem loads as it should
 end
 
-$GITLAB_PROJECT_ID = ENV['GITLAB_PROJECT_ID'].encode("UTF-8") rescue ''
-$GITLAB_TOKEN = ENV['GITLAB_TOKEN'].encode("UTF-8") rescue ''
-$GITLAB_URL_API = ENV['GITLAB_URL_API'].encode("UTF-8") rescue ''
-$GITLAB_EMAIL = ENV['GITLAB_EMAIL'].to_s.empty? ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL'].encode("UTF-8")
-$GITLAB_LISTS = ENV['GITLAB_LISTS'].encode("UTF-8").split(',') rescue nil
-$GITLAB_NEXT_RELEASE_LIST = ENV['GITLAB_NEXT_RELEASE_LIST'].encode("UTF-8") rescue ''
-$GIT_BRANCH_MASTER= ENV["GIT_BRANCH_MASTER"].encode("UTF-8") rescue ''
-$GIT_BRANCH_DEVELOP= ENV["GIT_BRANCH_DEVELOP"].encode("UTF-8") rescue ''
-$GIT_BRANCHES_STAGING= ENV["GIT_BRANCHES_STAGING"].encode("UTF-8").split(',')rescue nil
-$SFLOW_TEMPLATE_RELEASE= ENV["SFLOW_TEMPLATE_RELEASE"].to_s.empty? ? "Release version {version} - {date}" : ENV["SFLOW_TEMPLATE_RELEASE"].encode("UTF-8")
-$SFLOW_TEMPLATE_RELEASE_DATE_FORMAT= ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].to_s.empty? ? 'Y/m/d': ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].encode("UTF-8") 
+require 'tty_integration.rb'
+module Config
+  extend TtyIntegration
+  def self.init
+    project_name = cmd.run!("git remote -v | head -n1 | awk '{print $2}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//'").out
+    file = "#{Dir.home}/.config/gitsflow/#{project_name.gsub("\n","")}/config.yml"
+    config = TTY::Config.new
+    config.filename = file
+
+    begin
+      result = config.read(file).transform_keys(&:to_sym)   
+      $GITLAB_PROJECT_ID = result[:GITLAB_PROJECT_ID]
+      $GITLAB_TOKEN = result[:GITLAB_TOKEN]
+      $GITLAB_URL_API = result[:GITLAB_URL_API]
+      $GITLAB_EMAIL = result[:GITLAB_EMAIL]
+      $GITLAB_LISTS = result[:GITLAB_LISTS].split(',')
+      $GITLAB_NEXT_RELEASE_LIST = result[:GITLAB_NEXT_RELEASE_LIST]
+      $GIT_BRANCH_MASTER = result[:GIT_BRANCH_MASTER]
+      $GIT_BRANCH_DEVELOP = result[:GIT_BRANCH_DEVELOP]
+      $GIT_BRANCHES_STAGING= result[:GIT_BRANCHES_STAGING].split(',')
+      $SFLOW_TEMPLATE_RELEASE= result[:SFLOW_TEMPLATE_RELEASE]
+      $SFLOW_TEMPLATE_RELEASE_DATE_FORMAT= result[:SFLOW_TEMPLATE_RELEASE_DATE_FORMAT]
+
+    rescue => e
+
+    end
+  end
+end