carrierwave-ftp 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72042eaccd1416fe327ba26b7210442e5247ed24
-  data.tar.gz: fbaec8655d9b81609faac3724d857e2a06c81d45
+  metadata.gz: df0afee16e1ea7ec251387b0d40e51b34125f393
+  data.tar.gz: 60e317278e41bce9435f0ae5a2f91b34ce354575
 SHA512:
-  metadata.gz: f69cc5ac46c1064368b7b808f4c450f0050dfaaab5714e0cb2cba3664e6fed5866f4df72fb98305247db521bd4286b6f35c172212806bff257358c871f41b440
-  data.tar.gz: fbd2cf91d00c678d834b8d9db8522a457cf7df68d65113a42003079962c717d6bb9c63ef2983a00edf175697550135368a54a46d05a7579ea7fc8255e3d795df
+  metadata.gz: 1b8ba3eb90cf8cace416957dfa485cd14c0b62bd3c8e1946df51d68b39d8d60fd43ffb69323eb4ecc3a68843603626b3733a8e66dac2fd7767ff632a236bf0e2
+  data.tar.gz: c966647c7f64e7d23f61cb911b0617bfaedef048c62178ff4aa807ef5148cc31918bdbd1f4a12479eaf9ce4277fea00adb8af47f33da44d8f7e2525a0afe6bec

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.4
+
+RUN mkdir -p /gem
+WORKDIR /gem
+
+ADD . ./
+
+RUN gem install bundler && bundle install --jobs 20 --retry 5

data/README.md

@@ -35,6 +35,7 @@ CarrierWave.configure do |config|
   config.ftp_folder = "/public_html/uploads"
   config.ftp_url = "http://example.com/uploads"
   config.ftp_passive = false # false by default
+  config.ftp_tls = false # false by default
 end
 ```
 

data/{carrerwave-ftp.gemspec → carrierwave-ftp.gemspec}

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "carrierwave", [">= 0.6.2"]
   s.add_dependency "net-sftp", ["~> 2.1.2"]
+  s.add_dependency "double-bag-ftps", ["0.1.3"]
   s.add_development_dependency "rspec", ["~> 2.14"]
   s.add_development_dependency "rake", ["~> 10.3"]
 end

data/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  gem:
+    build: .
+    volumes:
+      - .:/gem
+      - bundler:/usr/local/bundle
+
+volumes:
+  bundler:

data/lib/carrierwave/storage/ftp.rb

@@ -1,5 +1,6 @@
 require 'carrierwave'
 require 'carrierwave/storage/ftp/ex_ftp'
+require 'carrierwave/storage/ftp/ex_ftptls'
 
 module CarrierWave
   module Storage
@@ -26,6 +27,9 @@ module CarrierWave
             ftp.mkdir_p(::File.dirname "#{@uploader.ftp_folder}/#{path}")
             ftp.chdir(::File.dirname "#{@uploader.ftp_folder}/#{path}")
             ftp.put(file.path, filename)
+            if @uploader.ftp_chmod
+              ftp.sendcmd("SITE CHMOD #{@uploader.permissions.to_s(8)} #{@uploader.ftp_folder}/#{path}")
+            end
           end
         end
 
@@ -91,7 +95,12 @@ module CarrierWave
         private
 
         def connection
-          ftp = ExFTP.new
+          if @uploader.ftp_tls
+            ftp = ExFTPTLS.new
+            ftp.ssl_context = DoubleBagFTPS.create_ssl_context(:verify_mode => OpenSSL::SSL::VERIFY_NONE)
+          else
+            ftp = ExFTP.new
+          end
           ftp.connect(@uploader.ftp_host, @uploader.ftp_port)
 
           begin
@@ -118,6 +127,8 @@ class CarrierWave::Uploader::Base
   add_config :ftp_folder
   add_config :ftp_url
   add_config :ftp_passive
+  add_config :ftp_tls
+  add_config :ftp_chmod
 
   configure do |config|
     config.storage_engines[:ftp] = "CarrierWave::Storage::FTP"
@@ -128,5 +139,7 @@ class CarrierWave::Uploader::Base
     config.ftp_folder = "/"
     config.ftp_url = "http://localhost"
     config.ftp_passive = false
+    config.ftp_tls = false
+    config.ftp_chmod = true
   end
 end

data/lib/carrierwave/storage/ftp/all.rb

@@ -1,2 +1,2 @@
 require 'carrierwave/storage/ftp'
-require 'carrierwave/storage/sftp'
+require 'carrierwave/storage/sftp'

data/lib/carrierwave/storage/ftp/ex_ftptls.rb

@@ -0,0 +1,25 @@
+require 'double_bag_ftps'
+
+class ExFTPTLS < DoubleBagFTPS
+  def mkdir_p(dir)
+    parts = dir.split("/")
+    if parts.first == "~"
+      growing_path = ""
+    else
+      growing_path = "/"
+    end
+    for part in parts
+      next if part == ""
+      if growing_path == ""
+        growing_path = part
+      else
+        growing_path = File.join(growing_path, part)
+      end
+      begin
+        mkdir(growing_path)
+        chdir(growing_path)
+      rescue Net::FTPPermError, Net::FTPTempError => e
+      end
+    end
+  end
+end

data/lib/carrierwave/storage/ftp/version.rb

@@ -1,7 +1,7 @@
 module Carrierwave
   module Storage
     class FTP
-      VERSION = "0.3.1"
+      VERSION = "0.4.0"
     end
   end
 end

data/spec/ftp_spec.rb

@@ -7,7 +7,7 @@ end
 
 describe CarrierWave::Storage::FTP do
   before do
-    CarrierWave.configure do |config|
+    FtpUploader.configure do |config|
       config.reset_config
       config.ftp_host = 'ftp.testcarrierwave.dev'
       config.ftp_user = 'test_user'
@@ -15,6 +15,7 @@ describe CarrierWave::Storage::FTP do
       config.ftp_folder = '~/public_html'
       config.ftp_url = 'http://testcarrierwave.dev'
       config.ftp_passive = true
+      config.ftp_chmod = true
     end
 
     @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
@@ -38,10 +39,39 @@ describe CarrierWave::Storage::FTP do
     ftp.should_receive(:mkdir_p).with('~/public_html/uploads')
     ftp.should_receive(:chdir).with('~/public_html/uploads')
     ftp.should_receive(:put).with(@file.path, 'test.jpg')
+    ftp.should_receive(:sendcmd).with("SITE CHMOD 644 ~/public_html/uploads/test.jpg")
     ftp.should_receive(:quit)
     @stored = @storage.store!(@file)
   end
 
+  describe 'when CHMOD is disabled' do
+    before do
+      FtpUploader.configure do |config|
+        config.ftp_chmod = false
+      end
+    end
+
+    it "opens/closes an ftp connection to the given host" do
+      ftp = double(:ftp_connection)
+      ftp_params = [
+        'ftp.testcarrierwave.dev',
+        'test_user',
+        'test_passwd',
+        21
+      ]
+
+      Net::FTP.should_receive(:new).and_return(ftp)
+      ftp.should_receive(:connect).with('ftp.testcarrierwave.dev', 21)
+      ftp.should_receive(:login).with('test_user', 'test_passwd')
+      ftp.should_receive(:passive=).with(true)
+      ftp.should_receive(:mkdir_p).with('~/public_html/uploads')
+      ftp.should_receive(:chdir).with('~/public_html/uploads')
+      ftp.should_receive(:put).with(@file.path, 'test.jpg')
+      ftp.should_receive(:quit)
+      @stored = @storage.store!(@file)
+    end
+  end
+
   describe 'after upload' do
     before do
       ftp = double(:ftp_connection)
@@ -52,6 +82,7 @@ describe CarrierWave::Storage::FTP do
       ftp.stub(:mkdir_p)
       ftp.stub(:chdir)
       ftp.stub(:put)
+      ftp.stub(:sendcmd)
       ftp.stub(:quit)
       @stored = @storage.store!(@file)
     end
@@ -75,6 +106,7 @@ describe CarrierWave::Storage::FTP do
       @ftp.stub(:mkdir_p)
       @ftp.stub(:chdir)
       @ftp.stub(:put)
+      @ftp.stub(:sendcmd)
       @ftp.stub(:quit)
       @stored = @storage.store!(@file)
     end

data/spec/ftp_tls_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'carrierwave/storage/ftp'
+
+class FtpTlsUploader < CarrierWave::Uploader::Base
+  storage :ftp
+end
+
+describe CarrierWave::Storage::FTP do
+  before do
+    FtpTlsUploader.configure do |config|
+      config.reset_config
+      config.ftp_host = 'ftp.testcarrierwave.dev'
+      config.ftp_user = 'test_user'
+      config.ftp_passwd = 'test_passwd'
+      config.ftp_folder = '~/public_html'
+      config.ftp_url = 'http://testcarrierwave.dev'
+      config.ftp_passive = true
+      config.ftp_tls = true
+      config.ftp_chmod = true
+    end
+
+    @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+    FtpTlsUploader.stub(:store_path).and_return('uploads/test.jpg')
+    @storage = CarrierWave::Storage::FTP.new(FtpTlsUploader)
+  end
+
+  it "opens/closes a secure ftp connection to the given host" do
+    ftp = double(:ftp_connection)
+    Net::FTP.should_receive(:new).and_return(ftp)
+    ftp.should_receive(:sendcmd)
+    ftp.should_receive(:ssl_context=)
+    ftp.should_receive(:connect).with('ftp.testcarrierwave.dev', 21)
+    ftp.should_receive(:login).with('test_user', 'test_passwd')
+    ftp.should_receive(:passive=).with(true)
+    ftp.should_receive(:mkdir_p).with('~/public_html/uploads')
+    ftp.should_receive(:chdir).with('~/public_html/uploads')
+    ftp.should_receive(:put).with(@file.path, 'test.jpg')
+    ftp.should_receive(:quit)
+    @stored = @storage.store!(@file)
+  end
+
+  describe 'when CHMOD is disabled' do
+    before do
+      FtpTlsUploader.configure do |config|
+        config.ftp_chmod = false
+      end
+    end
+
+    it "opens/closes a secure ftp connection to the given host" do
+      ftp = double(:ftp_connection)
+      Net::FTP.should_receive(:new).and_return(ftp)
+      ftp.should_receive(:ssl_context=)
+      ftp.should_receive(:connect).with('ftp.testcarrierwave.dev', 21)
+      ftp.should_receive(:login).with('test_user', 'test_passwd')
+      ftp.should_receive(:passive=).with(true)
+      ftp.should_receive(:mkdir_p).with('~/public_html/uploads')
+      ftp.should_receive(:chdir).with('~/public_html/uploads')
+      ftp.should_receive(:put).with(@file.path, 'test.jpg')
+      ftp.should_receive(:quit)
+      @stored = @storage.store!(@file)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-ftp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Luan Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: double-bag-ftps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,18 +90,22 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- carrerwave-ftp.gemspec
+- carrierwave-ftp.gemspec
+- docker-compose.yml
 - lib/carrierwave/storage/ftp.rb
 - lib/carrierwave/storage/ftp/all.rb
 - lib/carrierwave/storage/ftp/ex_ftp.rb
+- lib/carrierwave/storage/ftp/ex_ftptls.rb
 - lib/carrierwave/storage/ftp/ex_sftp.rb
 - lib/carrierwave/storage/ftp/version.rb
 - lib/carrierwave/storage/sftp.rb
 - spec/ftp_spec.rb
+- spec/ftp_tls_spec.rb
 - spec/sftp_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/luan/carrierwave-ftp
@@ -110,11 +128,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave-ftp
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: FTP support for CarrierWave
 test_files:
 - spec/ftp_spec.rb
+- spec/ftp_tls_spec.rb
 - spec/sftp_spec.rb
 - spec/spec_helper.rb