girror 0.0.4 → 0.0.5

data/Gemfile

@@ -6,12 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
   gem "yard"
   gem "bluecloth"
+  gem "rdoc"
 end
 
 gem "net-sftp"

data/Gemfile.lock

@@ -1,21 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bluecloth (2.0.9)
+    bluecloth (2.1.0)
+    bluecloth (2.1.0-x86-mingw32)
     git (1.2.5)
-    highline (1.6.1)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    highline (1.6.2)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.0.23)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    net-ssh (2.1.4)
+    rake (0.9.2)
+    rdoc (3.6.1)
     syslog-logger (1.6.4)
-    yard (0.6.4)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
@@ -23,12 +23,11 @@ PLATFORMS
 
 DEPENDENCIES
   bluecloth
-  bundler (~> 1.0.0)
+  bundler
   git
   highline
-  jeweler (~> 1.5.1)
+  jeweler
   net-sftp
-  rcov
-  shoulda
+  rdoc
   syslog-logger
   yard

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Girror == [G]it the M[irror]
 
-A CLI remote-to-local directory mirroring tool, the poor man's "filezilla" which 
+A CLI remote-to-local directory mirroring tool, the poor man's "filezilla" which
 I couldn't google up, so decided to make it myself.
 
 What does it do?
@@ -14,10 +14,10 @@ What does it do?
 - Downloads all the files/directories which are:
   - don't exist in the local tree,
   - newer than local ones (mtime comparison),
