ctodo 0.0.2 → 0.1.0

data/.todo

@@ -3,8 +3,7 @@
 # If you don't want to use some of these services just
 # remove the corresponding lines below:
 --- 
-:gh_user: <github-user>
-:gh_pass: <github-password>
+:gh_user: <github-default-user (_not_ your email!)>
 :red_uri: <redmine-base-uri>
 :red_key: <redmine-api-key>
 :red2_uri: <another-redmine-base-uri>

data/README.md

@@ -8,8 +8,9 @@ Provider
 --------
 
 - LocalFS -- grep-like local file system provider
-- Github -- issues from identically named github.com/user repo
-- Redmine -- issues from identically named your.redmine.com server
+- Github -- issues from identically named github.com/<gh_user> repo
+- Google Project Hosting -- issues from identically named code.google.com/p/ project
+- Redmine -- issues from identically named project on your.redmine.com server
 
 Setup
 -----
@@ -25,7 +26,6 @@ Template for ~/.todo
 	# remove the corresponding lines below:
 	---
 	:gh_user: <github-user>
-	:gh_pass: <github-password>
 	:red_uri: <redmine-base-uri>
 	:red_key: <redmine-api-key>
 	:red2_uri: <another-redmine-base-uri>
@@ -36,4 +36,5 @@ Links
 
 - [Github API](http://developer.github.com/v3/)
 - [Redmine API](http://www.redmine.org/projects/redmine/wiki/Rest_api)
+- [Google Project Hosting Issues API](https://code.google.com/p/support/wiki/IssueTrackerAPI)
 - [HSV color space](https://secure.wikimedia.org/wikipedia/de/wiki/HSV-Farbraum)

data/lib/ctodo/gcode.rb

@@ -0,0 +1,42 @@
+
+module CTodo
+	class GoogleCodeProjectHosting
+		include HTTParty
+		base_uri "https://code.google.com/feeds/issues/p"
+		
+		def initialize(conf)
+			@enabled = true
+			if @enabled
+				dir = [:git_repo_dir, :hg_repo_dir, :cur_dir].map {|k| conf[k]}.select {|v| not v.nil?}.first
+				@repo_name = File.basename(dir)
+				# HACK: 1000 should really be enough
+				@limit = (conf[:all] ? 1000 : 25)
+			end
+		end
+		
+		def get_issues(issues)
+			return if not @enabled
+			
+			r = self.class.get "/#{@repo_name}/issues/full", :query => {:can => 'open', :"max-results" => @limit}
+			#puts r.code
+			return unless r.code == 200
+			#puts r.inspect
+		
+			feed = HTTParty::Parser.call(r.body, :xml)
+			return if feed['feed'].nil?
+			feed = feed['feed']
+			
+			return if feed['entry'].nil?
+			
+			#puts feed['entry'].first.inspect
+			
+			feed['entry'].each do |e|
+				loc = e['link'].select {|link| link['type'] == 'text/html'}.first
+				loc = loc['href'] unless loc.nil?
+				assig = e['owner'].nil? ? nil : e['owner']['username']
+				tags = e['label'].map {|lab| Tag.new(lab, ColorUtils.rgb4string(lab))}
+				issues << Issue.new(e['title'], loc, assig, tags)
+			end
+		end
+	end
+end

data/lib/ctodo/github.rb

@@ -5,9 +5,10 @@ module CTodo
 		base_uri "https://api.github.com"
 		
 		def initialize(conf)
-			@enabled = (!conf[:gh_user].nil? and !conf[:gh_pass].nil? and !conf[:git_repo_dir].nil?)
+			@enabled = (!conf[:gh_user].nil? and !conf[:git_repo_dir].nil?)
 			if @enabled
-				self.class.basic_auth(conf[:gh_user], conf[:gh_pass])
+				@login = conf[:gh_user]
+				# needed to locate .git/config to look for other remotes
 				@repo_dir = Pathname.new(conf[:git_repo_dir])
 				@repo_name = File.basename(conf[:git_repo_dir])
 			end
@@ -19,17 +20,15 @@ module CTodo
 			status_msgs = []
 			
 			# try current user first
-			r = self.class.get "/user"
-			login = r['login']
-			
-			gh_issues = get_issues_for(login, @repo_name)
+			gh_issues = get_issues_for(@login, @repo_name)
 			if !gh_issues.nil?
-				#status_msgs << "User: #{login}"
+				# don't output as this is the default
+				#status_msgs << "User: #{@login}"
 				parse_issues(gh_issues, issues)
 			else
 				# find alternative login from "remote origin" config entry
 				alt_login = remote_login("origin")
-				if !alt_login.nil? and alt_login != login
+				if !alt_login.nil? and alt_login != @login
 					alt_gh_issues = get_issues_for(alt_login, @repo_name)
 					if !alt_gh_issues.nil?
 						status_msgs << "User: #{alt_login}"

data/lib/ctodo/localfs.rb

@@ -11,7 +11,7 @@ module CTodo
 		def initialize(conf)
 			@enabled = true
 			if @enabled
-				@parent_dir = conf[:git_repo_dir].nil? ? conf[:cur_dir] : conf[:git_repo_dir]
+				@parent_dir = [:git_repo_dir, :hg_repo_dir, :cur_dir].map {|k| conf[k]}.select {|v| not v.nil?}.first
 				@todo_labels = (conf[:all] ? ALL_LABELS : IMP_LABELS).join('|')
 			end
 		end

data/lib/ctodo/redmine.rb

@@ -7,12 +7,13 @@ module CTodo
 		def initialize(conf, prefix = 'red')
 			red_uri = conf[:"#{prefix}_uri"]
 			red_key = conf[:"#{prefix}_key"]
-			@enabled = (!red_uri.nil? and !red_key.nil? and !conf[:git_repo_dir].nil?)
+			@enabled = (!red_uri.nil? and !red_key.nil?)
 			if @enabled
 				self.class.base_uri(red_uri)
 				rand_pwd = (0...8).map {65.+(rand(25)).chr}.join
 				self.class.basic_auth(red_key, rand_pwd)
-				@repo = File.basename(conf[:git_repo_dir])
+				dir = [:git_repo_dir, :hg_repo_dir, :cur_dir].map {|k| conf[k]}.select {|v| not v.nil?}.first
+				@repo = File.basename(dir)
 				# HACK: 1000 should really be enough
 				@limit = (conf[:all] ? 1000 : 25)
 			end
@@ -29,7 +30,7 @@ module CTodo
 			p_id = find_id_for_identifier(r['projects'], @repo)
 			return if p_id == nil
 			
-			r = self.class.get "/issues.json?project_id=#{p_id}&offset=0&limit=#{@limit}"
+			r = self.class.get "/issues.json", :query => {:project_id => p_id, :offset => 0, :limit => @limit}
 			
 			r['issues'].each do |i|
 				loc = "#{self.class.base_uri}/issues/#{i['id']}"

data/lib/ctodo.rb

@@ -9,6 +9,7 @@ require 'json'
 
 # ctodo
 require 'ctodo/color'
+require 'ctodo/gcode'
 require 'ctodo/localfs'
 require 'ctodo/github'
 require 'ctodo/redmine'
@@ -93,10 +94,16 @@ module CTodo
 			
 			conf[:cur_dir] = Dir.getwd
 			conf[:git_repo_dir] = find_git_repo(Dir.getwd)
+			conf[:hg_repo_dir] = find_hg_repo(Dir.getwd)
 			conf[:all] = @options[:all]
 			conf[:cs] = CTodo.const_get("#{@options[:cs]}ColorSet").new
 			
-			ip = [LocalFS.new(conf), Github.new(conf), Redmine.new(conf), Redmine.new(conf, 'red2')]
+			ip = [
+				LocalFS.new(conf),
+				Github.new(conf),
+				Redmine.new(conf), Redmine.new(conf, 'red2'),
+				GoogleCodeProjectHosting.new(conf)
+			]
 			
 			issues = []
 			ip.each do |ip| ip.get_issues(issues) end
@@ -125,7 +132,8 @@ module CTodo
 				tag_list.push "@#{i.assignee}" if @options[:show_assignee] and not i.assignee.nil?
 				tag_list = (tag_list.empty? ? '' : format('(%s) ', tag_list.join(', ')))
 				
-				if @options[:show_source]
+				# source may be nil
+				if @options[:show_source] and !i.source.nil?
 					puts format("- %-#{title_padding}s %sin %s",
 						title, tag_list, i.source)
 				else
@@ -148,14 +156,25 @@ module CTodo
 		end
 		
 		def find_git_repo(path)
-			rel_git_dir = Pathname.new(!ENV['GIT_DIR'].nil? ? ENV['GIT_DIR'] : '.git')
+			git_dir_name = Pathname.new(!ENV['GIT_DIR'].nil? ? ENV['GIT_DIR'] : '.git')
 			p = Pathname.new(path)
 			until p.root?
-				git_dir = p + rel_git_dir
+				git_dir = p + git_dir_name
 				return p.to_s if git_dir.exist? and git_dir.directory?
 				p = p.parent
 			end
 			nil
 		end
+		
+		def find_hg_repo(path)
+			hg_dir_name = '.hg'
+			p = Pathname.new(path)
+			until p.root?
+				hg_dir = p + hg_dir_name
+				return p.to_s if hg_dir.exist? and hg_dir.directory?
+				p = p.parent
+			end
+			nil
+		end
 	end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -59,7 +59,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: 
+description: Searches for issues on Github/Google Code/custom Redmine instances/local files for current project or folder.
 email: chrnicolai@gmail.com
 executables: 
 - todo
@@ -70,6 +70,7 @@ extra_rdoc_files: []
 files: 
 - bin/todo
 - lib/ctodo/color.rb
+- lib/ctodo/gcode.rb
 - lib/ctodo/github.rb
 - lib/ctodo/localfs.rb
 - lib/ctodo/redmine.rb