saddler-reporter-support-git 0.1.7 → 0.1.8

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/CHANGELOG.md +20 -11
  4. data/README.md +7 -0
  5. data/lib/saddler/reporter/support/git/repository.rb +32 -3
  6. data/lib/saddler/reporter/support/git/version.rb +1 -1
  7. data/saddler-reporter-support-git.gemspec +2 -2
  8. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c61e6c70e7bc92327215ef0123b40b69ae256886
4
- data.tar.gz: 33b1ab68201dd76c93d77fc043786c6d363a4cbb
3
+ metadata.gz: b1be3da4bb0b294f83f818e1ccfc9031301483ea
4
+ data.tar.gz: d410d009d669ce45ff284998450034aaac1b1c60
5
5
  SHA512:
6
- metadata.gz: 53f9c8f7ff2029284c714d3180fc6ddb938512c9b9f921091deec7dcf24235a7c57042a4567dff1c69d3c6e7b3c07916efdbd89e2bde1995bdac6c749a40a943
7
- data.tar.gz: c17ba1c2f5c422f40c15c9b73146715345ab42c4d4f251a8c54cbd0ae71f62c8c621d8e72b549e5854d8dc731620f8fd0af4c3543451a73b5615ffab54a443bd
6
+ metadata.gz: dcbb55f3391a75a0c3b3b7b5cd296f3fb168130cd9851dded82f063043327e54bb760d8bac1af4adbc8c65f429ae0e4c2135cc0814615e675dcf4fab8fddc0b3
7
+ data.tar.gz: 4abdda305707fb6e4c9f365a19bf6ebecec3a3704cae5dd47737aaf7f811427670f2820df270d9e9e56ef60c5088bce44d038debf3ffa601e35713d9fd5fe03a
data/.gitignore CHANGED
@@ -7,3 +7,4 @@
7
7
  /pkg/
8
8
  /spec/reports/
9
9
  /tmp/
10
+ node_modules/
data/CHANGELOG.md CHANGED
@@ -1,19 +1,28 @@
1
- ### 0.1.7 (2015-03-06)
1
+ ## Change Log
2
2
 
