gitsflow 0.3.1 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of gitsflow might be problematic. Click here for more details.

Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +7 -0
  3. data/Gemfile +1 -1
  4. data/Gemfile.lock +11 -13
  5. data/README.md +3 -1
  6. data/gitsflow.gemspec +6 -7
  7. data/lib/config.rb +8 -3
  8. data/lib/sflow.rb +7 -6
  9. metadata +21 -34
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9a490296f500d1def1cc52746e4b76929007cd0182619c08a2bfa000b458d0ea
4
- data.tar.gz: c73307ca48222d3dac05246f31d473c850f59c365ec829228b0e39ca8588472d
3
+ metadata.gz: fe575dd9c530a6bf10754a8f7752fe02236bdd5104e36f59bbe1a4cfdff9e055
4
+ data.tar.gz: 7636dedd2b259c7334474331f5ed38f16bd8443ba76f3ec4607a4dc864fae63c
5
5
  SHA512:
6
- metadata.gz: 960cf298859190dec0b3df9519bbcb8a877f806f7871e911701847a13fed2635e6e749a847b324ca8db1c00e2f426842dd861ca16e25cfb59dd557c7e61de865
7
- data.tar.gz: 4d011cd37e2b1c36a282dc65bde56a3e1283d9f13e58486aa3e1cd55b2c5dea477586b5f45512e2face880bcfe641000defe3eabdec641967d5e9c514a9f9838
6
+ metadata.gz: 84b5f060d9e6e88fd15376bd32f543303e7b540ee576707a34b63fce5b3403a7505efb2f753e18f10945feead332cf35627f64cd83ccc5ad9835074172867049
7
+ data.tar.gz: 4e6fd8ab6dd39332a1664767b55ea7f7ca60930a09def06cfd1fad54a65537cc7d65b19b90a7ce15325909139fa8711a7e34cd9f48b3407c3a2093b72b5d7384
data/.travis.yml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ language: ruby
3
+ # cache: bundler
4
+ rvm:
5
+ - 2.7.0
6
+ before_install:
7
+ - gem install bundler -v 2.1.4
data/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
3
+ # git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
4
 
5
5
  # Specify your gem's dependencies in SFlow.gemspec
6
6
  gemspec
data/Gemfile.lock CHANGED
@@ -1,21 +1,19 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitsflow (0.3.0)
5
- dotenv (~> 0)
4
+ gitsflow (0.4.0)
5
+ dotenv (~> 2.7.5)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
9
9
  specs:
10
10
  coderay (1.1.2)
11
11
  diff-lcs (1.3)
12
- dotenv (0.11.1)
13
- dotenv-deployment (~> 0.0.2)
14
- dotenv-deployment (0.0.2)
15
- method_source (1.0.0)
16
- pry (0.13.0)
17
- coderay (~> 1.1)
18
- method_source (~> 1.0)
12
+ dotenv (2.7.5)
13
+ method_source (0.9.2)
14
+ pry (0.12.2)
15
+ coderay (~> 1.1.0)
16
+ method_source (~> 0.9.0)
19
17
  rake (12.3.3)
20
18
  rspec (3.9.0)
21
19
  rspec-core (~> 3.9.0)
@@ -35,12 +33,12 @@ PLATFORMS
35
33
  ruby
36
34
 
37
35
  DEPENDENCIES
38
- bundler (~> 1.16)
39
- dotenv
36
+ bundler (~> 2.1.4)
37
+ dotenv (~> 2.7.5)
40
38
  gitsflow!
41
- pry
39
+ pry (~> 0.12.2)
42
40
  rake (~> 12.3)
43
41
  rspec (~> 3.0)
44
42
 
45
43
  BUNDLED WITH
