tms 1.1.2 → 1.2.0

data/Rakefile

@@ -15,7 +15,6 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ['Boba Fat']
   gem.add_runtime_dependency 'colored'
   gem.add_runtime_dependency 'xattr'
-  gem.add_runtime_dependency 'mutter'
   gem.add_development_dependency 'jeweler', '~> 1.5.1'
   gem.add_development_dependency 'rake-compiler'
   gem.add_development_dependency 'rake-gem-ghost'

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/bin/tms

@@ -9,34 +9,45 @@ end
 
 require 'optparse'
 
-ids, options = ARGV.partition{ |arg| arg =~ /^-?\d+$/ }
-OptionParser.new do |op|
-  op.banner = <<-BANNER
-Usege:
-  List:                #{op.program_name} [options]
-  Diff:                #{op.program_name} [options] id1 id2
-  Diff with previous:  #{op.program_name} [options] id
-  BANNER
-
-  op.on('-d', '--directory DIRECTORY', 'Use backup directory') do |dir|
-    Tms::Backup.backups_dir = dir
-  end
+def option_parser
+  OptionParser.new do |op|
+    op.banner = <<-BANNER
+    Usege:
+      List:                #{op.program_name} [options]
+      Diff:                #{op.program_name} [options] id|nxxx id|nxxx
+      Diff with previous:  #{op.program_name} [options] id|nxxx
+      BANNER
 
-  op.on('-f', '--filter DIRECTORY', 'Show diff starting from directory') do |dir|
-    Tms::Backup.filter_dir = dir
-  end
+    op.on('-d', '--directory DIRECTORY', 'Use backup directory') do |dir|
+      Tms::Backup.backups_dir = dir
+    end
+
+    op.on('-f', '--filter DIRECTORY', 'Show diff starting from directory') do |dir|
+      Tms::Backup.filter_dir = dir
+    end
+
+    op.on('-p', '--[no-]progress', 'Show backups in progress') do |show_in_progress|
+      Tms::Backup.show_in_progress = show_in_progress
+    end
 
-  op.on('-p', '--progress', 'Show backups in progress') do
-    Tms::Backup.show_in_progress = true
+    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
-end.parse!(options)
+end
+
+options, ids = ARGV.partition{ |arg| arg =~ /^--?\D/ }
+begin
+  option_parser.parse!(options)
+rescue OptionParser::InvalidOption => e
+  abort e
+end
 
-ids = ids.map(&:to_i)
 case ids.length
 when 0
   Tms.list
-when 1
-  Tms.diff(ids[0] - 1, ids[0])
-when 2
-  Tms.diff(ids[0], ids[1])
+when 1..2
+  Tms.diff(*ids)
+else
+  abort 'Max two arguments'
 end

data/lib/tms.rb

@@ -1,80 +1,90 @@
-require 'pathname'
-require 'colored'
-require 'xattr'
-require 'mutter'
-
-class Pathname
-  def real_directory?
-    directory? && !symlink?
-  end
-
-  def lino
-    @ino ||= lstat.ino
-  end
-
-  def postfix
-    return '@' if symlink?
-    return '/' if directory?
-    ''
-  end
+module Tms
+  class << self
+    def list
+      backups = Backup.list
+      Table.new do |t|
+        t.col '', :red
+        t.col '', :blue
+        t.col 'num'
+        t.col 'name'
+        if Backup.show_all_columns
+          t.col 'state'
+          t.col 'type'
+          t.col 'version'
+          t.col 'completed in', nil, :right
+          t.col 'started at'
+          t.col 'finished at'
+        end
 
-  def count_size(options = {})
-    if defined?(@counted_size)
-      @counted_size
-    else
-      @counted_size = if exist?
-        if directory?
-          if options[:recursive]
-            total = 0
-            find do |path|
-              total += path.size rescue nil
-            end
-            total
-          else
-            0
+        backups.each_with_index do |b, i|
+          values = [
+            i,
+            i - backups.length,
+            b.number,
+            b.name
+          ]
+          if Backup.show_all_columns
+            values += [
+              b.state,
+              b.type,
+              b.version,
+              format(b.completed_in, :time),
+              format(b.started_at, :date),
+              format(b.finished_at, :date)
+            ]
           end
-        else
-          size
+          t << values
         end
+      end.print
+    end
+
+    def diff(a, b = nil)
+      a_id = backup_id(a)
+      if b
+        b_id = backup_id(b)
       else
