toolshed 1.0.9 → 1.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/toolshed/git.rb +0 -4
- data/lib/toolshed/git/branch.rb +5 -7
- data/lib/toolshed/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f59c748de28147e98b514bbb55497754b083db87
|
4
|
+
data.tar.gz: 609adee1280558e2de65725d85786736bc7e591f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 15b75ab22236323e63161709ba292e9192e1b0e0e710eaa12d0657610eeffcad476d5346b3338530a7ac7b142c8832910b7698518c3693dc407915388b79a5ed
|
7
|
+
data.tar.gz: 75846609561724ff2d005fdd118a6e42383484fe3b1ff5ff33c818638a74a39d1e0ccb9dc62d711905cbcbd7cdd80769c4c03fee876b160ec44a327d10c0dc8a
|
data/lib/toolshed/git.rb
CHANGED
@@ -43,10 +43,6 @@ module Toolshed
|
|
43
43
|
git_submodule_command = "git submodule update #{Toolshed::Client.instance.git_quiet}" if Toolshed::Client.instance.use_git_submodules
|
44
44
|
git_submodule_command
|
45
45
|
end
|
46
|
-
|
47
|
-
def clean_branch_name(branch_name)
|
48
|
-
branch_name.strip.downcase.tr(' ', '_').gsub('&', '').gsub('.', '_').gsub("'", '').gsub(':', '').gsub(',', '').gsub('>', '').gsub('__', '_')
|
49
|
-
end
|
50
46
|
end
|
51
47
|
|
52
48
|
def remote_update
|
data/lib/toolshed/git/branch.rb
CHANGED
@@ -63,12 +63,10 @@ module Toolshed
|
|
63
63
|
def create
|
64
64
|
validator.validate!(self)
|
65
65
|
Toolshed.logger.info ''
|
66
|
-
|
67
|
-
new_branch_name = Toolshed::Git.clean_branch_name(to_remote_branch_name)
|
68
|
-
Toolshed.logger.info "Creating branch #{new_branch_name} from #{from_remote_name}/#{from_remote_branch_name}"
|
66
|
+
Toolshed.logger.info "Creating branch #{to_remote_branch_name} from #{from_remote_name}/#{from_remote_branch_name}"
|
69
67
|
|
70
68
|
remote_update
|
71
|
-
results = Toolshed::Base.wait_for_command("git checkout -b #{
|
69
|
+
results = Toolshed::Base.wait_for_command("git checkout -b #{to_remote_branch_name} #{from_remote_name}/#{from_remote_branch_name} #{Toolshed::Client.instance.git_quiet}")
|
72
70
|
results[:all].each do |out|
|
73
71
|
if out.match(/.*fatal.*/)
|
74
72
|
Toolshed.logger.fatal out
|
@@ -80,12 +78,12 @@ module Toolshed
|
|
80
78
|
Toolshed::Base.wait_for_command(Toolshed::Git.git_submodule_command) unless Toolshed::Git.git_submodule_command.empty?
|
81
79
|
|
82
80
|
Toolshed.logger.info ''
|
83
|
-
Toolshed.logger.info "Pushing branch #{
|
84
|
-
self.passed_branch_name =
|
81
|
+
Toolshed.logger.info "Pushing branch #{to_remote_branch_name} to #{from_remote_name}/#{from_remote_branch_name}."
|
82
|
+
self.passed_branch_name = to_remote_branch_name
|
85
83
|
push
|
86
84
|
|
87
85
|
Toolshed.logger.info ''
|
88
|
-
Toolshed.logger.info "Branch #{
|
86
|
+
Toolshed.logger.info "Branch #{to_remote_branch_name} has been created from #{from_remote_name}/#{from_remote_branch_name}."
|
89
87
|
end
|
90
88
|
|
91
89
|
def delete(delete_branch_name)
|
data/lib/toolshed/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: toolshed
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jake Waller
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: httparty
|
@@ -423,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
423
423
|
version: '0'
|
424
424
|
requirements: []
|
425
425
|
rubyforge_project:
|
426
|
-
rubygems_version: 2.
|
426
|
+
rubygems_version: 2.6.6
|
427
427
|
signing_key:
|
428
428
|
specification_version: 4
|
429
429
|
summary: Create a Github pull request with minimal work. Will automatically read ticket
|