glman 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/glman/commands/base.rb +26 -3
- data/lib/glman/repos/projects_repo.rb +1 -1
- data/lib/glman/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MmNjNTk0ZWYzZmFiMzA5YmZiMzE1YmNlMWEyYzgyMjczNzU5YzE1NA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MGFiYWQwODMwZmJkNmYzMzU3NGM5ODgzM2Q0NGZhNjM1NzgyODZjNQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
OTU0MDBmZGMwZjQ1NTkxYzNlNDJmODZkZTczNWE0ODhmNzI4NWI5YmRiZTMy
|
10
|
+
YmY4MGQ4MTgxZTcxYmZiNTViZjg3ZTFiNjY2MmVkZTkxNzMwNmU1NmIzMTJk
|
11
|
+
N2I5NDgyY2VlMTE4NDVhOGUxOWU5ZWVmYmFjZTZmYjU4MTExZjE=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZDgxYmVmMTk1ZTM4YjhlM2YwMzMwYzUzNjZiNTZkYTZhZjUzYzBmNTQ1YmRh
|
14
|
+
MDk2YmY1MjM2NjVmMjhhOWY1NjMxMWI5MzcyMmEwMGRmMmQyMTljYWE2Zjdk
|
15
|
+
ZTBmM2YwY2RlMTYwODJjZDM0NzlhZTJjNGFhYmI0NzdmN2U2MTk=
|
data/lib/glman/commands/base.rb
CHANGED
@@ -12,7 +12,12 @@ module Glman
|
|
12
12
|
return show_all_mrs if show?
|
13
13
|
user_name = params[0]
|
14
14
|
current_branch = git_repo.current_branch
|
15
|
-
|
15
|
+
|
16
|
+
if current_branch == 'master'
|
17
|
+
p 'Merge request from master to master is not so good idea!'
|
18
|
+
return
|
19
|
+
end
|
20
|
+
|
16
21
|
target_branch = params[2] || 'master'
|
17
22
|
user_id = get_user_id(user_name)
|
18
23
|
message = params[1] || git_repo.last_commit_message || current_branch
|
@@ -22,8 +27,26 @@ module Glman
|
|
22
27
|
|
23
28
|
push_branch_first(origin, current_branch) unless origin.nil?
|
24
29
|
|
25
|
-
projects_repo.create_merge_request(repository_name, params)
|
26
|
-
|
30
|
+
opts = projects_repo.create_merge_request(repository_name, params)
|
31
|
+
assignee = opts['assignee'] || {}
|
32
|
+
author = opts['author'] || {}
|
33
|
+
info = {
|
34
|
+
url: "#{configuration.load[:gitlab_url]}/resfinity/resfinity_profile/merge_requests/#{opts['iid']}",
|
35
|
+
assignee: {
|
36
|
+
username: assignee['username'],
|
37
|
+
email: assignee['email'],
|
38
|
+
name: assignee['name']
|
39
|
+
},
|
40
|
+
author: {
|
41
|
+
username: author['username'],
|
42
|
+
email: author['email'],
|
43
|
+
name: author['name']
|
44
|
+
},
|
45
|
+
id: opts['id'],
|
46
|
+
iid: opts['iid'],
|
47
|
+
created_at: assignee['created_at']
|
48
|
+
}
|
49
|
+
ap params.merge({repository_name: repository_name}.merge(info))
|
27
50
|
end
|
28
51
|
|
29
52
|
def push=(origin=nil)
|
@@ -46,7 +46,7 @@ module Glman
|
|
46
46
|
def create_merge_request(id, opts={})
|
47
47
|
merge_request_params_validate(opts)
|
48
48
|
#source_branch, target_branch, assignee_id, title
|
49
|
-
client.post(url(id: id, path: 'merge_requests'), opts)
|
49
|
+
JSON.parse(client.post(url(id: id, path: 'merge_requests'), opts).body)
|
50
50
|
end
|
51
51
|
|
52
52
|
def find(opts={})
|
data/lib/glman/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: glman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Paweł Niemczyk
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|