3
- * **slug:** use git_clone_url ([7576c4a](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/7576c4ad42c89e827ef31faa863645a5754f6426))
3
+ ### v0.1.8 (2015/07/27 00:01 +00:00)
4
+ - [#16](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/16) fix(merging-sha): remove hard-corded branch name (@sanemat)
5
+ - [#14](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/14) chore(gem): relax dependencies (@sanemat)
6
+ - [#13](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/13) chore(changelog): use github-changes (@sanemat)
4
7
 
5
- ### 0.1.6 (2015-03-06)
8
+ ### v0.1.7 (2015/03/06 08:45 +00:00)
9
+ - [#11](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/11) chore(gem): use git_clone_url (@sanemat)
6
10
 
7
- * **slug:** revert: use uri-ssh_git if ssh protocol ([1509925](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/1509925b226eeff5245c04cff0a99039604c6f07))
11
+ ### v0.1.6 (2015/03/05 18:23 +00:00)
12
+ - [#10](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/10) Revert "Merge pull request #9 from packsaddle/chore/use-uri-sshgit" (@sanemat)
8
13
 
9
- ### 0.1.5 (2015-03-05)
14
+ ### v0.1.5 (2015/03/05 03:44 +00:00)
15
+ - [#9](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/9) chore(gem): use uri-ssh_git instead of addressable if ssh protocol (@sanemat)
16
+ - [#8](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/8) chore(travisci): power-assert v0.2.3 (@sanemat)
10
17
 
11
- #### Fix
18
+ ### v0.1.4 (2015/02/26 05:53 +00:00)
19
+ - [#7](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/7) feat(circleci): detect circle ci branch (@sanemat)
12
20
 
13
- * **slug:** use uri-ssh_git if ssh protocol ([90ad516](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/90ad516ccb5e39cdb374572fa43641383becdcfb))
21
+ ### v0.1.3 (2015/02/25 14:01 +00:00)
22
+ - [#6](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/6) feat(merging object): add merging object implementation (@sanemat)
14
23
 
15
- ### 0.1.4 (2015-02-26)
24
+ ### v0.1.2 (2015/02/25 09:44 +00:00)
25
+ - [#4](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/4) Refactor/test git repo mocha (@sanemat)
16
26
 
17
- #### Features
18
-
19
- * **circleci:** detect circle-ci branch ([357c77f](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/357c77f75d783ce89c0c5a1fa367dcf4b04a59e1))
27
+ ### v0.1.1 (2015/02/24 17:37 +00:00)
28
+ - [#1](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/1) feat(travis): add env current branch (@sanemat)
data/README.md CHANGED
@@ -25,6 +25,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
25
25
 
26
26
  To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
27
27
 
28
+ ### Change log
29
+
30
+ ```bash
31
+ npm install -g github-changes
32
+ github-changes -o packsaddle -r ruby-saddler-reporter-support-git --only-pulls --use-commit-body
33
+ ```
34
+
28
35
  ## Contributing
29
36
 
30
37
  1. Fork it ( https://github.com/packsaddle/ruby-saddler-reporter-support-git/fork )
data/lib/saddler/reporter/support/git/repository.rb CHANGED
@@ -43,18 +43,47 @@ module Saddler
43
43
  def merging_object
44
44
  return head unless merge_commit?(head)
45
45
  commit = head.parents.select do |parent|
46
- ![master.sha, origin_master.sha].include?(parent.sha)
46
+ ![tracking.sha, origin_tracking.sha].include?(parent.sha)
47
47
  end
48
48
  return commit.last if commit.count == 1
49
49
  head # fallback
50
50
  end
51
51
 
52
52
  def master
53
- @git.object('master')
53
+ warn "[DEPRECATION] `#{self.class.name}#master` is deprecated. Please use `#tracking` instead."
54
+ tracking
55
+ end
56
+
57
+ def tracking
58
+ @git.object(tracking_branch_name)
54
59
  end
55
60
 
56
61
  def origin_master
57
- @git.object('origin/master')
62
+ warn "[DEPRECATION] `#{self.class.name}#origin_master` is deprecated. Please use `#origin_tracking` instead."
63
+ origin_tracking
64
+ end
65
+
66
+ def origin_tracking
67
+ @git.object("origin/#{tracking_branch_name}")
68
+ end
69
+
70
+ def config
71
+ @git.config
72
+ end
73
+
74
+ # http://stackoverflow.com/questions/4950725/how-do-i-get-git-to-show-me-which-branches-are-tracking-what
75
+ # { "branch.spike/no-valid-master.merge" => "refs/heads/develop" }
76
+ # => "develop"
77
+ def tracking_branch_name
78
+ config
79
+ .select { |k, _| /\Abranch.*merge\Z/ =~ k }
80
+ .values
81
+ .map do |v|
82
+ match = %r{\Arefs/heads/(.*)\Z}.match(v)
83
+ match ? match[1] : nil
84
+ end.compact
85
+ .uniq
86
+ .shift
58
87
  end
59
88
 
60
89
  def merge_commit?(commit)
data/lib/saddler/reporter/support/git/version.rb CHANGED
@@ -2,7 +2,7 @@ module Saddler
2
2
  module Reporter
3
3
  module Support
4
4
  module Git
5
- VERSION = '0.1.7'
5
+ VERSION = '0.1.8'
6
6
  end
7
7
  end
8
8
  end
data/saddler-reporter-support-git.gemspec CHANGED
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
22
22
  spec.add_runtime_dependency 'git'
23
23
  spec.add_runtime_dependency 'git_clone_url'
24
24
 
25
- spec.add_development_dependency 'bundler', '~> 1.8'
26
- spec.add_development_dependency 'rake', '~> 10.0'
25
+ spec.add_development_dependency 'bundler'
26
+ spec.add_development_dependency 'rake'
27
27
  spec.add_development_dependency 'test-unit'
28
28
  spec.add_development_dependency 'mocha'
29
29
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: saddler-reporter-support-git
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
4
+ version: 0.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - sanemat
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-03-06 00:00:00.000000000 Z
11
+ date: 2015-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: git
@@ -42,30 +42,30 @@ dependencies:
42
42
  name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '1.8'
47
+ version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '1.8'
54
+ version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: '10.0'
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
- version: '10.0'
68
+ version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: test-unit
71
71
  requirement: !ruby/object:Gem::Requirement