struggle 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8fd0fe098d5b9742470ed55c764daced3c5101f14d7aa6248d330d2f6764a83
-  data.tar.gz: bd99a799faeabf1a42024f85847658d7461bfc715d0876b92b8eebaf12a03b51
+  metadata.gz: 8eed13f75451e0fd49c798b83dc03571562b6214177b0145b282361ba9284e3a
+  data.tar.gz: d5ca75d4fed7a3b5bb540c4defc2857517270966b198c86be8b761863f275b16
 SHA512:
-  metadata.gz: 7ae9954e08a7a3a9e3f1aeba53a3181bb35d7ff518b3d9d4293d2a5dcec15979052559ed937ab2652e1a5aa72a198ca488a79146e36baacafec8e5403a489219
-  data.tar.gz: ed35daa24d047b86fe4c6e1eab8b8bfc0f6c418eed8d0b3b0ed78e9c75c6398701accb939253b617ebf53c1fc5be541e327e6ca75104b27f8158bca136650c83
+  metadata.gz: 87563c4c6cd9350c061a5afca3beefcf6ec414e32acdd8a2a53c875253720e19cabc1f4097bb5386ec02e89efd0cb7a791b2c7cce113d3b098fa5182ac2e4c4f
+  data.tar.gz: 1de164ba9a53f52aae43c29558a9f9753afd80e859264a0ce5ce895cb5cfc983102d036f02c157099911ef1b60c24479880687207384b3a12d15c7c470e35a9d

data/lib/struggle.rb

@@ -5,7 +5,7 @@ begin
 rescue LoadError
   #do nothing
 end
-require 'zip'
+# require 'zip'
 require 'struggle/tfile'
 require 'struggle/http'
 require 'struggle/logistic'

data/lib/struggle/ftp_tool.rb

@@ -37,7 +37,6 @@ module Struggle
 
     # 上传文件到指定的路径
     # 例如： put("tmp\\test\\test.txt", "/test/")
-    #
     def put(origin_file, remote_path)
       return nil if not File.exist?(origin_file)
       _file_name = File.basename(origin_file)

data/lib/struggle/tfile.rb

@@ -51,14 +51,15 @@ module Struggle
     end
 
     def Tfile.getname(filestream, filepath)
-      file_for = Tfile.file_format(filestream.original_filename)
-      filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
-      file = filepath+filename
-      while File.exist?(file) do
-        filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
-        file = filepath+filename
-      end
-      filename
+      # file_for = Tfile.file_format(filestream.original_filename)
+      # filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
+      # file = filepath+filename
+      # while File.exist?(file) do
+      #   filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
+      #   file = filepath+filename
+      # end
+      # filename
+      filepath+filestream.original_filename
     end
 
     def Tfile.file_format(filename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
@@ -138,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: struggle!