struggle 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef72bc9812621c23ccbe70632bef93a7fc9a71dd
-  data.tar.gz: e06e3ce96f749c6541be4e82a6f8327b997d2f2d
+  metadata.gz: 0de663c31ad25e4b730c910a5bb3a1d75fe00ac5
+  data.tar.gz: 1e85ed90acdac7bb95e1ed61eef1607999a24a3d
 SHA512:
-  metadata.gz: c277df83f080cca01a0c507c4bb521ac5d31fbf146786e838fc028b495521f78a16f1e44bb6dee5e2d9604c6f342dc8c465ad86da9a9018a6786dcff93878a94
-  data.tar.gz: ea97ced70716a7a72c0178d3ec96551765f20fb42cb3c59b717f0a7471de4c3681ecd5e8a29f48eb391d69f4641714c120cc076e09cf8a421bf53e31b17e8b7c
+  metadata.gz: 4611e93533123a3025394be48eaf1d07e29478f8b97cb92f70e2efc3b4355ae73a38560c1722a3bc9ae0f117c7eabf7ab7d66ead4b790a02da140c3702dba00a
+  data.tar.gz: d5869ca27cd5feefad64df206681d0078a8d37b7e034e24ec8fccce7631c5577749aa3aecf525d8955a31481345ae369fb83a98123484d92ba39d16e419afefd

data/lib/struggle/concerns/decimal_extend.rb

@@ -0,0 +1,7 @@
+module Struggle
+  module DecimalExtend
+    def clean
+      self.to_s.gsub(/0+?$/,"").gsub(/[.]$/,"")
+    end
+  end
+end

data/lib/struggle/ftp_tool.rb

@@ -0,0 +1,183 @@
+module Struggle
+  class FtpTool
+    #实例化
+    def initialize(host, user, password, port = 21, mode = true)
+      require "net/ftp"
+      @current_ftp = Net::FTP.new
+      @current_ftp.connect(host, port)
+      @current_ftp.login(user, password)
+      @current_ftp.passive = mode
+    end
+
+    # 获取指定格式的文件名称列表
+    # 例如： source = "test/*.txt"
+    # 返回： [source/file_name.txt]
+    def fetch_remote_filenames(source)
+      return [] if source.blank?
+      log_info("source is " + source)
+      filenames = @current_ftp.nlst(source)
+      filenames
+    end
+
+    # 获取服务器上确切名称的文件
+    # 例如： get("test/test.txt")
+    # 文件将被保存到本地 tmp/test/test.txt
+    def get(origin_file)
+      local_file = local_file(origin_file)
+      local_file.gsub("\\", "\\\\") #此处注意是window下执行， 在linux下需要注意改成/
+      log_info("Ftp Get: #{origin_file} -> #{local_file}")
+      begin
+        @current_ftp.getbinaryfile(origin_file, local_file+".tmp")
+      rescue
+        delete_local_file(local_file+".tmp")
+      end
+      rename_local_file(local_file+".tmp", local_file) if File.exist?(local_file+".tmp")
+    end
+
+
+    # 上传文件到指定的路径
+    # 例如： 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)
+      _root = @current_ftp.getdir
+      begin
+        @current_ftp.chdir(remote_path)
+      rescue
+        @current_ftp.mkdir(remote_path)
+        @current_ftp.chdir(remote_path)
+      end
+      log_info("Ftp put: #{origin_file} -> #{remote_path}")
+      begin
+        @current_ftp.putbinaryfile(origin_file, remote_path + _file_name + ".tmp")
+      rescue
+        delete(remote_path + _file_name + ".tmp")
+      end
+      @current_ftp.chdir(_root)
+      rename(remote_path + _file_name + ".tmp", remote_path + _file_name)
+    end
+
+    # 关闭ftp
+    def close
+      @current_ftp.close if @current_ftp
+    end
+
+    # 服务器copy文件
+    def copy(origin_file, file_path)
+      local_file = local_file(origin_file)
+      _file_name = File.basename(origin_file)
+      begin
+        #1. 到本地
+        log_info("FTP get file to:" + local_file+".tmp")
+        @current_ftp.getbinaryfile(origin_file, local_file+".tmp")
+        return nil if not File.exist?(local_file+".tmp")
+        #2. 到服务器
+        log_info("FTP put file to :" + file_path + _file_name + ".tmp")
+        @current_ftp.putbinaryfile(local_file+".tmp", file_path + _file_name + ".tmp")
+        #3. 改名字
+        rename(file_path + _file_name + ".tmp", file_path + _file_name)
+        #5. 删除本地
+        delete_local_file(local_file + ".tmp")
+      rescue => e
+        log_info(e)
+        #4. 删除服务器上临时文件
+        delete(file_path + origin_file + ".tmp")
+        #5. 删除本地
+        delete_local_file(local_file + ".tmp")
+      end
+    end
+
+    # 服务器上移动文件
+    def move(origin_file, file_path)
+      _file_name = File.basename(origin_file)
+      begin
+        copy(origin_file, file_path)
+        # 删除服务器上源文件
+        delete(origin_file)
+      rescue => e
+        log_info(e)
+        # 删除临时文件，如果存在
+        delete(file_path + _file_name + ".tmp")
+        # 删除服务器上目标文件， 如果存在
+        delete(file_path + _file_name)
+      end
+    end
+
+    # 重命名服务器文件
+    def rename(origin_file, file)
+      if not @current_ftp.list(origin_file).blank?
+        log_info("FTP rename #{origin_file} to #{file}")
+        @current_ftp.rename(origin_file, file)
+      end
+    end
+
+    # 删除服务器上的文件
+    def delete(origin_file)
+      if not @current_ftp.list(origin_file).blank?
+        log_info("FTP delete #{origin_file}")
+        @current_ftp.delete(origin_file)
+      end
+    end
+
+    # ftp 是否关闭
+    def closed?
+      @current_ftp.closed?
+    end
+
+    class << self
+      # 文件编码转换
+      def convert(src_file, dest_file, from_encode, to_encode)
+        log_info("Convert #{src_file} to #{dest_file}")
+        cd = Iconv.new(to_encode, from_encode)
+        File.open(dest_file, "w") do |out|
+          File.open(src_file) do |in_stream|
+            in_stream.each_line do |line|
+              begin
+                new_line = cd.iconv(line)
+                out.write(new_line)
+              rescue => e
+                log_info "convert line error : #{line}"
+                next
+              end
+            end
+          end
+        end
+        cd.close
+        dest_file
+      end
+    end
+
+    protected
+
+    #本地路径
+    def local_file(file)
+      local = File.join("tmp/", file)
+      FileUtils.makedirs(File.dirname(local))
+      local
+    end
+
+    # 删除本地文件
+    def delete_local_file(file)
+      if File.exist?(file)
+        log_info("delete local file : " + file)
+        File.delete(file)
+      end
+    end
+
+    # 重命名本地文件
+    def rename_local_file(origin_file, file)
+      if File.exist?(origin_file)
+        log_info("rename local file : " + origin_file + " to " + file)
+        File.rename(origin_file, file)
+      end
+    end
+
+    private
+    def log_info(log)
+      if Rails.env == "development"
+        puts log
+      end
+    end
+  end
+end

