tms 1.0.1 → 1.1.0

data/.gitignore

@@ -3,3 +3,7 @@ pkg
 doc
 *.gem
 *.swp
+ext/Makefile
+ext/*.o
+ext/*.bundle
+lib/*.bundle

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/bin/tms

@@ -21,6 +21,14 @@ Usege:
   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', '--progress', 'Show backups in progress') do
+    Tms::Backup.show_in_progress = true
+  end
 end.parse!(options)
 
 ids = ids.map(&:to_i)

data/lib/tms/backup.rb

@@ -18,18 +18,38 @@ class Tms::Backup
       @backups_dir = Pathname(dir)
     end
 
+    attr_accessor :filter_dir
+    attr_accessor :show_in_progress
+
     def list
       @list ||= begin
-        backups_dir.children.select do |path|
-          path.basename.to_s =~ /^\d{4}-\d{2}-\d{2}-\d{6}$/
-        end.map(&method(:new)).sort_by(&:number)
+        backups = []
+        backups_dir.children.each do |path|
+          case path.basename.to_s
+          when /^\d{4}-\d{2}-\d{2}-\d{6}$/
+            backups << 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)
+              end
+            end
+          end
+        end
+        backups.sort
       end
     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|
-        total += compare(a.path + path, b.path + path, Pathname('/') + path)
+      if filter_dir
+        root_dir = (a.path.children + b.path.children).select(&:directory?).select{ |child| Pathname(File.join(child, filter_dir)).exist? }.map(&:basename).uniq
+        root_dir = File.join(root_dir, filter_dir)
+        total += compare(a.path + root_dir, b.path + root_dir, Pathname('/') + root_dir)
+      else
+        (a.path.children(false) | b.path.children(false)).reject{ |child| child.to_s[0, 1] == '.' }.sort.each do |path|
+          total += compare(a.path + path, b.path + path, Pathname('/') + path)
+        end
       end
       puts "#{'Total:'.bold} #{Tms::Space.space(total, :color => true)}"
     end
@@ -69,13 +89,14 @@ class Tms::Backup
     end
   end
 
-  attr_reader :path
-  def initialize(path)
+  attr_reader :path, :in_progress
+  def initialize(path, in_progress = false)
     @path = path
+    @in_progress = in_progress
   end
 
   def name
-    @name ||= path.basename.to_s
+    @name ||= in_progress ? "#{path.dirname.basename}/#{path.basename}" : path.basename.to_s
   end
 
   def started_at
@@ -95,11 +116,15 @@ class Tms::Backup
   }.each do |name, attr|
     class_eval <<-src
       def #{name}
-        @#{name} ||= xattr.get('#{attr}').to_i
+        @#{name} ||= xattr.get('#{attr}').to_i rescue '-'
       end
     src
   end
 
+  def <=>(other)
+    name <=> other.name
+  end
+
 private
 
   def xattr

data/tms.gemspec

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

metadata

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