glman 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQyNGY2OWNjZDA3MzJjZWQ2OWJkY2VjNzY3MDFiNGVjYTEyMTQ2YQ==
+    MmNjNTk0ZWYzZmFiMzA5YmZiMzE1YmNlMWEyYzgyMjczNzU5YzE1NA==
   data.tar.gz: !binary |-
-    MzA5OTY5ZDZmYTc4MjgzODY0OTVjZDRkMTQ0ZTc1NTRkNTdhMTQxNA==
+    MGFiYWQwODMwZmJkNmYzMzU3NGM5ODgzM2Q0NGZhNjM1NzgyODZjNQ==
 SHA512:
   metadata.gz: !binary |-
-    NjAxNDU2OTkwOTQ1ZjdiYTIyNWU1Nzk4NWU3ZDZkZGFmZDkzMzRhM2QzYTg1
-    NmI3NWUwZWYzZTc2ZDU0MzdmMDU0NzE0MjQ0NDhkZTAwYWQ4YjQ2YmYzOWQ5
-    YzdhNGQ4ZjBlYThhZDU5MTkxZmM2YTAzMGQxOTAyM2QwMzkyZDY=
+    OTU0MDBmZGMwZjQ1NTkxYzNlNDJmODZkZTczNWE0ODhmNzI4NWI5YmRiZTMy
+    YmY4MGQ4MTgxZTcxYmZiNTViZjg3ZTFiNjY2MmVkZTkxNzMwNmU1NmIzMTJk
+    N2I5NDgyY2VlMTE4NDVhOGUxOWU5ZWVmYmFjZTZmYjU4MTExZjE=
   data.tar.gz: !binary |-
-    YWZhNjA4ZjZjZDM3OGQwMDk5ZjE5N2EzZWZjNDViM2ZjMzFhMTRhZDVkN2Fk
-    YTY5OTBhYTllMTNkNjJhNWM0NzU0ZThjNmNlNGU1NTVlZDYyM2JmZDQyODBh
-    NWU1NWQ3NzI5MDk0YTBlMDM3YjQyMGZiYTlmY2E4NzFjMzU3YmU=
+    ZDgxYmVmMTk1ZTM4YjhlM2YwMzMwYzUzNjZiNTZkYTZhZjUzYzBmNTQ1YmRh
+    MDk2YmY1MjM2NjVmMjhhOWY1NjMxMWI5MzcyMmEwMGRmMmQyMTljYWE2Zjdk
+    ZTBmM2YwY2RlMTYwODJjZDM0NzlhZTJjNGFhYmI0NzdmN2U2MTk=

data/lib/glman/commands/base.rb

@@ -12,7 +12,12 @@ module Glman
         return show_all_mrs if show?
         user_name       = params[0]
         current_branch  = git_repo.current_branch
-        p 'You realy want to create merge request master to master ?' if current_branch == 'master'
+
+        if current_branch == 'master'
+          p 'Merge request from master to master is not so good idea!'
+          return
+        end
+
         target_branch   = params[2] || 'master'
         user_id         = get_user_id(user_name)
         message         = params[1] || git_repo.last_commit_message || current_branch
@@ -22,8 +27,26 @@ module Glman
 
         push_branch_first(origin, current_branch) unless origin.nil?
 
-        projects_repo.create_merge_request(repository_name, params)
-        ap params.merge({user_name: user_name, repository_name: repository_name})
+        opts = projects_repo.create_merge_request(repository_name, params)
+        assignee = opts['assignee'] || {}
+        author    = opts['author'] || {}
+        info = {
+          url: "#{configuration.load[:gitlab_url]}/resfinity/resfinity_profile/merge_requests/#{opts['iid']}",
+          assignee: {
+            username: assignee['username'],
+            email:    assignee['email'],
+            name:     assignee['name']
+          },
+          author: {
+            username: author['username'],
+            email:    author['email'],
+            name:     author['name']
+          },
+          id:         opts['id'],
+          iid:        opts['iid'],
+          created_at: assignee['created_at']
+        }
+        ap params.merge({repository_name: repository_name}.merge(info))
       end
 
       def push=(origin=nil)

data/lib/glman/repos/projects_repo.rb

@@ -46,7 +46,7 @@ module Glman
       def create_merge_request(id, opts={})
         merge_request_params_validate(opts)
         #source_branch, target_branch, assignee_id, title
-        client.post(url(id: id, path: 'merge_requests'), opts)
+        JSON.parse(client.post(url(id: id, path: 'merge_requests'), opts).body)
       end
 
       def find(opts={})

data/lib/glman/version.rb

@@ -1,3 +1,3 @@
 module Glman
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glman
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Paweł Niemczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler