git-gitlab 0.2.5 → 0.3.0

data/README.md

@@ -28,6 +28,10 @@ Config some setting
 	git config --global gitlab.token GITLAB_SECRET_TOKEN
 	git config gitlab.project NAMESPACE/PROJECT
 
+if your remote repository is not origin
+
+	git config gitlab.remote REMOTE
+
 ### Let' run and Confirm setting
 
 	git gitlab
@@ -44,6 +48,10 @@ Config some setting
 
 	git gitlab issue ISSUE_ID
 
+### Code Review
+	
+	git gitlab review MERGEREQUEST_ID
+
 ## Contributing
 
 1. Fork it

data/README_ja.md

@@ -18,6 +18,10 @@ Ruby関連のツールをインストールして、次のコマンドを実行
 	git config --glolab gitlab.token GITLAB_SECRET_TOKEN
 	git config gitlab.project NAMESPACE/PROJECT
 
+もしもGitlabのリモートリポジトリがoriginでない場合には
+
+	git config gitlab.remote REMOTE
+
 ### 設定の確認を行います
 
 	git gitlab
@@ -34,6 +38,10 @@ Ruby関連のツールをインストールして、次のコマンドを実行
 
 	git gitlab issue ISSUE_ID
 
+### Mergeリクエストのレビューを行います
+
+	git gitlab review MERGEREQUEST_ID
+
 ## 貢献するには
 
 1. フォークします

data/bin/git-gitlab

@@ -2,83 +2,111 @@
 # encoding: utf-8
 
 require 'git/gitlab'
-require "thor"
+require 'thor'
 
+#
+# Gitlab Commandline interface
+#
 class GitGitlabCLI < Thor
