gitx 2.19.0 → 2.20.0.ci.117.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +13 -5
  2. data/README.md +10 -2
  3. data/lib/gitx/cli/buildtag_command.rb +9 -14
  4. data/lib/gitx/version.rb +1 -1
  5. data/spec/gitx/cli/buildtag_command_spec.rb +25 -24
  6. metadata +45 -46
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 7840fd8c8d120b7a96065ca4c9b4122ca5687993
4
- data.tar.gz: dc5d1e821ce2ac799ffdfd48e017755313399544
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MjY5ZjEwMWIyNzI1NzJhZTlkODYzODJlOTlmNTcxODZhNmJjODVhNw==
5
+ data.tar.gz: !binary |-
6
+ MDQ2MTUxOGVmNDRkYjAxYzRhZTFlYmFlMWRmOTRhMDg2NTgxNDk5Mw==
5
7
  SHA512:
6
- metadata.gz: d09e5e44dd249f12a6991345b2e89d36b988ba53af651d2545bbf965b04ab5638bf0b966f871dd3c22a2bf7178febd191d7b31b8c55b83825cc8ebfa26c5af5f
7
- data.tar.gz: d77a9932a9b5fa7597f7a68c6b787b3b897113834c8daf9460d259106146665beb655412e041ffb3ad2d44cca2843a9ada38abf4fe23f5cd5907a1041989c2f5
8
+ metadata.gz: !binary |-
9
+ NzAzOGI1YmRlNzFhZDI0YjMxZDA5NmNhYzdmY2M1NGFiOGVlNGJmNDQwMjVk
10
+ MWM5YzczZThkZjFiZmU1MzA2NDdjNmM5NWE3N2MxMDYyYjA1MWZmZjA0Zjcw
11
+ ODA4MDFmOWIxNjk3YTEyMzZiNmVhNWZmM2ZmMzIwY2JhNjFiYmY=
12
+ data.tar.gz: !binary |-
13
+ YmMxYTdjYTYxNzg4YjVlYzk1NzkwODY0M2M3MWU1YTc4MDE2ZDc0YzBmNzA5
14
+ MTZjOTJkNjFhMTJiZjBjMzNkN2U5NmU0MTdkZmRhYmM5YTNkNTRiMTY3MGFl
15
+ MzE0Zjc1NzdkYTEzZWNlNWNiZWQ3NzZkZDQ5NWUwN2IyMzRjMWY=
data/README.md CHANGED
@@ -9,6 +9,12 @@
9
9
  These custom scripts are automatically registered into the git namespace
10
10
  so they are available without learning any new commands!
11
11
 
12
+ ## Installation
13
+
14
+ ```bash
15
+ $ gem install gitx
16
+ ```
17
+
12
18
  ### Global Options
13
19
  * `--trace` or `-v` = verbose output for debugging commands
14
20
  * `--pretend` or `-p` = dry run commands and do not actually invoke operations
@@ -71,6 +77,10 @@ reset an aggregate branch (ex: prototype, staging) back to a known good state.
71
77
 
72
78
  create a build tag for the current Travis-CI build and push it back to origin
73
79
 
80
+ options:
81
+ * `--branch` = configure the branch name related to the build tag
82
+ * `--message` = configure the git message associated to the tag
83
+
74
84
  ## Configuration
75
85
  Any of the [default settings defined in the gem](lib/gitx/defaults.yml) can be overridden
76
86
  by creating a custom `.gitx.yml` file in the root directory of your project.
