upstreamer 0.0.2 → 0.0.3
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.
- checksums.yaml +4 -4
- data/README.md +30 -6
- data/lib/upstreamer/cli.rb +14 -2
- data/lib/upstreamer/version.rb +1 -1
- data/upstreamer.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a9525bea234946601335eacf93246258dbace4ff
|
|
4
|
+
data.tar.gz: 40743aae8dadee7695175e12da0d9a21d9643b9a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 507530ab3b48d4e135ef4ff3038168d57978e77afcbabaa9ba75212f5f11ad53d92ee338c9af9d4fe14ed1ff2462410e0642e51a9c584c5f9ac0d8a10773fe4f
|
|
7
|
+
data.tar.gz: ea64b8992dbf72bd0d218ee01bb6675b6e07983908356da8313fc73b6bac003a00e210ce5f14c5a8b23130e29850704221caee62933fb750c3e94c26550b9bae
|
data/README.md
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
[](http://badge.fury.io/rb/upstreamer)
|
|
2
|
+
[](https://gemnasium.com/meganemura/upstreamer)
|
|
3
|
+
[](https://codeclimate.com/github/meganemura/upstreamer)
|
|
4
|
+
|
|
1
5
|
# Upstreamer
|
|
2
6
|
|
|
3
7
|
Add `upstream` remote-tracking branch to your forked repository by tracking GitHub.
|
|
@@ -7,18 +11,38 @@ Add `upstream` remote-tracking branch to your forked repository by tracking GitH
|
|
|
7
11
|
```shell
|
|
8
12
|
$ gem install upstreamer
|
|
9
13
|
$ cd /path/to/forked-repository
|
|
14
|
+
|
|
10
15
|
$ git remote -v
|
|
11
|
-
origin
|
|
12
|
-
origin
|
|
16
|
+
origin https://github.com/your-username/forked-repository.git (fetch)
|
|
17
|
+
origin https://github.com/your-username/forked-repository.git (push)
|
|
13
18
|
|
|
14
19
|
$ upstreamer
|
|
15
20
|
git remote add upstream https://github.com/upstream-username/forked-repository.git
|
|
16
21
|
|
|
17
22
|
$ git remote -v
|
|
18
|
-
origin
|
|
19
|
-
origin
|
|
20
|
-
upstream
|
|
21
|
-
upstream
|
|
23
|
+
origin https://github.com/your-username/forked-repository.git (fetch)
|
|
24
|
+
origin https://github.com/your-username/forked-repository.git (push)
|
|
25
|
+
upstream https://github.com/upstream-username/forked-repository.git (fetch)
|
|
26
|
+
upstream https://github.com/upstream-username/forked-repository.git (push)
|
|
27
|
+
```
|
|
28
|
+
|
|
29
|
+
### Batch configure
|
|
30
|
+
|
|
31
|
+
```shell
|
|
32
|
+
$ cd /path/to/your-repositories-directory
|
|
33
|
+
$ ls -1
|
|
34
|
+
forked-repo1
|
|
35
|
+
forked-repo2
|
|
36
|
+
forked-repo3
|
|
37
|
+
$ ls -d $PWD/* | xargs -n1 upstreamer
|
|
38
|
+
git remote add upstream https://github.com/upstream-username/forked-repo1.git
|
|
39
|
+
git remote add upstream https://github.com/upstream-username/forked-repo2.git
|
|
40
|
+
git remote add upstream https://github.com/upstream-username/forked-repo3.git
|
|
41
|
+
```
|
|
42
|
+
|
|
43
|
+
### Using with [ghq](https://github.com/motemen/ghq)
|
|
44
|
+
```shell
|
|
45
|
+
$ ghq list --full-path | grep github.com/your-username | xargs -n1 upstreamer
|
|
22
46
|
```
|
|
23
47
|
|
|
24
48
|
## Contributing
|
data/lib/upstreamer/cli.rb
CHANGED
|
@@ -18,16 +18,20 @@ module Upstreamer
|
|
|
18
18
|
repo = Rugged::Repository.new(directory)
|
|
19
19
|
|
|
20
20
|
if repo.remotes['upstream']
|
|
21
|
-
|
|
21
|
+
log_error "Error: Remote 'upstream' already exists. (#{repo.remotes['upstream'].url})"
|
|
22
22
|
return
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
remote = repo.remotes['origin'] # https://github.com/meganemura/bundler.git
|
|
26
|
+
unless remote
|
|
27
|
+
log_error "Error: Could not find remote 'origin'. (#{directory})"
|
|
28
|
+
return
|
|
29
|
+
end
|
|
26
30
|
username_repository = remote.url[/github.com\/(.*)\.git/, 1] # meganemura/bundler
|
|
27
31
|
|
|
28
32
|
repository = Octokit.repository(username_repository)
|
|
29
33
|
unless repository.fork?
|
|
30
|
-
|
|
34
|
+
log_error "Error: This repository is not forked repository. (#{directory})"
|
|
31
35
|
return
|
|
32
36
|
end
|
|
33
37
|
upstream_url = repository.parent.clone_url
|
|
@@ -43,5 +47,13 @@ module Upstreamer
|
|
|
43
47
|
def current_directory
|
|
44
48
|
Dir.pwd
|
|
45
49
|
end
|
|
50
|
+
|
|
51
|
+
def log_error(message)
|
|
52
|
+
STDERR.puts(message) unless quiet
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
def quiet
|
|
56
|
+
false
|
|
57
|
+
end
|
|
46
58
|
end
|
|
47
59
|
end
|
data/lib/upstreamer/version.rb
CHANGED
data/upstreamer.gemspec
CHANGED
|
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
|
|
|
19
19
|
spec.require_paths = ["lib"]
|
|
20
20
|
|
|
21
21
|
spec.add_runtime_dependency "octokit", "~> 3.4"
|
|
22
|
-
spec.add_runtime_dependency "rugged", "
|
|
22
|
+
spec.add_runtime_dependency "rugged", ">= 0.21.3"
|
|
23
23
|
spec.add_development_dependency "bundler", "~> 1.7"
|
|
24
24
|
spec.add_development_dependency "rake", "~> 10.0"
|
|
25
25
|
spec.add_development_dependency "pry"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: upstreamer
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- meganemura
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2015-09-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: octokit
|
|
@@ -28,16 +28,16 @@ dependencies:
|
|
|
28
28
|
name: rugged
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
|
-
- - "
|
|
31
|
+
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version:
|
|
33
|
+
version: 0.21.3
|
|
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
|
-
version:
|
|
40
|
+
version: 0.21.3
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: bundler
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|