textmate 0.9.0 → 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, optionally filtering by `search`.
+
+## List installed bundles
+
 `textmate list [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 bundles that are installed on the local system, optionally filtering by `search`.
+
+## Installing new bundles
+
+`textmate install NAME [SOURCE]`
 
-`textmate installed`
---------------------
+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:
 
-List all of the bundles that are installed on the local system.
+`textmate install "Ruby on Rails" GitHub`
 
-`textmate install NAME`
------------------------
+Available remote bundle locations are:
+* Macromates Trunk
+* Macromates Review
+* GitHub
 
-Installs a bundle from the remote repository.
+## Uninstalling bundles
 
 `textmate uninstall NAME`
--------------------------
 
 Uninstalls a bundle from the local repository.

data/Rakefile

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require 'date'
 
 GEM = "textmate"
-GEM_VERSION = "0.9.0"
+GEM_VERSION = "0.9.2"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://yehudakatz.com"
@@ -20,11 +21,10 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   
-  s.add_dependency "thor", ">= 0.9.1"
-    
-  s.require_path = 'lib'
+  s.add_dependency "thor", ">= 0.9.2"
+  
   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
@@ -33,6 +33,13 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+desc "make a gemspec file"
+task :make_spec do
+  File.open("#{GEM}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end
+
 task :install => [:package] do
   sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION} --no-rdoc --no-ri}
 end

data/bin/textmate

@@ -1,71 +1,183 @@
 #!/usr/bin/env ruby
 
 require "fileutils"
+require "rubygems"
 require "thor"
+require "open-uri"
+require "yaml"
 
 class TextmateInstaller < Thor
   
-  desc "list [SEARCH]", "Lists all the matching remote bundles"
-  def list(limit = "")
-    limit = Regexp.new(".*#{limit}.*", "i")
-    puts "\nBundles\n-------\n"
-    results = %x[svn list #{svn_for("bundles")}]
-    puts results.map {|x| x.split(".")[0]}.select {|x| x =~ limit}.join("\n")
-    puts "\nReview\n------\n"
-    results = %x[svn list #{svn_for("review")}]
-    puts results.map {|x| x.split(".")[0]}.select {|x| x =~ limit}.join("\n")
+  # CHANGED: renamed list to remote. Could there be a better name?
+  desc "remote [SEARCH]", "Lists all the matching remote bundles"
+  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 = 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| normalize_github_repo_name(result['name']).split('.').first}
+                end
+      
+      puts results
+    end
   end
-
-  desc "installed", "lists all the bundles installed locally"
-  def installed()
-    puts "\nSystem\n------\n"
-    puts Dir["/Library/Application Support/TextMate/Bundles/*.tmbundle"].map {|x| x.split("/").last.split(".").first}.join("\n")
-    puts "\nUser\n----\n"
-    puts Dir["#{ENV["HOME"]}/Library/Application Support/TextMate/Bundles/*.tmbundle"].map {|x| x.split("/").last.split(".").first}.join("\n")
+  
+  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
   end
   
-  desc "install NAME", "install a bundle"
-  def install(name)
-    FileUtils.mkdir_p "/Library/Application Support/TextMate/Bundles"
-    quoted_name = name.gsub(" ", "\\ ")
-    type = where(name)
-    puts "Checking out #{name}..."
-    res = %x[svn co #{svn_for(type)}/#{quoted_name}.tmbundle /Library/Application\\ Support/TextMate/Bundles/#{quoted_name}.tmbundle]
-    puts "Reloading Bundles..."
-    reload_textmate!
-    puts "Done."
+  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
+              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]
+            end
+      
+      res = %x{#{cmd}}
+      
+      puts cmd, res.gsub(/^/,'    ')
+      
+      installed=true and break if res =~ /Checked out revision|Initialized empty Git repository/
+    end
+    abort 'Not Installed' unless installed
+    
+    reload :verbose => true
   end
 
   desc "uninstall NAME", "uninstall a bundle"
-  def uninstall(name)
+  def uninstall(bundle_name)
     puts "Removing bundle..."
-    FileUtils.rm_rf("/Library/Application Support/TextMate/Bundles/#{name}.tmbundle")
-    FileUtils.rm_rf("#{ENV["HOME"]}/Library/Application Support/TextMate/Bundles/#{name}.tmbundle")    
-    puts "Reloading bundles..."
-    reload_textmate!
-    puts "Done."
+    # 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
   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
-
-  def where(bundle)
-    bundles = %x[svn list #{svn_for("bundles")}].map {|x| x.split(".")[0]}
-    review  = %x[svn list #{svn_for("review")}].map {|x| x.split(".")[0]}
-    return "bundles" if bundles.include?(bundle)
-    return "review"  if review.include?(bundle)
+  
+  private
+  def remote_bundle_locations
+    { :'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'},
+      
+      # :'Bunch of Git Bundles' => {:scm => :git, :url => 'git://NotImplemented'},
+      
+      :'GitHub' => {:scm => :github, :url => 'http://github.com/search?q=tmbundle'},
+    }
   end
-    
-  def svn_for(type)
-    if type =~ /bundles/i
-      "http://macromates.com/svn/Bundles/trunk/Bundles"
-    elsif type =~ /review/i
-      "http://macromates.com/svn/Bundles/trunk/Review/Bundles"
-    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(/^$/, "''")
+  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)}
   end
   
 end
 
-TextmateInstaller.start
+# 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
+
+TextmateInstaller.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: textmate
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: textmate
 bindir: bin
 cert_chain: []
 
-date: 2008-05-12 00:00:00 -07:00
+date: 2008-05-28 00:00:00 +02:00
 default_executable: 
 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
@@ -35,7 +35,6 @@ files:
 - README.markdown
 - Rakefile
 - bin/textmate
-- lib/class_cli.rb
 has_rdoc: true
 homepage: http://yehudakatz.com
 post_install_message: 
@@ -58,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Command-line textmate package manager

data/lib/class_cli.rb

@@ -1,77 +0,0 @@
-require "getopt/long"
-
-module Hermes
-  def self.extended(klass)
-    klass.class_eval <<-RUBY, "class_cli.rb", 6
-    
-      def self.method_added(meth)
-        return if !public_instance_methods.include?(meth.to_s) || !@@usage
-        @@descriptions                         = defined?(@@descriptions) ? @@descriptions : []
-        @@usages                               = defined?(@@usages) ? @@usages : []
-        @@opts                                 = defined?(@@opts) ? @@opts : []
-        @@descriptions                        << [meth.to_s, @@desc]
-        @@usages                              << [meth.to_s, @@usage]
-        if defined?(@@method_options) && @@method_options
-          @@opts                                << [meth.to_s, @@method_options]
-        end
-        @@usage, @@desc, @@method_options      = nil
-      end
-
-      def self.desc(usage, description)
-        @@usage, @@desc = usage, description
-      end
-      
-      def self.method_options(opts)
-        @@method_options = opts
-      end
-
-      def self.start
-        meth = ARGV.shift
-        params = ARGV.inject([]) do |accum, arg|
-          accum << ARGV.delete(arg) unless arg =~ /^\-/
-          accum
-        end
-        if @@opts.assoc(meth)
-          opts = @@opts.assoc(meth).last.map {|opt, val| [opt, val == true ? Getopt::BOOLEAN : Getopt.const_get(val)].flatten}
-          options = Getopt::Long.getopts(*opts)
-          params << options
-        end
-        new(meth, params)
-      end
-
-      def initialize(op, params)
-        send(op.to_sym, *params) if public_methods.include?(op)
-      end
-      
-      private
-      def format_opts(opts)
-        return "" unless opts
-        opts.map do |opt, val|
-          if val == true || val == "BOOLEAN"
-            opt
-          elsif val == "REQUIRED"
-            opt + "=" + opt.gsub(/\-/, "").upcase
-          elsif val == "OPTIONAL"
-            "[" + opt + "=" + opt.gsub(/\-/, "").upcase + "]"
-          end
-        end.join(" ")
-      end
-      
-      public
-      desc "help", "show this screen"
-      def help
-        puts "Options"
-        puts "-------"
-        max_usage = @@usages.max {|x,y| x.last.to_s.size <=> y.last.to_s.size}.last.size
-        max_opts  = @@opts.empty? ? 0 : format_opts(@@opts.max {|x,y| x.last.to_s.size <=> y.last.to_s.size}.last).size 
-        max_desc  = @@descriptions.max {|x,y| x.last.to_s.size <=> y.last.to_s.size}.last.size
-        @@usages.each do |meth, usage|
-          format = "%-" + (max_usage + max_opts + 4).to_s + "s"
-          print format % (@@usages.assoc(meth)[1] + (@@opts.assoc(meth) ? " " + format_opts(@@opts.assoc(meth)[1]) : ""))
-          # print format % (@@usages.assoc(meth)[1] + @@opts.assoc(meth) ? format_opts(@@opts.assoc(meth)[1]) : ""))
-          puts  @@descriptions.assoc(meth)[1]      
-        end
-      end      
-    RUBY
-  end
-end