git-pulls 0.4.13 → 0.4.14

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 (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git-pulls.rb +5 -2
  3. metadata +26 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8fd90633fa273de0b437751664bbbb6ddcdc8c3b
4
- data.tar.gz: bb842649ffe21dd38f21177620245f27dd3002e1
3
+ metadata.gz: 43d292871ba96b91590f9118992781e2580fe358
4
+ data.tar.gz: dce77fc5941a5243e3515029d7018aa6c9713cbb
5
5
  SHA512:
6
- metadata.gz: 8b14ac16432e94a68c6df68be33d1293bd5b02c3795ef433127700879f3d8e814b73c7888e381efeabd686e262e922ce8cf79979b55edf739d072428b060d89b
7
- data.tar.gz: 023921dd7dc35cf22bfe990920ac2007a3b0aac7e94cd3fbaa96c44cf3c63a4e722f87d5b7d819ee12c66cdb085744cd165e84dbd3fc298670c7143110e397d5
6
+ metadata.gz: 9bbcecc637a1905a5cb953182895fc77a3dd4909d3bb265febf4a67860db5fd0900542928abc822f8a29b452ca6f156bc838175e5f4272a244c9de4399617e24
7
+ data.tar.gz: 7d6099bfc3cdaeee127f3441b33d5fb52ebe0d4ff6c09da93d34cb88dc51fc4359d9be92f98574b600cf4dcab3796e12e1570def472d543a4493cb967d68c7ee
data/lib/git-pulls.rb CHANGED
@@ -57,7 +57,7 @@ Usage: git pulls update
57
57
  or: git pulls list [state] [--reverse]
58
58
  or: git pulls show <number> [--comments] [--full]
59
59
  or: git pulls browse <number>
60
- or: git pulls merge <number>
60
+ or: git pulls merge <number> [--no-commit] [--log]
61
61
  or: git pulls checkout [--force]
62
62
  USAGE
63
63
  end
@@ -76,11 +76,14 @@ Usage: git pulls update
76
76
  sha = head[:sha]
77
77
 
78
78
  message = "Merge pull request ##{num} from #{owner[:login]}/#{repo_name}\n\n---\n\n"
79
- message += pull[:body].gsub("'", '')
79
+ message += pull[:body] ? pull[:body].gsub("'", '') : ""
80
80
  cmd = ''
81
81
  if option == '--log'
82
82
  message += "\n\n---\n\nMerge Log:\n"
83
83
  puts cmd = "git merge --no-ff --log -m '#{message}' #{sha}"
84
+ elsif option == '--no-commit'
85
+ message += "\n\n---\n\nMerge with --no-commit option:\n"
86
+ puts cmd = "git merge --no-commit -m '#{message}' #{sha}"
84
87
  else
85
88
  puts cmd = "git merge --no-ff -m '#{message}' #{sha}"
86
89
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-pulls
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.13
4
+ version: 0.4.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrien Giboire
@@ -9,106 +9,106 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-09-20 00:00:00.000000000 Z
12
+ date: 2015-12-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - "~>"
18
+ - - ~>
19
19
  - !ruby/object:Gem::Version
20
20
  version: '1.8'
21
- - - ">="
21
+ - - '>='
22
22
  - !ruby/object:Gem::Version
23
23
  version: 1.8.1
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - "~>"
28
+ - - ~>
29
29
  - !ruby/object:Gem::Version
30
30
  version: '1.8'
31
- - - ">="
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: 1.8.1
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: launchy
36
36
  requirement: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2.4'
41
- - - ">="
41
+ - - '>='
42
42
  - !ruby/object:Gem::Version
43
43
  version: 2.4.2
44
44
  type: :runtime
45
45
  prerelease: false
46
46
  version_requirements: !ruby/object:Gem::Requirement
47
47
  requirements:
48
- - - "~>"
48
+ - - ~>
49
49
  - !ruby/object:Gem::Version
50
50
  version: '2.4'
51
- - - ">="
51
+ - - '>='
52
52
  - !ruby/object:Gem::Version
53
53
  version: 2.4.2
54
54
  - !ruby/object:Gem::Dependency
55
55
  name: octokit
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - "~>"
58
+ - - ~>
59
59
  - !ruby/object:Gem::Version
60
60
  version: '2.6'
61
- - - ">="
61
+ - - '>='
62
62
  - !ruby/object:Gem::Version
63
63
  version: 2.6.1
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - "~>"
68
+ - - ~>
69
69
  - !ruby/object:Gem::Version
70
70
  version: '2.6'
71
- - - ">="
71
+ - - '>='
72
72
  - !ruby/object:Gem::Version
73
73
  version: 2.6.1
74
74
  - !ruby/object:Gem::Dependency
75
75
  name: minitest
76
76
  requirement: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - "~>"
78
+ - - ~>
79
79
  - !ruby/object:Gem::Version
80
80
  version: '5.4'
81
- - - ">="
81
+ - - '>='
82
82
  - !ruby/object:Gem::Version
83
83
  version: 5.4.1
84
84
  type: :development
85
85
  prerelease: false
86
86
  version_requirements: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - "~>"
88
+ - - ~>
89
89
  - !ruby/object:Gem::Version
90
90
  version: '5.4'
91
- - - ">="
91
+ - - '>='
92
92
  - !ruby/object:Gem::Version
93
93
  version: 5.4.1
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: rake
96
96
  requirement: !ruby/object:Gem::Requirement
97
97
  requirements:
98
- - - "~>"
98
+ - - ~>
99
99
  - !ruby/object:Gem::Version
100
100
  version: '10.3'
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: 10.3.2
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: '10.3'
111
- - - ">="
111
+ - - '>='
112
112
  - !ruby/object:Gem::Version
113
113
  version: 10.3.2
114
114
  description: git-pulls facilitates github pull requests.
@@ -119,8 +119,8 @@ extensions: []
119
119
  extra_rdoc_files: []
120
120
  files:
121
121
  - LICENSE
122
- - bin/git-pulls
123
122
  - lib/git-pulls.rb
123
+ - bin/git-pulls
124
124
  homepage: http://github.com/schacon/git-pulls
125
125
  licenses:
126
126
  - MIT
@@ -131,17 +131,17 @@ require_paths:
131
131
  - lib
132
132
  required_ruby_version: !ruby/object:Gem::Requirement
133
133
  requirements:
134
- - - ">="
134
+ - - '>='
135
135
  - !ruby/object:Gem::Version
136
136
  version: '0'
137
137
  required_rubygems_version: !ruby/object:Gem::Requirement
138
138
  requirements:
139
- - - ">="
139
+ - - '>='
140
140
  - !ruby/object:Gem::Version
141
141
  version: '0'
142
142
  requirements: []
143
143
  rubyforge_project:
144
- rubygems_version: 2.2.2
144
+ rubygems_version: 2.0.14
145
145
  signing_key:
146
146
  specification_version: 4
147
147
  summary: facilitates github pull requests