git-confident 0.0.7 → 0.0.8

data/README.rdoc

@@ -69,6 +69,7 @@ an entire folder to backup. You can track a whole folder using a .gcrecusrive fi
 = Alternatives
 
 * rsync
+* http://eigenclass.org/hiki/gibak-0.3.0
 * gitback[http://github.com/brycethornton/gitback] - very similar to this project, but sets up the repository from a config file.
 * Desktop backup systems
 * Time machine (on OS X)

data/bin/git-confident

@@ -8,28 +8,63 @@ $:.unshift( LIB_PATH )
 require 'git/confident'
 
 options = {
-  :action => :backup,
   :path   => File.expand_path( Dir::pwd ) # Default to current directory
 }
 
-OptionParser.new do | opts |
-  opts.banner = "Usage: #{ $0 } [options]"
+def usage
+  puts @opts.to_s
+  exit 0
+end
+
+@opts = OptionParser.new do | opts |
+  opts.banner = "Usage: #{ $0 } [options] [FILES]"
+
+  opts.separator ""
+  opts.separator "Actions:"
+
+  opts.on("-b", "--backup", "Copy tracked files to the repository, commit changes and push") do
+    options[ :action ] = :backup
+  end
 
   opts.on("-C", "--no-commit", "Only copy files, do not do a git commit") do
+    options[ :action ] = :backup
     options[ :no_commit ] = true
   end
 
+  opts.on("-d", "--diff", "Show differences between file system and repository") do
+    options[ :action ] = :diff
+  end
+
   opts.on("-l", "--list", "List all files in the repository") do
     options[ :action ] = :list
   end
 
+  opts.on("-r", "--restore", "Restore system files from the repository") do
+    options[ :action ] = :restore
+  end
+
+  opts.on("-h", "--help", "Show usage") do
+    usage
+  end
+
+  opts.separator ""
+  opts.separator "Other options:"
+
   opts.on("-p", "--path PATH", "The path to the local copy of the repository. Defaults to current directory") do | path |
     options[ :path ] = File.expand_path( path )
   end
 
-  opts.on("-r", "--restore", "Restore system files from the repository") do
-    options[ :action ] = :restore
-  end
-end.parse!
+  opts.separator ""
+  opts.separator "FILES:"
+  opts.separator "Files are given with their repository path."
+  opts.separator "E.g. a file that resides in /home/user/my_file"
+  opts.separator "     has a repository path of home/user/my_file"
+end
+
+@opts.parse!
+
+usage if options[ :action ].nil?
+
+options[ :files ] = ARGV.clone if ARGV.size > 0
 
 Git::Confident.new( options )

data/lib/git/confident.rb

@@ -9,8 +9,8 @@ module Git
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 7
- 
+      TINY  = 8
+
       STRING = [ MAJOR, MINOR, TINY ].join( '.' )
     end
 
@@ -18,6 +18,7 @@ module Git
 
     def initialize( options )
       @path      = options[ :path ].clone
+      @files     = options[ :files ]
       @no_commit = options[ :no_commit ] ? true : false
 
       raise "Git repository not found at '#{ @path }'" if ! File.directory?( "#{ @path }/.git" )
@@ -28,20 +29,25 @@ module Git
       case options[ :action ]
       when :backup
         backup
+      when :diff
+        diff
       when :list
-        puts "Files:"
-        puts @elements.files
-        puts "Folders:"
-        puts @elements.folders
-        puts "Ignored:"
-        puts @elements.ignored
+        list
       when :restore
         restore
-      end     
+      end
     end
 
     private
 
+    def file_list
+      if @files
+        @files
+      else
+        @elements.files + @elements.folders
+      end
+    end
+
     def backup
       local_backup
       return if @no_commit
@@ -49,15 +55,32 @@ module Git
       push
     end
 
+    def diff
+      file_list.each do | pathname |
+        s = `diff -U 2 #{ @path }/#{ pathname } /#{ pathname }`
+        puts s unless s.empty?
+      end
+    end
+
+    def list
+      @elements = Git::Elements.new( @path )
+      puts "Files:"
+      puts @elements.files
+      puts "Folders:"
+      puts @elements.folders
+      puts "Ignored:"
+      puts @elements.ignored
+    end
+
     def restore
       IO.popen( "rsync --no-perms --executability --keep-dirlinks --delete --files-from=- #{ @path }/ /", "w+" ) do | pipe |
-        (@elements.files + @elements.folders).each { | pathname | pipe.puts pathname }
+        file_list.each { | pathname | pipe.puts pathname }
       end
     end
 
     def local_backup
-      IO.popen( "rsync -a --recursive --delete --files-from=- / #{ @path }/", "w+" ) do | pipe |
-        (@elements.files + @elements.folders).each { | pathname | pipe.puts pathname }
+      IO.popen( "rsync -a --recursive --copy-dirlinks --delete --files-from=- / #{ @path }/", "w+" ) do | pipe |
+        file_list.each { | pathname | pipe.puts pathname }
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-confident
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Joe Yates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +01:00
+date: 2011-07-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency