six-rsync 0.6.9 → 0.7.0

data/Rakefile

@@ -12,13 +12,14 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-rsync'
-  s.version = '0.6.9'
+  s.version = '0.7.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
   s.description = s.summary
   s.author = 'Sickboy'
   s.email = 'sb@dev-heaven.net'
+  #s.add_dependency('faster_require', '>= 0.5.2')
   s.add_dependency('log4r', '>= 1.1.2')
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,spec}/**/*") + Dir.glob("lib/*/**/*.rb")
   s.require_path = "lib"

data/lib/six/rsync-app.rb

@@ -114,6 +114,8 @@ module Six
 
         @@log.outputters << o_out << o_err
 
+        puts "six-rsync by Sickboy <sb_at_dev-heaven.net> v#{Six::Repositories::Rsync::VERSION}"
+
         if ARGV.empty?
           ARGV << Dir.pwd
           #logger.error "Using current folder"

data/lib/six/rsync.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+#begin; require 'faster_require'; rescue LoadError; end if RUBY_PLATFORM =~ /cygwin|mingw|win32/
 
 require 'fileutils'
 require 'digest/md5'
@@ -27,7 +28,7 @@ module Six
 
     module Rsync
       COMPONENT = 'six-rsync'
-      VERSION = '0.6.9'
+      VERSION = '0.7.0'
       BASE_PATH = Dir.pwd      
 
       case RUBY_PLATFORM

data/lib/six/rsync/base.rb

@@ -94,8 +94,8 @@ module Six
 
         end
 
-        def update
-          lib.update('')
+        def update(opts = {})
+          lib.update('', [], opts)
         end
 
         def reset(opts = {})

data/lib/six/rsync/lib.rb

@@ -13,7 +13,7 @@ module Six
         attr_accessor :verbose
         PROTECTED = false
         WINDRIVE = /\"(\w)\:/
-        DEFAULT_CONFIG = {:hosts => [], :exclude => []}.to_yaml
+        DEFAULT_CONFIG = {:hosts => [], :exclude => [], :include => []}.to_yaml
         DEFAULT_TIMEOUT = 60
         PARAMS = if PROTECTED
           "--dry-run --times -O --no-whole-file -r --delete --progress -h --exclude=.rsync"
@@ -337,7 +337,12 @@ module Six
           arr_opts << "-I" if opts[:force]
 
           init
-          update('', arr_opts, {:force => true})
+          config[:include] = opts[:include] if opts.keys.include?(:include)
+          config[:exclude] = opts[:exclude] if opts.keys.include?(:exclude)
+          config[:hosts] = opts[:hosts] if opts.keys.include?(:hosts)
+          save_config(config)
+
+          update('', arr_opts, opts.merge({:force => true}))
           opts[:bare] ? {:repository => @rsync_work_dir} : {:working_directory => @rsync_work_dir}
         end
 
@@ -346,6 +351,10 @@ module Six
 
           handle_config
           handle_hosts
+          config[:hosts] = opts[:hosts] if opts.keys.include?(:hosts)
+          config[:include] = opts[:include] if opts.keys.include?(:include)
+          config[:exclude] = opts[:exclude] if opts.keys.include?(:exclude)
+          save_config(config)
 
           load_repos(:local)
           begin
@@ -358,7 +367,9 @@ module Six
           hosts = config[:hosts].clone
           host = hosts.sample
 
-          if opts[:force]
+          man = false
+          man = true if !opts[:include].nil? && !opts[:include].empty?
+          if opts[:force] && !man
             done = false
             b, i = false, 0
             #verbose = @verbose
@@ -473,6 +484,7 @@ module Six
 
           mismatch = []
           @repos_remote[typ].each_pair do |key, value|
+            next unless include_match(key, typ)
             if value == @repos_local[typ][key]
               #@logger.info "Match! #{key}"
             else
@@ -548,6 +560,7 @@ module Six
           end
 
           @repos_local[typ].each_pair do |key, value|
+            next unless include_match(key, typ)
             del_file(key, typ) unless config[:exclude].include?(key) || !@repos_remote[typ][key].nil?
           end
 
@@ -560,6 +573,22 @@ module Six
 
 
         private
+        def include_match(key, typ)
+          return true if config[:include].empty?
+          config[:include].each do |i|
+            if typ == :pack
+              key = key.sub(/\.gz$/, "")
+            end
+            case i
+              when /^*\.(\S*)$/
+                return true if key =~ /\.#{$1}$/
+              when /^(\S*)\.*/
+                return true if key =~ /^#{$1}\./
+            end
+          end
+          return false
+        end
+
         def handle_config
           @config = load_config
           unless @config
@@ -596,6 +625,7 @@ module Six
         def config
           cfg = @config ||= YAML::load(DEFAULT_CONFIG)
           cfg[:exclude] = [] unless cfg[:exclude]
+          cfg[:include] = [] unless cfg[:include]
           cfg[:hosts] = [] unless cfg[:hosts]
           cfg
         end
@@ -645,6 +675,7 @@ module Six
             relative.gsub!(@rsync_work_dir, '')
             relative.gsub!(reg, '')
 
+            next unless include_match(relative, typ)
             next if config[:exclude].include?(relative)
             sum = md5(file)
             h[relative] = sum if sum

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +02:00
+date: 2010-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -67,6 +68,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -74,6 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -83,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Your summary here