46
- 1.16.1
44
+ 2.1.4
data/README.md CHANGED
@@ -1,3 +1,5 @@
1
+ [![Gem Version](https://badge.fury.io/rb/gitsflow.svg)](https://badge.fury.io/rb/gitsflow)
2
+ [![Build Status](https://travis-ci.org/carloswherbet/GitSFlow.svg?branch=master)](https://travis-ci.org/carloswherbet/GitSFlow)
1
3
  # GitSFlow
2
4
  GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow
3
5
  ## Installation
@@ -67,7 +69,7 @@ List of commands:
67
69
  10. git sflow hotfix [reintegration|finish] HOTFIX_BRANCH
68
70
  11. git sflow release start RELEASE
69
71
  12. git sflow release finish RELEASE
70
- 13. git sflow push BRANCH
72
+ 13. git sflow push origin BRANCH
71
73
 
72
74
 
73
75
 
data/gitsflow.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  lib = File.expand_path("../lib", __FILE__)
2
2
  $LOAD_PATH.push(lib)
3
- require "sflow"
3
+ require_relative "lib/sflow"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = %q{gitsflow}
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
11
11
  s.summary = %q{GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow}
12
12
  s.authors = ["Carlos Wherbet"]
13
13
  s.email = 'carloswherbet@gmail.com'
14
- s.required_ruby_version = '>= 2.0.0'
14
+ s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
15
15
  s.license = "MIT"
16
16
  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
17
17
  # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -27,12 +27,11 @@ Gem::Specification.new do |s|
27
27
  s.files = `git ls-files -z`.split("\x0").reject do |f|
28
28
  f.match(%r{^(test|spec|features)/})
29
29
  end
30
- s.add_dependency "dotenv", "~> 0"
31
- s.add_dependency "pry", "~> 0"
32
- s.add_development_dependency "dotenv", "~> 0"
33
- s.add_development_dependency "pry", "~> 0"
34
- s.add_development_dependency "bundler", "~> 1.16"
30
+ s.add_development_dependency "bundler", "~> 2.1.4"
31
+ s.add_development_dependency "dotenv", "~> 2.7.5"
32
+ s.add_development_dependency "pry", '~> 0.12.2'
35
33
  s.add_development_dependency "rake", "~> 12.3"
36
34
  s.add_development_dependency "rspec", "~> 3.0"
35
+ s.add_dependency "dotenv", "~> 2.7.5"
37
36
  end
38
37
 
data/lib/config.rb CHANGED
@@ -1,9 +1,14 @@
1
- require 'dotenv'
2
- Dotenv.load(File.join( Dir.pwd, ".env"))
1
+
2
+ begin
3
+ require 'dotenv'
4
+ Dotenv.load(File.join( Dir.pwd, ".env"))
5
+ rescue LoadError
6
+ # Gem loads as it should
7
+ end
3
8
  $GITLAB_PROJECT_ID = ENV['GITLAB_PROJECT_ID']
4
9
  $GITLAB_TOKEN = ENV['GITLAB_TOKEN']
5
10
  $GITLAB_URL_API = ENV['GITLAB_URL_API']
6
- $GITLAB_EMAIL = ENV['GITLAB_EMAIL'] == "" ? Open3.popen3("git config --global user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
11
+ $GITLAB_EMAIL = ENV['GITLAB_EMAIL'] == "" ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
7
12
  $GITLAB_LISTS = ENV['GITLAB_LISTS'].split(',') rescue nil
8
13
  $GITLAB_NEXT_RELEASE_LIST = ENV['GITLAB_NEXT_RELEASE_LIST']
9
14
  $GIT_BRANCH_MASTER= ENV["GIT_BRANCH_MASTER"]
data/lib/sflow.rb CHANGED
@@ -1,8 +1,9 @@
1
- #!/usr/bin/env ruby
2
- # frozen_string_literal: true
3
-
4
1
  #!/usr/bin/ruby
5
- require 'pry'
2
+ begin
3
+ require 'pry'
4
+ rescue LoadError
5
+ # Gem loads as it should
6
+ end
6
7
 
7
8
  require 'net/http'
8
9
  require "open3"
@@ -15,7 +16,7 @@ load 'Git/git.rb'
15
16
  # require './lib/gitlab/issue.rb'
16
17
  # require './lib/gitlab/merge_request.rb'
17
18
  class SFlow
18
- VERSION = "0.3.1"
19
+ VERSION = "0.4.0"
19
20
  $TYPE = ARGV[0]
20
21
  $ACTION = ARGV[1]
21
22
  $PARAM1 = ARGV[2]
@@ -453,7 +454,7 @@ class SFlow
453
454
  print "10 - git sflow hotfix [reintegration|finish] HOTFIX_BRANCH\n".yellow
454
455
  print "11 - git sflow release start RELEASE\n".yellow
455
456
  print "12 - git sflow release finish RELEASE\n".yellow
456
- print "13 - git sflow push BRANCH\n".yellow
457
+ print "13 - git sflow push origin BRANCH\n".yellow
457
458
 
458
459
  choice = -1
459
460
  question = "Choice a number for show a example or 0 for exit:\n\n".light_blue
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.3.1
4
+ version: 0.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Carlos Wherbet
@@ -11,103 +11,89 @@ cert_chain: []
11
11
  date: 2020-03-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: dotenv
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - "~>"
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - "~>"
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
- - !ruby/object:Gem::Dependency
28
- name: pry
14
+ name: bundler
29
15
  requirement: !ruby/object:Gem::Requirement
30
16
  requirements:
31
17
  - - "~>"
32
18
  - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :runtime
19
+ version: 2.1.4
20
+ type: :development
35
21
  prerelease: false
36
22
  version_requirements: !ruby/object:Gem::Requirement
37
23
  requirements:
38
24
  - - "~>"
39
25
  - !ruby/object:Gem::Version
40
- version: '0'
26
+ version: 2.1.4
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: dotenv
43
29
  requirement: !ruby/object:Gem::Requirement
44
30
  requirements:
45
31
  - - "~>"
46
32
  - !ruby/object:Gem::Version
47
- version: '0'
33
+ version: 2.7.5
48
34
  type: :development
49
35
  prerelease: false
50
36
  version_requirements: !ruby/object:Gem::Requirement
51
37
  requirements:
52
38
  - - "~>"
53
39
  - !ruby/object:Gem::Version
54
- version: '0'
40
+ version: 2.7.5
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: pry
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
45
  - - "~>"
60
46
  - !ruby/object:Gem::Version
61
- version: '0'
47
+ version: 0.12.2
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
52
  - - "~>"
67
53
  - !ruby/object:Gem::Version
68
- version: '0'
54
+ version: 0.12.2
69
55
  - !ruby/object:Gem::Dependency
70
- name: bundler
56
+ name: rake
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
59
  - - "~>"
74
60
  - !ruby/object:Gem::Version
75
- version: '1.16'
61
+ version: '12.3'
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
66
  - - "~>"
81
67
  - !ruby/object:Gem::Version
82
- version: '1.16'
68
+ version: '12.3'
83
69
  - !ruby/object:Gem::Dependency
84
- name: rake
70
+ name: rspec
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
73
  - - "~>"
88
74
  - !ruby/object:Gem::Version
89
- version: '12.3'
75
+ version: '3.0'
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
80
  - - "~>"
95
81
  - !ruby/object:Gem::Version
96
- version: '12.3'
82
+ version: '3.0'
97
83
  - !ruby/object:Gem::Dependency
98
- name: rspec
84
+ name: dotenv
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
87
  - - "~>"
102
88
  - !ruby/object:Gem::Version
103
- version: '3.0'
104
- type: :development
89
+ version: 2.7.5
90
+ type: :runtime
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
94
  - - "~>"
109
95
  - !ruby/object:Gem::Version
110
- version: '3.0'
96
+ version: 2.7.5
111
97
  description:
112
98
  email: carloswherbet@gmail.com
113
99
  executables:
@@ -116,6 +102,7 @@ extensions: []
116
102
  extra_rdoc_files: []
117
103
  files:
118
104
  - ".gitignore"
105
+ - ".travis.yml"
119
106
  - CODE_OF_CONDUCT.md
120
107
  - Gemfile
121
108
  - Gemfile.lock
@@ -148,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
148
135
  requirements:
149
136
  - - ">="
150
137
  - !ruby/object:Gem::Version
151
- version: 2.0.0
138
+ version: 2.3.0
152
139
  required_rubygems_version: !ruby/object:Gem::Requirement
153
140
  requirements:
154
141
  - - ">="