gitx 3.0.1 → 3.0.2.ci.207.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -1
- data/gitx.gemspec +2 -1
- data/lib/gitx/cli/start_command.rb +1 -1
- data/lib/gitx/extensions/thor.rb +3 -1
- data/lib/gitx/version.rb +1 -1
- data/spec/gitx/cli/base_command_spec.rb +6 -6
- data/spec/gitx/cli/integrate_command_spec.rb +1 -1
- data/spec/gitx/cli/nuke_command_spec.rb +2 -2
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8ed35ddb21db73e7fe696acf0f68f6cbe1d5fec1
|
4
|
+
data.tar.gz: bc7c18139c9c1b903fe1c1af830ff9f9295733a3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 309704595ce9c974389f33643cd3617f31ff4a48283eb031c99a3aed27902d1b411a39232d3dd305b6674fbcdfa5fe44cfffc1a197f6e1ad580d57c81aa599ac
|
7
|
+
data.tar.gz: adebec824546f017340e76b5858f52518dcf0a6d3c283a7bfca2363df8302e59ea4fda073d59c081244f94ef2281a7809e25175aa4c0808af3a1e9a823c8b539
|
data/.rubocop.yml
CHANGED
data/gitx.gemspec
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# coding: utf-8
|
2
|
+
|
2
3
|
lib = File.expand_path('../lib', __FILE__)
|
3
4
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
5
|
require 'gitx/version'
|
@@ -18,7 +19,7 @@ Gem::Specification.new do |spec|
|
|
18
19
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
20
|
spec.require_paths = ['lib']
|
20
21
|
|
21
|
-
spec.add_runtime_dependency 'rugged', '~> 0.
|
22
|
+
spec.add_runtime_dependency 'rugged', '~> 0.26.0'
|
22
23
|
spec.add_runtime_dependency 'thor'
|
23
24
|
spec.add_runtime_dependency 'octokit'
|
24
25
|
|
@@ -5,7 +5,7 @@ require 'gitx/cli/base_command'
|
|
5
5
|
module Gitx
|
6
6
|
module Cli
|
7
7
|
class StartCommand < BaseCommand
|
8
|
-
EXAMPLE_BRANCH_NAMES = %w
|
8
|
+
EXAMPLE_BRANCH_NAMES = %w[api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link].freeze
|
9
9
|
VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
|
10
10
|
|
11
11
|
desc 'start', 'start a new git branch with latest changes from master'
|
data/lib/gitx/extensions/thor.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'tempfile'
|
2
|
+
|
1
3
|
class Thor
|
2
4
|
module Actions
|
3
5
|
# launch configured editor to retreive message/string
|
@@ -7,7 +9,7 @@ class Thor
|
|
7
9
|
def ask_editor(initial_text = '', editor: nil, footer: nil)
|
8
10
|
editor ||= ENV['EDITOR'] || 'vi'
|
9
11
|
initial_text += "\n\n#{footer}" if footer
|
10
|
-
text = Tempfile.open('text.md') do |f|
|
12
|
+
text = ::Tempfile.open('text.md') do |f|
|
11
13
|
f << initial_text
|
12
14
|
f.flush
|
13
15
|
|
data/lib/gitx/version.rb
CHANGED
@@ -24,9 +24,9 @@ describe Gitx::Cli::BaseCommand do
|
|
24
24
|
describe 'with custom .gitx.yml config file' do
|
25
25
|
let(:config) do
|
26
26
|
{
|
27
|
-
'aggregate_branches' => %w
|
28
|
-
'reserved_branches' => %w
|
29
|
-
'taggable_branches' => %w
|
27
|
+
'aggregate_branches' => %w[foo bar],
|
28
|
+
'reserved_branches' => %w[baz qux],
|
29
|
+
'taggable_branches' => %w[quux corge]
|
30
30
|
}
|
31
31
|
end
|
32
32
|
before do
|
@@ -36,9 +36,9 @@ describe Gitx::Cli::BaseCommand do
|
|
36
36
|
end
|
37
37
|
end
|
38
38
|
it 'overrides default options' do
|
39
|
-
expect(cli.send(:config).aggregate_branches).to eq(%w
|
40
|
-
expect(cli.send(:config).reserved_branches).to eq(%w
|
41
|
-
expect(cli.send(:config).taggable_branches).to eq(%w
|
39
|
+
expect(cli.send(:config).aggregate_branches).to eq(%w[foo bar])
|
40
|
+
expect(cli.send(:config).reserved_branches).to eq(%w[baz qux])
|
41
|
+
expect(cli.send(:config).taggable_branches).to eq(%w[quux corge])
|
42
42
|
end
|
43
43
|
end
|
44
44
|
end
|
@@ -159,7 +159,7 @@ describe Gitx::Cli::IntegrateCommand do
|
|
159
159
|
expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
|
160
160
|
expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
|
161
161
|
expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Integrate feature-branch into staging\n\nConnected to #10", 'feature-branch')
|
162
|
-
|
162
|
+
.and_raise('git merge feature-branch failed').ordered
|
163
163
|
|
164
164
|
VCR.use_cassette('pull_request_does_exist_with_success_status') do
|
165
165
|
expect { cli.integrate }.to raise_error(/Merge conflict occurred. Please fix merge conflict and rerun command with --resume feature-branch flag/)
|
@@ -108,7 +108,7 @@ describe Gitx::Cli::NukeCommand do
|
|
108
108
|
let(:good_branch) { 'master' }
|
109
109
|
let(:bad_branch) { 'prototype' }
|
110
110
|
let(:migrations) do
|
111
|
-
%w
|
111
|
+
%w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
|
112
112
|
end
|
113
113
|
before do
|
114
114
|
FileUtils.mkdir_p('db/migrate')
|
@@ -134,7 +134,7 @@ describe Gitx::Cli::NukeCommand do
|
|
134
134
|
let(:good_branch) { 'master' }
|
135
135
|
let(:bad_branch) { 'prototype' }
|
136
136
|
let(:migrations) do
|
137
|
-
%w
|
137
|
+
%w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
|
138
138
|
end
|
139
139
|
before do
|
140
140
|
FileUtils.mkdir_p('db/migrate')
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitx
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.1
|
4
|
+
version: 3.0.2.ci.207.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:
|
11
|
+
date: 2017-08-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rugged
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.26.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
|
-
version: 0.
|
26
|
+
version: 0.26.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: thor
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -277,12 +277,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
277
277
|
version: '0'
|
278
278
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
279
279
|
requirements:
|
280
|
-
- - "
|
280
|
+
- - ">"
|
281
281
|
- !ruby/object:Gem::Version
|
282
|
-
version:
|
282
|
+
version: 1.3.1
|
283
283
|
requirements: []
|
284
284
|
rubyforge_project:
|
285
|
-
rubygems_version: 2.
|
285
|
+
rubygems_version: 2.4.5
|
286
286
|
signing_key:
|
287
287
|
specification_version: 4
|
288
288
|
summary: Utility scripts for Git to increase productivity for common operations
|