mymedia_ftp 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1fcf82bafaf00c2c6b63959544fe165ba5e07a50
-  data.tar.gz: 75a6c2ca3d8fa8cc3d30fb63080c3369e9870f5f
+SHA256:
+  metadata.gz: fdfae1127b5532481e69af2799cecff89c08c092b5cdf6ff782b497a410c1aad
+  data.tar.gz: 9a026fec231bc2763a19e9ae1696daced22055bf58ad1789907c0c99d735d428
 SHA512:
-  metadata.gz: 177f855f772f6478579ba796fb74b7c603015897481ced5a4f3f91c3514f354fa00b62b79f3a06e89236c510e0159c0ae2c3c7727cce40b6d787fc93af2b5418
-  data.tar.gz: f3d77a20c1e4f50d3137969688de67b4151fb0236478f9f20554d32fde09148047be778c7b7a9309b5dcc1db3f2e96653394778910bfe3ac732c92b5119aa1ae
+  metadata.gz: 5a69a11adf2e762df3f40123a567eb80690e8514b3e53999d82386a41532d547ceb2be038ebb4b4dead8c167d503aedd5c431e441e9d6d402a85648e8a87dcd7
+  data.tar.gz: 9d61a3263591215ea6d0ef71499a6778d5ba9b8500e25ac71bcd5121e576bc67c72e964ebb456b38d5b10d722ec6b4d55146d938063704bbdfc870a42e541e57

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-DA
v0�q�{�f�Fbu��(Yz�� �B�����I�R�."���n\y[e�zek�b��
-ƥc��}���Ac��G��mw�mU�p�}՝y����
�jw�n *�w
+:>{��ң̗	��Qs��۽�`<��H]5��/�*13�"|՜Y2&O��%���
+
+T&�D\[SI��
#��0:o99������j��
����fͣ�j�t��#;������<n��>f8��U z�'�{�&�`p��v� fkJ�6���d�K�����v��3�h��{�tgZ�G�.YzC�V�W��2
+4U�V��p'��+]�h���vp(�&�%���'�

data/lib/mymedia_ftp.rb

@@ -3,62 +3,205 @@
 # file: mymedia_ftp.rb
 
 require 'net/ftp'
+require 'tempfile'
 require 'fileutils'
 
 
 class MyMediaFTP < Net::FTP
 
-  def initialize(host: '127.0.0.1', user: 'user', password: '1234')
+  def self.cp(src, dest, debug: false)
+    
+    if src =~ /^ftp:\/\// then
+      uri, remotepath = src.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures    
+      new(uri, debug: debug).cp(remotepath, dest, :inbound)
+    else
+      uri, remotepath = dest.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures    
+      new(uri, debug: debug).cp(src, remotepath, :outbound)      
+    end    
+    
+  end
+  
+  def self.ls(s, debug: false)
+    
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]*)/).captures    
+    puts 'remotepath'  + remotepath if debug
+    new(uri, debug: debug).ls(remotepath)
+    
+  end
+
+  def self.read(s, debug: false)
+        
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures
+    ftp = new(uri, debug: debug)
+    p ftp if debug
+    
+    tmpfile = Tempfile.new('ftp')
+
+    ftp.cp remotepath, tmpfile.path
+    File.read tmpfile.path
+
+  end
+  
+  def self.rm(s, debug: false)
+        
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures
+    new(uri, debug: debug).rm(remotepath)
+
+  end  
+  
+  def initialize(s=nil, host: '127.0.0.1', user: 'user', password: '1234', 
+                 port: 21, debug: false)
+
+    if s then
+      
+      r = s.match(/(?<user>\w+):(?<password>\w+)@(?<host>[^:]+)(?:\:(?<port>\d+))?/)
+      h = r.named_captures.map {|k,v| [k.to_sym, v]}.to_h
+      puts 'h: ' + h.inspect if debug
+      user, password, host = h.values.take(3)
+      port = h[:port] if h[:port]
+      
+    end
+    
+    @debug = debug
 
-    @curdir = Dir.pwd
+    @curdir = '/'
     super()
