gitsflow 0.8.2.alfa → 0.8.3.release230620231302
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.tool-versions +1 -0
- data/README.md +20 -43
- data/gitsflow.gemspec +1 -1
- data/lib/GitLab/merge_request.rb +2 -2
- data/lib/sflow/sflow.rb +5 -5
- data/lib/sflow/version.rb +1 -1
- metadata +4 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b07db6e3af47ebc26e69f4e990a62aa60bef26e07666161ecf6d1df4fc10cad0
|
4
|
+
data.tar.gz: 17eb377d55f60968f5a61a8408994eba7ddb9b5b6da0078ccccc5e05e0e123d6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 28bebf3372ad968f4ea196dbabdf02a9127314d2c83d4aa5b22d1e43af233fac48f15631d48c1441f5ab78c3abdbc6631bb57820efac4436b0866482df356fea
|
7
|
+
data.tar.gz: 5726f88885a83d21dd2b2afe35701024bea9ced01ba66c0bdc9791bd85b724e8170a957b69a589aef196354a3b0b32c20ee65354b6e856936bc8bf2d1725963e
|
data/.tool-versions
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
ruby 2.7.6
|
data/README.md
CHANGED
@@ -1,62 +1,39 @@
|
|
1
1
|
[![Gem Version](https://badge.fury.io/rb/gitsflow.svg)](https://badge.fury.io/rb/gitsflow)
|
2
2
|
[![Build Status](https://travis-ci.org/carloswherbet/GitSFlow.svg?branch=master)](https://travis-ci.org/carloswherbet/GitSFlow)
|
3
|
-
# GitSFlow 0.8.
|
4
|
-
GitSFlow
|
5
|
-
## Installation
|
3
|
+
# GitSFlow 0.8.3
|
4
|
+
GitSFlow é uma ferramenta integrada ao Gitlab que contém um modelo de fluxo de trabalho inspirado no Git Flow.
|
6
5
|
|
6
|
+
[Veja o fluxo de trabalho](#fluxo)
|
7
7
|
|
8
|
-
|
9
|
-
gem 'gitsflow', group: :development
|
10
|
-
```
|
11
|
-
|
12
|
-
$ gem install gitsflow
|
13
|
-
|
14
|
-
And in your application's:
|
15
|
-
|
16
|
-
$ sflow install
|
17
|
-
-> It will install the git alias
|
18
|
-
|
19
|
-
|
20
|
-
## Flow Sugestion
|
8
|
+
[Manual do Desenvolvedor](#dev)
|
21
9
|
|
10
|
+
## Instalação
|
22
11
|
|
23
|
-
|
24
|
-
|
25
|
-
$ git sflow config
|
26
|
-
or
|
27
|
-
$ sflow config
|
28
|
-
|
29
|
-
In your project create or update file .env with variables below:
|
30
|
-
|
31
|
-
```shell
|
32
|
-
GITLAB_PROJECT_ID=
|
33
|
-
GITLAB_TOKEN=
|
34
|
-
GITLAB_URL_API=https://gitlab.com/api/v4
|
35
|
-
GITLAB_EMAIL=
|
36
|
-
GITLAB_LISTS=To Do,Doing,Next Release,Staging
|
37
|
-
GITLAB_NEXT_RELEASE_LIST=Next Release
|
38
|
-
GIT_BRANCH_MASTER=master
|
39
|
-
GIT_BRANCH_DEVELOP=develop
|
40
|
-
GIT_BRANCHES_STAGING=staging_1,staging_2
|
41
|
-
SFLOW_TEMPLATE_RELEASE=Version {version} - {date}
|
42
|
-
SFLOW_TEMPLATE_RELEASE_DATE_FORMAT=Y/m/d
|
43
|
-
|
12
|
+
```ruby
|
13
|
+
gem install gitsflow
|
44
14
|
```
|
45
15
|
|
46
|
-
##
|
16
|
+
## Exemplo de uso
|
47
17
|
|
48
|
-
For help:
|
49
18
|
```bash
|
50
|
-
|
19
|
+
sflow
|
51
20
|
```
|
21
|
+
<a name="fluxo"></a>
|
22
|
+
## Fluxo de Trabalho
|
23
|
+
|
52
24
|
## Uninstall
|
53
|
-
|
25
|
+
```bash
|
26
|
+
gem uninstall gitsflow
|
27
|
+
```
|
28
|
+
|
29
|
+
<a name="dev"></a>
|
30
|
+
## Desenvolvedor
|
54
31
|
|
55
|
-
##
|
32
|
+
## Criando um GitLab Token
|
56
33
|
|
57
34
|
![Get a GitLab Token](https://github.com/carloswherbet/GitSFlow/raw/master/src/common/images/get_token.gif "Get a GitLab Token")
|
58
35
|
|
59
|
-
##
|
36
|
+
## Contribuições
|
60
37
|
|
61
38
|
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.
|
62
39
|
|
data/gitsflow.gemspec
CHANGED
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
|
|
7
7
|
s.date = '2020-03-20'
|
8
8
|
s.bindir = 'bin'
|
9
9
|
s.homepage = 'https://github.com/carloswherbet/GitSFlow'
|
10
|
-
s.summary =
|
10
|
+
s.summary = 'GitSFlow is a Gitlab-integrated tool that contains a workflow model inspired by Git FLOW.'
|
11
11
|
s.authors = ['Carlos Wherbet']
|
12
12
|
s.email = 'carloswherbet@gmail.com'
|
13
13
|
s.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
|
data/lib/GitLab/merge_request.rb
CHANGED
@@ -85,8 +85,8 @@ class GitLab::MergeRequest
|
|
85
85
|
@obj_gitlab = GitLab.request_post(url, {
|
86
86
|
source_branch: @source_branch,
|
87
87
|
target_branch: @target_branch,
|
88
|
-
title
|
89
|
-
description
|
88
|
+
title: title,
|
89
|
+
description: description,
|
90
90
|
labels: @labels,
|
91
91
|
assignee_id: GitLab::User.me['id'].to_i,
|
92
92
|
reviewer_ids: [assignee_id.to_i]
|
data/lib/sflow/sflow.rb
CHANGED
@@ -348,12 +348,11 @@ module SFlow
|
|
348
348
|
end
|
349
349
|
|
350
350
|
def self.release_finish(branch_name)
|
351
|
-
version = branch_name
|
351
|
+
version = branch_name.gsub(/(.*)\//, '')
|
352
352
|
|
353
353
|
new_labels = []
|
354
354
|
|
355
|
-
|
356
|
-
issue_release = GitLab::Issue.find_by_branch(release_branch)
|
355
|
+
issue_release = GitLab::Issue.find_by_branch(branch_name)
|
357
356
|
|
358
357
|
Git.merge issue_release.branch, $GIT_BRANCH_DEVELOP
|
359
358
|
Git.push $GIT_BRANCH_DEVELOP
|
@@ -575,8 +574,9 @@ module SFlow
|
|
575
574
|
sleep(0.2)
|
576
575
|
@@bar.advance
|
577
576
|
end
|
578
|
-
Git.new_branch
|
579
|
-
Git.
|
577
|
+
Git.new_branch(branch)
|
578
|
+
Git.pull(parent_branch_name) unless parent_branch_name.empty?
|
579
|
+
Git.push(branch)
|
580
580
|
|
581
581
|
@@bar.finish
|
582
582
|
prompt.say(pastel.cyan("Você está na branch: #{branch}"))
|
data/lib/sflow/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitsflow
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.3.release230620231302
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Carlos Wherbet
|
@@ -383,6 +383,7 @@ extra_rdoc_files: []
|
|
383
383
|
files:
|
384
384
|
- ".env.yml"
|
385
385
|
- ".gitignore"
|
386
|
+
- ".tool-versions"
|
386
387
|
- ".travis.yml"
|
387
388
|
- CODE_OF_CONDUCT.md
|
388
389
|
- Gemfile
|
@@ -432,6 +433,6 @@ requirements: []
|
|
432
433
|
rubygems_version: 3.1.6
|
433
434
|
signing_key:
|
434
435
|
specification_version: 4
|
435
|
-
summary: GitSFlow is a tool that
|
436
|
-
|
436
|
+
summary: GitSFlow is a Gitlab-integrated tool that contains a workflow model inspired
|
437
|
+
by Git FLOW.
|
437
438
|
test_files: []
|