six-rsync 0.4.1 → 0.4.2

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-rsync'
-  s.version = '0.4.1'
+  s.version = '0.4.2'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/rsync/lib.rb

@@ -44,16 +44,6 @@ module Six
             @rsync_dir = base[:repository]
             @rsync_work_dir = base[:working_directory]
           end
-
-          etc = File.join(TOOLS_PATH, 'etc')
-          FileUtils.mkdir_p etc
-          fstab = File.join(etc, 'fstab')
-          str = ""
-          str = File.open(fstab) {|file| file.read} if File.exists?(fstab)
-          unless str[/cygdrive/]
-            str += "\nnone /cygdrive cygdrive user,noacl,posix=0 0 0\n"
-            File.open(fstab, 'w') {|file| file.puts str}
-          end
         end
 
         def status
@@ -101,8 +91,10 @@ module Six
             raise RsyncError
           end
           if File.exists? @rsync_work_dir
-            @logger.error "Seems to already be a folder, Aborting!"
-            raise RsyncError
+            unless Dir[File.join(@rsync_work_dir, '*')].empty?
+              @logger.error "Seems to already be a folder, Aborting!"
+              raise RsyncError
+            end
           end
           FileUtils.mkdir_p pack_path
           save_config(config)
@@ -422,7 +414,7 @@ module Six
                       else
                         c = mismatch.size
                         @logger.info "Fetching #{mismatch.size} files... Please wait"
-                        slist = File.join(TEMP_PATH, ".six-updater_#{rand 9999}-list")
+                        slist = File.join(TEMP_PATH, ".six-rsync_#{rand 9999}-list")
                         slist.gsub!("\\", "/")
                         File.open(slist, 'w') do |f|
                           mismatch.each { |e| f.puts e }

data/lib/six/rsync/options.rb

@@ -41,57 +41,12 @@ module Six
             @@host = s
           end
 
-=begin
-        opts.on("--depth I", Integer, "Clone depth, default: #{@config[:depth]}. Set to 0 to clone all history") do |s|
-          options[:depth] = s
-        end
-
-        opts.on("--mods S", String, "Additional Mods") do |s|
-          options[:mods] = s
-        end
-=end
+          opts.on("-l", "--log", "Write logfile") do |bool|
+            options[:logging] = bool if bool
+          end
         end.parse!
-        @@options = todo
-=begin
-      default = if (todo + second_todo + general_todo).size > 0
-        false
-      else
-        true
-      end
 
-      # TODO: Move this to Updater ?
-      @todo = if todo.size > 0
-        todo
-      else
-        log.info "No parameters given, running the default"
-        #options[:wait] = true
-        if default
-          @config[:defaultactions]
-        else
-          []
-        end
-      end
-      @general_todo = if general_todo.size > 0
-        general_todo
-      else
-        if default
-          @config[:defaultgeneralactions]
-        else
-          []
-        end
-      end
-
-      @second_todo = if second_todo.size > 0
-        second_todo
-      else
-        if default
-          @config[:defaultsecondactions]
-        else
-          []
-        end
-      end
-      @config = @config.merge(options)
-=end
+        [options, todo]
       end
 
     end

data/lib/six/rsync-app.rb

@@ -12,43 +12,19 @@ module Six
     module Rsync
       COMPONENT = 'six-rsync'
 
-      # Create loggers
-      @@log = Log4r::Logger.new(COMPONENT)
-      if defined?(DEBUG)
-        format1 = Log4r::PatternFormatter.new(:pattern => "[%l] %d: %m", :date_pattern => '%H:%M:%S')
-      else
-        format1 = Log4r::PatternFormatter.new(:pattern => "%m")
-      end
-      format2 = Log4r::PatternFormatter.new(:pattern => "[%l] %c %d: %m", :date_pattern => '%H:%M:%S')
-
-      # Create Outputters
-      o_file = Log4r::FileOutputter.new "#{COMPONENT}-file",
-        'level' => 0, # All
-      :filename => "#{COMPONENT}.log",
-        'formatter' =>  format2
-      #:maxsize => 1024
-
-      @@log.outputters << o_file
-
-      o_out = Log4r::StdoutOutputter.new "#{COMPONENT}-stdout",
-        'level' => 2, # no DEBUG
-      'formatter' =>  format1
-
-      o_err = Log4r::StderrOutputter.new "#{COMPONENT}-stderr",
-        'level' => 4, # Error and Up
-      'formatter' =>  format1
-
-      @@log.outputters << o_out << o_err
-
       module_function