-    connect(host, 21)
+    connect(host, port)
     login(user, password)
 
   end
+  
+  def chdir(dir)
+    super(dir)
+    @curdir = pwd
+  end
+  
+  alias cd chdir
 
-  def cp(src='', dest='')
+  def cp(src='', dest='', direction=:inbound, &blk)
 
+    return outbound_cp(src, dest) if direction == :outbound
+    
+    puts 'cp: ' + src.inspect if @debug
     chdir File.dirname(src)
-    FileUtils.mkdir_p dest
-    Dir.chdir  dest
-
-    files = list_filenames(src)
-
-    puts 'copying ...'
+    dir = File.dirname(dest)
+    FileUtils.mkdir_p dir
+    Dir.chdir  dir
+
+    puts 'copying ...' if @debug
+    
+    files = if src =~ /[\*\?]/ then
+    
+      cp_files(src)
+      
+    else
+      
+      begin
+        getbinaryfile src, dest
+      rescue Net::FTPPermError => e
+        puts 'e: ' + e.inspect
+      end      
+      
+    end
 
-    files.each do |x|
+  end
+  
+  def delete(filename)
+    super(filename)
+    'file deleted'
+  end
+  
+  def list_filenames(s=@curdir+'/*')
+    
+    if @debug
+      puts 'inside list_filenames' 
+      puts 's: ' + s.inspect
+    end
+    
+    if s =~ /\*/ then
+      
+      src = File.dirname(s)
+
+      raw_q = File.basename(s)
+      puts 'raw_q: ' + raw_q.inspect if @debug
+      
+      q = raw_q.gsub('.','\.').gsub('*','.*').gsub('?','.?')\
+          .sub(/[^\*\?\.]$/,'.*')
+    else
+      src = s
+    end
 
-      puts x
-      getbinaryfile x, x.downcase.gsub(/ +/,'-')
-      yield(x) if block_given?
+    list(src).inject([]) do |r, x| 
+
+      raw_attr, _, owner, group, filesize, month, day, time, filename = \
+          x.split(/ +/,9)
+      type = raw_attr =~ /d/ ? :directory : :file
+      
+      if q then
+        filename[/^#{q}$/] ? r << {name: filename, type: type} : r
+      else
+        r << {name: filename, type: type}
+      end
+      r
     end
 
   end
-
+  
+  alias ls list_filenames
 
   def mv(src='', dest='')
 
     puts 'moving ...'
-    cp(src, dest) {|file| delete file }
-
+    cp(src, dest) do |file, type| 
+      type == :file ? delete(file) : rmdir(file)
+    end
 
   end
-
+  
+  alias rm delete
+  
   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
-    end
-
+  
+  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
+  
+  def cp_files(src)
+    
+    files = list_filenames(src)    
+    
+    files.each do |h|
+
+      name, type = h[:name], h[:type]
+      
+      puts name
+      
+      if type == :file then
+        begin
+          getbinaryfile name, name.downcase.gsub(/ +/,'-')
+        rescue Net::FTPPermError => e
+          puts 'e: ' + e.inspect
+        end
+      else
+        cp_dir(name, &blk)
+      end
+      blk.call(name, type) if block_given?
+    end    
   end
   
+  def outbound_cp(src, destination='.')
+    
+    if File.basename(destination) == '.' then
+      destination.sub!(/\.$/, File.basename(src))
+    end
+    
+    putbinaryfile(src, destination)
+  end
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia_ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,31 +10,35 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDkyNDEyNDcwMloXDTE2MDkyMzEyNDcwMlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALukh1F6BczdR6TwHdTUxw2jIyU7DkDFBqcVCQElX0s0iEbKbI9BbkPf0NA1
-  +soTS6yrp3SGUvRLal9MKqh8WUz1eubz7wlhlVkcnDZK7H93nttpRuI9W5NbwM+i
-  E4yR9YBzHww5YKOB1Nq8B20WF1MHI0aoKiNO6/4FZ1UwItKjJoykQR8IWhaM8Ful
-  zYQcPyhjRYKVYvAJIoIdoyC4v4wVcmhefZPzfMxWSYir/eO1CE89SD41kIhStA04
-  IZJt4WS16sfpxGtjCY4gPgXhkp3Aw0ZhqrjLNTQRzeoOPRwLtMktraID5ap6k4aI
-  R0DAfqKqtdZFvMcyj+IVpqL0wE8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUo6GaGSMfYN0TFrof6GC6QT2GdMQwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAOy2HD+aQ
-  Ep/WchO9094AxsTyoAn9XU+sy8zEQ4JLk25/FmdRRpt5h3eA/uc3LBvQPEg43QVj
-  UCMNE5/eLiBfwB9im10jsHZ9EcEVdqsO4UyYdlyY8xgns2TvFKeXQcGjGJIaR240
-  snl/hy49kMPnFhEt5V/waF/8/qbb5s2QBRO0BNXIAcv4FtA264T7cUXgdhMDp5NM
-  T0afxR4ch10x9rHkB19kBT1UhcYpVnIprmsOoWTR8U0FZm2+dqYmQJb7rfaJq5q8
-  ZRUL5ZwWYbBZdJ0SVJZnYoh1mhb1O6juky0IhBVpbNjYCPlFMTShFb4nRrXHTJIQ
-  7PFO89bOpR1IEw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwOTA2MTA1OTAxWhcN
+  MjEwOTA2MTA1OTAxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFzmsx
+  8i7y/T2jgUQTBx/SMOu2OXWbl7FSmXvNqiScWjvkHHKFBtUTJ6eCGSKGF3xoAGKn
+  tolvsX3ZxNLGeYaaGSLImAx1yDskE8H2o/B+gQkhXOaqAWF0gMKKuSHgZGyBsrvf
+  LOSQipq/vbLQBrl2D1q5rlYetcKQ7sjAW3IAQWJsJe/TvoohEb2iXR1Btq8qx9qZ
+  XtL2SxNV7OaNRECTC2UieCXJNKVi/xpfkRorfyjv21KWfgw5T5h4xrNZtBRiS3vH
+  kO/cIlNTAqgSu0ZeQUhr8blMP+Te6o2cmynR/4vfGMU7L822l+in9Fkde5AxoVBQ
+  FejSp6+UEd8Bu2nXQmO91NxlwCvRlylHheYjabsij41+KeFYhJqsVFOzQlcBD0Pb
+  FGsq3YNbStt+DHir1OfceK4JX3N7CiPnQsXTx06T3ZnUxiYUj0QquefTnqb/S7MO
+  XtAMy3eH5msr8cAYiPRBW0hr/6RGGDTMM6Cjz+VzFgAF6OXqVDN9bjYQqckCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU/PN/KSth
+  nZ4pBrLLklzgnH00nkMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAHM0WneD/luRLhn4hraEIWTNCUaVzz94DUcoo4umJ
+  2APA5QsBXnnh33rUwCx3bWtTCR7mW0cShSVbGFwgvB7dRyegHczXlQcx2AgwB1k1
+  FzhR/37ef8Vdu44nXhhKj6NDhzVi89XuNLxSXzEHoGde6liAjTiGA7ydCyxSBdzq
+  Ld3WBJ+LycfVWgoNmW2csBCgrALXa145QKO5HW34n03wbZ5fAaCVy8GjAaHRf6Tf
+  3QFe8+mYaXbHnqf2qEkNPIPQmdBKrfiyJK2kMIqQ3ldUGZZj+H5e1VOH8NKlSvr8
+  MtTHQ/vWwolPDjip3vyPbPMyNsdwC8QJHXiYl5M4rxYHSCaG6/+dMWMFAGMYVs52
+  4LpA7DyCXsIeDLLZm4GvsGU+ntoCovwRCl4ZtgXtZt19QRze/nd9rcIxwULjVOBR
+  vmQbOdyo1gepCZyCN+UN/SCimjgu1yZtpI0S9lPHE1w/fMob3ohXflP/mnwUFxsN
+  KVwzt+QIecFrRei1GVykx8z3
   -----END CERTIFICATE-----
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -59,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A MyMedia FTP client which uses Net/FTP.