git-confident 0.0.4 → 0.0.5

data/bin/git-confident

@@ -8,16 +8,19 @@ $:.unshift( LIB_PATH )
 require 'git/confident'
 
 options = {
-  :restore => false,
-  :commit  => true,
-  :path    => File.expand_path( Dir::pwd ) # Default to current directory
+  :action => :backup,
+  :path   => File.expand_path( Dir::pwd ) # Default to current directory
 }
 
 OptionParser.new do | opts |
-  opts.banner = "Usage: $0 [options]"
+  opts.banner = "Usage: #{ $0 } [options]"
 
   opts.on("-C", "--no-commit", "Only copy files, do not do a git commit") do
-    options[:commit] = false
+    options[ :no_commit ] = true
+  end
+
+  opts.on("-l", "--list", "List all files in the repository") do
+    options[ :action ] = :list
   end
 
   opts.on("-p", "--path PATH", "The path to the local copy of the repository. Defaults to current directory") do | path |
@@ -25,12 +28,8 @@ OptionParser.new do | opts |
   end
 
   opts.on("-r", "--restore", "Restore system files from the repository") do
-    options[ :restore ] = true
+    options[ :action ] = :restore
   end
 end.parse!
 
-conf = Git::Confident.new( options[ :path ] )
-conf.local_backup
-exit unless options[:commit]
-conf.commit
-conf.push
+Git::Confident.new( options )

data/lib/git/confident.rb

@@ -8,21 +8,48 @@ module Git
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 4
+      TINY  = 5
  
       STRING = [ MAJOR, MINOR, TINY ].join( '.' )
     end
 
-    def initialize( path )
-      raise "Git repository not found at '#{ path }'" if ! File.directory?( "#{ path }/.git" )
-      @path = path.clone
+    def initialize( options )
+      @path      = options[ :path ].clone
+      @no_commit = options[ :no_commit ] ? true : false
+
+      raise "Git repository not found at '#{ @path }'" if ! File.directory?( "#{ @path }/.git" )
+
       super( { :working_directory => @path } )
+
+      case options[ :action ]
+      when :backup
+        backup
+      when :list
+        puts files
+      when :restore
+        restore
+      end     
     end
 
     def files
       ls_files.keys.sort
     end
 
+    private
+
+    def backup
+      local_backup
+      return if @no_commit
+      commit
+      push
+    end
+
+    def restore
+      IO.popen( "rsync --no-perms --executability --files-from=- #{ @path }/ /", "w+" ) do | pipe |
+        files.each { | pathname | pipe.puts pathname }
+      end
+    end
+
     def local_backup
       IO.popen( "rsync -av --files-from=- / #{ @path }/", "w+" ) do | pipe |
         files.each { | pathname | pipe.puts pathname }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-confident
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Joe Yates