-	@@gitlab = GitlabKernel.new
+  @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
-	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
+  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
+  option :list, :type => :boolean
+  option :l , :type => :boolean
+  def merge(source =nil, 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
-			url = if target == nil
-				@@gitlab.create_merge_request(title, assign, source)
-			else
-				@@gitlab.create_merge_request(title, assign, source, target)
-			end
-		rescue GitlabApi::Error::MergeRequestError => e
-			puts("Failed Create Merge Request")
-			puts("Please check your command's argument ,options and already exists mergerequests...")
-			puts(e.message)
-			exit 1
-		rescue GitlabApi::Error::ProjectIdNotFound => e
-			puts(e.message)
-			exit 1
-		end
-		puts("created mergerequest at")
-		puts(url)
-	end
+    title = source
+    assign = options[:assign]
+    begin
+      url = if target == nil
+        @gitlab.create_merge_request(title, assign, source)
+      else
+        @gitlab.create_merge_request(title, assign, source, target)
+      end
+    rescue GitlabApi::Error::MergeRequestError => e
+      puts("Failed Create Merge Request")
+      puts("Please check your command's argument ,options and already exists mergerequests...")
+      puts(e.message)
+      exit 1
+    rescue GitlabApi::Error::ProjectIdNotFound => e
+      puts(e.message)
+      exit 1
+    end
+    puts("created mergerequest at")
+    puts(url)
+  end
 
-	desc "issue ID", "show issue which has ID"
-	option :all, :type => :boolean
-	def issue(id = nil)
-		if id == nil
-			issues = @@gitlab.issues(options[:all])
-			result = issues.map { |i| "\##{i.iid}, #{i.title}" }.join("\n")
-			puts(result)
-			exit 0
-		end
-		begin
-			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
+  desc "issue ID", "show issue which has ID"
+  option :all, :type => :boolean
+  def issue(id = nil)
+    if id == nil
+      issues = @gitlab.issues(options[:all])
+      result = issues.map { |i| "\##{i.iid}, #{i.title}" }.join("\n")
+      puts(result)
+      exit 0
+    end
+    begin
+      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
 
-		puts("\##{issue.iid}")
-		puts("title      : #{issue.title}")
-		puts("description: #{issue.description}")
-		puts("label      : #{issue.labels.join(',')}")
-		puts("state      : #{issue.state}")
-		if issue.assignee != nil
-			puts("assignee   : #{issue.assignee.username}")
-		end
-	end
+    puts("\##{issue.iid}")
+    puts("title      : #{issue.title}")
+    puts("description: #{issue.description}")
+    puts("label      : #{issue.labels.join(',')}")
+    puts("state      : #{issue.state}")
+    if issue.assignee != nil
+      puts("assignee   : #{issue.assignee.username}")
+    end
+  end
 
-	def help
-		user = @@gitlab.authorize
-		puts("You are #{user.username}")		
-		puts("Gitlab is #{Gitlab.endpoint}")
-		super
-	end
+  desc "review ID", "checkout mergerequest merged commit"
+  def review(id)
+    
+    begin
+      remote = @gitlab.remote
+      mergerequest = @gitlab.mergerequest(id)
+      
+      repository = GitlabLocalRepository.new()
+      repository.review("mergerequest/\##{id}" , mergerequest.source_branch, mergerequest.target_branch, remote)
+      puts("When you finish code review,then")
+      puts("  git merge --abort")
+      puts("and")
+      puts("  git checkout -")
+    rescue GitlabApi::Error::MergeRequestError => e
+      puts("Merege request is not found")
+      puts(e.message)
+      exit 1
+    rescue GitlabApi::Error::ReviewError => e
+      puts("Local Repository's status is invalided")
+      puts("Check your repository's status")
+      puts(e.message)
+      exit 1
+    end
+  end
+
+  def help
+    user = @gitlab.authorize
+    puts("You are #{user.username}")    
+    puts("Gitlab is #{Gitlab.endpoint}")
+    super
+  end
 end
 
 GitGitlabCLI.start

data/lib/git/error.rb

@@ -1,7 +1,8 @@
 module GitlabApi
-	module Error
-		class MergeRequestError < StandardError; end
-		class IssueNotFound < StandardError; end
-		class ProjectIdNotFound < StandardError; end
-	end
-end
+  module Error
+    class MergeRequestError < StandardError; end
+    class IssueNotFound < StandardError; end
+    class ProjectIdNotFound < StandardError; end
+    class ReviewError < StandardError; end
+  end
+end

data/lib/git/gitlab.rb

@@ -3,12 +3,18 @@ require "git/gitlab/apiclient"
 require "git/gitlab/api/issue"
 require "git/gitlab/api/authorize"
 require "git/gitlab/api/mergerequest"
+require "git/gitlab/gitlablocal"
+require "git/gitlab/local/codereview"
 require "git/error"
 require "gitlab"
 require "grit"
 
 class GitlabKernel < GitlabApi::ApiClient
-	include GitlabApi::ApiClient::Issue
-	include GitlabApi::ApiClient::Authorize
-	include GitlabApi::ApiClient::Mergerequest
-end
+  include GitlabApi::ApiClient::Issue
+  include GitlabApi::ApiClient::Authorize
+  include GitlabApi::ApiClient::Mergerequest
+end
+
+class GitlabLocalRepository < GitlabLocal
+  include GitlabLocal::CodeReview
+end

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

@@ -3,11 +3,11 @@ require "grit"
 require "git/error"
 
 class GitlabApi::ApiClient
-	
-	module Authorize
-		def authorize
-			@client.user
-		end
-	end
-	
-end
+
+  module Authorize
+    def authorize
+      @client.user
+    end
+  end
+
+end

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

@@ -4,59 +4,59 @@ require "git/error"
 
 
 class GitlabApi::ApiClient
-	
-	module Issue
-		PER_PAGE = 100
-		PAGE = 1
-
-		def issue(id)
-			pid = project_id
-
-			issues = all_issues(pid, PAGE, PER_PAGE)
-
-			specfied_issue = issues.select { |issue|
-				issue.iid == id.to_i
-			}.first
-
-			if specfied_issue == nil
-				raise GitlabApi::Error::IssueNotFound, "Issue not find"
-			else
-				specfied_issue
-			end
-		end
-
-		def issues(with_closed)
-			pid = project_id
-
-			issues = all_issues(pid, PAGE, PER_PAGE)
-			if with_closed
-				issues
-			else
-				issues.select { |i|
-					i.state == "opened"
-				}
-			end
-		end
-
-		def all_issues(pid, page, per_page)
-			def _issues(list, pid, page, per_page)
-				i = @client.issues(pid, :page => page, :per_page => per_page)
-				if i.count < per_page
-					list + i
-				else
-					_issues(list + i, pid, page + 1, per_page)
-				end
-
-			end
-
-			i = @client.issues(pid, :page => page, :per_page => per_page)
-			if i.count < per_page
-				i
-			else
-				_issues(i, pid, page + 1, per_page)
-			end
-		end
-
-	end
-	
-end
+
+  module Issue
+    PER_PAGE = 100
+    PAGE = 1
+
+    def issue(id)
+      pid = project_id
+
+      issues = all_issues(pid, PAGE, PER_PAGE)
+
+      specfied_issue = issues.select { |issue|
+        issue.iid == id.to_i
+      }.first
+
+      if specfied_issue == nil
+        raise GitlabApi::Error::IssueNotFound, "Issue not find"
+      else
+        specfied_issue
+      end
+    end
+
+    def issues(with_closed)
+      pid = project_id
+
+      issues = all_issues(pid, PAGE, PER_PAGE)
+      if with_closed
+        issues
+      else
+        issues.select { |i|
+          i.state == "opened"
+        }
+      end
+    end
+
+    def all_issues(pid, page, per_page)
+      def _issues(list, pid, page, per_page)
+        i = @client.issues(pid, :page => page, :per_page => per_page)
+        if i.count < per_page
+          list + i
+        else
+          _issues(list + i, pid, page + 1, per_page)
+        end
+
+      end
+
+      i = @client.issues(pid, :page => page, :per_page => per_page)
+      if i.count < per_page
+        i
+      else
+        _issues(i, pid, page + 1, per_page)
+      end
+    end
+
+  end
+
+end

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

@@ -3,74 +3,86 @@ require "grit"
 require "git/error"
 
 class GitlabApi::ApiClient
-	
-	module Mergerequest
-		PER_PAGE = 100
-		PAGE = 1
-
-		def create_merge_request(title, assign, source, target = "master")
-			pid = project_id
-
-			mr_title = if title == nil
-				@repository.head.name
-			else
-				title
-			end
-
-			mr_source = if source == nil
-				@repository.head.name
-			else
-				source
-			end
-
-			assignee_id = if assign == nil
-				0
-			else
-				@client.users.select { |user|
-					user.username == assign
-				}[0].id
-			end
-
-			begin
-				mergerequest = if assignee_id > 0
-					@client.create_merge_request(pid, mr_title, :source_branch => mr_source, :target_branch => target, :assignee_id => assignee_id)
-				else
-					@client.create_merge_request(pid, mr_title, :source_branch => mr_source, :target_branch => target)
-				end
-			rescue Gitlab::Error::NotFound => e
-				raise GitlabApi::Error::MergeRequestError, "Failed Create Merge Request"
-			end
-
-			project_url = @client.project(pid).web_url
-			mergerequest_url = project_url + "/merge_requests/" + mergerequest.iid.to_s
-
-			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
+
+  module Mergerequest
+    PER_PAGE = 100
+    PAGE = 1
+
+    def create_merge_request(title, assign, source, target = "master")
+      pid = project_id
+
+      mr_title = if title == nil
+        @repository.head.name
+      else
+        title
+      end
+
+      mr_source = if source == nil
+        @repository.head.name
+      else
+        source
+      end
+
+      assignee_id = if assign == nil
+        0
+      else
+        @client.users.select { |user|
+          user.username == assign
+        }[0].id
+      end
+
+      begin
+        mergerequest = if assignee_id > 0
+          @client.create_merge_request(pid, mr_title, :source_branch => mr_source, :target_branch => target, :assignee_id => assignee_id)
+        else
+          @client.create_merge_request(pid, mr_title, :source_branch => mr_source, :target_branch => target)
+        end
+      rescue Gitlab::Error::NotFound => e
+        raise GitlabApi::Error::MergeRequestError, "Failed Create Merge Request"
+      end
+
+      project_url = @client.project(pid).web_url
+      mergerequest_url = project_url + "/merge_requests/" + mergerequest.iid.to_s
+
+      mergerequest_url
+    end
+
+    def mergerequests
+      pid = project_id
+
+      all_mergerequests(pid, PAGE, PER_PAGE).select { |m|
+        m.state == "opened"
+      }
+    end
+
+    def mergerequest(id)
+      pid = project_id
+
+      begin
+        mr = @client.merge_request(pid, id)
+      rescue Gitlab::Error::NotFound => e
+        raise GitlabApi::Error::MergeRequestError, "Can not find #{id} mergerequest"
+      end
+      mr
+    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

@@ -33,6 +33,14 @@ module GitlabApi
 			@client = Gitlab.client
 		end
 
+		def remote
+			if @repository.config.keys.include? "gitlab.remote"
+				@repository.config["gitlab.remote"]
+			else
+				"origin"
+			end
+		end
+
 		def project_id
 			pid = if @repository.config.keys.include? "gitlab.projectid"
 					@repository.config["gitlab.projectid"].to_i

data/lib/git/gitlab/gitlablocal.rb

@@ -0,0 +1,9 @@
+require "grit"
+
+class GitlabLocal
+  attr_reader :repository
+
+  def initialize
+    @repository = Grit::Repo.new(`git rev-parse --show-toplevel`.chomp)
+  end
+end

data/lib/git/gitlab/local/codereview.rb

@@ -0,0 +1,23 @@
+require "git/gitlab/version"
+require "git/error"
+require "grit"
+
+class GitlabLocal
+
+  module CodeReview
+
+    def review(title ,source, target, remote)
+      status = @repository.status
+      is_modified = status.added.count > 0  ||
+        status.changed.count >0 ||
+        status.deleted.count >0
+      if is_modified
+        raise GitlabApi::Error::ReviewError, `git status`
+      end
+
+      puts(`git fetch #{remote}`)
+      puts(`git checkout -b #{title} #{remote}/#{target}`)
+      puts(`git merge --no-ff --no-commit #{remote}/#{source}`)
+    end
+  end
+end

data/lib/git/gitlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,8 @@ files:
 - lib/git/gitlab/api/issue.rb
 - lib/git/gitlab/api/mergerequest.rb
 - lib/git/gitlab/apiclient.rb
+- lib/git/gitlab/gitlablocal.rb
+- lib/git/gitlab/local/codereview.rb
 - lib/git/gitlab/version.rb
 - spec/issue_spec.rb
 - spec/mergerequest_spec.rb