ddollar-textmate 0.9.8 → 1.0.0

data/README.markdown

@@ -2,6 +2,41 @@
 
 A binary that provides package management for TextMate.
 
+# Example
+
+    $ textmate install javascript
+    Please select a bundle from the following list:
+
+    Github
+    ------
+    1. Javascript
+
+    Macromates
+    ----------
+    2. JavaScript
+    3. JavaScript Flash
+    4. JavaScript JSDoc
+    5. JavaScript MooTools
+    6. JavaScript Objective-J
+    7. JavaScript Prototype & Script_aculo_us
+    8. JavaScript YUI
+    9. JavaScript jQuery
+
+    Which bundle would you like to install? 1
+
+    Please select a repository from the following list:
+
+    1. subtleGradient/javascript.tmbundle                 watchers:16  updated:2009-04-29
+    2. textmate/javascript.tmbundle                       watchers:6   updated:2009-06-09
+    3. rdougan/javascript.tmbundle                        watchers:2   updated:2009-01-28
+    4. cohitre/javascript-tmbundle                        watchers:1   updated:2009-01-29
+
+    Which repository would you like to install? 1
+
+    Javascript bundle installed
+
+    Reloading bundles...
+
 # Usage
 
 `textmate [COMMAND] [*PARAMS]`
@@ -10,7 +45,7 @@ Textmate bundles are automatically reloaded after install or uninstall operation
 
 ## List available remote bundles
 
-`textmate remote [SEARCH]`
+`textmate search [SEARCH]`
 
 List all of the available bundles in the remote repository, optionally filtering by `search`.
 

data/VERSION

@@ -1 +1 @@
-0.9.8
+1.0.0

data/bin/textmate

@@ -1,236 +1,94 @@
 #!/usr/bin/env ruby
 
-require "fileutils"
-require "rubygems"
-require "thor"
-require "open-uri"
-require "yaml"
+require 'thor'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'textmate'
 
 class TextmateInstaller < Thor
-  
-  # CHANGED: renamed list to remote. Could there be a better name?
+
   desc "search [SEARCH]", "Lists all the matching remote bundles"
-  def search(search_term = "")
-    search_term = Regexp.new(".*#{search_term}.*", "i")
-    
-    remote_bundle_locations.keys.map { |key| key.to_s }.sort.each do |name|
-      location = remote_bundle_locations[name.to_sym]
-      puts "\n" << name.to_s << " Remote Bundles\n" << name.to_s.gsub(/./,'-') << '---------------'
-      
-      results = case location[:scm]
-                when :svn
-                  %x[svn list #{e_sh location[:url]}].select {|x| x =~ search_term}.map do |result|
-                    "%s - %s" % [
-                      result.split('.').first,
-                      "#{location[:url]}/#{result.chomp}"
-                    ]
-                  end.join("\n")
-                when :git
-                  'git remotes not implemented yet'
-                when :github
-                  find_github_bundles(search_term).map {|result|
-                    "%s - %s" %
-                    [
-                      normalize_github_repo_name(result['name']).split('.').first,
-                      git_url_from_github_result(result)
-                    ]
-                  }
-                end
-      
-      puts results
-    end
+  def search(search = "")
+    display_hash remote.bundles(search)
   end
-  
+
   desc "list [SEARCH]", "lists all the bundles installed locally"
-  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 =~ search_term}.join("\n")
-    end
+  def list(search = "")
+    display_hash local.bundles(search)
   end
-  
+
   desc "install NAME [SOURCE]", "install a bundle"
