file_loader 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20166382acf8d574784bb8e701df90a86ce57d0a
-  data.tar.gz: 80aef5c99adf2db35f73d83da8dfee24dbf8916a
+  metadata.gz: a38a99763a2f2b7161408df4885cef39a0498d0f
+  data.tar.gz: e4c6a6d161429b7346bcfbc544a1e6819bace1ec
 SHA512:
-  metadata.gz: 3cf7ffb81bcb4c6ee6f419918a13c08f4efda3e15b44ad677860e8cf1c9f4c4919b4d9604a805f43e47596f8fcf5aff9ea21e4ac1471c210a4faee14cbb02166
-  data.tar.gz: 093fd90d4227c6dc98cb2ee4c051cb66cd31813713fb0275ce1fe67b91b8bc25078acc9746431179e29d11792c93f42372d52597661cb8f259e34be914872715
+  metadata.gz: 8697676b11c6709402cd1df1e40482b5693f16c4f4ea329ea72e63328ceeb2cf8b4b5b328081f81db1bb9a9acb7a34c702d347354a873d64d4f8033e3a0b6334
+  data.tar.gz: d9b245e098a9b84e6f4f6203544978f43dda8115503d75c7f0d6b7dbb7b4f3b8854330d990980db47a5903df5127e04afcd07bcd1dbbfef337f43466be0778af

data/lib/file_loader.rb

@@ -6,37 +6,45 @@ require 'fileutils'
 module FileLoader
   extend self
 
-  def parse(url)
+  def parse_url(url)
     url.match(/^(?:(?<protocol>\w+):\/\/(?:(?<user>.+?)(?:\:(?<password>.+?))?@)?(?<host>.+?):?)?(?<path>\/.+)?$/) or raise("Invalid url #{url}")
   end
 
+  def build_url(opts)
+    res = ''
+    res += "#{opts[:protocol]}://" if opts[:protocol]
+    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
+  end
+
   def download(src, dst, opts = {})
     src = src.shellescape
     dst = dst.shellescape
-    parsed_src = parse(src)
+    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
-    case parsed_src[:protocol]
+    case psrc[:protocol]
     when 'http', 'https', 'ftp'
       cmd = "wget #{src} -O #{dst}"
     when 'scp'
-      if Socket.gethostname == parsed_src[:host]
-        cmd = cp_cmd(parsed_src[:path], dst)
+      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 += '"'
-        user = parsed_src[:user] || opts[:user]
-        cmd += user if user
-        cmd += ":#{parsed_src[:password]}" if parsed_src[:password]
-        cmd += '@' if user
-        cmd += "#{parsed_src[:host]}:#{parsed_src[:path]}\" #{dst}"
+        cmd += build_url(user: psrc[:user] || opts[:user], password: psrc[:password] || opts[:password], host: psrc[:host], path: psrc[:path])
+        cmd += '"'
+        cmd += " \"#{dst}\""
       end
     when nil
       cmd = cp_cmd(src, dst)
     else
-      raise "Unsupported protocol #{parsed_src[:protocol]}"
+      raise "Unsupported protocol #{psrc[:protocol]}"
     end
     opts[:logger].debug(cmd) if opts[:logger]
     exec_cmd(cmd, opts[:retries].to_i) unless opts[:dry_run]
@@ -45,7 +53,7 @@ module FileLoader
   def upload(src, dst, opts = {})
     src = src.shellescape
     dst = dst.shellescape
-    parsed_dst = parse(dst)
+    parsed_dst = parse_url(dst)
     case parsed_dst[:protocol]
     when 'scp'
       if Socket.gethostname == parsed_dst[:host]

data/lib/file_loader/version.rb

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

metadata

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