file_loader 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38a99763a2f2b7161408df4885cef39a0498d0f
-  data.tar.gz: e4c6a6d161429b7346bcfbc544a1e6819bace1ec
+  metadata.gz: 9382fbacb05be26be6f65d6fb26354e77955a687
+  data.tar.gz: da0602da95eb580284f8ae6a2bd20d33adcddcc9
 SHA512:
-  metadata.gz: 8697676b11c6709402cd1df1e40482b5693f16c4f4ea329ea72e63328ceeb2cf8b4b5b328081f81db1bb9a9acb7a34c702d347354a873d64d4f8033e3a0b6334
-  data.tar.gz: d9b245e098a9b84e6f4f6203544978f43dda8115503d75c7f0d6b7dbb7b4f3b8854330d990980db47a5903df5127e04afcd07bcd1dbbfef337f43466be0778af
+  metadata.gz: 65a51540e5457f9230edb63055e0128d1242572c6d90e923a4dc9f3b5ab80583191166e9461999161b21e91cdbb49beb93cb17b56462d3fa0be1ef75e3d3d00c
+  data.tar.gz: 45bfbaa1796384b268a9a98a27e8fa92664549505e9a38bfcd91fa0d95aeecb509d25e2070b343653ef9b763c3dec7b998d9fa0d20ef01ce3c3329ea4540e0af

data/lib/file_loader/version.rb

@@ -1,3 +1,3 @@
 module FileLoader
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/file_loader.rb

@@ -1,10 +1,26 @@
 require "file_loader/version"
 require 'shellwords'
 require 'socket'
-require 'fileutils'
+require 'logger'
 
 module FileLoader
   extend self
+  
+  # === Options
+  # [:permissions] b.e. '0777'
+  # [:speed_limit] in Kbit/s
+  # [:user] default user, used if url has no user
+  # [:password]
+  # [:logger] Logger instance
+  # [:retries] count of retries, default 1
+  # [:delay] sleep seconds between retries
+  # [:dry_run]
+  attr_accessor :defaults
+  self.defaults = {
+    retries: 0,
+    logger: Logger.new(STDOUT),
+    delay: 5
+  }
 
   def parse_url(url)
     url.match(/^(?:(?<protocol>\w+):\/\/(?:(?<user>.+?)(?:\:(?<password>.+?))?@)?(?<host>.+?):?)?(?<path>\/.+)?$/) or raise("Invalid url #{url}")
@@ -16,103 +32,106 @@ module FileLoader
     res += opts[:user].to_s
     res += ":#{opts[:password]}" if opts[:password]
     res += '@' if opts[:user]
-    res += "#{opts[:host]}:" if opts[:host]
-    res += opts[:path].to_s
+    res += opts[:host] if opts[:host]
+    res += ':' if opts[:host] && opts[:path]
+    res += opts[:path] if opts[:path]
+    res
   end
 
   def download(src, dst, opts = {})
-    src = src.shellescape
-    dst = dst.shellescape
-    psrc = parse_url(src)
-    unless Dir.exists?(File.dirname(dst))
-      FileUtils.mkdir_p(File.dirname(dst), :mode => opts[:permissions] ? opts[:permissions].to_i(8) : nil)
-    end
+    pdst = parse_url(dst = dst.shellescape)
+    raise "Unsupported dst protocol #{pdst[:protocol]}" if pdst[:protocol]
+    
+    opts = defaults.merge(opts)
+
+    psrc = parse_url(src = src.shellescape)
     case psrc[:protocol]
     when 'http', 'https', 'ftp'
       cmd = "wget #{src} -O #{dst}"
+      cmd += " --limit-rate #{opts[:speed_limit] * 1024 / 8}" if opts[:speed_limit]
     when 'scp'
       if Socket.gethostname == psrc[:host]
         cmd = cp_cmd(psrc[:path], dst)
       else
         cmd = "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no "
-        cmd += "-l #{speed_limit} " if opts[:speed_limit]
+        cmd += "-l #{opts[:speed_limit]} " if opts[:speed_limit]
         cmd += '"'
         cmd += build_url(user: psrc[:user] || opts[:user], password: psrc[:password] || opts[:password], host: psrc[:host], path: psrc[:path])
+        cmd += '" "'
+        cmd += dst
         cmd += '"'
-        cmd += " \"#{dst}\""
       end
     when nil
       cmd = cp_cmd(src, dst)
     else
-      raise "Unsupported protocol #{psrc[:protocol]}"
+      raise "Unsupported src protocol #{psrc[:protocol]}"
     end
-    opts[:logger].debug(cmd) if opts[:logger]
-    exec_cmd(cmd, opts[:retries].to_i) unless opts[:dry_run]
+    cmd = mkdir_cmd(dst, opts) + ' && ' + cmd if cmd
+    exec_cmd(cmd, opts)
   end
 
   def upload(src, dst, opts = {})
-    src = src.shellescape
-    dst = dst.shellescape
-    parsed_dst = parse_url(dst)
-    case parsed_dst[:protocol]
+    psrc = parse_url(src = src.shellescape)
+    raise "Unsupported src protocol #{psrc[:protocol]}" if psrc[:protocol]
+  
+    opts = defaults.merge(opts)
+      
+    pdst = parse_url(dst = dst.shellescape)
+    case pdst[:protocol]
     when 'scp'
-      if Socket.gethostname == parsed_dst[:host]
-        unless Dir.exists?(File.dirname(dst))
-          FileUtils.mkdir_p(File.dirname(dst), :mode => opts[:permissions] ? opts[:permissions].to_i(8) : nil)
-        end
-        cmd = cp_cmd(src, parsed_dst[:path])
+      if Socket.gethostname == pdst[:host]
+        cmd = cp_cmd(src, pdst[:path])
+        cmd = mkdir_cmd(pdst[:path], opts) + ' && ' + cmd if cmd
       else
         cmd = "ssh -oBatchMode=yes -oStrictHostKeyChecking=no "
-        user = parsed_dst[:user] || opts[:user]
-        cmd += user if user
-        cmd += ":#{parsed_dst[:password]}" if parsed_dst[:password]
-        cmd += '@' if user
-        cmd += "#{parsed_dst[:host]} \""
-        if opts[:permissions]
-          umask = 'umask %03o' % ('0777'.to_i - opts[:permissions].to_i)
-          cmd += "(#{umask}; "
-        end
-        cmd += "mkdir -p #{File.dirname(parsed_dst[:path])}"
-        cmd += ")" if opts[:permissions]
-        cmd += "\" && scp -r -oBatchMode=yes -oStrictHostKeyChecking=no "
+        cmd += build_url(user: pdst[:user] || opts[:user], password: pdst[:password], host: pdst[:host])
+        cmd += ' "'
+        cmd += mkdir_cmd(pdst[:path], opts)
+        cmd += '" && scp -r -oBatchMode=yes -oStrictHostKeyChecking=no '
         cmd += "-l #{opts[:speed_limit]} " if opts[:speed_limit]
         cmd += "#{src} \""
-        cmd += user if user
-        cmd += ":#{opts[:password]}" if opts[:password]
-        cmd += '@' if user
-        cmd += "#{parsed_dst[:host]}:#{parsed_dst[:path]}\""
+        cmd += build_url(user: pdst[:user] || opts[:user], password: pdst[:password], host: pdst[:host], path: pdst[:path])
+        cmd += '"'
       end
     when nil
-      unless Dir.exists?(File.dirname(dst))
-        FileUtils.mkdir_p(File.dirname(dst), :mode => opts[:permissions] ? opts[:permissions].to_i(8) : nil)
-      end
       cmd = cp_cmd(src, dst)
+      cmd = mkdir_cmd(pdst[:path], opts) + ' && ' + cmd if cmd
     else
       raise "Unsupported protocol #{parsed_src[:protocol]}"
     end
-    opts[:logger].debug(cmd) if opts[:logger]
-    exec_cmd(cmd, opts[:retries].to_i) unless opts[:dry_run]
+    exec_cmd(cmd, opts)
   end
 
   private
 
-  def exec_cmd(cmd, retries = 0, delay = 5)
-    return unless cmd
+  def exec_cmd(cmd, opts)
+    opts[:logger].debug(cmd) if opts[:logger]
+    return if opts[:dry_run] || !cmd
     cmd += " 2>&1"
-    (retries + 1).times do |n|
+    (opts[:retries].to_i + 1).times do |n|
       res = `#{cmd}`
       if $?.exitstatus == 0
         break
-      elsif n >= retries
+      elsif n >= opts[:retries].to_i
         raise res
       else
-        sleep delay
+        opts[:logger].debug('retry') if opts[:logger]
+        sleep(opts[:delay] || 5)
       end
     end
   end
 
-  def cp_cmd(src, dst, permissions = nil)
+  def cp_cmd(src, dst)
     return if src == dst
     "cp -r #{src} #{dst}"
   end
-end
+
+  def mkdir_cmd(dst, opts)
+    cmd = "mkdir -p #{File.dirname(dst)}"
+    if opts[:permissions]
+      umask = 'umask %03o' % ('0777'.to_i - opts[:permissions].to_i)
+      cmd = "(#{umask}; #{cmd})"
+    end
+    cmd
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler