@@ -26,7 +26,7 @@ class TextmateInstaller < Thor "%s (by %s)" % [ normalize_github_repo_name(result['name']).split('.').first, - result['url'][/github\.com\/([a-zA-Z0-9]+)\//, 1] # Extract the username out of the repo URL + result['username'] ] } end @@ -69,7 +69,7 @@ class TextmateInstaller < Thor when 0 'echo "Sorry, no such bundle found"' when 1 - %[git clone #{e_sh repos.first['url'].sub('http', 'git') + '.git'} #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1] + %[git clone git://github.com/#{repos.first['username']}/#{repos.first['name']}.git #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1] else puts "Multiple bundles with that name found. Please choose which one you want to install:" repos.each_with_index {|repo, idx| @@ -77,7 +77,7 @@ class TextmateInstaller < Thor [ idx + 1, normalize_github_repo_name(repo['name']), - repo['url'][/github\.com\/([a-zA-Z0-9]+)\//, 1] + repo['username'] ] } print "Your choice: " @@ -89,7 +89,7 @@ class TextmateInstaller < Thor choice = Integer(STDIN.gets.chomp) rescue nil end - %[git clone #{e_sh repos[choice - 1]['url'].sub('http', 'git') + '.git'} #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1] + %[git clone git://github.com/#{repos[choice - 1]['username']}/#{repos.first['name']}.git #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1] end end @@ -177,12 +177,12 @@ class TextmateInstaller < Thor # Until GitHub fixes http://support.github.com/discussions/feature-requests/11-api-search-results, # we need to account for multiple pages of results: page = 1 - repositories = YAML.load(open("http://github.com/api/v1/yaml/search/tmbundle?page=#{page}"))['repositories'] + repositories = YAML.load(open("http://github.com/api/v1/yaml/search/tmbundle?start_value=#{page}"))['repositories'] results = [] until repositories.empty? results += repositories.find_all{|result| result['name'].match(search_term)} page += 1 - repositories = YAML.load(open("http://github.com/api/v1/yaml/search/tmbundle?page=#{page}"))['repositories'] + repositories = YAML.load(open("http://github.com/api/v1/yaml/search/tmbundle?start_value=#{page}"))['repositories'] end results.sort{|a,b| a['name'] <=> b['name']} end bin/textmate 07914a7871aabef3804ff34f5c87f59a9a7bf99c Roberto Salicio roberto.salicio@gmail.com http://github.com/wycats/textmate/commit/2892c157eba7d84ba03710edfbdd1a3e280d268c 2892c157eba7d84ba03710edfbdd1a3e280d268c 2009-04-09T12:10:26-07:00 2009-02-23T13:37:01-08:00 Fix for GitHub's pagination, usernames and clone urls Signed-off-by: Yehuda Katz <wycats@gmail.com> a3aeccef1066d116a308ce4be9fe8cd2cd45e323 Yehuda Katz wycats@gmail.com