wycats-textmate 0.9.1 → 0.9.2

data/README.markdown

@@ -1,31 +1,41 @@
-textmate
-========
+# textmate
 
 A binary that provides package management for TextMate.
 
-Usage
-=====
+# Usage
 
 `textmate [COMMAND] [*PARAMS]`
 
 Textmate bundles are automatically reloaded after install or uninstall operations.
 
+## List available remote bundles
+
 `textmate remote [SEARCH]`
-------------------------
 
-List all of the available bundles in the remote repository that have a substring `search`. By default, list all bundles.
+List all of the available bundles in the remote repository, optionally filtering by `search`.
+
+## List installed bundles
+
+`textmate list [SEARCH]`
 
-`textmate list`
---------------------
+List all of the bundles that are installed on the local system, optionally filtering by `search`.
 
-List all of the bundles that are installed on the local system.
+## Installing new bundles
 
 `textmate install NAME [SOURCE]`
------------------------
 
-Installs a bundle from the remote repository. SOURCE filters known remote bundle locations. 
+Installs a bundle from the remote repository. SOURCE filters known remote bundle locations.
+For example, if you want to install the "Ruby on Rails" bundle off GitHub, you'd type the following:
+
+`textmate install "Ruby on Rails" GitHub`
+
+Available remote bundle locations are:
+* Macromates Trunk
+* Macromates Review
+* GitHub
+
+## Uninstalling bundles
 
 `textmate uninstall NAME`
--------------------------
 
 Uninstalls a bundle from the local repository.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'date'
 
 GEM = "textmate"
-GEM_VERSION = "0.9.1"
+GEM_VERSION = "0.9.2"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://yehudakatz.com"
@@ -21,11 +21,11 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   
-  s.add_dependency "thor", ">= 0.9.1"
+  s.add_dependency "thor", ">= 0.9.2"
     
-  s.require_path = 'lib'
+  s.require_path = 'bin' # Yes, it's a hack, but otherwise gem complains on install
   s.autorequire = GEM
-  s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{bin,lib,specs}/**/*")
+  s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{bin,specs}/**/*")
   s.bindir = "bin"
   s.executables = %w( textmate )
 end

data/bin/textmate

@@ -3,39 +3,51 @@
 require "fileutils"
 require "rubygems"
 require "thor"
+require "open-uri"
+require "yaml"
 
 class TextmateInstaller < Thor
   
   # CHANGED: renamed list to remote. Could there be a better name?
   desc "remote [SEARCH]", "Lists all the matching remote bundles"
-  def remote(limit = "")
-    limit = Regexp.new(".*#{limit}.*", "i")
+  def remote(search_term = "")
+    search_term = Regexp.new(".*#{search_term}.*", "i")
     
     remote_bundle_locations.each do |name,location|
       puts "\n" << name.to_s << " Remote Bundles\n" << name.to_s.gsub(/./,'-') << '---------------'
       
-      results = %x[svn list #{e_sh location[:url]}] if location[:scm]==:svn
-      puts results.map {|x| x.split(".")[0]}.select {|x| x =~ limit}.join("\n") if results
+      results = case location[:scm]
+                when :svn
+                  %x[svn list #{e_sh location[:url]}].map {|x| x.split(".")[0]}.select {|x| x =~ search_term}.join("\n")
+                when :git
+                  'git remotes not implemented yet'
+                when :github
+                  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 'git remotes not implemented yet' if location[:scm]==:git
+      puts results
     end
   end
   
   desc "list [SEARCH]", "lists all the bundles installed locally"
-  def list(limit = "")
-    limit = Regexp.new(".*#{limit}.*", "i")
+  def list(search_term = "")
+    search_term = Regexp.new(".*#{search_term}.*", "i")
     
     local_bundle_paths.each do |name,bundles_path|
       puts "\n" << name.to_s << " Bundles\n" << name.to_s.gsub(/./,'-') << '--------'
       puts Dir["#{e_sh bundles_path}/*.tmbundle"].map {|x| x.split("/").last.split(".").first}.
-        select {|x| x =~ limit}.join("\n")
+        select {|x| x =~ search_term}.join("\n")
     end
   end
   
-  # TODO: Add a DESTINATION option to decide where to install. Maybe make some sort of ~/.textmate-cli config file?
   desc "install NAME [SOURCE]", "install a bundle"
   def install(bundle_name, remote_bundle_location_name=nil)
-    # TODO: Add an option to remove all other versions of the same bundle
     FileUtils.mkdir_p install_bundles_path
     puts "Checking out #{bundle_name}..."
     
@@ -44,66 +56,99 @@ class TextmateInstaller < Thor
     remote_bundle_locations.each do |remote_name,location|
       next unless remote_name.to_s.downcase.include? remote_bundle_location_name.to_s.downcase if remote_bundle_location_name
       
-      cmd = 'echo "git remotes not implemented yet"' if location[:scm]==:git
-      cmd = %[svn co #{e_sh location[:url]}/#{e_sh bundle_name}.tmbundle #{e_sh install_bundles_path}/#{e_sh bundle_name}.tmbundle 2>&1] if location[:scm]==:svn
+      cmd = case location[:scm]
+            when :git
+              'echo "git remotes not implemented yet"'
+            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
+              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}}
       
-      puts cmd, res.gsub(/^/,'    ') #if verbose # TODO: Implement a verbose mode to toggle showing all the gory details
+      puts cmd, res.gsub(/^/,'    ')
       
       installed=true and break if res =~ /Checked out revision|Initialized empty Git repository/
     end
-    abort 'Not Installed' unless installed # TODO: Offer suggestions for alternate bundles with similar names. Maybe let them choose
+    abort 'Not Installed' unless installed
     
-    puts "Reloading Bundles..."
-    reload_textmate!
-    puts "Done."
+    reload :verbose => true
   end
 
   desc "uninstall NAME", "uninstall a bundle"
   def uninstall(bundle_name)
     puts "Removing bundle..."
-    # FIXME: Move deleted bundles to the trash instead of rm_rf-ing them?
     # When moving to the trash, maybe move the bundle into a trash/disabled_bundles subfolder 
     #   named as the bundles_path key. Just in case there are multiple versions of 
     #     the same bundle in multiple bundle paths
     local_bundle_paths.each do |name,bundles_path|
-      FileUtils.rm_rf("#{bundles_path}/#{bundle_name}.tmbundle")    
+      bundle_path = "#{bundles_path}/#{bundle_name}.tmbundle"
+      if File.exist? bundle_path
+        %x[osascript -e 'tell application "Finder" to move the POSIX file "#{bundle_path}" to trash']
+      end
     end
-    puts "Reloading bundles..."
-    reload_textmate!
-    puts "Done."
+    
+    reload :verbose => true
   end
   
-  private
-  def reload_textmate!
+  desc "reload", "Reloads TextMate Bundles"
+  method_options :verbose => :boolean
+  def reload(opts = {})
+    puts "Reloading bundles..." if opts[:verbose]
     %x[osascript -e 'tell app "TextMate" to reload bundles']
+    puts "Done." if opts[:verbose]
   end
   
+  private
   def remote_bundle_locations
-    { :'Marcomates Trunk'  => {:scm => :svn, :url => 'http://macromates.com/svn/Bundles/trunk/Bundles'},
-      :'Marcomates Review' => {:scm => :svn, :url => 'http://macromates.com/svn/Bundles/trunk/Review/Bundles'},
+    { :'Macromates Trunk'  => {:scm => :svn, :url => 'http://macromates.com/svn/Bundles/trunk/Bundles'},
+      :'Macromates Review' => {:scm => :svn, :url => 'http://macromates.com/svn/Bundles/trunk/Review/Bundles'},
       
-      # TODO: Add Git support to remote_bundle_locations. Define some sort of standard way of listing git repos, checkout how rubygems does it
       # :'Bunch of Git Bundles' => {:scm => :git, :url => 'git://NotImplemented'},
       
-      # TODO: Add GitHub support as a remote_bundle_location
-      #   This will require fetching the html of the search page, scanning for urls and converting them to git urls
-      # :'GitHub' => {:scm => :github, :url => 'http://github.com/search?q=tmbundle'},
+      :'GitHub' => {:scm => :github, :url => 'http://github.com/search?q=tmbundle'},
     }
-    # TODO: Add some way to add more custom remotes
   end
   
   def local_bundle_paths
     { :Application       => '/Applications/TextMate.app/Contents/SharedSupport/Bundles',
       :User              => "#{ENV["HOME"]}/Library/Application Support/TextMate/Bundles",
       :System            => '/Library/Application Support/TextMate/Bundles',
-      :'User Pristine'   => "#{ENV["HOME"]}/Library/Application Support/TextMate/Pristine Copy",
-      :'System Pristine' => '/Library/Application Support/TextMate/Pristine Copy',
+      :'User Pristine'   => "#{ENV["HOME"]}/Library/Application Support/TextMate/Pristine Copy/Bundles",
+      :'System Pristine' => '/Library/Application Support/TextMate/Pristine Copy/Bundles',
     }
   end
   
   def install_bundles_path
-    #TODO: Add some way for the user to configure where they'd prefer to install bundles
     local_bundle_paths[:'User Pristine']
   end
   
@@ -113,6 +158,27 @@ class TextmateInstaller < Thor
   	str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
   end
   
+  CAPITALIZATION_EXCEPTIONS = %w[tmbundle on]
+  # Convert a GitHub repo name into a "normal" TM bundle name
+  # e.g. ruby-on-rails-tmbundle => Ruby on Rails.tmbundle
+  def normalize_github_repo_name(name)
+    name = name.gsub("-", " ").split.each{|part| part.capitalize! unless CAPITALIZATION_EXCEPTIONS.include? part}.join(" ")
+    name[-9] = ?. if name =~ / tmbundle$/
+    name
+  end
+  
+  # Does the opposite of normalize_github_repo_name
+  def denormalize_github_repo_name(name)
+    name += " tmbundle" unless name =~ / tmbundle$/
+    name.split(' ').each{|part| part.downcase!}.join(' ').gsub(' ', '-')
+  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)}.
+      sort{|a,b| a['name'] <=> b['name']}
+  end
+  
 end
 
 # TODO: create a "monument to personal cleverness" by class-izing everything?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wycats-textmate
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: textmate
 bindir: bin
 cert_chain: []
 
-date: 2008-05-19 00:00:00 -07:00
+date: 2008-05-28 00:00:00 -07:00
 default_executable: textmate
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.2
     version: 
 description: Command-line textmate package manager
 email: wycats@gmail.com
@@ -41,7 +41,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+- bin
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="