niftp 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4ecdd6f91f41ec89d5f2f51e87d06aa829999a0b
-  data.tar.gz: def6a841b38631985ea3e1dd5203a034f55f822f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDE1MTZiZWMyOGJlZGFmNjhiOTA5YzQwOThiZTQxYzNlMmY5YTE5Nw==
+  data.tar.gz: !binary |-
+    MTcxYzEyNjZhMjJkYjVjMDkxMDQyYmUzNGI5YWE1ZTAxNTVmOGI2Zg==
 SHA512:
-  metadata.gz: 8661c3de51ddb34af10bb16982ef174c6d34a5d9a75f5717e4f47ab308733de1b3acef4359af4287c36043c64ee64c1b84e81f7be0d3aa2cb36b72f33431705a
-  data.tar.gz: aa51e846a3efae363e2e458193609d4701a6c192ef1b6351a6ed2f44beb9f54116a99000eaccdd75ac7b6034351c5c87cd5c8c428b0c160d2f8b76a149b41885
+  metadata.gz: !binary |-
+    M2NhNDdiZDBjMGUxZTE5MWJhOTJlZmI1NzczOWIwMmNjZTkzNjlhMDEyM2Yz
+    MTY5ZjlhYzFjNjZkZDhlYWJkNjMzOWIxN2E5ODI0Zjg1MWUwNTMxZGJlNzM5
+    YWYzYTM3NzY2OWE4MGU4NTAxM2E5ODUzMjQ0ZWRjZjdhMGQ5NjI=
+  data.tar.gz: !binary |-
+    OGFiMTM4ZmMxYjgyMmVjNzc0YmJhMTk2Zjc1Y2ViYTExMmU5ZDljOTA4YWM5
+    MzFlMWU2ZGJlMzVkMGJkZWM4NTUwYmI1NTU0NjgyZTIwN2VmYmY2NDJhZjNk
+    OTAxZTRiZjQ4ZmE4MjgxY2I5ZWQxMjQyNTY4OWQ5MjRlZDk3NDA=

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-rdoc
+rdoc
+.ruby-version

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - "1.9.3"
   - "2.0.0"
   - "2.1.0"
   - "2.2.0"
+  - "2.2.3"
   - jruby-19mode # JRuby in 1.9 mode

data/README.md

@@ -1,4 +1,6 @@
-NiFTP, a Ruby gem, makes Ruby's decidedly un-nifty Net::FTP library easier to
+## NiFTP
+Only supports Ruby 2.0.0+
+A Ruby gem, makes Ruby's decidedly un-nifty Net::FTP library easier to
 use. It abstracts away the FTP plumbing, such as establishing and closing
 connections. Options include retrying your commands on flakey FTP servers, and
 forced timeouts. FTP Secure (FTPS) is also supported.
@@ -25,10 +27,19 @@ forced timeouts. FTP Secure (FTPS) is also supported.
     class SomeObject
       include NiFTP
 
+      def ftps_options
+        {
+          username: "",
+          password: "",
+          ftps: true,
+          ssl_context_params: {
+            verify_mode: OpenSSL::SSL::VERIFY_NONE
+          }
+        }
+      end
+
       def ftp_stuff
-        # get a file from an FTP Secure (FTPS) server
-        ftp("ftp.secure.com", { username: "some_user", password: "FTP_FTL",
-                                ftps: true }) do |client|
+        ftp("ftp.appareldownload.com", ftps_options) do |client|
           files = client.list('n*')
           # ...
           file = client.getbinaryfile('nif.rb-0.91.gz', 'nif.gz', 1024)
@@ -42,7 +53,6 @@ forced timeouts. FTP Secure (FTPS) is also supported.
 * **username**: The user name, if required by the host (default: "").
 * **password**: The password, if required by the host (default: "").
 * **port**: The port for the host (default: 21).
-* **ftps**: Set to true if connecting to a FTP Secure server (default: false).
 * **tries**: The number of times to try the given FTP commands upon any
   exception, before raising the exception (Default: 2, meaning it will *retry
   once* upon any exception).
@@ -57,6 +67,9 @@ forced timeouts. FTP Secure (FTPS) is also supported.
   (default: 30). Use 0 to disable the authentication timeout.
 * **passive**: Set to false to prevent a connection in passive mode (default:
   true).
+* **ftps**: Set to true if connecting to a FTP Secure server (default: false).
+* **ftps_mode**: Set to one of the following: `DoubleBagFTPS::EXPLICIT` or `DoubleBagFTPS::IMPLICIT` (default: `DoubleBagFTPS::IMPLICIT`).
+* **ssl_context_params**: See the [DoubleBagFTPS](https://github.com/bnix/double-bag-ftps) for options. (default: { }).
 
 ## Caveats
 

data/lib/niftp.rb

@@ -1,5 +1,5 @@
 require "net/ftp"
-require "ftpfxp"
+require "double_bag_ftps"
 require "retryable"
 require "timeout"
 
@@ -35,8 +35,20 @@ module NiFTP
   end
 
   def instantiate_ftp_per_options(options)
-    (options[:ftps] ? Net::FTPFXPTLS.new : Net::FTP.new).tap do |ftp|
-      ftp.passive = options[:passive]
+    (options[:ftps] ? DoubleBagFTPS.new : Net::FTP.new).tap do |obj|
+      if options[:ftps]
+        if options[:ftps_mode]
+          obj.ftps_mode = options[:ftps_mode]
+        end
+
+        if options[:ssl_context_params]
+          obj.ssl_context = DoubleBagFTPS.create_ssl_context(
+            options[:ssl_context_params]
+          )
+        end
+      end
+
+      obj.passive = options[:passive]
     end
   end
 

data/lib/niftp/version.rb

@@ -1,3 +1,3 @@
 module NiFTP
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

data/niftp.gemspec

@@ -28,12 +28,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"] + Dir.glob("doc/*")
 
   # Dependencies
-  s.add_dependency "ftpfxp",                     ">= 0.0.4"
+  s.add_dependency "double-bag-ftps",            ">= 0.1.3"
   s.add_dependency "retryable",                  ">= 2.0"
   s.add_dependency "i18n",                       ">= 0.5"
   s.add_development_dependency "minitest",       "~> 4.7"
-  s.add_development_dependency "guard",          "~> 1.8.3"
-  s.add_development_dependency "guard-minitest", "~> 1.0.1"
   s.add_development_dependency "mocha",          "~> 0.14"
   s.add_development_dependency "rake"
 end

data/test/niftp_test.rb

@@ -98,8 +98,8 @@ module NiFTP
         object.ftp(host, { :timeout => 1 })
       end
 
-      it "must use the FTPFXP (FTPS) library when instructed" do
-        Net::FTPFXPTLS.expects(:new).once.returns(ftp)
+      it "must use the DoubleBagFTPS library when instructed" do
+        DoubleBagFTPS.expects(:new).once.returns(ftp)
         object.ftp(host, { :ftps => true })
       end
     end
@@ -110,4 +110,4 @@ module NiFTP
       Net::FTP.stubs(:new => ftp)
     end
   end
-end
+end

metadata

@@ -1,125 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: niftp
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Christopher R. Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ftpfxp
+  name: double-bag-ftps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   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: NiFTP makes Ruby's decidedly un-nifty Net::FTP library easier to use.
@@ -130,11 +102,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -149,22 +120,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--include=examples --main README.md"
+- --include=examples --main README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: niftp
-rubygems_version: 2.2.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: NiFTP makes Ruby's decidedly un-nifty Net::FTP library easier to use.

data/Guardfile

@@ -1,7 +0,0 @@
-group :ruby do
-  guard :minitest, all_on_start: false do
-    watch(%r{^test/.+_test\.rb$})
-    watch('test/test_helper.rb') { "test" }
-    watch(%r{^lib/(.+)\.rb$})    { |m| "test/#{m[1]}_test.rb" }
-  end
-end