data/lib/struggle/zip_tool.rb

@@ -0,0 +1,77 @@
+# This is a simple example which uses rubyzip to
+# recursively generate a zip file from the contents of
+# a specified directory. The directory itself is not
+# included in the archive, rather just its contents.
+#
+# Usage:
+#   directory_to_zip = "/tmp/input"
+#   output_file = "/tmp/out.zip"
+#   ZipTool.dir(directory_to_zip, output_file)
+#   ZipTool.dir("1.txt", output_file)
+module Struggle
+  class ZipTool
+    class << self
+      def dir(input_dir, output_file)
+        @input_dir = input_dir
+        @output_file = output_file
+        entries = Dir.entries(@input_dir) - %w(. ..)
+
+        ::Zip::File.open(@output_file, ::Zip::File::CREATE) do |io|
+          write_entries entries, '', io
+        end
+      end
+
+      def file(input_files, output_file)
+        Zip::File.open(output_file, Zip::File::CREATE) do |zipfile|
+          if input_files.class == Array
+            input_files.each do |filename|
+              idex = filename.rindex("/")
+              if idex
+                zipfile.add(filename[idex+1, filename.length-idex], filename)
+              else
+                zipfile.add(filename, filename)
+              end
+            end
+          elsif input_files.class == String
+            idex = input_files.rindex("/")
+            if idex
+              zipfile.add(input_files[idex+1, input_files.length-idex], input_files)
+            else
+              zipfile.add(input_files, input_files)
+            end
+          end
+        end
+      end
+    end
+
+    private
+    class << self
+      # A helper method to make the recursion work.
+      def write_entries(entries, path, io)
+        entries.each do |e|
+          zip_file_path = path == '' ? e : File.join(path, e)
+          disk_file_path = File.join(@input_dir, zip_file_path)
+          puts "Deflating #{disk_file_path}"
+
+          if File.directory? disk_file_path
+            recursively_deflate_directory(disk_file_path, io, zip_file_path)
+          else
+            put_into_archive(disk_file_path, io, zip_file_path)
+          end
+        end
+      end
+
+      def recursively_deflate_directory(disk_file_path, io, zip_file_path)
+        io.mkdir zip_file_path
+        subdir = Dir.entries(disk_file_path) - %w(. ..)
+        write_entries subdir, zip_file_path, io
+      end
+
+      def put_into_archive(disk_file_path, io, zip_file_path)
+        io.get_output_stream(zip_file_path) do |f|
+          f.write(File.open(disk_file_path, 'rb').read)
+        end
+      end
+    end
+  end
+end

data/lib/struggle.rb

@@ -5,6 +5,7 @@ begin
 rescue LoadError
   #do nothing
 end
+require 'zip'
 require 'struggle/tfile'
 require 'struggle/http'
 require 'struggle/logistic'
@@ -15,6 +16,10 @@ require 'struggle/code'
 require 'struggle/aes'
 require 'struggle/concerns/string_extend'
 require 'struggle/concerns/int_extend'
+require 'struggle/concerns/decimal_extend'
+require "struggle/ftp_tool"
+require "struggle/zip_tool"
 require 'pay/jd_gateway'
 String.send :include, Struggle::StringExtend
 Integer.send :include, Struggle::IntExtend
+Numeric.send :include, Struggle::DecimalExtend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - lean
@@ -38,7 +38,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes;
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  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: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes,ftp_tool,zip_tool;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -50,15 +64,18 @@ files:
 - lib/struggle.rb
 - lib/struggle/aes.rb
 - lib/struggle/code.rb
+- lib/struggle/concerns/decimal_extend.rb
 - lib/struggle/concerns/int_extend.rb
 - lib/struggle/concerns/string_extend.rb
 - lib/struggle/font/font.ttf
+- lib/struggle/ftp_tool.rb
 - lib/struggle/http.rb
 - lib/struggle/logistic.rb
 - lib/struggle/pager.rb
 - lib/struggle/sms.rb
 - lib/struggle/tfile.rb
 - lib/struggle/tmagick.rb
+- lib/struggle/zip_tool.rb
 homepage: http://rubygems.org/gems/struggle
 licenses:
 - struggle
@@ -79,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: struggle!