paperclip-storage-ftp 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de0a8d8ea7ed9dc2328bf8c6b9d5ff9eaae40f35
-  data.tar.gz: 7da4635ee11a19c26c051e4a5c23229efa00521a
+SHA256:
+  metadata.gz: f8e3482435d4e8f14b4a7facab27ac44de03d12a32c95ec8af472a3cbace5091
+  data.tar.gz: e8952f378161c220a1d489b0362b5d18ca4495f19e1de90df284ed71f45c5b34
 SHA512:
-  metadata.gz: 7947b3eb940d332765d567b71c6f548e5ed1ef8bdba0654801a46496981d7a8f8d89af5ff3803889192cc3ab2d6be29d200a1937c117942cbaf1e24531a49436
-  data.tar.gz: 267ed5502e2193a0acc7357d64b6a33c501eac55fc35101046da96405ea0f1fb01b773c04961e494a8c3d2a2ea6225355f4dcad6555285f1b55dcceb3e300b44
+  metadata.gz: f19662f017a22c212eef62c6b47b68d29e258507bb9d0f4ba611c3c14c724e822b3ef0d2ff5aebb0742ce0573d025a30174a3631bc23a5e46c1fa12244d42704
+  data.tar.gz: 9af2f49b84b12427567d374e05c6b3c186874c18729f5c800142bf85c383f7e9746d5d6d60af9abec2aa0dd3db5614b04a58d6e4155759944648a99ac7ceeb11

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
+# Keep in sync with test-all.sh
 rvm:
-  - 2.1
-  - 2.2
-  - jruby-19mode
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 gemfile:
   - gemfiles/Gemfile.paperclip-4.x
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
+  - gemfiles/Gemfile.paperclip-5.x
+  - gemfiles/Gemfile.paperclip-6.x
 sudo: false
 cache: bundler

data/Gemfile

@@ -2,15 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in paperclip-storage-ftp.gemspec
 gemspec
-
-group :test do
-  gem "sqlite3",                          :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
-
-  gem "coveralls", :require => false
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'json'
-end

data/README.md

@@ -87,6 +87,10 @@ end
 
 ## Changelog
 
+### 1.2.8
+
+* Handle possible ftp error when uploading to empty remote dir [#28](https://github.com/xing/paperclip-storage-ftp/pull/28)
+
 ### 1.2.7
 
 * Reduce number of FTP commands for creating directories [#27](https://github.com/xing/paperclip-storage-ftp/pull/27)

data/gemfiles/Gemfile.paperclip-4.x

@@ -3,10 +3,3 @@ source "http://rubygems.org"
 gemspec :path => '..'
 
 gem "paperclip", "~>4.0"
-
-group :test do
-  gem "sqlite3", :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-  gem "coveralls", :require => false, :platforms => :ruby
-end

data/gemfiles/Gemfile.paperclip-5.x

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+gem "paperclip", "~>5.0"

data/gemfiles/Gemfile.paperclip-6.x

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+gem "paperclip", "~>6.0"

data/lib/paperclip/storage/ftp.rb

@@ -1,5 +1,5 @@
-require "paperclip"
 require "active_support/all"
+require "paperclip"
 require "tempfile"
 
 require "paperclip/storage/ftp/server"

data/lib/paperclip/storage/ftp/server.rb

@@ -100,8 +100,15 @@ module Paperclip
 
         def mktree(tree, base = "/")
           return unless tree.any?
-          list = connection.nlst(base)
-          tree.reject{|k,_| list.include?(k)}.each do |directory, sub_directories|
+
+          existing_files =
+            begin
+              connection.nlst(base)
+            rescue Net::FTPError
+              []
+            end
+
+          tree.reject{|k,_| existing_files.include?(k)}.each do |directory, sub_directories|
             begin
               connection.mkdir(base + directory)
             rescue Net::FTPPermError
@@ -109,6 +116,7 @@ module Paperclip
               # maybe it was created in the meantime.
             end
           end
+
           tree.each do |directory, sub_directories|
             mktree(sub_directories, base + directory + "/")
           end

data/paperclip-storage-ftp.gemspec

@@ -12,12 +12,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "paperclip-storage-ftp"
   gem.require_paths = ["lib"]
-  gem.version       = "1.2.7"
+  gem.version       = "1.2.8"
 
-  gem.add_dependency("paperclip")
+  gem.add_dependency("paperclip", ">= 4.0.0")
 
   gem.add_development_dependency("rspec")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("daemon_controller", ">= 1.1.0")
   gem.add_development_dependency("activerecord")
+  gem.add_development_dependency("sqlite3")
+  gem.add_development_dependency("coveralls")
 end

data/spec/paperclip/storage/ftp/server_spec.rb

@@ -190,6 +190,12 @@ describe Paperclip::Storage::Ftp::Server do
         connection.should_receive(:mkdir).with("/foo/baz/qux").ordered
         server.mktree(tree)
       end
+
+      it "handles possible error on nlst" do
+        connection.should_receive(:nlst).with("/").ordered.and_raise(Net::FTPError)
+        connection.should_receive(:mkdir).with("/foo").ordered
+        server.mktree("foo"=>{})
+      end
     end
 
     context "partially existent ftp tree" do

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
-begin
-  require "coveralls"
-  Coveralls.wear!
-rescue LoadError
+# Send coveralls report on one job per build only
+if ENV["TRAVIS_JOB_NUMBER"].to_s.end_with?(".1")
+  begin
+    require "coveralls"
+    Coveralls.wear!
+  rescue LoadError
+  end
 end
 
 RSpec.configure do |config|
@@ -19,6 +22,3 @@ end
 require "paperclip/storage/ftp"
 
 Paperclip.options[:log] = false
-
-# https://github.com/thoughtbot/cocaine#caveat
-Cocaine::CommandLine.runner = Cocaine::CommandLine::BackticksRunner.new

data/spec/support/integration/user.rb

@@ -1,7 +1,5 @@
 require "active_record"
 
-ActiveRecord::Base.raise_in_transactional_callbacks = true
-
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",
   :database => ":memory:"

data/test-all.sh

@@ -3,6 +3,8 @@
 # Run specs against all supported ruby and paperclip versions
 # using RVM (http://rvm.io/)
 
+set -e
+
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
   # First try to load from a user install
@@ -14,14 +16,14 @@ else
   printf "ERROR: An RVM installation was not found.\n"
 fi
 
-for ruby in '2.1' '2.2' 'jruby'
+# Keep in sync with .travis.yml
+for ruby in '2.3.7' '2.4.4' '2.5.1'
 do
-  rvm use $ruby
+  rvm use $ruby --fuzzy
   gem install bundler --conservative --no-rdoc --no-ri
 
-  for paperclip_version in 4
+  for gemfile in gemfiles/Gemfile.paperclip-*.x
   do
-    gemfile="gemfiles/Gemfile.paperclip-${paperclip_version}.x"
     bundle install --gemfile=$gemfile
     BUNDLE_GEMFILE=$gemfile bundle exec rake
   done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allow Paperclip attachments to be stored on FTP servers
 email:
 - sebastian.roebke@xing.com
@@ -94,6 +122,8 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.paperclip-4.x
+- gemfiles/Gemfile.paperclip-5.x
+- gemfiles/Gemfile.paperclip-6.x
 - lib/paperclip/storage/ftp.rb
 - lib/paperclip/storage/ftp/server.rb
 - paperclip-storage-ftp.gemspec
@@ -157,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Allow Paperclip attachments to be stored on FTP servers