rest-ftp-daemon 0.432.0 → 0.433.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e094d356f8271d07f64222768a60997ce50a88
-  data.tar.gz: f3deb47de89bc54b1b5f807aa8ecfc868d0c1926
+  metadata.gz: 9e668f8f43effe91b3332111a2963abb1011343c
+  data.tar.gz: 79bc3e98795a91cdef80609096b15fc9606f4a6a
 SHA512:
-  metadata.gz: ad21099fd7392bc545888394974d95c1e0ce8204e28de1682e3b93087d38c95f20e6594ec59ecc465f562625b9c1def500076aa7a8c3695b1edddea8bd0ff754
-  data.tar.gz: 952ac92bf57af92ec2c99570d5fff30aefcf8b8bf9ba21f3f661b70c8af801757f55ed5c876fc3df590ec8ce708d1ed882bf0ab85cbd6ffbc68ccfc7f397a12a
+  metadata.gz: 0a06749631bb61dd15e9ef0556e8909fd6ca75ab32d944e70a854533a8caa9e50854fd13942b2fa11dda2dfea2f098dbf15c9fdd2e123c00971911f35f7ce396
+  data.tar.gz: c6ae3a6914a80a1c932947f63be90d8d9a722134411839cdfa6d0694e8c3555ac86dac8b9afdbc923561489c0993186c61811d49b375a981f8fa4dbae0b8513a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.432.0)
+    rest-ftp-daemon (0.433.0)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)
@@ -110,7 +110,7 @@ GEM
     jmespath (1.3.1)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (2.99.2)
+    mime-types (2.99.3)
     minitest (5.9.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)

data/lib/rest-ftp-daemon/location.rb

@@ -42,7 +42,7 @@ module RestFtpDaemon
       # Ensure result does not contain tokens after replacement
       detected_tokens = detect_tokens(location_uri)
       unless detected_tokens.empty?
-        raise RestFtpDaemon::JobUnresolvedTokens, detected_tokens.join(' ')
+        raise RestFtpDaemon::JobUnresolvedTokens, 'unresolved tokens: ' + detected_tokens.join(' ')
       end
 
       # Parse URL and do specific initializations

data/lib/rest-ftp-daemon/remote/base.rb

@@ -63,12 +63,17 @@ module RestFtpDaemon
 
     private
 
-      def extract_parent path
+      def split_path path
         return unless path.is_a? String
-        m = path.match(/^(.*)\/([^\/]+)\/?$/)
-        return m[1], m[2] unless m.nil?
+        return File.dirname(path), File.basename(path)
       end
 
+      # def extract_parent path
+      #   return unless path.is_a? String
+      #   m = path.match(/^(.*)\/([^\/]+)\/?$/)
+      #   return m[1], m[2] unless m.nil?
+      # end
+
       def myname
         self.class.to_s
       end

data/lib/rest-ftp-daemon/remote/ftp.rb

@@ -60,24 +60,29 @@ module RestFtpDaemon
         raise TargetPermissionError, ex.message
       end
 
-      def chdir_or_create directory, mkdir = false
+      def chdir_or_create thedir, mkdir = true
         # Init, extract my parent name and my own name
-        log_debug "RemoteFTP.chdir_or_create mkdir[#{mkdir}] dir[#{directory}]"
-        parent, current = extract_parent(directory)
-
-        #dirname, _current = extract_parent(directory)
-
+        parent, current = split_path(thedir)
+        log_debug "RemoteFTP.chdir_or_create mkdir[#{mkdir}] dir[#{thedir}] parent[#{parent}] current[#{current}]"
 
         # Access this directory
         begin
-          @ftp.chdir "/#{directory}"
+          @ftp.chdir "/#{thedir}"
 
         rescue Net::FTPPermError => _e
+
           # If not allowed to create path, that's over, we're stuck
-          return false unless mkdir
+          unless mkdir
+            log_debug "  [#{thedir}] failed > no mkdir > over"
+            return false
+          end
+
+          # Try to go into my parent directory
+          log_debug "  [#{thedir}] failed > chdir_or_create [#{parent}]"
           chdir_or_create parent, mkdir
 
           # Now I was able to chdir into my parent, create the current directory
+          log_debug "  [#{thedir}] failed > mkdir [#{current}]"
           mkdir current
 
           # Finally retry the chdir
@@ -85,6 +90,7 @@ module RestFtpDaemon
         else
           return true
         end
+
       end
 
       def upload source, target, use_temp_name = false, &callback

data/lib/rest-ftp-daemon/remote/sftp.rb

@@ -61,11 +61,10 @@ module RestFtpDaemon
       def chdir_or_create directory, mkdir = false
         # Init, extract my parent name and my own name
         log_debug "RemoteSFTP.chdir_or_create mkdir[#{mkdir}] dir[#{directory}]"
-        parent, _current = extract_parent(directory)
+        parent, _current = split_path(directory)
 
         # Access this directory
         begin
-          #log_debug "chdir [/#{directory}]"
           @sftp.opendir! directory
 
         rescue Net::SFTP::StatusException => _e

data/lib/rest-ftp-daemon/static/css/main.css

@@ -159,11 +159,6 @@ body {
 }
 
 .transfer-type {
-  width: 35px;
+  width: 40px;
   }
 
-
-
-
-
-

data/lib/rest-ftp-daemon/views/dashboard_footer.haml

@@ -14,7 +14,7 @@
   %a{href: "http://refactorcop.com/bmedici/rest-ftp-daemon/", target: TARGET_BLANK} RefactorCop
 
   ·
-  %a{href: MOUNT_SWAGGER_UI, target: TARGET_BLANK} API Documentation
+  %a{href: MOUNT_SWAGGER_UI, target: TARGET_BLANK} API
 
 
 .footer-indicators.indicators.pull-right

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.432.0"
+  spec.version                    = "0.433.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.432.0
+  version: 0.433.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler