ftpro 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0faf3fa340eb512b2586b54df7e9f87e5031da
-  data.tar.gz: da5e474603ec371802861c82274c570d3f7bbed7
+  metadata.gz: 1c55466dc7609eef6e2fdd48315c945c7444e6ff
+  data.tar.gz: 14c75d721882b8019165a2beb1e9d94516d59187
 SHA512:
-  metadata.gz: 3ca3ef2dc0498410b9bb7f3e77d4901bbf8f641627dfbd96d0f0ebcbbe9331902b90d01fd788b2c903e4b211d7315fd58e63a90046573f2c5f83fb4f53a311fe
-  data.tar.gz: 21e41a18af93496ed9010bf07f49d0e70ef4acce9630cee4bf86d10ab550dac2193af5c2e59d39a3941d16322512da1b5e9a9d011c6e931615a720db80096f93
+  metadata.gz: 9a3d49b2f81cfd3b0a953e9f23a0d2226435065a3308068d979964f64cca5252aac068ca7b95138c2655f5e78f87f96e13c11f6618b24bd6aa34e7db537b75e2
+  data.tar.gz: c2ec8094cf05a70885677b3dbbf86e78f464010f1bf88813effd5b734aad9eadfef726a7301a2030cc40f2a24f3c6161a8c864ce9693bc0481ea37d251e602ce

data/ftpro.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "ftpro"
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ["dddd1919"]
   spec.email         = ["dingrank@gmail.com"]
   spec.summary       = %q{The enhanced version of net/ftp}

data/lib/ftpro.rb

@@ -91,7 +91,7 @@ class Ftpro < Net::FTP
 
     def upload_dir(local_dir, remote_dir)
       remote_folder = local_dir.split('/')[-1] == ".." ? "" : local_dir.split('/')[-1] ## check if folder name is return symbol
-      remote_new_dir = "#{remote_dir}/#{remote_folder}"
+      remote_new_dir = remote_dir.empty? ? "#{remote_folder}" : "#{remote_dir}/#{remote_folder}"
       mkdir_p(remote_new_dir)  ## init remote dir
       Dir.foreach(local_dir) do |file|
         if file != "." && file != ".."

data/spec/ftpro_spec.rb

@@ -2,29 +2,82 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Ftpro test" do
 
-  before(:each) do
-    @ftp_host = "example.com"
-    @ftp_port = "21"
-    @ftp_user = 'name'
-    @ftp_pwd = 'password'
-  end
+  let(:ftp_host) { "example.com" }
+  let(:ftp_port) { "21"}
+  let(:ftp_user) { 'name'}
+  let(:ftp_pwd) { 'password'}
 
-  it 'With normal way' do
-    ftp = Ftpro.new
-    ftp.connect(@ftp_host, @ftp_port)
-    ftp.login(@ftp_user, @ftp_pwd)
-    expect(ftp.nlst.class).to eq(Array)
-  end
+  describe "Normal function" do
 
-  it 'With block call' do
-    Net::FTP::FTP_PORT = @ftp_port  ## There will raise a warning cause FTP_PORT is a constant
-    Ftpro.open(@ftp_host) do |ftp|
-      ftp.login(@ftp_user, @ftp_pwd)
+    it 'With normal way' do
+      ftp = Ftpro.new
+      ftp.connect(ftp_host, ftp_port)
+      ftp.login(ftp_user, ftp_pwd)
       expect(ftp.nlst.class).to eq(Array)
+      ftp.close
     end
+
+    it 'With block call' do
+      Net::FTP::FTP_PORT = ftp_port  ## There will raise a warning cause FTP_PORT is a constant
+      Ftpro.open(ftp_host) do |ftp|
+        ftp.login(ftp_user, ftp_pwd)
+        expect(ftp.nlst.class).to eq(Array)
+      end
+    end
+
   end
 
-  it 'do some function test' do
+  describe "Extension function test" do
+
+    before(:each) do
+      @ftp = Ftpro.new
+      @ftp.connect(ftp_host, ftp_port)
+      @ftp.login(ftp_user, ftp_pwd)
+    end
+
+    after(:each) do
+      @ftp.close
+    end
+
+    it 'nlst_a method test' do
+      @ftp.putbinaryfile('../.gitignore')
+      visible_files = @ftp.nlst
+      all_files = @ftp.nlst_a
+      expect(visible_files.count).to be < all_files.count
+      expect(all_files - visible_files).to include('.gitignore')
+      @ftp.delete('.gitignore')
+    end
+
+    it 'judge file type and exist' do
+      @ftp.put_r("../spec", "")
+      expect(@ftp.exist?("spec")).to be true
+      expect(@ftp.directory?("spec")).to be true
+      expect(@ftp.exist?("spec/ftpro_spec.rb")).to be true
+      expect(@ftp.directory?("spec/ftpro_spec.rb")).to be false
+      expect(@ftp.file?("spec/ftpro_spec.rb")).to be true
+      @ftp.rm_r("spec")
+      expect(@ftp.directory?("spec")).to be false
+      expect(@ftp.exist?("spec")).to be false
+    end
+
+    it 'mkdir_p method' do
+      target_dir = 'foo/bar/baz/test'
+      expect(@ftp.exist?(target_dir)).to be false
+      @ftp.mkdir_p(target_dir)
+      expect(@ftp.exist?(target_dir)).to be true
+      @ftp.rm_r("foo")
+      expect(@ftp.exist?(target_dir)).to be false
+    end
+
+    it 'put_r and rm_r methods' do
+      expect(@ftp.exist?('foo/bar')).to be false
+      @ftp.put_r('../', 'foo/bar')
+      expect(@ftp.exist?('foo/bar/lib')).to eq true
+      expect(@ftp.nlst_a('foo/bar').count + 2).to eq(Dir.foreach('../').count)
+      @ftp.rm_r('foo')
+      expect(@ftp.exist?('foo/bar/lib')).to eq false
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpro
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - dddd1919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler