cypher-textmate 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'date'
 
 GEM = "textmate"
-GEM_VERSION = "0.9.2"
+GEM_VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://yehudakatz.com"

data/bin/textmate

@@ -22,7 +22,13 @@ class TextmateInstaller < Thor
                 when :git
                   'git remotes not implemented yet'
                 when :github
-                  find_github_bundles(search_term).map{|result| normalize_github_repo_name(result['name']).split('.').first}
+                  find_github_bundles(search_term).map {|result|
+                    "%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
+                    ]
+                  }
                 end
       
       puts results
@@ -56,8 +62,35 @@ class TextmateInstaller < Thor
             when :svn
               %[svn co #{e_sh location[:url]}/#{e_sh bundle_name}.tmbundle #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1]
             when :github
-              repo = find_github_bundles(denormalize_github_repo_name(bundle_name)).first
-              %[git clone #{e_sh repo['url'].sub('http', 'git') + '.git'} #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1]
+              repos = find_github_bundles(denormalize_github_repo_name(bundle_name))
+              
+              # Handle possible multiple Repos with the same name
+              case repos.size
+              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]
+              else
+                puts "Multiple bundles with that name found. Please choose which one you want to install:"
+                repos.each_with_index {|repo, idx|
+                  puts "%d: %s by %s" %
+                  [
+                    idx + 1,
+                    normalize_github_repo_name(repo['name']),
+                    repo['url'][/github\.com\/([a-zA-Z0-9]+)\//, 1]
+                  ]
+                }
+                print "Your choice: "
+                
+                # Since to_i defaults to 0, we have to use Integer
+                choice = Integer(STDIN.gets.chomp) rescue nil
+                until choice && (0...repos.size).include?( choice - 1 ) do
+                  print "Sorry, invalid choice. Please enter a valid number or Ctrl+C to stop: "
+                  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]
+              end
             end
       
       res = %x{#{cmd}}
@@ -141,7 +174,17 @@ class TextmateInstaller < Thor
   end
   
   def find_github_bundles(search_term)
-    YAML.load(open('http://github.com/api/v1/yaml/search/tmbundle'))['repositories'].find_all{|result| result['name'].match(search_term)}
+    # 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']
+    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']
+    end
+    results.sort{|a,b| a['name'] <=> b['name']}
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cypher-textmate
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Command-line textmate package manager