-        nil
+        if Backup.list.length == 1
+          abort("Only one backup exist")
+        elsif a_id == 0 || (Backup.list[a_id] && !Backup.list[a_id - 1])
+          abort("No backup before oldest one")
+        else
+          a_id, b_id = a_id - 1, a_id
+        end
       end
+      backup_a = Backup.list[a_id] or abort("No backup #{a}")
+      backup_b = Backup.list[b_id] or abort("No backup #{b}")
+      Backup.diff(backup_a, backup_b)
     end
-  end
 
-  def colored_size(options = {})
-    case size = count_size(options)
-    when nil
-      '!!!!!!'
-    when 0
-      '      '
-    else
-      Tms::Space.space(size, :color => true)
-    end
-  end
-end
+  private
 
-module Tms
-  class << self
-    def list
-      backups = Backup.list
-      Mutter::Table.new do
-        column :align => :right, :style => :red
-        column :align => :right, :style => :blue
-        column :align => :right
-        column
-      end.tap do |table|
-        table << ['', '', 'num', 'name']
-        backups.each_with_index do |backup, i|
-          table << [i, i - backups.length, backup.number, backup.name]
-        end
-      end.print
+    def backup_id(arg)
+      if arg[0, 1] == 'n'
+        number = arg[/\d+/].to_i
+        Backup.list.index{ |backup| backup.number == number }
+      else
+        arg.to_i
+      end
     end
 
-    def diff(a, b)
-      backup_a = Backup.list[a] || abort("No backup with id #{a}")
-      backup_b = Backup.list[b] || abort("No backup with id #{b}")
-      Backup.diff(backup_a, backup_b)
+    def format(value, type)
+      case type
+      when :time
+        case value
+        when 0...60
+          "#{value.round} sec"
+        when 60...3600
+          '%.1f min' % (value / 60)
+        when 3600...86400
+          '%.1f hou' % (value / 3600)
+        else
+          '%.1f day' % (value / 86400)
+        end
+      when :date
+        value.strftime('%Y-%m-%d %H:%M:%S')
+      else
+        value
+      end
     end
   end
 end
@@ -82,3 +92,5 @@ end
 require 'tms.so'
 require 'tms/backup'
 require 'tms/space'
+require 'tms/table'
+require 'tms/pathname'

data/lib/tms/backup.rb

@@ -1,3 +1,6 @@
+require 'colored'
+require 'xattr'
+
 class Tms::Backup
   class << self
     def backups_dir
@@ -9,7 +12,7 @@ class Tms::Backup
         abort 'can\'t get computer name' unless $?.success?
 
         backups_dir = Pathname(backup_volume) + 'Backups.backupdb' + computer_name
-        abort "ops backups dir is not a dir" unless backups_dir.directory?
+        abort "ops! backups dir is not a dir" unless backups_dir.directory?
 
         backups_dir
       end
@@ -20,23 +23,22 @@ class Tms::Backup
 
     attr_accessor :filter_dir
     attr_accessor :show_in_progress
+    attr_accessor :show_all_columns
 
     def list
       @list ||= begin
-        backups = []
-        backups_dir.children.each do |path|
+        backups_dir.children.map do |path|
           case path.basename.to_s
           when /^\d{4}-\d{2}-\d{2}-\d{6}$/
-            backups << new(path)
+            new(path)
           when /^\d{4}-\d{2}-\d{2}-\d{6}\.inProgress$/
             if show_in_progress
               path.children.select(&:directory?).each do |path_in_progress|
-                backups << new(path_in_progress, true)
+                new(path_in_progress, true)
               end
             end
           end
-        end
-        backups.sort
+        end.flatten.compact.sort
       end
     end
 
@@ -65,7 +67,7 @@ class Tms::Backup
         puts "#{'█  '.blue} #{a.colored_size(:recursive => true)} #{path}#{a.postfix}"
         0
       when a.ftype != b.ftype
-        puts "#{'!!!'.red.bold} #{a.colored_size} #{path} (#{a.ftype}=>#{b.ftype})"
+        puts "#{'!!!'.red.bold} #{a.colored_size(:recursive => true)} #{path} (#{a.ftype}=>#{b.ftype})"
         b.count_size || 0
       when a.lino != b.lino
         if a.readable? && b.readable?

data/lib/tms/pathname.rb