@@ -90,7 +100,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
90
100
  * [socialcast-git-extensions](https://github.com/socialcast/socialcast-git-extensions)
91
101
  * [thegarage-gitx](https://github.com/thegarage/thegarage-gitx)
92
102
 
93
-
94
103
  ## Copyright
95
104
  See [LICENSE.txt](LICENSE.txt)
96
-
data/lib/gitx/cli/buildtag_command.rb CHANGED
@@ -6,32 +6,27 @@ module Gitx
6
6
  module Cli
7
7
  class BuildtagCommand < BaseCommand
8
8
  desc 'buildtag', 'create a tag for the current build and push it back to origin (supports Travis CI and Codeship)'
9
+ method_option :branch, type: :string, aliases: '-b', desc: 'branch name for build tag'
10
+ method_option :message, type: :string, aliases: '-m', desc: 'message to attach to the buildtag'
9
11
  def buildtag
10
- fail 'Unknown branch. Environment variables TRAVIS_BRANCH or CI_BRANCH are required' unless branch_name
11
12
  fail "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
12
-
13
- label = "buildtag generated by build #{build_number}"
14
- create_build_tag(branch_name, label)
13
+ run_cmd "git tag #{git_tag} -a -m '#{label}'"
14
+ run_cmd "git push origin #{git_tag}"
15
15
  end
16
16
 
17
17
  private
18
18
 
19
- # pull the current branch name from environment variables
20
- # supports Travis CI or Codeship variables
21
- # see https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
22
19
  def branch_name
23
- ENV['TRAVIS_BRANCH'] || ENV['CI_BRANCH']
20
+ options[:branch] || current_branch.name
24
21
  end
25
22
 
26
- def build_number
27
- ENV['TRAVIS_BUILD_NUMBER'] || ENV['CI_BUILD_NUMBER']
23
+ def label
24
+ options[:message] || "[gitx] buildtag for #{branch_name}"
28
25
  end
29
26
 
30
- def create_build_tag(branch, label)
27
+ def git_tag
31
28
  timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
32
- git_tag = "build-#{branch}-#{timestamp}"
33
- run_cmd "git tag #{git_tag} -a -m '#{label}'"
34
- run_cmd "git push origin #{git_tag}"
29
+ "build-#{branch_name}-#{timestamp}"
35
30
  end
36
31
  end
37
32
  end
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.19.0'
2
+ VERSION = '2.20.0'
3
3
  end
data/spec/gitx/cli/buildtag_command_spec.rb CHANGED
@@ -9,7 +9,7 @@ describe Gitx::Cli::BuildtagCommand do
9
9
  pretend: true
10
10
  }
11
11
  end
12
- let(:cli) { Gitx::Cli::BuildtagCommand.new(args, options, config) }
12
+ let(:cli) { described_class.new(args, options, config) }
13
13
  let(:branch) { double('fake branch', name: 'feature-branch') }
14
14
 
15
15
  before do
@@ -17,33 +17,30 @@ describe Gitx::Cli::BuildtagCommand do
17
17
  end
18
18
 
19
19
  describe '#buildtag' do
20
- let(:env_travis_branch) { nil }
21
- let(:env_travis_build_number) { nil }
22
- let(:env_ci_branch) { nil }
23
- let(:env_ci_build_number) { nil }
24
- before do
25
- ENV['TRAVIS_BRANCH'] = env_travis_branch
26
- ENV['TRAVIS_BUILD_NUMBER'] = env_travis_build_number
27
- ENV['CI_BRANCH'] = env_ci_branch
28
- ENV['CI_BUILD_NUMBER'] = env_ci_build_number
29
- end
30
- context 'when TRAVIS_BRANCH is nil' do
31
- it 'raises Unknown Branch error' do
32
- expect { cli.buildtag }.to raise_error(/Unknown branch/)
20
+ context 'when options[:branch] is NOT set' do
21
+ it 'defaults to current branch (feature-branch)' do
22
+ expect { cli.buildtag }.to raise_error(/Branch must be one of the supported taggable branches/)
33
23
  end
34
24
  end
35
- context 'when TRAVIS_BRANCH is NOT master or staging' do
36
- let(:env_travis_branch) { 'random-branch' }
25
+ context 'when options[:branch] is NOT master or staging' do
26
+ let(:options) do
27
+ {
28
+ branch: 'feature-branch'
29
+ }
30
+ end
37
31
  it 'raises unsupported branch error' do
38
32
  expect { cli.buildtag }.to raise_error(/Branch must be one of the supported taggable branches/)
39
33
  end
40
34
  end
41
- context 'when TRAVIS_BRANCH is master' do
42
- let(:env_travis_branch) { 'master' }
43
- let(:env_travis_build_number) { '24' }
35
+ context 'when options[:branch] is master' do
36
+ let(:options) do
37
+ {
38
+ branch: 'master'
39
+ }
40
+ end
44
41
  before do
45
42
  Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
46
- expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'buildtag generated by build 24'").ordered
43
+ expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m '[gitx] buildtag for master'").ordered
47
44
  expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
48
45
  cli.buildtag
49
46
  end
@@ -52,12 +49,16 @@ describe Gitx::Cli::BuildtagCommand do
52
49
  should meet_expectations
53
50
  end
54
51
  end
55
- context 'when CI_BRANCH is master' do
56
- let(:env_ci_branch) { 'master' }
57
- let(:env_ci_build_number) { '24' }
52
+ context 'when options[:message] is passed' do
53
+ let(:options) do
54
+ {
55
+ branch: 'master',
56
+ message: 'custom git commit message'
57
+ }
58
+ end
58
59
  before do
59
60
  Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
60
- expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'buildtag generated by build 24'").ordered
61
+ expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'custom git commit message'").ordered
61
62
  expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
62
63
  cli.buildtag
63
64
  end
metadata CHANGED
@@ -1,237 +1,237 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.19.0
4
+ version: 2.20.0.ci.117.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-31 00:00:00.000000000 Z
11
+ date: 2015-09-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rugged
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.23.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.23.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: octokit
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '3.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '3.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - ! '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: webmock
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - ! '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: timecop
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - ! '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: vcr
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ! '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ! '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: guard
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - ! '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - ! '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: guard-rspec
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - ! '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: coveralls
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - ! '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - ! '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: terminal-notifier
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - ! '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - ! '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: terminal-notifier-guard
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - ! '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - ! '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rubocop
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ">="
227
+ - - ! '>='
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ">="
234
+ - - ! '>='
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  description: Git eXtensions for improved development workflows
@@ -251,13 +251,13 @@ executables:
251
251
  extensions: []
252
252
  extra_rdoc_files: []
253
253
  files:
254
- - ".gitignore"
255
- - ".gitx.yml"
256
- - ".hound.yml"
257
- - ".rspec"
258
- - ".rubocop.yml"
259
- - ".ruby-version"
260
- - ".travis.yml"
254
+ - .gitignore
255
+ - .gitx.yml
256
+ - .hound.yml
257
+ - .rspec
258
+ - .rubocop.yml
259
+ - .ruby-version
260
+ - .travis.yml
261
261
  - CONTRIBUTING.md
262
262
  - Gemfile
263
263
  - Guardfile
@@ -326,17 +326,17 @@ require_paths:
326
326
  - lib
327
327
  required_ruby_version: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - ">="
329
+ - - ! '>='
330
330
  - !ruby/object:Gem::Version
331
331
  version: '0'
332
332
  required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - ">="
334
+ - - ! '>'
335
335
  - !ruby/object:Gem::Version
336
- version: '0'
336
+ version: 1.3.1
337
337
  requirements: []
338
338
  rubyforge_project:
339
- rubygems_version: 2.4.8
339
+ rubygems_version: 2.4.5
340
340
  signing_key:
341
341
  specification_version: 4
342
342
  summary: Utility scripts for Git to increase productivity for common operations
@@ -364,4 +364,3 @@ test_files:
364
364
  - spec/support/timecop.rb
365
365
  - spec/support/vcr.rb
366
366
  - spec/support/webmock.rb
367
- has_rdoc: