gitsflow 0.6.3 → 0.8.2.alfa

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c67c4563202b190f6486858af820186e7c9e2eb1806d75f1be5c59f2223467
-  data.tar.gz: 853643113dc3d9d09a78958b1e1dd2488251fe16ab0dd50519de6ed2bd2223d0
+  metadata.gz: e087e5bb59ff508d43db27b28813b5e28b38f6780dfa054e441bdecbb0f42651
+  data.tar.gz: 60b76474764cea99b7c94e2c6fa5592361cbf6d25d6934ff5eee2bf799838351
 SHA512:
-  metadata.gz: '008803af2e130b03178420aea6d3155fc24b3a1945d2214a6f4c52ba0f0560c9569f41e07b77fbbd800352787573cfde8b54ea79bfeafc6cbd75e7014942c118'
-  data.tar.gz: ee3294c8a10de03e446816178f6b9c75eb44a7e4e9cc63a30e313259508a1b4aff295651d1e98da5f057e39280d7d4e81f7252c8a8a0ecb0d0bd05bd8a455af3
+  metadata.gz: e0a54b5795f7873c1f1d462f6fee03fdba4f421491ce4ef5a18fd78ce3475c603ce4e01a2cb196cd57029dfa6d291ffe449853592bc3f6d9fddb9fc07a837177
+  data.tar.gz: bfacbca7aba1032c6eec5f5bca70a9b186813a182c47d647804d09fded09a6f778f649c43e73896865f866c3d9187b0af25fc2d0cf8ae91acae9163dda45c1e2

data/.env.yml

@@ -0,0 +1 @@
+---

data/Gemfile.lock

@@ -1,8 +1,18 @@
 PATH
   remote: .
   specs:
-    gitsflow (0.6.2)
+    gitsflow (0.8.0)
       dotenv (~> 2.7.5)
+      pastel (~> 0.8.0)
+      tty-box (~> 0.7.0)
+      tty-command (~> 0.10.1)
+      tty-config (~> 0.5.0)
+      tty-editor (~> 0.7.0)
+      tty-file (~> 0.10.0)
+      tty-option (~> 0.2.0)
+      tty-progressbar (~> 0.18.2)
+      tty-prompt (~> 0.23.1)
+      tty-table (~> 0.12.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,6 +21,8 @@ GEM
     diff-lcs (1.3)
     dotenv (2.7.5)
     method_source (0.9.2)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -28,17 +40,68 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-cursor (~> 0.7)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-config (0.5.0)
+    tty-cursor (0.7.1)
+    tty-editor (0.7.0)
+      tty-prompt (~> 0.22)
+    tty-file (0.10.0)
+      diff-lcs (~> 1.3)
+      pastel (~> 0.8)
+      tty-prompt (~> 0.22)
+    tty-option (0.2.0)
+    tty-progressbar (0.18.2)
+      strings-ansi (~> 0.2)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      unicode-display_width (>= 1.6, < 3.0)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
+    unicode-display_width (2.1.0)
+    unicode_utils (1.4.0)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.1.4)
+  bundler (~> 2.2.26)
   dotenv (~> 2.7.5)
   gitsflow!
+  pastel (~> 0.8.0)
   pry (~> 0.12.2)
   rake (~> 12.3)
   rspec (~> 3.0)
