six-updater 0.19.4-x86-mswin32 → 0.19.5-x86-mswin32

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.platform = "x86-mingw32"
   s.name = 'six-updater'
-  s.version = '0.19.4'
+  s.version = '0.19.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -35,7 +35,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.19.4'
+  s.version = '0.19.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -56,7 +56,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.19.4'
+  s.version = '0.19.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/cleanup.rb

@@ -15,95 +15,86 @@ module Six
       r[/\A\w*/]
     end
 
-    def self.check_dir(dir, repack = false)
-      if File.directory?(dir)
-        entry = File.join(dir, ".repository.yml")
-        if File.exists?(entry)
-          #puts "Processing: #{entry}"
-          config = YAML::load_file(entry)
-          [:pack, :wd].each do |typ|
-            ar = []
-            config[typ].each do |e|
-              sum = if repack && e[0] =~ /.*[A-Z].*\.gz$/
-                Dir.chdir(dir) do
-                  puts "Repacking #{e[0]} to #{e[0].downcase} in #{dir}"
-                  system "gzip -d \"#{e[0]}\""
-                  f = e[0].clone
-                  f.sub!(/\.gz$/, "")
-
-                  target = if File.dirname(f) == "."
-                    f.downcase
-                  else
-                    "#{File.dirname(f)}/#{File.basename(f).downcase}"
-                  end
-                  rename(f, target)
-                  system "gzip --rsyncable --best \"#{target}\""
-                  md5sum(File.join(dir, "#{target}.gz"))
-                end
-              else
-                e[1]
-              end
-              ar << [e[0].downcase, sum]
-            end
-            config[typ] = ar
-          end
-		  File.open(entry, 'w') {|f| f.puts config.to_yaml }#.to_s
-        end
+    def self.process(dir, repack = false)
+      return unless File.directory?(dir)
 
-        Dir.glob(File.join(dir, "**", "*")).each do |e|
-          cleanup(e, repack)
-          #self.repack(e) if repack
-        end
+      repos = []
+      # Handle folder and file renames, in reverse, and . and .. excluded
+      Dir.glob(File.join(dir, '**', '*'), File::FNM_DOTMATCH).reject{ |e|
+        ["..", "."].include? File.basename(e) }.reverse.each do |entry|
+        r = cleanup(entry)
+        repos << r if r
       end
-    end
 
-    def self.rename(entry, newentry)
-      FileUtils.mv(entry, "#{entry}_tmp")
-      FileUtils.mv("#{entry}_tmp", newentry)
+      # Handle all .repository.yml as last
+      repos.each do |e|
+        handle_repo(e, repack)
+      end
     end
 
     def self.cleanup(entry, repack = false)
       dirname = File.dirname(entry)
       base = File.basename(entry)
-  
-      if File.directory?(entry)
-        check_dir(File.join(entry, ".rsync"), false)
-        check_dir(File.join(entry, ".rsync/.pack"), repack)
-        check_dir(File.join(entry, ".pack"), repack)
-      end
 
+      # Rename if the base contains capitals
       if base =~ /[A-Z]/
         newentry = File.join(dirname, base.downcase)
         rename(entry, newentry)
         entry = newentry
         base = File.basename(entry)
       end
+      check_dir(entry) ? entry : nil
     end
 
+    def self.check_dir(dir)
+      return nil unless File.directory?(dir)
+      entry = File.join(dir, ".repository.yml")
+      return nil unless File.exists?(entry)
+      true
+    end
+
+    def self.handle_repo(dir, repack = false)
+      return unless File.directory?(dir)
+      entry = File.join(dir, ".repository.yml")
+      return unless File.exists?(entry)
+      #puts "Processing: #{entry}"
+      config = YAML::load_file(entry)
+      [:pack, :wd].each do |typ|
+        ar = []
+        config[typ].each do |e|
+          sum = if repack && e[0] =~ /.*[A-Z].*\.gz$/
+            entry = File.join(dir, e[0])
+            entry = repack(entry)
+            md5sum(entry)
+          else
+            e[1]
+          end
+          ar << [e[0].downcase, sum]
+        end
+        config[typ] = ar
+      end
+      File.open(entry, 'w') {|f| f.puts config.to_yaml }#.to_s
+    end
+
+    def self.rename(entry, newentry)
+      FileUtils.mv(entry, "#{entry}_tmp")
+      FileUtils.mv("#{entry}_tmp", newentry)
+    end
+
+    # TODO: take a serious look at repack :) especially with handle_repo 
     def self.repack(entry)
       dirname = File.dirname(entry)
       base = File.basename(entry)
       if base =~ /\.gz$/
         Dir.chdir(dirname) do
-          system "gunzip \"#{base}\""
-          f = entry.clone
+          f = base.clone
           f.sub!(/\.gz$/, "")
+          puts "Repacking #{f} to #{f.downcase}"
+          system "gzip -d \"#{base}\""
           rename(f, f.downcase)
-          dirname = File.dirname(f)
-          base = File.basename(f)
+          base = f.downcase
           system "gzip --rsyncable --best \"#{base}\""
-        end
-      end
-    end
-
-    def self.process(dir, repack = false)
-      if File.directory?(dir)
-        check_dir(File.join(dir, ".rsync"), false)
-        check_dir(File.join(dir, ".rsync/.pack"), repack)
-        check_dir(File.join(dir, ".pack"), repack)
-
-        Dir.glob(File.join(dir, '**', '*')).each do |entry|
-          cleanup(entry, repack)
+          File.join(dirname, base)
         end
       end
     end

data/lib/six/updater.rb

@@ -39,7 +39,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.19.4'
+    VERSION = '0.19.5'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 4
-  version: 0.19.4
+  - 5
+  version: 0.19.5
 platform: x86-mswin32
 authors: 
 - Sickboy