git-gitlab 0.1.0 → 0.2.0

data/README.md

@@ -1,6 +1,8 @@
 # Git::Gitlab
 
-TODO: Write a gem description
+[日本語](https://github.com/numa08/git-gitlab/blob/master/README_ja.md)
+
+Command line tool for [Gitlab](https://www.gitlab.com/)
 
 ## Installation
 
@@ -18,7 +20,25 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Set up
+
+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
+
+### Let' run and Confirm setting
+
+	git gitlab
+
+### Create Merge Request
+
+	git gitlab merge SOURCE_BRANCH TARGET_BRANCH --assign USER_NAME
+
+### Show Issue by ID
+
+	git gitlab issue ISSUE_ID
 
 ## Contributing
 

data/README_ja.md

@@ -0,0 +1,39 @@
+# Git::Gitlab
+
+[Gitlab](https://www.gitlab.com/)のためのコマンドラインツールです
+
+## インストール方法
+
+Ruby関連のツールをインストールして、次のコマンドを実行します
+
+    $ gem install git-gitlab
+
+## 使い方
+
+### 初期設定
+
+次のように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 gitlab
+
+### マージリクエストを作ります
+
+	git gitlab merge SOURCE_BRANCH TARGET_BRANCH --assign USER_NAME
+
+### IDでイシューを検索し、表示します
+
+	git gitlab issue ISSUE_ID
+
+## 貢献するには
+
+1. フォークします
+2. あなたの機能ブランチを作ります (`git checkout -b my-new-feature`)
+3. 変更をコミットします (`git commit -am 'Add some feature'`)
+4. リモートブランチにプッシュします (`git push origin my-new-feature`)
+5. 新しいプルリクエストを作ります

data/bin/git-gitlab

@@ -28,10 +28,17 @@ class GitGitlabCLI < Thor
 	end
 
 	desc "issue ID", "show issue which has ID"
-	def issue(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 GitlabKernel::Error::IssueNotFound => e
+		rescue GitlabApi::Error::IssueNotFound => e
 			puts("Could not find \##{id} issue!!")
 			exit 1
 		end

data/git-gitlab.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "thor" , "~> 0.19.1"
   spec.add_development_dependency "gitlab", "~> 3.0.0"
   spec.add_development_dependency "grit", "~> 2.5.0"
+  spec.add_development_dependency "rspec", "~> 2.14.1"
 end

data/lib/git/gitlab.rb

@@ -1,86 +1,14 @@
 require "git/gitlab/version"
-require "git/gitlab/issue"
+require "git/gitlab/apiclient"
+require "git/gitlab/api/issue"
+require "git/gitlab/api/authorize"
+require "git/gitlab/api/mergerequest"
 require "git/error"
 require "gitlab"
 require "grit"
 
-module GitlabApi
-	API_VERSION = "v3"
-	USER_AGENT = "nyonyonyonyonyo! Gitlab nyo!!"
-	attr_reader :client, :repository
-
-	def initialize
-		@repository = Grit::Repo.new(`git rev-parse --show-toplevel`.chomp)
-		config = @repository.config
-
-		url = config["gitlab.url"]
-		if url == nil
-			raise "Plase set 'git config gitlab.url ${Gitlab URL}'"
-		end
-
-		token = config["gitlab.token"]
-		if token == nil
-			raise "Please set 'git config gitlab.token ${Gitlab Token}'"
-		end
-
-		Gitlab.configure do |config|
-		  config.endpoint       = "#{url}/api/#{API_VERSION}"
-		  config.private_token  = token
-		  config.user_agent     = USER_AGENT
-		end
-
-		@client = Gitlab.client
-	end
-
-	def authorize
-		@client.user
-	end
-
-	def create_merge_request(title, assign, source, target = "master")
-		pid = @repository.config["gitlab.projectid"].to_i
-
-		if pid == 0
-			raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
-		end
-
-		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 Error::MergeRequestError, "Failed Create Merge Request"
-		end
-
-		project_url = @client.project(pid).web_url
-		mergerequest_url = project_url + "/merge_requests/" + mergerequest.id.to_s
-
-		mergerequest_url
-	end
-end
-
-class GitlabKernel
-	include GitlabApi
-	include Issue
+class GitlabKernel < GitlabApi::ApiClient
+	include GitlabApi::ApiClient::Issue
+	include GitlabApi::ApiClient::Authorize
+	include GitlabApi::ApiClient::Mergerequest
 end

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

@@ -0,0 +1,13 @@
+require "gitlab"
+require "grit"
+require "git/error"
+
+class GitlabApi::ApiClient
+	
+	module Authorize
+		def authorize
+			@client.user
+		end
+	end
+	
+end

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

@@ -0,0 +1,70 @@
+require "gitlab"
+require "grit"
+require "git/error"
+
+
+class GitlabApi::ApiClient
+	
+	module Issue
+		PER_PAGE = 100
+		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
+
+			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 = @repository.config["gitlab.projectid"].to_i
+
+			if pid == 0
+				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
+			end
+
+			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

@@ -0,0 +1,51 @@
+require "gitlab"
+require "grit"
+require "git/error"
+
+class GitlabApi::ApiClient
+	
+	module Mergerequest
+		def create_merge_request(title, assign, source, target = "master")
+			pid = @repository.config["gitlab.projectid"].to_i
+
+			if pid == 0
+				raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
+			end
+
+			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
+	end
+end

data/lib/git/gitlab/apiclient.rb

@@ -0,0 +1,35 @@
+require "git/gitlab/version"
+require "gitlab"
+require "grit"
+
+
+module GitlabApi
+	class ApiClient
+		API_VERSION = "v3"
+		USER_AGENT = "nyonyonyonyonyo! Gitlab nyo!!"
+		attr_reader :client, :repository
+
+		def initialize
+			@repository = Grit::Repo.new(`git rev-parse --show-toplevel`.chomp)
+			config = @repository.config
+
+			url = config["gitlab.url"]
+			if url == nil
+				raise "Plase set 'git config gitlab.url ${Gitlab URL}'"
+			end
+
+			token = config["gitlab.token"]
+			if token == nil
+				raise "Please set 'git config gitlab.token ${Gitlab Token}'"
+			end
+
+			Gitlab.configure do |config|
+			  config.endpoint       = "#{url}/api/#{API_VERSION}"
+			  config.private_token  = token
+			  config.user_agent     = USER_AGENT
+			end
+
+			@client = Gitlab.client
+		end
+	end
+end

data/lib/git/gitlab/version.rb

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

data/spec/issue_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require "git/gitlab"
+
+describe GitlabKernel, "get issue" do
+	
+	before do
+		@gitlab = GitlabKernel.new
+	end
+
+	it "should return issue title" do
+		actual = @gitlab.issue(1).title
+		actual.should == "the issue"
+	end
+
+	it "should get all issues" do
+		actual = @gitlab.issues(true).count
+		actual.should == 650
+	end
+
+	it "should get opened issues" do
+		actual = @gitlab.issues(false).count
+		actual.should == 649
+	end
+end

data/spec/mergerequest_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require "git/gitlab"
+
+describe GitlabKernel, "create new mergerequest" do
+	
+	before do
+		@gitlab = GitlabKernel.new
+
+		@test_config = {:projectid => 8,
+			   :project_path => "numa08/git-gitlab",
+			   :gitlab_url => "http://vagrant-ubuntu-precise-64/"}
+	end
+
+	it "should return mergerquest url" do
+		actual = @gitlab.create_merge_request("test", nil, "tem", "master")
+		expect(actual).to include("#{@test_config[:gitlab_url]}#{@test_config[:project_path]}/merge_requests")
+	end	
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 description: Gitlab Command line interface
 email:
 - n511287@gmail.com
@@ -103,13 +119,20 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- README_ja.md
 - Rakefile
 - bin/git-gitlab
 - git-gitlab.gemspec
 - lib/git/error.rb
 - lib/git/gitlab.rb
-- lib/git/gitlab/issue.rb
+- lib/git/gitlab/api/authorize.rb
+- lib/git/gitlab/api/issue.rb
+- lib/git/gitlab/api/mergerequest.rb
+- lib/git/gitlab/apiclient.rb
 - lib/git/gitlab/version.rb
+- spec/issue_spec.rb
+- spec/mergerequest_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/numa08/git-gitlab
 licenses:
 - MIT
@@ -135,4 +158,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: git-gitlab command line
-test_files: []
+test_files:
+- spec/issue_spec.rb
+- spec/mergerequest_spec.rb
+- spec/spec_helper.rb

data/lib/git/gitlab/issue.rb

@@ -1,49 +0,0 @@
-require "gitlab"
-require "grit"
-require "git/error"
-
-
-module Issue
-	
-	def issue(id)
-		pid = @repository.config["gitlab.projectid"].to_i
-
-		if pid == 0
-			raise "Please set 'git config gitlab.projectid ${Gitlab Project id}'"
-		end
-
-		per_page = 100
-		page = 1
-
-		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
-
-		issues = all_issues(pid, page, per_page)
-
-		specfied_issue = issues.select { |issue|
-			issue.iid == id.to_i
-		}.first
-
-		if specfied_issue == nil
-			raise GitlabKernel::Error::IssueNotFound, "Issue not find"
-		else
-			specfied_issue
-		end
-	end
-end