tmb 0.0.95 → 0.0.96

data/Rakefile

@@ -4,13 +4,14 @@ require 'echoe'
 #Echoe.new(File.basename(File.dirname(__FILE__)))
 
 App = "tmb"
-Version = "0.0.95"
+Version = "0.0.96"
 
 Echoe.new(App, Version) do |p|
    p.name    = App
    p.version = Version
    p.author  = "Justin Thibault"
    p.email   = "jvthibault@gmail.com"
+   p.runtime_dependencies = ['json' ]
    p.bin_files = ["tmb"]
 
    p.install_message = <<-eos

data/lib/tmb/bundle.rb

@@ -1,10 +1,14 @@
+require 'fileutils'
 module TM
+  
+  include FileUtils
 
   TextWrap = 78
   IndentSpacing = 10
   Indent    = (" " * IndentSpacing)
   Justify = 15
   Delimiter = ": "
+  BundleListPrefix = "  * "
   BaseBundleDirectory = "/Library/Application Support/TextMate/Bundles"
   UserBundleDirectory = "#{ENV['HOME']}/Library/Application Support/TextMate/Bundles"
   `mkdir -p "#{TM::UserBundleDirectory}"`
@@ -54,6 +58,13 @@ module TM
   # you'd like to destroy
 
   \033[1m#{App} uninstall json\033[0m
+    
+  # Update bundle named 'json' if we can find it in your installation records.
+  # If we can't find a record, we will attempt to run the normal installation routine
+  # for the bundle name you entered.  If #{App} has degenerate records, you will still
+  # have the option to overwrite the existing version during the normal install process.
+
+  \033[1m#{App} update json\033[0m
 
 
   # Tell textmate (if it's open) to reload its bundle information,
@@ -110,9 +121,18 @@ module TM
     end
 
     def initialize(result=nil, options={})
-      @before_hooks =      @result     = result
-      @repository = options[:repo] || git_repo
-      before(:git_install_script, :update_db)
+      if result.nil?
+        @repository = options[:repo]
+        @result = {
+          "name" => self.class.name_from_repo(@repository), 
+          "bundle_name" => options[:bundle_name],
+          "url" => @repository 
+        }
+      else
+        @before_hooks =      @result     = result
+        @repository = git_repo
+      end
+      #before(:git_install_script, :update_db)
     end
 
     def self.installed
@@ -122,25 +142,46 @@ module TM
     def self.db_filename
       File.join(SettingsDirectory, DB)
     end
+    
+    def self.existing_installdb
+      ( YAML.load File.read( self.db_filename ) rescue nil ) || {}
+    end
 
     def self.db(settings=nil)
+      #puts "with settings...#{settings.inspect}"
+      if !File.exist?(db_filename)
+        puts "DB doesn't exist (#{db_filename}).  Skipping addition of bundle to install db."
+        return 
+      end
       f = File.open(db_filename,File::RDWR|File::CREAT)
-      unless settings.nil? or settings.class.name =~ /^Hash/
-        parsed = settings.merge(YAML::parse( f.read ) || {})
+      unless settings.nil? or !( settings.class.name =~ /^Hash/ )
+        parsed = settings.merge self.existing_installdb
         f.puts YAML::dump( parsed )
       end
       db_content = f.read
       f.close
-      YAML::parse( db_content )
+      self.existing_installdb
     end
 
     def self.info
       File.read(db_filename)
     end
+    
+    def self.installed_bundle_filenames
+      installed.map do |b|
+        File.basename(b)
+      end
+    end
+    
+      def self.installed_bundle_titles
+      installed.map do |b|
+        TM::BundleListPrefix + File.basename(b).gsub(/\.tmbundle$/,'')
+      end
+    end
 
     def self.list
       installed.each do |b|
-        puts File.basename(b)
+        puts  TM::BundleListPrefix + File.basename(b)
       end
     end
 
@@ -149,20 +190,29 @@ module TM
     end
 
     def self.uninstall(bundle)
+      if bundle.nil? || bundle == ""
+        puts "We couldn't find an appropriate bundle to uninstall...Exiting"
+        return 
+      end
       bundle_dir = File.basename(bundle)
-      FileUtils.rm_r(File.join(BundleDirectory, bundle_dir))
+      #{}` rm -Rf #{ File.join(BundleDirectory, bundle_dir) }`
+      FileUtils.rm_r File.join(BundleDirectory, bundle_dir)
     end
 
     def short_result
       {:description => result["description"], :repo => repository }
     end
+    
+    def self.name_from_repo(repository_url)
+      repository_url.scan(/(\w\-0-9)\.git$/)
+    end
 
     def name
       result["name"] || repository.scan(/(\w\-0-9)\.git$/)
     end
 
     def bundle_name
-      name.gsub("tmbundle",'').gsub(/^[[:punct:]]+|[[:punct:]]+$/,'')
+      result["bundle_name"] || name.gsub("tmbundle",'').gsub(/^[[:punct:]]+|[[:punct:]]+$/,'')
     end
 
     def git_repo
@@ -335,7 +385,14 @@ module TM
 
     def hash(digester="sha1")
       if git_repo?
-        op = File.read(File.join(destination,".git","refs","heads","master"))
+        master_file = File.join(destination,".git","refs","heads","master")
+        begin
+          op = File.read(master_file)
+        rescue => e
+          puts "An error occurred while attempting to read #{master_file}...skipping\n   #{e.message}"
+          `ls "#{ File.dirname(master_file) }"`
+          op = ""
+        end
       else
         op = IO.popen("cat `ls -F #{destination} | grep -v -E '\/$'` | #{digester} | tr '\n' ''").read
       end
@@ -343,10 +400,11 @@ module TM
     end
 
     def db_hash
-      { name => {"url" => repository, "dir" => destination, "installed" => Time.now.to_s, "sha1" => hash}}
+      { bundle_name => {"url" => repository, "dir" => destination, "installed" => Time.now.to_s, "sha1" => hash}}
     end
 
     def update_db
+      puts "Updating install db"
       self.class.db(db_hash)
     end
 
@@ -358,13 +416,13 @@ module TM
       File.exists?(destination)
     end
 
-    def install
-      if bundle_exists?
+    def install(prompt_on_reinstall=true)
+      if bundle_exists? && prompt_on_reinstall
         puts "That bundle already appears to be installed at #{destination}.\n\nReinstall? [Yn]"
         answer = STDIN.gets.chomp
-        return if answer == "n"
+        exit if answer == "n"
       end
-      puts "Installing from #{@repository}"
+      puts "#{prompt_on_reinstall ? 'Installing' : 'Updating bundle'} from #{@repository}"
       run_script(:git_install_script)
       puts "Bundle installed to #{destination}.  \n\nReloading bundles..."
       run_script(:bundle_reload_script)

data/lib/tmb/bundles.rb

@@ -58,7 +58,7 @@ module TM
       def self.socket_error(e, url)
         <<-eos
 
-          #LIB is raising a #EXCEPTION: \033[1m#{e.message}\033[0m
+          #LIB is raising a #EXCEPTION: \033[0m#{e.message}\033[0m
 
           Either \033[1m#HOST\033[0m is currently unavailable or your internet connection is down.
 

data/lib/tmb/commands.rb

@@ -7,7 +7,8 @@ module TM
     end
 
     def self.run(args)
-      `mkdir -p #{TM::SettingsDirectory}`
+      FileUtils.mkdir_p TM::SettingsDirectory unless File.exist?(TM::SettingsDirectory)
+      #`mkdir -p #{TM::SettingsDirectory}`
       `touch #{TM::Bundles.searchdb_file}`
       if args[0].nil?
         help
@@ -34,17 +35,47 @@ module TM
         print "\n\nMake your selection: "
         selection = STDIN.gets.chomp
         result = results[selection.to_i - 1]
-
-      else
+      elsif results.size == 1
         result = results.first
+      else
+        puts "There are no bundles matching #{args[1].bold}"
+        remaining = TM::Bundle.installed_bundle_titles
+        if remaining.size > 0
+          puts "Here are the bundles installed to #{TM::BundleDirectory.bold}:\n\n"
+          self.list
+        else
+          puts "The bundle directory appears to be completely empty."
+        end
+        exit 1
+      end
+      bundle_name = File.basename(result)
+      bundle_title = bundle_name.gsub(/\.tmbundle$/,'').bold
+      puts "\nThis will uninstall the #{bundle_title} bundle."
+      puts "\nThis can't be undone, aside from reinstalling #{bundle_title} with\n\n    #{TM::App} install #{bundle_title}\n\n"
+      print "Are you sure you want to continue? (Y/n): "
+      confirm = STDIN.gets.chomp
+      confirm_string = "Y"
+      if confirm == confirm_string
+        removed = TM::Bundle.uninstall(result)
+        puts "#{bundle_title} uninstalled successfully." if removed
+        remaining = TM::Bundle.installed_bundle_titles
+        if remaining.size > 0
+          puts "\nHere are the remaining bundles:\n\n"
+          self.list
+        else
+          puts "There are now no remaining bundles."
+        end
+      else
+        puts "\nExiting uninstall (we were looking for #{confirm_string.bold} as a response, and you typed #{confirm.bold})..."
+        puts "The #{bundle_title} bundle remains active."
       end
-      puts "\nYou chose #{result}\n\nUninstalling...\n\n"
-      removed = TM::Bundle.uninstall(result)
-      puts "#{result} uninstalled" if removed
     end
 
     def self.list(args=nil)
-      TM::Bundle.list
+      TM::Bundle.installed.each do |bundle|
+        puts File.basename(bundle).gsub(/\.tmbundle$/,'').ljust(40).bold + " (#{File.basename(bundle)})"
+      end
+      #TM::Bundle.list
     end
 
     def self.search_remote(args)
@@ -90,6 +121,18 @@ eos
     def self.local(args=nil)
       puts File.read(TM::Bundles.searchdb_file)
     end
+    
+    def self.update(args)
+      bundle_name = args[1]
+      repo = TM::Bundle.db[bundle_name]["url"] rescue nil
+      if repo.nil?
+        puts "OOPS!!!!  There is no record of installing #{bundle_name}, so updating won't work at this point.\n\n"
+        puts "Running a normal install instead and you may overwrite the existing version if we find one..."
+        self.install(args)
+      else
+        TM::Bundle.new( nil, :repo => repo, :bundle_name => bundle_name ).install(false)
+      end
+    end
 
     def self.install(args)
       if args[1] =~ /^(https|git):\S*\.git$/
@@ -110,11 +153,11 @@ eos
         bundles.each_with_index do |b,i|
           puts b.as_selection(i) + (i==0 ? " (default)" : "").bold
         end
-        print "\n\nMake your selection (hit enter to choose default #{bundles.first.name.bold}): "
+        print "\nMake your selection (hit enter to choose default #{bundles.first.name.bold}): "
         selection = STDIN.gets.chomp
         selection = 1 if selection.nil? or selection == ""
         result = results[selection.to_i - 1]
-        puts "\nYou chose #{selection}: #{result['name']}\n\nInstalling...\n\n"
+        puts "\nYou chose #{selection}: #{result['name']}...\n\n"
         bundle = TM::Bundle.new(result)
         bundle.install
         puts "Bundle installed to #{bundle.destination}"

data/tmb.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tmb"
-  s.version = "0.0.95"
+  s.version = "0.0.96"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Thibault"]
-  s.date = "2011-09-01"
+  s.date = "2011-09-02"
   s.description = "tmb provides a command line interface to manage your textmate bundles, allowing you to search for new bundles on github, install them, and uninstall existing local bundles."
   s.email = "jvthibault@gmail.com"
   s.executables = ["tmb"]
@@ -24,8 +24,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmb
 version: !ruby/object:Gem::Version 
-  hash: 161
+  hash: 223
   prerelease: 
   segments: 
   - 0
   - 0
-  - 95
-  version: 0.0.95
+  - 96
+  version: 0.0.96
 platform: ruby
 authors: 
 - Justin Thibault
@@ -15,9 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
-dependencies: []
-
+date: 2011-09-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: tmb provides a command line interface to manage your textmate bundles, allowing you to search for new bundles on github, install them, and uninstall existing local bundles.
 email: jvthibault@gmail.com
 executables: