gitsflow 0.8.2.beta → 0.8.3.release100620241155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50109a2a692360263689f621c57ea57359423f8f7d3f242ef0c542d561843a1a
-  data.tar.gz: 648ed9201fb3d4fc58b138ade8fa1a9211bd58bb2811afdbee61d70a8c0fb59a
+  metadata.gz: 285bd27f31714bebf8bc5f84f8b2504369f38296cc715f0b5b4511ef1c47d4fd
+  data.tar.gz: 90e181b2af1a45f1f8ef34c524f769e3d38a5484a9e88cc0c2945e1a7983684b
 SHA512:
-  metadata.gz: e9b5f0d2aaa6a461223210a99e68316e7fb7f027c11de23cea6018dec17ab247acb01050f6630df4d32496d4f04d8ea20a018e4e900c9df9a5f0ff0cea613a3b
-  data.tar.gz: 5a78fe751dbfb6bfb3308ffa3ebdad1860448e9c8e07892e8ddb83f1762be96001b9cff89643270a33a69c0d08e8e43576ffb259855500063996147e9b227b66
+  metadata.gz: 953346ee898e87e0b8bccd5ec21cac3dea00e4b7d1b88479417e695bfcfff484c8743d38a4159a7c43808c1bb5b1421515b56e4037e8f6c324ae801ea9ba2977
+  data.tar.gz: ee6fa9b15b1291ce0c6882a769ec859bad6fed48ae0eff68ac2dc2edf546cf961fc651883b9eea386e73130d3e3e34f5529c0f3901dc9a92803dc6412b93b586

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.6

data/README.md

@@ -1,62 +1,39 @@
 [![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 0.8.0
-GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow
-## Installation
+# GitSFlow 0.8.3
+GitSFlow é uma ferramenta integrada ao Gitlab que contém um  modelo de fluxo de trabalho inspirado no Git Flow.
 
+[Veja o fluxo de trabalho](#fluxo)
 
-```ruby
-gem 'gitsflow',  group: :development
-```
-
-    $ gem install gitsflow
-
-And in your application's:
-
-    $ sflow install
-    -> It will install the git alias
-
-
-## Flow Sugestion
+[Manual do Desenvolvedor](#dev)
 
+## Instalação
 
-## Config
-
-    $ git sflow config
-    or 
-    $ sflow config
-
-In your project create or update file .env with variables below:
-
-```shell
-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
-SFLOW_TEMPLATE_RELEASE=Version {version} - {date}
-SFLOW_TEMPLATE_RELEASE_DATE_FORMAT=Y/m/d
-    
+```ruby
+gem install gitsflow
 ```
 
-## Usage
+## Exemplo de uso
 
-For help:
 ```bash
- sflow
+sflow
 ```
+<a name="fluxo"></a>
+## Fluxo de Trabalho
+
 ## Uninstall
-   gem uninstall gitsflow
+```bash
+gem uninstall gitsflow
+```
+   
+<a name="dev"></a>
+## Desenvolvedor
 
-## Get a GitLab Token
+## Criando um GitLab Token
 
 ![Get a GitLab Token](https://github.com/carloswherbet/GitSFlow/raw/master/src/common/images/get_token.gif "Get a GitLab Token")
 
-## Contributing
+## Contribuições
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/carloswherbet/GitSFlow. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 

data/gitsflow.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   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.summary       = 'GitSFlow is a Gitlab-integrated tool that contains a workflow model inspired by Git FLOW.'
   s.authors       = ['Carlos Wherbet']
   s.email         = 'carloswherbet@gmail.com'
   s.required_ruby_version = Gem::Requirement.new('>= 2.7.0')

data/lib/GitLab/gitlab.rb

@@ -78,7 +78,7 @@ module GitLab
     # 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'] }) if label
+      request_post("projects/#{$GITLAB_PROJECT_ID}/boards/#{board_gitsflow['id']}/lists", { label_id: label['id'] })
     end
   end
 

data/lib/GitLab/merge_request.rb

@@ -85,8 +85,8 @@ class GitLab::MergeRequest
     @obj_gitlab = GitLab.request_post(url, {
                                         source_branch: @source_branch,
                                         target_branch: @target_branch,
-                                        title:,
-                                        description:,
+                                        title: title,
+                                        description: description,
                                         labels: @labels,
                                         assignee_id: GitLab::User.me['id'].to_i,
                                         reviewer_ids: [assignee_id.to_i]

data/lib/config.rb

@@ -9,7 +9,7 @@ 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
+    project_name = cmd.run!("git remote -v | grep origin | 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

data/lib/sflow/sflow.rb

@@ -348,12 +348,11 @@ module SFlow
     end
 
     def self.release_finish(branch_name)
-      version = branch_name
+      version = branch_name.gsub(/(.*)\//, '')
 
       new_labels = []
 
-      release_branch = "-release/#{version}"
-      issue_release = GitLab::Issue.find_by_branch(release_branch)
+      issue_release = GitLab::Issue.find_by_branch(branch_name)
 
       Git.merge issue_release.branch, $GIT_BRANCH_DEVELOP
       Git.push $GIT_BRANCH_DEVELOP
@@ -575,8 +574,9 @@ module SFlow
         sleep(0.2)
         @@bar.advance
       end
-      Git.new_branch branch
-      Git.push branch
+      Git.new_branch(branch)
+      Git.pull(parent_branch_name) unless parent_branch_name.nil?
+      Git.push(branch)
 
       @@bar.finish
       prompt.say(pastel.cyan("Você está na branch: #{branch}"))

data/lib/sflow/version.rb

@@ -1,3 +1,3 @@
 module SFlow
-  VERSION = '0.8.2.beta'
+  VERSION = "0.8.3.release#{Time.now.strftime('%d%m%Y%H%M')}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.8.2.beta
+  version: 0.8.3.release100620241155
 platform: ruby
 authors:
 - Carlos Wherbet
@@ -383,6 +383,7 @@ extra_rdoc_files: []
 files:
 - ".env.yml"
 - ".gitignore"
+- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -432,6 +433,6 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: GitSFlow is a tool that integrate Git custom commands with GitLab and it's
-  inspired GitFlow
+summary: GitSFlow is a Gitlab-integrated tool that contains a workflow model inspired
+  by Git FLOW.
 test_files: []