@@ -0,0 +1,49 @@
+require 'pathname'
+
+class Pathname
+  def real_directory?
+    directory? && !symlink?
+  end
+
+  def lino
+    @ino ||= lstat.ino
+  end
+
+  def postfix
+    case
+    when symlink?
+      '@'
+    when directory?
+      '/'
+    else
+      ''
+    end
+  end
+
+  def count_size(options = {})
+    if @count_size.nil?
+      if exist?
+        if directory?
+          @counted_size = 0
+          find{ |path| @counted_size += path.size rescue nil } if options[:recursive]
+        else
+          @counted_size = size
+        end
+      else
+        @counted_size = false
+      end
+    end
+    @counted_size
+  end
+
+  def colored_size(options = {})
+    case size = count_size(options)
+    when false
+      '!!!!!!'
+    when 0
+      '      '
+    else
+      Tms::Space.space(size, :color => true)
+    end
+  end
+end

data/lib/tms/space.rb

@@ -1,3 +1,5 @@
+require 'colored'
+
 module Tms::Space
   SIZE_SYMBOLS = %w[B K M G T P E Z Y].freeze
   COLORS = [].tap do |colors|

data/lib/tms/table.rb

@@ -0,0 +1,39 @@
+require 'colored'
+
+class Tms::Table
+  attr_accessor :cols, :rows
+
+  def initialize(&block)
+    @cols, @rows = [], []
+    yield self if block_given?
+  end
+
+  ADJUST = {:left => :ljust, :right => :rjust, :center => :center}
+  def col(name, color = nil, adjust = nil)
+    @cols << {:name => name, :color => color, :adjust => ADJUST[adjust]}
+  end
+
+  def <<(row)
+    @rows << row
+  end
+
+  def lines
+    @cols.each_with_index do |col, i|
+      col[:width] = ([col[:name]] + @rows.map{ |row| row[i] }).map(&:to_s).map(&:length).max
+    end
+
+    ([@cols.map{ |col| col[:name] }] + @rows).each_with_index.map do |line, i|
+      line.zip(@cols).map do |val, col|
+        width, color, adjust = col.values_at(:width, :color, :adjust)
+        adjust ||= val.is_a?(Integer) ? :rjust : :ljust
+        val_s = val.to_s.send(adjust, width)
+        val_s = Colored.colorize(val_s, :foreground => color) if color
+        val_s
+      end.join(' ')
+    end
+  end
+
+  def print
+    puts lines
+  end
+end

data/tms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tms}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Boba Fat"]
-  s.date = %q{2010-12-05}
+  s.date = %q{2010-12-06}
   s.default_executable = %q{tms}
   s.description = %q{View avaliable Time Machine backups and show diff}
   s.executables = ["tms"]
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
     "ext/tms/tms.c",
     "lib/tms.rb",
     "lib/tms/backup.rb",
+    "lib/tms/pathname.rb",
     "lib/tms/space.rb",
+    "lib/tms/table.rb",
     "tms.gemspec"
   ]
   s.homepage = %q{http://github.com/toy/tms}
@@ -44,14 +46,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<colored>, [">= 0"])
       s.add_runtime_dependency(%q<xattr>, [">= 0"])
-      s.add_runtime_dependency(%q<mutter>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rake-compiler>, [">= 0"])
       s.add_development_dependency(%q<rake-gem-ghost>, [">= 0"])
     else
       s.add_dependency(%q<colored>, [">= 0"])
       s.add_dependency(%q<xattr>, [">= 0"])
-      s.add_dependency(%q<mutter>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rake-compiler>, [">= 0"])
       s.add_dependency(%q<rake-gem-ghost>, [">= 0"])
@@ -59,7 +59,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<colored>, [">= 0"])
     s.add_dependency(%q<xattr>, [">= 0"])
-    s.add_dependency(%q<mutter>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rake-compiler>, [">= 0"])
     s.add_dependency(%q<rake-gem-ghost>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tms
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Boba Fat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +03:00
+date: 2010-12-06 00:00:00 +03:00
 default_executable: tms
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,24 +46,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mutter
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,11 +61,11 @@ dependencies:
         - 1
         version: 1.5.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +75,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake-gem-ghost
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,7 +89,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: View avaliable Time Machine backups and show diff
 email: 
 executables: 
@@ -123,7 +109,9 @@ files:
 - ext/tms/tms.c
 - lib/tms.rb
 - lib/tms/backup.rb
+- lib/tms/pathname.rb
 - lib/tms/space.rb
+- lib/tms/table.rb
 - tms.gemspec
 has_rdoc: true
 homepage: http://github.com/toy/tms