tms 1.3.0 → 1.3.1

data/README.markdown

@@ -6,6 +6,46 @@ View avaliable Time Machine backups and show changes
 
 Name from [fernlightning.com](http://www.fernlightning.com/doku.php?id=software:misc:tms)
 
+## INSTALL:
+
+    gem install progress # use sudo if you need
+
+## USAGE:
+
+List backups:
+
+    tms
+
+Show changes for last backup (same as `tms -2 -1`):
+
+    tms -1
+
+Show changes between first and last backups:
+
+    tms 1 -1
+
+Show changes for last backup only under your user dir:
+
+    tms -1 -f ~
+
+List backups from another Time Machine:
+
+    tms -d `/Volumes/Time Machine/Backups.backupdb/user name`
+
+Show backups in progress:
+
+    tms -i
+
+Other options:
+
+    tms -h
+
+## REQUIREMENTS:
+
+* OS X
+* ruby
+* Time Machine
+
 ## Copyright
 
 Copyright (c) 2010 Boba Fat. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/bin/tms

@@ -3,22 +3,34 @@
 require 'tms'
 require 'optparse'
 
-def option_parser
-  @option_parser ||= OptionParser.new do |op|
-    op.banner = <<-BANNER
-    #{op.program_name}, version #{Tms.version}
+def option_parser(type = nil)
+  @option_parser ||= {}
+  @option_parser[type] ||= OptionParser.new do |op|
+    op.banner = <<-TEXT
+#{op.program_name}, version #{Tms.version}
 
-    Usege:
-      List: #{op.program_name} [options]
-      Diff: #{op.program_name} [options] id|nXXX [id|nXXX]
-      BANNER
+Usege:
+  List: #{op.program_name} [options]
+  Diff: #{op.program_name} [options] id|nXXX [id|nXXX]
+
+    TEXT
+
+    if type
+      op.banner << <<-TEXT
+Options for #{type} (-h to view all options):
+
+      TEXT
+    end
 
     op.on('-d', '--directory DIRECTORY', 'Use backup directory') do |backups_dir|
       Tms::Backup.backups_dir = backups_dir
     end
 
-    op.on('-f', '--filter DIRECTORY', 'Show diff starting from directory', '  (can be used multiple times)') do |filter_dir|
-      Tms::Backup.add_filter_dir(filter_dir)
+    unless type == :list
+      op.on('-f', '--filter DIRECTORY', 'Show diff starting from directory',
+                                        '  (can be used multiple times)') do |filter_dir|
+        Tms::Backup.add_filter_dir(filter_dir)
+      end
     end
 
     op.on('-i', '--[no-]in-progress', 'Show backups in progress',
@@ -27,20 +39,28 @@ def option_parser
       Tms::Backup.show_in_progress = show_in_progress
     end
 
-    op.on('-l', '--[no-]long', 'Show more info about backup in list') do |show_all_columns|
-      Tms::Backup.show_all_columns = show_all_columns
+    unless type == :diff
+      op.on('-l', '--[no-]long', 'Show more info about backup in list') do |show_all_columns|
+        Tms::Backup.show_all_columns = show_all_columns
+      end
     end
 
-    op.on('--[no-]color', 'Use color', '  (true by default if stdout is a tty)') do |colorize|
+    op.on('--[no-]color', 'Use color',
+                          '  (true by default if stdout is a tty)') do |colorize|
       Tms::Backup.colorize = colorize
     end
 
-    op.on('--[no-]progress', 'Show progress when counting folder size', '  (true by default if stderr is a tty)') do |show_progress|
-      Tms::Backup.show_progress = show_progress
+    unless type == :list
+      op.on('--[no-]progress',  'Show progress when counting folder size',
+                                '  (true by default if stderr is a tty)') do |show_progress|
+        Tms::Backup.show_progress = show_progress
+      end
     end
 
-    op.on('--[no-]decimal', 'Use base 10 size') do |use_decimal|
-      Tms::Space.base10 = use_decimal
+    unless type == :list
+      op.on('--[no-]decimal', 'Use base 10 size') do |use_decimal|
+        Tms::Space.base10 = use_decimal
+      end
     end
 
     op.on_tail('-h', '--help', 'Show this message') do
@@ -48,7 +68,7 @@ def option_parser
       exit
     end
 
-    op.on_tail('--version', 'Show version') do
+    op.on_tail('-v', '--version', 'Show version') do
       puts Tms.version
       exit
     end
@@ -57,9 +77,14 @@ end
 
 ids, options = ARGV.partition{ |arg| arg =~ /^[\-n]?\d+$/ }
 begin
-  option_parser.parse!(options)
+  option_parser.parse(options) # exits on -h or -v
+rescue OptionParser::ParseError => e
+end
+type = ids.empty? ? :list : :diff
+begin
+  option_parser(type).parse!(options)
 rescue OptionParser::ParseError => e
-  abort "#{e.to_s}\n#{option_parser.help}"
+  abort "#{e.to_s}\n#{option_parser(type).help}"
 end
 unless options.empty?
   abort "Unknown arguments: #{options.join(' ')}"

data/lib/tms/comparison.rb

@@ -67,11 +67,42 @@ module Tms
       $stdout.puts "#{s}#{CLEAR_LINE}"
     end
 
+    def trim_right_colored(s, length)
+      length = 0 if length < 0
+      colorizers = []
+      s.gsub(/\e\[\d+(;\d+)*m/) do
+        if $`.length < length
+          length += $&.length
+        else
+          colorizers << $&
+        end
+      end
+      s[0, length] << colorizers.join('')
+    end
+
+    def trim_left_colored(s, length)
+      length = 0 if length < 0
+      colorizers = []
+      s.reverse.gsub(/m(\d+;)*\d+\[\e/) do
+        if $`.length < length
+          length += $&.length
+        else
+          colorizers << $&.reverse
+        end
+      end
+      length = s.length if length > s.length
+      colorizers.reverse.join('') << s[-length, length]
+    end
+
     def progress
       if Tms::Backup.show_progress?
         @last_progress ||= Time.now
         if (now = Time.now) > @last_progress + 0.1
-          $stderr.print "#{yield}#{CLEAR_LINE}\r"
+          line = yield.to_s
+          if width = terminal_width
+            line = trim_left_colored(line, terminal_width - 1)
+          end
+          $stderr.print "#{line}#{CLEAR_LINE}\r"
           @last_progress = now
         end
       end
@@ -106,5 +137,33 @@ module Tms
         @total += sub_total
       end
     end
+
+    def command_exists?(command)
+      `which #{command}`
+      $?.success?
+    end
+
+    # method from hirb: https://github.com/cldwalker/hirb
+    # Returns [width, height] of terminal when detected, nil if not detected.
+    # Think of this as a simpler version of Highline's Highline::SystemExtensions.terminal_size()
+    def terminal_size
+      if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
+        [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+      elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
+        [`tput cols`.to_i, `tput lines`.to_i]
+      elsif STDIN.tty? && command_exists?('stty')
+        `stty size`.scan(/\d+/).map{ |s| s.to_i }.reverse
+      else
+        nil
+      end
+    rescue
+      nil
+    end
+
+    def terminal_width
+      if size = terminal_size
+        size[0]
+      end
+    end
   end
 end

data/tms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tms}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Boba Fat"]
-  s.date = %q{2010-12-11}
+  s.date = %q{2010-12-12}
   s.default_executable = %q{tms}
   s.description = %q{View avaliable Time Machine backups and show their diff}
   s.executables = ["tms"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tms
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Boba Fat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 +03:00
+date: 2010-12-12 00:00:00 +03:00
 default_executable: tms
 dependencies: 
 - !ruby/object:Gem::Dependency