+  tty-box (~> 0.7.0)
+  tty-command (~> 0.10.1)
+  tty-config (~> 0.5.0)
+  tty-editor (~> 0.7.0)
+  tty-file (~> 0.10.0)
+  tty-option (~> 0.2.0)
+  tty-progressbar (~> 0.18.2)
+  tty-prompt (~> 0.23.1)
+  tty-table (~> 0.12.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.26

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/gitsflow.svg)](https://badge.fury.io/rb/gitsflow)
 [![Build Status](https://travis-ci.org/carloswherbet/GitSFlow.svg?branch=master)](https://travis-ci.org/carloswherbet/GitSFlow)
-# GitSFlow
+# GitSFlow 0.8.0
 GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow
 ## Installation
 
@@ -46,34 +46,11 @@ SFLOW_TEMPLATE_RELEASE_DATE_FORMAT=Y/m/d
 ## Usage
 
 For help:
-
-    $ git sflow help
-    or
-    $ sflow help 
-
-List of commands:
-1. git sflow feature start FEATURE DESCRIPTION 
-2. git sflow feature [reintegration|finish] FEATURE_BRANCH
-3. git sflow feature codereview BRANCH
-4. git sflow feature staging SOURCE_BRANCH
-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 bugfix staging BUGFIX_BRANCH
-9. git sflow hotfix start HOTFIX DESCRIPTION
-10. git sflow hotfix [reintegration|finish] HOTFIX_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
-
-
-
+```bash
+ sflow
+```
 ## Uninstall
-    $ git sflow uninstall
-    or 
-    $ sflow uninstall
-
+   gem uninstall gitsflow
 
 ## Get a GitLab Token
 

data/bin/sflow

@@ -2,5 +2,5 @@
 
 lib = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.push(lib)
-load 'sflow.rb'
-SFlow.call()
+load 'sflow/sflow.rb'
+SFlow::SFlow.call()

data/gitsflow.gemspec

@@ -1,37 +1,65 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.push(lib)
-require_relative "lib/sflow"
-
+require_relative 'lib/sflow/version'
 Gem::Specification.new do |s|
-    s.name          = %q{gitsflow}
-    s.version       = SFlow::VERSION
-    s.date          = %q{2020-03-20}
-    s.bindir        = "bin"
-    s.homepage      = "https://github.com/carloswherbet/GitSFlow"
-    s.summary       = %q{GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow}
-    s.authors       = ["Carlos Wherbet"]
-    s.email         = 'carloswherbet@gmail.com'
-    s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-    s.license       = "MIT"
-    # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-    # to allow pushing to a single host or delete this section to allow pushing to any host.
-    if s.respond_to?(:metadata)
-      s.metadata["allowed_push_host"] = "https://rubygems.org"
-    else
-      raise "RubyGems 2.0 or newer is required to protect against " \
-        "public gem pushes."
-    end
-    s.executables << 'sflow'
-  
-    s.require_paths = ["lib"]
-    s.files =  `git ls-files -z`.split("\x0").reject do |f|
-      f.match(%r{^(test|spec|features)/})
-    end
-    s.add_development_dependency "bundler", "~> 2.1.4"
-    s.add_development_dependency  "dotenv", "~> 2.7.5"
-    s.add_development_dependency  "pry",  '~> 0.12.2'
-    s.add_development_dependency "rake", "~> 12.3"
-    s.add_development_dependency "rspec", "~> 3.0"
-    s.add_dependency  "dotenv", "~> 2.7.5"
+  s.name = 'gitsflow'
+  s.version       = SFlow::VERSION
+  s.date          = '2020-03-20'
+  s.bindir        = 'bin'
+  s.homepage      = 'https://github.com/carloswherbet/GitSFlow'
+  s.summary       = "GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow"
+  s.authors       = ['Carlos Wherbet']
+  s.email         = 'carloswherbet@gmail.com'
+  s.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  s.license = 'MIT'
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if s.respond_to?(:metadata)
+    s.metadata['allowed_push_host'] = 'https://rubygems.org'
+  else
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
+  end
+  s.executables << 'sflow'
+
+  s.require_paths = ['lib']
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
   end
-  
+
+  s.add_development_dependency 'bundler', '~> 2.2.26'
+  s.add_development_dependency 'dotenv', '~> 2.7.5'
+  s.add_dependency 'dotenv', '~> 2.7.5'
+  s.add_development_dependency 'pry', '~> 0.12.2'
+  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'tty-prompt', '~> 0.23.1'
+  s.add_dependency 'tty-prompt', '~> 0.23.1'
+
+  s.add_development_dependency 'tty-progressbar', '~> 0.18.2'
+  s.add_dependency 'tty-progressbar', '~> 0.18.2'
+
+  s.add_development_dependency 'pastel', '~> 0.8.0'
+  s.add_dependency 'pastel', '~> 0.8.0'
+
+  s.add_development_dependency 'tty-config', '~> 0.5.0'
+  s.add_dependency 'tty-config', '~> 0.5.0'
+
+  s.add_development_dependency 'tty-box', '~> 0.7.0'
+  s.add_dependency 'tty-box', '~> 0.7.0'
+
+  s.add_development_dependency 'tty-command', '~> 0.10.1'
+  s.add_dependency 'tty-command', '~> 0.10.1'
+
+  s.add_development_dependency 'tty-option', '~> 0.2.0'
+  s.add_dependency 'tty-option', '~> 0.2.0'
+
+  s.add_development_dependency 'tty-editor', '~> 0.7.0'
+  s.add_dependency 'tty-editor', '~> 0.7.0'
+
+  s.add_development_dependency 'tty-file', '~> 0.10.0'
+  s.add_dependency 'tty-file', '~> 0.10.0'
+
+  s.add_development_dependency 'tty-table', '~> 0.12.0'
+  s.add_dependency 'tty-table', '~> 0.12.0'
+end

data/lib/Git/git.rb

@@ -1,24 +1,28 @@
+require 'tty_integration.rb'
 module Git
+  extend TtyIntegration
+
   def self.checkout(branch, options = :with_fetch)
     fetch(branch) if options == :with_fetch
-    print "checkout: ".yellow
-    print "#{branch}\n\n".green
+    # prompt.say(pastel.yellow("[checkout] ") + pastel.green(branch))
     execute {"git checkout #{branch}"}
-    self.pull branch
+    self.pull branch  if options == :with_fetch
   end
   
   def self.merge from, to
     # self.checkout(from)
     checkout(to, :local)
-    print "Merge ".yellow
-    print "#{from} ".green
-    print "into ".yellow
-    print "#{to} \n\n".green
-    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
+    # prompt.say(pastel.yellow('[Merge] '))
+    # prompt.say(pastel.green("#{from} "))
+    # prompt.say(pastel.yellow("into "))
+    # prompt.say(pastel.green("#{to} \n\n"))
+    result = cmd.run!("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 result.success?
+      return result.out
     else
       print "Conflicts on merge!".yellow.bg_red
       print "\n\nResolve conflicts and commit. \n"
@@ -32,7 +36,7 @@ module Git
         print "Continuing...\n\n"
       else
         print "Aborting merge...\n\n"
-        system ('git merge --abort')
+        execute { ('git merge --abort') }
         raise 'Aborting...'
       end
 
@@ -42,69 +46,65 @@ module Git
   end
 
   def self.delete_branch branch
-    print "Delete branch: ".yellow
-    print "#{branch} \n\n".green
-    system("git checkout develop && git branch -D #{branch}")
+    # print "Delete branch: ".yellow
+    # print "#{branch} \n\n".green
+    execute {("git checkout develop && git branch -D #{branch}") }
   end
 
   def self.reset_hard from, to
     self.fetch from
     self.checkout(to)
-    print "Reset --hard:  #{to} is equal: ".yellow
-    print "origin/#{from}\n".green
-    system "git reset --hard origin/#{from}\n\n"
+    # print "Reset --hard:  #{to} is equal: ".yellow
+    # print "origin/#{from}\n".green
+    execute { "git reset --hard origin/#{from}\n\n" }
   end
   
   def self.push branch
-    print "Push: ".yellow
-    print "#{branch}\n\n".green
+    # prompt.say(pastel.yellow('[Push]: '))
+    # prompt.say(pastel.green("#{branch}\n\n"))
     execute {"git push origin #{branch}"}
   end
 
   def self.push_force branch
-    print "Push --force: ".yellow
-    print "#{branch}\n\n".green
+    # 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'"}
+    execute {%{git log origin/#{branch}..HEAD --oneline --format="%ad - %B}}
   end
 
   def self.pull branch
-    print "Pull: ".yellow
-    print "#{branch}\n\n".green
-    system "git pull origin #{branch}"
+    # prompt.say(pastel.yellow('[Pull]: '))
+    # prompt.say(pastel.yellow("#{branch}\n\n"))
+    execute { "git pull origin #{branch}" }
   end
 
   def self.fetch branch
-    print "Fetch: ".yellow
-    print "origin/#{branch}\n\n".green
-    system "git fetch origin #{branch}"
+    # prompt.say(pastel.yellow('[Fetch]: '))
+    # prompt.say(pastel.yellow("origin/#{branch}\n\n"))
+    execute { "git fetch origin #{branch}" }
   end
 
   def self.new_branch branch
-    print "Create new branch: ".yellow
-    print "#{branch}\n".green
-    system  "git checkout -b #{branch}"
+    # prompt.say(pastel.yellow('Create new branch: '))
+    # prompt.say(pastel.green( "#{branch}\n"))
+    execute {  "git checkout -b #{branch}" }
   end
 
 
   def self.exist_branch? branch
     execute {"git fetch origin #{branch}"}
-
   end
-    
 
   private
 
   def self.execute
-    processs, stderr , stdout= Open3.popen3(yield) do |i, o, stderr, wait_thr|
-      [wait_thr.value, stderr.read, o.read] 
-    end
-    if processs.success?
-      return stdout
-    end
-    raise "#{stderr}"
+
+    result= cmd.run!(yield)
+
+    raise result.err if result.failed?
+    return result.out
   end
 end

data/lib/GitLab/gitlab.rb

@@ -1,83 +1,116 @@
 require 'json'
-
+require 'tty_integration'
 module GitLab
+  include TtyIntegration
   autoload :User, 'GitLab/user.rb'
   autoload :Issue, 'GitLab/issue.rb'
   autoload :MergeRequest, 'GitLab/merge_request.rb'
   autoload :Comment, 'GitLab/comment.rb'
   autoload :List, 'GitLab/list.rb'
 
-  def self.request_post url, params 
-    request = "#{$GITLAB_URL_API}/#{url}" 
-    uri = URI(request) 
-    req = Net::HTTP::Post.new(uri) 
-    req['PRIVATE-TOKEN'] = $GITLAB_TOKEN 
+  def self.request_post(url, params)
+    request = "#{$GITLAB_URL_API}/#{url}"
+    uri = URI(request)
+    req = Net::HTTP::Post.new(uri)
+    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) } 
+    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.request_put url, params 
-    request = "#{$GITLAB_URL_API}/#{url}" 
-    uri = URI(request) 
-    req = Net::HTTP::Put.new(uri) 
-    req['PRIVATE-TOKEN'] = $GITLAB_TOKEN 
+  def self.request_put(url, params)
+    request = "#{$GITLAB_URL_API}/#{url}"
+    uri = URI(request)
+    req = Net::HTTP::Put.new(uri)
+    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) } 
+    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.request_get url 
-    request = "#{$GITLAB_URL_API}/#{url}" 
-    uri = URI(request) 
-    req = Net::HTTP::Get.new(uri) 
+
+  def self.request_get(url)
+    request = "#{$GITLAB_URL_API}/#{url}"
+    uri = URI(request)
+    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) } 
+    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
+  def self.check_errors_404(res)
+    return unless res.code == '404'
+
+    raise "Project: #{$GITLAB_PROJECT_ID} \n#{JSON.parse(res.body)['message']}"
+  end
+
+  def self.check_authorized(res)
+    return unless res.code == '401'
+
+    raise 'Unauthorized. Check GITLAB_TOKEN and file .env'
+  end
+
+  def self.get_boards
+    gitlab_boards = request_get("projects/#{$GITLAB_PROJECT_ID}/boards")
   end
 
-  def self.check_authorized res
-    if res.code == "401"
-      raise "Unauthorized. Check GITLAB_TOKEN and file .env"
+  def self.get_board_gitsflow
+    boards = get_boards
+    boards.detect { |i| i['name'] == 'GitSFlow' }
+  end
+
+  def self.create_board_lists
+    board_gitsflow = get_board_gitsflow
+    return if board_gitsflow
+
+    # Create Board
+    request_post("projects/#{$GITLAB_PROJECT_ID}/boards", { name: 'GitSFlow' })
+
+    board_gitsflow = get_board_gitsflow
+
+    gitlab_labels = request_get("projects/#{$GITLAB_PROJECT_ID}/labels")
+
+    # Create lists
+    $GITLAB_LISTS.each do |list|
+      label = gitlab_labels.detect { |i| i['name'] == list }
+      request_post("projects/#{$GITLAB_PROJECT_ID}/boards/#{board_gitsflow['id']}/lists", { label_id: label['id'] })
     end
   end
 
   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"},
-      {name: 'tasks', color: "#F0AD4E"},
-      ]
+    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' },
+      { name: 'tasks', color: '#F0AD4E' },
+      { name: 'parent', color: '#34495E' },
+      { name: 'To Do', color: '#009966' },
+      { name: 'Doing', color: '#ed9121' }
+    ]
     $GIT_BRANCHES_STAGING.each do |staging|
-      params << {name: staging, color: '#FAD8C7'}
+      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)
+
+    $GITLAB_LISTS.each do |list|
+      params << { name: list, color: '#FAD8C7' }
     end
 
+    params << { name: $GITLAB_NEXT_RELEASE_LIST, color: '#34495E' }
+
+    params.each do |label_params|
+      request_post(url, label_params)
+    end
   end
-   
-end
+end