+
       def logger
         @@log
       end
+
       def host
         @@host
       end
+
       class App
         attr_reader :repo
+
         def logger
           Six::Repositories::Rsync.logger
         end
@@ -96,22 +72,52 @@ module Six
         end
       end
 
-	  unless defined?(Ocra)
-		  parse_options
+      unless defined?(Ocra)
+        options, todo = parse_options
+
+        # Create loggers
+        @@log = Log4r::Logger.new(COMPONENT)
+        format1 = if defined?(DEBUG)
+          Log4r::PatternFormatter.new(:pattern => "[%l] %d: %m", :date_pattern => '%H:%M:%S')
+        else
+          Log4r::PatternFormatter.new(:pattern => "%m")
+        end
+        format2 = Log4r::PatternFormatter.new(:pattern => "[%l] %c %d: %m", :date_pattern => '%H:%M:%S')
+
+        # Create Outputters
+        if options[:logging]
+          o_file = Log4r::FileOutputter.new "#{COMPONENT}-file",
+                                            'level' => 0, # All
+                                            :filename => "#{COMPONENT}.log",
+                                            'formatter' =>  format2
+          #:maxsize => 1024
+          @@log.outputters << o_file
+        end
+
+        o_out = Log4r::StdoutOutputter.new "#{COMPONENT}-stdout",
+                                           'level' => 2, # no DEBUG
+                                           'formatter' =>  format1
 
-		  if ARGV.empty?
-			logger.error "No folder argument given!"
-			Process.exit
-		  end
+        o_err = Log4r::StderrOutputter.new "#{COMPONENT}-stderr",
+                                           'level' => 4, # Error and Up
+                                           'formatter' =>  format1
 
+        @@log.outputters << o_out << o_err
 
-		  #app = App.new(ARGV[0])
-		  ARGV.each do |arg|
-			@@options.each do |option|
-				App.send option, arg
-			end
-		  end
-		end
-	  end
+        if ARGV.empty?
+          ARGV << '.'
+          #logger.error "Using current folder"
+          #Process.exit
+        end
+
+
+        #app = App.new(ARGV[0])
+        ARGV.each do |arg|
+          todo.each do |option|
+            App.send option, arg
+          end
+        end
+      end
+    end
   end
 end

data/lib/six/rsync.rb

@@ -30,24 +30,43 @@ module Six
     end
 
     module Rsync
-      VERSION = '0.4.1'
-      TOOLS_PATH = File.join(BASE_PATH, 'tools')
-
+      VERSION = '0.4.2'
       FOLDER = /(.*)\/(.*)/
-      ENV['PATH'] = "#{TOOLS_PATH};#{File.join(TOOLS_PATH, 'bin')};#{ENV['PATH']}"
-      TEMP_PATH = if ENV['TEMP']
-        if ENV['TEMP'].size > 0
-          if File.directory?(ENV['TEMP'])
-            ENV['TEMP']
+
+      case RUBY_PLATFORM
+        when "i386-mingw32"
+          HOME_PATH = File.join(ENV['APPDATA'])
+          TEMP_PATH = if ENV['TEMP']
+            if ENV['TEMP'].size > 0
+              if File.directory?(ENV['TEMP'])
+                ENV['TEMP']
+              else
+                BASE_PATH
+              end
+            else
+              BASE_PATH
+            end
           else
             BASE_PATH
           end
+
+          TOOLS_PATH = File.join(BASE_PATH, 'tools')
+          ENV['PATH'] = "#{TOOLS_PATH};#{File.join(TOOLS_PATH, 'bin')};#{ENV['PATH']}"
+
+          etc = File.join(TOOLS_PATH, 'etc')
+          FileUtils.mkdir_p etc
+          fstab = File.join(etc, 'fstab')
+          str = ""
+          str = File.open(fstab) {|file| file.read} if File.exists?(fstab)
+          unless str[/cygdrive/]
+            str += "\nnone /cygdrive cygdrive user,noacl,posix=0 0 0\n"
+            File.open(fstab, 'w') {|file| file.puts str}
+          end
         else
-          BASE_PATH
-        end
-      else
-        BASE_PATH
+          HOME_PATH = '~'
+          TEMP_PATH = '/tmp'
       end
+      DATA_PATH = File.join(HOME_PATH, 'six-rsync')
 
       # No meaning on Cygwin 1.7
       # ENV['CYGWIN'] = "nontsec"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +02:00
+date: 2010-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency