git-bundle 1.0.4 → 1.0.5

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0d9c83c130883d9bb05f90d5d6260689d2c9397f
4
- data.tar.gz: 2904acd79f0b4b98a9960312118458dcaec70af4
3
+ metadata.gz: 467edc493a125e6a31d611f2fb4ae6fcab556294
4
+ data.tar.gz: 86f3272c70dd19b54261a758a07bd686716fc888
5
5
  SHA512:
6
- metadata.gz: 677b1c479f241d31f851ac94667f0f04168cbf0087ec33321fbdbfbdecf8aa5d2b26ce43c5230cca3488fa0ae93b5537f42a6dc66dae35ec2fd8d5f25bc5e7db
7
- data.tar.gz: 30128ea57f981f488312c4b6b13e03922175dc4f4f660847e37a0b0608f73ac03bce8164da6b8aefd7a57eb47474e23a30709090dd359c9dbf3ff9ff9a7a9f5d
6
+ metadata.gz: f922497c2a5c2dc38b784e4216a364d6325e541c51b85bba273a83bb2aaedbd89d9c0f9d1c074af2d24bcdd3ec8f944cbfb8d4514902277726e2b3d399ab7544
7
+ data.tar.gz: 34bac554c411f39e3e835258ed3f275fe2618910fdf513926bd566ca6533828070c2b79bb80a071f699466a43d2803e8aa166685f620de37f8bf2349a52f5b66
data/README.md CHANGED
@@ -5,8 +5,8 @@ This gem simplifies working with [gems from git repositories](http://bundler.io/
5
5
  gem 'forum_engine', git: 'https://github.com/your_name/forum_engine.git', branch: :master
6
6
  ```
7
7
  in combination with [local overrides](http://bundler.io/v1.5/git.html#local):
8
- ```shell
9
- bundle config local.some_gem_or_rails_engine /path/to/local/git/repository
8
+ ```
9
+ bundle config local.forum_engine /path/to/local/git/repository
10
10
  ```
11
11
 
12
12
  ## Usage examples
@@ -48,17 +48,17 @@ Already up-to-date.
48
48
  Another example is a **gitb checkout release** will run **git checkout release** in all repositories:
49
49
  ```
50
50
  === forum_engine (master)
51
- Switched to branch 'master'
52
- Your branch is up-to-date with 'origin/master'.
51
+ Switched to branch 'release'
52
+ Your branch is up-to-date with 'origin/release'.
53
53
 
54
54
  === blog_engine (master)
55
- Switched to branch 'master'
56
- Your branch is ahead of 'origin/master' by 2 commits.
55
+ Switched to branch 'release'
56
+ Your branch is ahead of 'origin/release' by 2 commits.
57
57
  (use "git push" to publish your local commits)
58
58
 
59
59
  === your-rails-application (master)
60
- Switched to branch 'master'
61
- Your branch is up-to-date with 'origin/master'.
60
+ Switched to branch 'release'
61
+ Your branch is up-to-date with 'origin/release'.
62
62
  ```
63
63
 
64
64
  **2. Updating Gemfile.lock when pushing changes.**
@@ -124,7 +124,7 @@ group :development do
124
124
  end
125
125
  ```
126
126
 
127
- Both should allow you to use the **gitb** command anywhere
127
+ Both should allow you to use the **gitb** command anywhere.
128
128
 
129
129
  ## Contributing
130
130
 
@@ -37,12 +37,12 @@ module GitBundle
37
37
  end
38
38
 
39
39
  def commits_not_pushed
40
- execute_git("log #{branch} --not --remotes")
40
+ execute_git("rev-list --pretty=oneline --abbrev-commit origin/#{branch}..#{branch}")
41
41
  end
42
42
 
43
43
  def commit_messages_not_pushed
44
- count = execute_git("rev-list #{branch} --count --not --remotes").to_i
45
- count.times.map { |num| execute_git("log #{branch} --not --remotes --skip=#{num} --max-count=1 --pretty=format:'%B'").strip }
44
+ count = execute_git("rev-list origin/#{branch}..#{branch} --count").to_i
45
+ count.times.map { |num| execute_git("rev-list --pretty=oneline --skip=#{num} --max-count=1 origin/#{branch}..#{branch}").sub(/\h*\s/, '').strip }
46
46
  end
47
47
 
48
48
  def push(args)
@@ -1,3 +1,3 @@
1
1
  module GitBundle
2
- VERSION = '1.0.4'
2
+ VERSION = '1.0.5'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-bundle
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pierre Pretorius
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-30 00:00:00.000000000 Z
11
+ date: 2016-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -75,3 +75,4 @@ specification_version: 4
75
75
  summary: Simplifies working with gems from git repositories in combination with local
76
76
  overrides.
77
77
  test_files: []
78
+ has_rdoc: