git-gitlab 0.2.0 → 0.2.5

data/README.md

@@ -25,8 +25,8 @@ Or install it yourself as:
 Config some setting
 
 	git config --global gitlab.url http://gitlab.example.com/
-	git config --gloabl gitlab.token GITLAB_SECRET_TOKEN
-	git config gitlab.projectid GITLAB_PROJECTID
+	git config --global gitlab.token GITLAB_SECRET_TOKEN
+	git config gitlab.project NAMESPACE/PROJECT
 
 ### Let' run and Confirm setting
 
@@ -36,6 +36,10 @@ Config some setting
 
 	git gitlab merge SOURCE_BRANCH TARGET_BRANCH --assign USER_NAME
 
+### Get Mergerequest list
+
+	git gitlab merge --list
+
 ### Show Issue by ID
 
 	git gitlab issue ISSUE_ID

data/README_ja.md

@@ -15,8 +15,8 @@ Ruby関連のツールをインストールして、次のコマンドを実行
 次のようにGitの設定を行います
 
 	git config --global gitlab.url http://gitlab.example.com/
-	git config --gloabl gitlab.token GITLAB_SECRET_TOKEN
-	git config gitlab.projectid GITLAB_PROJECTID
+	git config --glolab gitlab.token GITLAB_SECRET_TOKEN
+	git config gitlab.project NAMESPACE/PROJECT
 
 ### 設定の確認を行います
 
@@ -26,6 +26,10 @@ Ruby関連のツールをインストールして、次のコマンドを実行
 
 	git gitlab merge SOURCE_BRANCH TARGET_BRANCH --assign USER_NAME
 
+### OpenなMergerequestを全て取得します
+
+	git gitlab merge --list
+
 ### IDでイシューを検索し、表示します
 
 	git gitlab issue ISSUE_ID

data/bin/git-gitlab

@@ -8,8 +8,20 @@ class GitGitlabCLI < Thor
 	@@gitlab = GitlabKernel.new
 
 	desc "merge SOURCE TARGET --assign ${ASSING}", "create mergerequest SOURCE to TARGET. assign to ${ASSING}"
+	long_desc <<-LONGDESC
+		[-l | --list] get all opened mergerequests
+	LONGDESC
 	option :assign
-	def merge(source = nil, target = nil)
+	option :list, :type => :boolean
+	option :l , :type => :boolean
+	def merge(source, target = nil)
+		if options[:list] || options[:l]
+			mergerequests = @@gitlab.mergerequests
+			result = mergerequests.map { |m| "\##{m.iid}, #{m.title}" }.join("\n")
+			puts(result)
+			exit 0
+		end
+
 		title = source
 		assign = options[:assign]
 		begin
@@ -18,10 +30,14 @@ class GitGitlabCLI < Thor
 			else
 				@@gitlab.create_merge_request(title, assign, source, target)
 			end
-		rescue GitlabKernel::Error::MergeRequestError => e
+		rescue GitlabApi::Error::MergeRequestError => e
 			puts("Failed Create Merge Request")
 			puts("Please check your command's argument ,options and already exists mergerequests...")
-			raise e
+			puts(e.message)
+			exit 1
+		rescue GitlabApi::Error::ProjectIdNotFound => e
+			puts(e.message)
+			exit 1
 		end
 		puts("created mergerequest at")
 		puts(url)
@@ -40,6 +56,10 @@ class GitGitlabCLI < Thor
 			issue = @@gitlab.issue(id)
 		rescue GitlabApi::Error::IssueNotFound => e
 			puts("Could not find \##{id} issue!!")
+			puts(e.message)
+			exit 1
+		rescue GitlabApi::Error::ProjectIdNotFound => e
+			puts(e.message)
 			exit 1
 		end
 

data/lib/git/error.rb

@@ -2,5 +2,6 @@ module GitlabApi
 	module Error
 		class MergeRequestError < StandardError; end
 		class IssueNotFound < StandardError; end
+		class ProjectIdNotFound < StandardError; end
 	end
 end

data/lib/git/gitlab/api/issue.rb

@@ -10,11 +10,7 @@ class GitlabApi::ApiClient
 		PAGE = 1
 
 		def issue(id)
-			pid = @repository.config["gitlab.projectid"].to_i
-
-			if pid == 0
-				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
-			end
+			pid = project_id
 
 			issues = all_issues(pid, PAGE, PER_PAGE)
 
@@ -30,11 +26,7 @@ class GitlabApi::ApiClient
 		end
 
 		def issues(with_closed)
-			pid = @repository.config["gitlab.projectid"].to_i
-
-			if pid == 0
-				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
-			end
+			pid = project_id
 
 			issues = all_issues(pid, PAGE, PER_PAGE)
 			if with_closed

data/lib/git/gitlab/api/mergerequest.rb

@@ -5,12 +5,11 @@ require "git/error"
 class GitlabApi::ApiClient
 	
 	module Mergerequest
-		def create_merge_request(title, assign, source, target = "master")
-			pid = @repository.config["gitlab.projectid"].to_i
+		PER_PAGE = 100
+		PAGE = 1
 
-			if pid == 0
-				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
-			end
+		def create_merge_request(title, assign, source, target = "master")
+			pid = project_id
 
 			mr_title = if title == nil
 				@repository.head.name
@@ -47,5 +46,31 @@ class GitlabApi::ApiClient
 
 			mergerequest_url
 		end
+
+		def mergerequests
+			pid = project_id
+
+			all_mergerequests(pid, PAGE, PER_PAGE).select { |m|
+				m.state == "opened"
+			}
+		end
+
+		def all_mergerequests(pid, page, per_page)
+			def _mergerequests(list, pid, page, per_page)
+				m = @client.merge_requests(pid, :page => page, :per_page => per_page)
+				if m.count < per_page
+					list + m
+				else
+					_mergerequests(list + m, pid, page +  1, per_page)
+				end
+			end
+
+			m = @client.merge_requests(pid, :page => page, :per_page => per_page)
+			if m.count < per_page
+				m
+			else
+				_mergerequests(m, pid, page + 1, per_page)
+			end
+		end
 	end
 end

data/lib/git/gitlab/apiclient.rb

@@ -1,7 +1,8 @@
 require "git/gitlab/version"
+require "git/error"
 require "gitlab"
 require "grit"
-
+require "uri"
 
 module GitlabApi
 	class ApiClient
@@ -31,5 +32,24 @@ module GitlabApi
 
 			@client = Gitlab.client
 		end
+
+		def project_id
+			pid = if @repository.config.keys.include? "gitlab.projectid"
+					@repository.config["gitlab.projectid"].to_i
+				else
+					@repository.config["gitlab.project"]
+				end
+
+			if pid == nil
+				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}' of git config gitlab.project ${NAMESPACE/PROJECT}"
+			end
+
+			begin
+				@client.project( URI.encode_www_form_component(pid.to_s)).id
+			rescue Gitlab::Error::NotFound => e
+				raise GitlabApi::Error::ProjectIdNotFound, "Can not find #{pid} Project."
+			end
+
+		end
 	end
 end

data/lib/git/gitlab/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Gitlab
-    VERSION = "0.2.0"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler