mymedia_ftp 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee82f89d2fec3cd42459555c373688c981a25dd
-  data.tar.gz: a4d18c1ba3dd02f95145d218faefcd1a0e9f9f6a
+  metadata.gz: 2a79c27201bd99d03df23d7fac22ac335904f591
+  data.tar.gz: c95aeb3a504437ed05e198d0e11d4b1d9ce2ecd4
 SHA512:
-  metadata.gz: bf61e6ef142660c9094a8ee5f2bc2402155423f396e94be2b883c5a5ff1fe49a6d15d06123c8d68d02c7bbdf2368090c7ee24da93e0c9249e6e732bc276d1e45
-  data.tar.gz: 589c4e23cccad086cfef34eba11be44cb7991d319e5101ed95a0615ceb24aaeb161c4f0562620e43343d91e0cf47cda7ac8a456fbc3e601de8ae5f927f55b114
+  metadata.gz: c96d73bf20f366be140b15d6702393431812bcf89094b2fd3dfbe04d20731adfff977f2c786f2415d9384c268590d32dca930474edf9c2dd5fd900bbdaff2e59
+  data.tar.gz: f0c685f277c99e5eb5a9dcf835c20d7af289f1f47927beec6d7f9ac311737d9d21203ab35079e4d9a17cc132f5ccd98e0372d0c669a61a2fddfa8f48751b7bc1

data/lib/mymedia_ftp.rb

@@ -8,17 +8,25 @@ require 'fileutils'
 
 class MyMediaFTP < Net::FTP
 
-  def initialize(host: '127.0.0.1', user: 'user', password: '1234', port: 21)
+  def initialize(host: '127.0.0.1', user: 'user', password: '1234', 
+                 port: 21, debug: false)
 
-    @curdir = Dir.pwd
+    @debug = debug
+    @curdir = '/'
     super()
     connect(host, port)
     login(user, password)
 
   end
+  
+  def chdir(dir)
+    super(dir)
+    @curdir = pwd
+  end
 
-  def cp(src='', dest='')
+  def cp(src='', dest='', &blk)
 
+    puts 'cp: ' + src.inspect if @debug
     chdir File.dirname(src)
     FileUtils.mkdir_p dest
     Dir.chdir  dest
@@ -27,38 +35,69 @@ class MyMediaFTP < Net::FTP
 
     puts 'copying ...'
 
-    files.each do |x|
-
-      puts x
-      getbinaryfile x, x.downcase.gsub(/ +/,'-')
-      yield(x) if block_given?
+    files.each do |h|
+
+      name, type = h[:name], h[:type]
+      
+      puts name
+      
+      if type == :file then
+        getbinaryfile name, name.downcase.gsub(/ +/,'-')
+      else
+        cp_dir(name, &blk)
+      end
+      blk.call(name, type) if block_given?
     end
 
   end
+  
+  def list_filenames(s=@curdir+'/*')
+    
+    if @debug
+      puts 'inside list_filenames' 
+      puts 's: ' + s.inspect
+    end
+    
+    src = File.dirname(s)
+
+    raw_q = File.basename(s)
+    puts 'raw_q: ' + raw_q.inspect if @debug
+    
+    q = raw_q.gsub('.','\.').gsub('*','.*').gsub('?','.?')\
+        .sub(/[^\*\?\.]$/,'.*')
+
+    list(src).inject([]) do |r, x| 
+
+      raw_attr, _, owner, group, filesize, month, day, time, filename = \
+          x.split(/ +/,9)
+      type = raw_attr =~ /d/ ? :directory : :file
+      filename[/^#{q}$/] ? r << {name: filename, type: type} : r
+      r
+    end
 
+  end
+  
+  alias ls list_filenames
 
   def mv(src='', dest='')
 
     puts 'moving ...'
-    cp(src, dest) {|file| delete file }
-
-
-  end
-
-  private
-
-  def list_filenames(src)
-
-    raw_q = File.basename(src)
-
-    q = raw_q.gsub('.','\.').gsub('*','.*').gsub('?','.?')
-
-    list.inject([]) do |r, x| 
-
-      filename = x.split(/ +/,9).last
-      filename[/^#{q}$/] ? r << filename : r
+    cp(src, dest) do |file, type| 
+      type == :file ? delete(file) : rmdir(file)
     end
 
   end
   
+  private
+  
+  def cp_dir(directory, &blk)
+    
+    puts 'inside cp_dir: ' + directory.inspect if @debug
+    FileUtils.mkdir_p directory
+    parent_dir = pwd
+    chdir directory
+    cp('*', directory, &blk)
+    chdir parent_dir
+  end
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia_ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDEyNDEyNTkwMFoXDTE4MDEyNDEyNTkwMFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAM6mxAwy84VrNmnnclGR4CVx4K7qOiHDOnmS3m2cqfWDyWRyaPh791JkpE8V
-  8M831U0KpI9fu+6xiJnG0zzaiCFw37/DyEGUkxHM1hvwETS66IWUfmd/6bjHYGw9
-  0wGHyWdSp0iN0YawQ6aZ5Ix6m4NDkonAY/lBINZd8a5V2r8shjiF53hBNjcSzURd
-  6rnK0ST6W162QV5mElPt32VKsVSmr7YTWRxBLW5+G3wVhv0ldKL50HLTkeAktBgQ
-  LpejUQ2H9+wa+MXmTOWLir4yqHOLuO1qV8E6aJpA9JyvyZcaDsP2R8bqrtQJVNTO
-  7tB1cuhq3m3mGs9QcoxlD/hH/4kCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUaSXrdeoJuNXzmb2PJyAO8I5Xl+MwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAtnawhy5h
-  eLhutk1/kicjoXEvSDlAFw1OMELFB9NEjAfVJTTdMKnbNpP9FSjfYFvmaN12Dp84
-  PoHepOWUyMOLbRiGso+H9Qi5Ouun2A7YP4RfKwA/Qvi/IxLZeBMjR5SLLNZr39qA
-  gJDBK4QEhTsvqLaNZPR7+3pQLQeiJZhot9XmgMYFVTi7cCTB8xZ6nqHU8zdubKoB
-  9uaz+4sUVlncMk1rY3djOiTrWrt9tSz/gAjU+6FQF8gkz0zj3sa2Fuz0MVQpviK0
-  R7ivFeER6/ShyimrJZhQbHR2pk+K/NAfM0EwRYlGcevvpjwRKzjgu4uHsokpvd5X
-  4B4pCY1yRwNaig==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzEyMTQzMjEyWhcN
+  MTkwMzEyMTQzMjEyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVvDiX
+  wZVChRBu6zZoETSQ17WFQF7bFJxMLuF+dQ45iCjGBOiMHkARKtgF/H9oeFLQGQpk
+  WxWVgjD0a1EW1Sbq76q6+4LTJHHzspMTR3OIclLg8uxhGH8XckMixwjYj2oX7j+h
+  837NDczDJwqB/OH8chn9zO1qfyWIiTDg0e9BRWQsAwNAigoAbipC56x6ciizdXq7
+  Uc2hfxmKUP4Rt5P5myMWhTAHNcYxXud0HS3XrtFUIL3pP/LBtwWy+/5HVTMS5iML
+  rlJLLOZ5ll0aNrT4h0DlspAN4IBYuZEwD/VKBSD2zg5vocSrDmvXFxaUnfMNGSxK
+  LR0DthL2JJU1KSGbAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFPr4r2Be8t/4br//MJNp3Rqta50nMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAMOtYvEPHEeLVwGNfgK5
+  lLMgIXA9Y4eRdOnhBFpcVlzsFrVm1oLieMFGVxkNHgflFRMHUpnzosaa8m+Tc4L4
+  ZQTtBa7dK7HjfBi7l8sGJR00KRk1QQNA1/dfhIr1YQejNq1J8RkUG7uI+aiEmMwW
+  +EWu4oQM7AHtDghXOxlPJlJphH/kpQcfSGfEz7pctL2WDEEr/7ax56cQHQzaInbh
+  7c6Xalbryf2I+Uj21nW9Sn5ZGyGl7mFqRiclRyqg89+k55DgQolX05KJGfiV8aWA
+  XgExvIVcxlAxeQOUlcIGBWKIf+Hva5DT7OUUp76DGt6bi3X8uUeZd6y3+UtFj/RZ
+  BXg=
   -----END CERTIFICATE-----
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -60,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A MyMedia FTP client which uses Net/FTP.