-  def install(bundle_name, remote_bundle_location_name=nil)
-    FileUtils.mkdir_p install_bundles_path
-    puts "Checking out #{bundle_name}..."
-    
-    # CHANGED: It's faster to just try and fail for each repo than to search them all first
-    installed=false
-    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 = 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 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|
-                  puts "%d: %s by %s" %
-                  [
-                    idx + 1,
-                    normalize_github_repo_name(repo['name']),
-                    repo['username']
-                  ]
-                }
-                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 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
-      
-      res = %x{#{cmd}}
-      
-      puts cmd, res.gsub(/^/,'    ')
-      
-      installed=true and break if res =~ /Checked out revision|Initialized empty Git repository/
+  def install(bundle)
+    remotes = remote.bundles(bundle)
+
+    case remotes.values.flatten.length
+      when 0 then abort("Unknown bundle: #{bundle}")
+      when 1 then local.install(bundle, remotes.keys.detect { |k| remotes[k].length == 1 })
+      else        local.install(*select_remote(remotes))
     end
-    abort 'Not Installed' unless installed
-    
-    reload :verbose => true
+
+    reload
   end
 
   desc "uninstall NAME", "uninstall a bundle"
-  def uninstall(bundle_name)
+  def uninstall(bundle)
     puts "Removing bundle..."
-    # 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|
-      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
-    
-    reload :verbose => true
+    local.uninstall(bundle)
+    reload
   end
-  
+
   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
-    { :'Macromates Trunk'  => {:scm => :svn, :url => 'http://svn.textmate.org/trunk/Bundles'},
-      :'Macromates Review' => {:scm => :svn, :url => 'http://svn.textmate.org/trunk/Review/Bundles'},
-      
-      # :'Bunch of Git Bundles' => {:scm => :git, :url => 'git://NotImplemented'},
-      
-      :'GitHub' => {:scm => :github, :url => 'http://github.com/search?q=tmbundle'},
-    }
-  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/Bundles",
-      :'System Pristine' => '/Library/Application Support/TextMate/Pristine Copy/Bundles',
-    }
-  end
-  
-  def install_bundles_path
-    local_bundle_paths[:'User Pristine']
-  end
-  
-  # Copied from http://macromates.com/svn/Bundles/trunk/Support/lib/escape.rb
-  # escape text to make it useable in a shell script as one “word” (string)
-  def e_sh(str)
-  	str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
+  def reload
+    puts "Reloading bundles..."
+    %x{ osascript -e 'tell app "TextMate" to reload bundles' }
   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)
-    # 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?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?start_value=#{page}"))['repositories']
+
+end
+
+def local
+  @local ||= Textmate::Local.new
+end
+
+def remote
+  @remote ||= Textmate::Remote.new
+end
+
+def display_hash(hash)
+  puts
+  hash.keys.sort.each do |key|
+    value = hash[key]
+    key = key.name if key.respond_to?(:name)
+    puts key
+    puts '-' * key.length
+    case value
+      when Array then puts value.join("\n") unless value.empty?
+      else            puts value
     end
-    results.sort{|a,b| a['name'] <=> b['name']}
+    puts
   end
-  
-  def git_url_from_github_result(result)
-    "git://github.com/#{result['username']}/#{result['name']}.git"
+end
+
+def select_remote(remotes)
+  puts "Please select a bundle from the following list:"
+  puts
+  bundle_index = {}
+  remotes.keys.sort.inject(0) do |index, remote|
+    bundles = remotes[remote]
+    puts remote.name
+    puts '-' * remote.name.length
+    bundles.each do |bundle|
+      bundle_index[index += 1] = [bundle, remote]
+      puts "#{index}. #{bundle}"
+    end
+    puts
+    index
   end
 
-end
+  index = ask('Which bundle would you like to install?').to_i
+  puts
+  abort("Unknown option: #{index}") unless bundle_index[index]
 
-# TODO: create a "monument to personal cleverness" by class-izing everything?
-# class TextMateBundle
-#   def self.find_local(bundle_name)
-#     
-#   end
-#   
-#   def self.find_remote(bundle_name)
-#     
-#   end
-#   attr_reader :name
-#   attr_reader :location
-#   attr_reader :scm
-#   def initialize(name, location, scm)
-#     @name     = name
-#     @location = location
-#     @scm      = scm
-#   end
-#   
-#   def install!
-#     
-#   end
-#   
-#   def uninstall!
-#     
-#   end
-#   
-#   
-#   def installed?
-#     # List all the installed versions, and where they're at
-#   end
-#   
-#   # TODO: dirty? method to show if there are any deltas
-# end
+  bundle_index[index]
+end
 
 TextmateInstaller.start

data/lib/textmate/local.rb

@@ -0,0 +1,55 @@
+class Textmate::Local
+
+  def self.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/Bundles",
+      'System Pristine' => '/Library/Application Support/TextMate/Pristine Copy/Bundles',
+    }
+  end
+
+  def self.bundle_install_path
+    bundle_paths['User Pristine']
+  end
+
+  def bundle_paths
+    self.class.bundle_paths
+  end
+
+  def bundle_install_path
+    self.class.bundle_install_path
+  end
+
+  def bundles(search = '')
+    bundle_paths.inject({}) do |hash, (name, path)|
+      hash.update(name => find_bundles(name, search))
+    end
+  end
+
+  def install(bundle, remote)
+    remote.install(bundle)
+  end
+
+  def uninstall(bundle)
+    bundle_paths.values.each do |path|
+      bundle_path = File.join(path, "#{bundle}.tmbundle")
+      if File.exist? bundle_path
+        %x[osascript -e 'tell application "Finder" to move the POSIX file "#{bundle_path}" to trash']
+      end
+    end
+  end
+
+private ######################################################################
+
+  def find_bundles(location, search='')
+    search_term = Regexp.new(".*#{search}.*", 'i')
+
+    Dir[File.join(bundle_paths[location], '*.tmbundle')].map do |bundle|
+      File.basename(bundle, '.*')
+    end.select do |bundle|
+      bundle =~ search_term
+    end
+  end
+
+end

data/lib/textmate/remote.rb

@@ -0,0 +1,21 @@
+class Textmate::Remote
+
+  def self.register_source(klass)
+    sources << klass.new
+  end
+
+  def self.sources
+    @sources ||= []
+  end
+
+  def sources
+    self.class.sources
+  end
+
+  def bundles(search = '')
+    sources.inject({}) do |hash, source|
+      hash.update(source => source.bundles(search))
+    end
+  end
+
+end

data/lib/textmate/source/base.rb

@@ -0,0 +1,31 @@
+class Textmate::Source::Base
+
+  def self.name(name = nil)
+    @name = name if name
+    @name
+  end
+
+  def name
+    self.class.name
+  end
+
+  def <=>(other)
+    name <=> other.name
+  end
+
+  def clear_existing(bundle)
+    FileUtils.rm_rf(local_path_for(bundle))
+  end
+
+  def local_path_for(bundle)
+    File.join(Textmate::Local.bundle_install_path, "#{bundle}.tmbundle")
+  end
+
+  def around_install(bundle, &block)
+    clear_existing(bundle)
+    yield
+    puts "#{bundle} bundle installed"
+    puts
+  end
+
+end

data/lib/textmate/source/github.rb

@@ -0,0 +1,72 @@
+require 'octopi'
+
+class Textmate::Source::Github < Textmate::Source::Base
+
+  name 'Github'
+
+  def bundles(search = '')
+    github_search(search).map do |repository|
+      normalize_github_repo_name(repository.name).split('.').first
+    end.uniq.sort
+  end
+
+  def install(bundle)
+    repositories = github_search(bundle).sort_by { |r| r.followers }.reverse
+
+    case repositories.length
+      when 0 then abort("Can't find Github bundle to install: #{bundle}")
+      when 1 then install_bundle_from_github(repositories.first, bundle)
+      else        install_bundle_from_github(select_repository(repositories), bundle)
+    end
+  end
+
+private ######################################################################
+
+  CAPITALIZATION_EXCEPTIONS = %w[tmbundle on]
+
+  def github_search(bundle)
+    Octopi::Repository.find_all(bundle, 'tmbundle')
+  end
+
+  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
+
+  def select_repository(repositories)
+    puts "Please select a repository from the following list:"
+    puts
+    repository_index = {}
+    repositories.inject(0) do |index, repository|
+      repository_index[index += 1] = repository
+      puts "%d. %-50s watchers:%-3d updated:%s" % [
+        index,
+        "#{repository.username}/#{repository.name}",
+        repository.followers,
+        repository.pushed.split('T').first
+      ]
+      index
+    end
+
+    puts
+    index = Thor.new.ask('Which repository would you like to install?').to_i
+    puts
+    abort("Unknown option: #{index}") unless repository_index[index]
+
+    repository_index[index]
+  end
+
+  def install_bundle_from_github(repository, bundle)
+    around_install(bundle) do
+      %x{ git clone "#{git_clone_url(repository)}" "#{local_path_for(bundle)}" }
+    end
+  end
+
+  def git_clone_url(repository)
+    "git://github.com/#{repository.username}/#{repository.name}.git"
+  end
+
+end
+
+Textmate::Remote.register_source Textmate::Source::Github

data/lib/textmate/source/macromates.rb

@@ -0,0 +1,45 @@
+class Textmate::Source::Macromates < Textmate::Source::Base
+
+  name 'Macromates'
+
+  def bundles(search = '')
+    repositories.map do |repository|
+      repository_bundles(repository, search)
+    end.flatten.uniq.sort
+  end
+
+  def install(bundle)
+    repository = repositories.detect do |repository|
+      repository_bundles(repository, bundle, :exact)
+    end
+    install_bundle_from_svn("#{repository}/#{bundle}.tmbundle", bundle)
+  end
+
+private ######################################################################
+
+  def repositories
+    repositories  = []
+    repositories << 'http://svn.textmate.org/trunk/Bundles/'
+    repositories << 'http://svn.textmate.org/trunk/Review/Bundles/'
+  end
+
+  def repository_bundles(repository, search = '', match = :partial)
+    search_term = Regexp.new(".*#{search}.*", 'i')
+
+    %x{ svn list #{repository} }.map do |bundle|
+      bundle.split('.').first
+    end.select do |bundle|
+      match == :partial ? bundle =~ search_term : bundle == search
+    end
+  end
+
+  def install_bundle_from_svn(svn_path, bundle)
+    around_install(bundle) do
+      %x{ svn co "#{svn_path}" "#{local_path_for(bundle)}" }
+      puts "#{bundle} installed"
+    end
+  end
+
+end
+
+Textmate::Remote.register_source Textmate::Source::Macromates

data/lib/textmate/source.rb

@@ -0,0 +1,5 @@
+module Textmate::Source; end
+
+require 'textmate/source/base'
+require 'textmate/source/github'
+require 'textmate/source/macromates'

data/lib/textmate.rb

@@ -0,0 +1,5 @@
+module Textmate; end
+
+require 'textmate/local'
+require 'textmate/remote'
+require 'textmate/source'

data/textmate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textmate}
-  s.version = "0.9.8"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar"]
@@ -25,6 +25,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/textmate",
+     "lib/textmate.rb",
+     "lib/textmate/local.rb",
+     "lib/textmate/remote.rb",
+     "lib/textmate/source.rb",
+     "lib/textmate/source/base.rb",
+     "lib/textmate/source/github.rb",
+     "lib/textmate/source/macromates.rb",
      "textmate.gemspec"
   ]
   s.homepage = %q{http://github.com/ddollar/textmate}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ddollar-textmate
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors: 
 - David Dollar
@@ -38,6 +38,13 @@ files:
 - Rakefile
 - VERSION
 - bin/textmate
+- lib/textmate.rb
+- lib/textmate/local.rb
+- lib/textmate/remote.rb
+- lib/textmate/source.rb
+- lib/textmate/source/base.rb
+- lib/textmate/source/github.rb
+- lib/textmate/source/macromates.rb
 - textmate.gemspec
 has_rdoc: false
 homepage: http://github.com/ddollar/textmate