tms 1.0.0.1 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0.1
+1.0.1

data/bin/tms

@@ -7,14 +7,28 @@ rescue LoadError
   require 'tms'
 end
 
-case ARGV.length
+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
+end.parse!(options)
+
+ids = ids.map(&:to_i)
+case ids.length
 when 0
   Tms.list
 when 1
-  id = ARGV[0].to_i
-  Tms.diff(id - 1, id)
+  Tms.diff(ids[0] - 1, ids[0])
 when 2
-  Tms.diff(ARGV[0].to_i, ARGV[1].to_i)
-else
-  abort 'Max two arguments'
+  Tms.diff(ids[0], ids[1])
 end

data/lib/tms.rb

@@ -18,23 +18,38 @@ class Pathname
     ''
   end
 
-  def colored_size(options = {})
-    if exist?
-      if directory?
-        if options[:recursive]
-          total = 0
-          find do |path|
-            total += path.size rescue nil
+  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
           end
-          Tms::Space.space(total, :color => true)
         else
-          '      '
+          size
         end
       else
-        Tms::Space.space(size, :color => true)
+        nil
       end
-    else
+    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

data/lib/tms/backup.rb

@@ -14,6 +14,9 @@ class Tms::Backup
         backups_dir
       end
     end
+    def backups_dir=(dir)
+      @backups_dir = Pathname(dir)
+    end
 
     def list
       @list ||= begin
@@ -24,9 +27,11 @@ class Tms::Backup
     end
 
     def diff(a, b)
+      total = 0
       (a.path.children(false) | b.path.children(false)).reject{ |child| child.to_s[0, 1] == '.' }.sort.each do |path|
-        compare(a.path + path, b.path + path, Pathname('/') + path)
+        total += compare(a.path + path, b.path + path, Pathname('/') + path)
       end
+      puts "#{'Total:'.bold} #{Tms::Space.space(total, :color => true)}"
     end
 
   private
@@ -35,21 +40,31 @@ class Tms::Backup
       case
       when !a.exist?
         puts "#{'  █'.green} #{b.colored_size(:recursive => true)} #{path}#{b.postfix}"
+        b.count_size || 0
       when !b.exist?
         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})"
+        b.count_size || 0
       when a.lino != b.lino
         if a.readable? && b.readable?
           puts "#{'█≠█'.yellow} #{a.colored_size} #{path}#{a.postfix}" unless a.symlink? && a.readlink == b.readlink
           if a.real_directory?
+            total = 0
             (a.children(false) | b.children(false)).sort.each do |child|
-              compare(a + child, b + child, path + child)
+              total += compare(a + child, b + child, path + child)
             end
+            total
+          else
+            b.size
           end
         else
           puts "??? #{path}#{a.postfix}".red.bold
+          0
         end
+      else
+        0
       end
     end
   end

data/tms.gemspec

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tms
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
   - 1
-  version: 1.0.0.1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Boba Fat
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +03:00
+date: 2010-11-11 00:00:00 +03:00
 default_executable: tms
 dependencies: 
 - !ruby/object:Gem::Dependency