-  - have the mode/owner changed (this feature is available only if the local 
+  - have the mode/owner changed (this feature is available only if the local
     system is Unix);
 - Removes all the removed-on-remote files;
-- Wraps all the operations into git transactions (creation/deletion 
+- Wraps all the operations into git transactions (creation/deletion
   of files/dirs);
 - Commits the changes to the local git repository.
 
@@ -27,7 +27,7 @@ besides the ssh/sftp.
 == CLI reference
 
 === girror -h
-Girror cli tool, version 0.0.4.
+Girror cli tool, version 0.0.5.
 
 Mirrors the remote sftp site and stores the changes in a local git repo.
 
@@ -57,22 +57,22 @@ Here's the example with the tested options:
 
 === _girror/config.rb
 
- # 
+ #
  # girror config for current mirror
  #
  module Config
- 
+
    # Program options for the current instance
    OPTIONS = {
      # custom commit message
      :commit_msg => Proc.new {"State at #{Time.now}"},
-   
+
      # local filename encoding
      :lenc => 'koi8-r',
-     
+
      # remote filename encoding
      :renc => 'cp1251',
- 
+
      # some specific ssh options
      # currently available are:
      # - :keys
@@ -80,14 +80,14 @@ Here's the example with the tested options:
      :ssh => {
        # specific ssh secret key files are listed in this array
        :keys        => ['/home/paul/.ssh/id_dsa_somekey'],
- 
-       # you may set this to true or one of algo settings 
+
+       # you may set this to true or one of algo settings
        # (see docs for Net::SSH.start)
        :compression => true
      }
- 
+
    }
- 
+
  end
 
 
@@ -124,7 +124,7 @@ Here's the example with the tested options:
 Note that remote git-related files aren't got.
 
 == Contributing to girror
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/Rakefile

@@ -21,21 +21,12 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Retrieves remote directory via SFTP and stores it in local Git repository.}
   gem.email = "argentoff@gmail.com"
   gem.authors = ["Pavel Argentov"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency 'bluecloth'
-  gem.add_development_dependency 'yard'
-  gem.add_runtime_dependency 'net-sftp'
-  gem.add_runtime_dependency 'git'
-  gem.add_runtime_dependency 'highline'
-  gem.add_runtime_dependency 'syslog-logger'
+  # Dependencies are held in bundler's Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
@@ -45,4 +36,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-YARD::Rake::YardocTask.new
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/girror.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{girror}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pavel Argentov"]
-  s.date = %q{2011-04-23}
-  s.default_executable = %q{girror}
+  s.date = %q{2011-06-22}
   s.description = %q{Retrieves remote directory via SFTP and stores it in local Git repository.}
   s.email = %q{argentoff@gmail.com}
   s.executables = ["girror"]
@@ -38,11 +37,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/argent-smith/girror}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Remote -> local directory 'mirror' using SFTP transport and Git storage.}
-  s.test_files = [
-    "examples/_girror/config.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -52,53 +48,32 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_runtime_dependency(%q<syslog-logger>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<net-sftp>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 0"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
-      s.add_runtime_dependency(%q<syslog-logger>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<net-sftp>, [">= 0"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<syslog-logger>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<net-sftp>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 0"])
-      s.add_dependency(%q<highline>, [">= 0"])
-      s.add_dependency(%q<syslog-logger>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<net-sftp>, [">= 0"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<syslog-logger>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<net-sftp>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 0"])
-    s.add_dependency(%q<highline>, [">= 0"])
-    s.add_dependency(%q<syslog-logger>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

data/lib/girror.rb

@@ -2,15 +2,15 @@
 # Copyright:: (c) 2010-2011 Pavel Argentov
 # License::   see LICENSE.txt
 #
-# Girror library code, the internals. Since the whole app is a CLI utility, 
+# Girror library code, the internals. Since the whole app is a CLI utility,
 # there's not a lot to document here.
-# 
+#
 # The library now contains only one module Girror which contains class Application
 # which is the app logic container. The methods have some documentation in the corresponding
 # section (Girror::Application).
-# 
+#
 # == Disclaimer
-# 
+#
 # This documentation is written as an aid to further development of the program.
 # For more user-friendly documentation see README.rdoc file.
 #
@@ -41,8 +41,8 @@ require 'iconv'
 # This module encapsulates *girror*'s namespace.
 module Girror
   # Version of the library.
-  VERSION = "0.0.4"
-  
+  VERSION = "0.0.5"
+
   # Regexp to filter out 'technical' files which aren't normally a part of
   # the mirrored tree and therefore should be _ignored_.
   FILTER_RE = /^((\.((\.{0,1})|((git)(ignore)?)))|(_girror))$/
@@ -53,7 +53,7 @@ module Girror
 
     class << self # class things
       include FileUtils
-      
+
       # Runs the app. Much like the C's main().
       def run ops
         # Logging setup
@@ -79,29 +79,29 @@ module Girror
         @lpath = ops[:to]       # local save path
         log "Opening local git repo at #{@lpath}"
         @git = Git.open(@lpath) # local git repo
-        
+
         cd ops[:to]; log "Changed to #{pwd}"
-        
+
         # read the config and use CLI ops to override it
         $:.unshift(File.join(".", "_girror"))
         begin
           require 'config'
           ops = Config::OPTIONS.merge ops
-          
-          begin 
+
+          begin
             debug "Program options:"
             ops.each do |pair|
               debug pair.inspect
             end
           end
-          
+
         rescue LoadError => d
           log "Not using stored config: #{d.message}"
         end
-                
+
         # set commit message for git
         ops[:commit_msg].nil? ? @commit_msg = Proc.new { Time.now.to_s } : @commit_msg = ops[:commit_msg]
-        
+
         # name conversion encodings for Iconv
         ops[:renc].nil? ? @renc = "utf-8" :  @renc = ops[:renc]
         ops[:lenc].nil? ? @lenc = "utf-8" :  @lenc = ops[:lenc]
@@ -114,7 +114,7 @@ module Girror
           @path = $6
 
           debug "Remote data specified as: login: #{@user}; pass: #{@pass.inspect}; host: #{@host}; path: #{@path}"
-          Net::SFTP.start(@host, @user, 
+          Net::SFTP.start(@host, @user,
 			  :password => @pass,
 			  :keys => ops[:ssh][:keys],
 			  :compression => ops[:ssh][:compression]
@@ -125,7 +125,7 @@ module Girror
             dl_if_needed @path
 
             log "Disconnected from remote #{@host}"
-            
+
             # fix the local tree in the git repo
             begin
               log "Committing changes to local git repo"
@@ -142,9 +142,9 @@ module Girror
                 log detail.message
               end
             end
-            
+
           end
-     
+
         else
           raise "Bad remote specification!"
         end
@@ -162,8 +162,8 @@ module Girror
         @log.info string
       end
 
-      # On-demand fetcher. Recursively fetches a directory entry 'name' (String) 
-      # if there's no local copy of it or the remote mtime is newer or the 
+      # On-demand fetcher. Recursively fetches a directory entry 'name' (String)
+      # if there's no local copy of it or the remote mtime is newer or the
       # attributes are to be updated.
       def dl_if_needed name
         debug "RNA: #{name}"
@@ -228,18 +228,18 @@ module Girror
             set_attrs = true
           end
           # recurse into the dir; get the remote list
-          rlist = @sftp.dir.entries(name).map do |e| 
+          rlist = @sftp.dir.entries(name).map do |e|
             unless e.name =~ FILTER_RE
               dl_if_needed(File.join(name, e.name))
               Iconv.conv("utf-8", @renc, e.name)
             end
           end . compact
-          
+
           # get the local list
           llist = Dir.entries(lname).map do |n|
             Iconv.conv("utf-8", @lenc, n) unless n =~ FILTER_RE
           end . compact
-          
+
           # differentiate the lists; remove what's needed from local repo
           diff = llist - rlist
           diff.each do |n|
@@ -247,17 +247,26 @@ module Girror
 	    # operations
             n = Iconv.conv(@lenc, "utf-8", File.join(lname, n))
             log "Removing #{n}"
-            @git.remove n, :recursive => true
+            begin
+              @git.remove n, :recursive => true
+            rescue Git::GitExecuteError => detail
+              case detail.message
+              when /did not match/
+                log "#{n} has no match in the git repo: removing it forcefully!"
+                rm_rf n
+              else
+                log detail.message
+              end
+            end
           end
-          
         end
-        
+
         # do the common after-fetch tasks (chown, chmod, utime)
         unless lname == "./"
           unless ENV['OS'] == "Windows_NT"     # chmod/chown issues on that platform
             if ENV['EUID'] == 0
               log "Setting owner: #{lname} => #{[rs.uid, rs.gid].inspect}"
-              File.chown rs.uid, rs.gid, lname 
+              File.chown rs.uid, rs.gid, lname
             end
             log "Setting mode: #{lname} => #{"%o" % rs.permissions}"
             File.chmod rs.permissions, lname
@@ -267,9 +276,9 @@ module Girror
         end if set_attrs
       end
 
-      # Converts the String str from @renc to @lenc if both @renc and @lenc are 
+      # Converts the String str from @renc to @lenc if both @renc and @lenc are
       # set and aren't equal.
-      # 
+      #
       # Returns the converted String.
       def econv str
         ((@lenc == @renc) or (@lenc.nil? or @renc.nil?)) ?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girror
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-23 00:00:00.000000000 +04:00
-default_executable: girror
+date: 2011-06-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &343032770 !ruby/object:Gem::Requirement
+  requirement: &351446130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *343032770
+  version_requirements: *351446130
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &343032350 !ruby/object:Gem::Requirement
+  requirement: &351445870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *343032350
+  version_requirements: *351445870
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &343031990 !ruby/object:Gem::Requirement
+  requirement: &351445620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *343031990
+  version_requirements: *351445620
 - !ruby/object:Gem::Dependency
   name: syslog-logger
-  requirement: &342949640 !ruby/object:Gem::Requirement
+  requirement: &351445370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *342949640
+  version_requirements: *351445370
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &342949260 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &351445130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,32 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *342949260
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &342948950 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *342948950
+  version_requirements: *351445130
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &342948670 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *342948670
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &342948260 !ruby/object:Gem::Requirement
+  requirement: &351430480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *342948260
+  version_requirements: *351430480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &342947900 !ruby/object:Gem::Requirement
+  requirement: &351430180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *342947900
+  version_requirements: *351430180
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &342947540 !ruby/object:Gem::Requirement
+  requirement: &351429910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *342947540
+  version_requirements: *351429910
 - !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: &342947210 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &351429650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,62 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *342947210
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &342946900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *342946900
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: &342946650 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *342946650
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: &342946350 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *342946350
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &342946100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *342946100
-- !ruby/object:Gem::Dependency
-  name: syslog-logger
-  requirement: &342945840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *342945840
+  version_requirements: *351429650
 description: Retrieves remote directory via SFTP and stores it in local Git repository.
 email: argentoff@gmail.com
 executables:
@@ -212,7 +134,6 @@ files:
 - girror.gemspec
 - lib/girror.rb
 - profile.pdf
-has_rdoc: true
 homepage: http://github.com/argent-smith/girror
 licenses:
 - MIT
@@ -228,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 136197517
+      hash: -886150257
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Remote -> local directory 'mirror' using SFTP transport and Git storage.
-test_files:
-- examples/_girror/config.rb
+test_files: []