struggle 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a55b2315ea94d918d91d363e65e15dd1fbe9b1b
-  data.tar.gz: 862affa2a11bb4c603648db4232960e0f35445bb
+  metadata.gz: 80baef3cddc4ff506f15cb285aa4e635156858c5
+  data.tar.gz: 1d37cf7398b8c2326072da3502dc800e1b5d8422
 SHA512:
-  metadata.gz: 5a4305e0ae51fb701102a4e510478c41d507fcf5d7737d98b60b6b5a806760b88fd698502a381bca34843f162beb67aab658ac164bcdcbd24da2208cd90a5169
-  data.tar.gz: 12ea78da2163f44cb9409d741d2fd6387a3a05ecfe3094fb2d0797070c310548e2a60bee54494f51ad45ae85fee7b04bb37b6369d2b8cad1c7043ac694466b82
+  metadata.gz: 64c3f18846f0c6802451ddfddebdfe43206f61e4c97b425eb174cc4536cb26e488bda423d5413923bd62c9ee5b031c8f2848b39487ab3a3a996ae86c82411fc7
+  data.tar.gz: 9e28466f11ec697087eeae226d2dbb2a3c80b03826392e941df13bef9e6914304cc57c8b7d7e16525eff37dd7315485b4d6c25034d6fa3d852071b709a9e2b9d

data/lib/generators/struggle/backup_config_generator.rb

@@ -0,0 +1,14 @@
+require 'rails'
+
+module Struggle
+  module Generators
+    class BackupConfigGenerator < Rails::Generators::Base
+      desc "create backup export config file"
+      def create_backup_config
+        libdir = File.expand_path(File.dirname(__FILE__))
+        backup_config = File.expand_path("../../templates/backup.yml", libdir)
+        FileUtils.cp(backup_config, "config/backup.yml")
+      end
+    end
+  end
+end

data/lib/struggle/backup.rb

@@ -0,0 +1,62 @@
+# 备份数据库和文件
+# 生成配置文件命令 rails g struggle:sql_config
+# Struggle::Backup.new.do 执行备份
+module Struggle
+  class Backup
+    # 初始化配置文件
+    def initialize
+      _config = YAML.load_file("#{Rails.root}/config/backup.yml")
+      @@config = _config.merge(YAML.load_file("#{Rails.root}/config/database.yml")[_config["env"]])
+      @@config["backup_path"] = File.expand_path(@@config["backup_path"], Rails.root)
+      @@now = Time.now
+      # 备份路径创建
+      # 参数now，创建时间，默认当前
+      @@dir = "#{@@config["backup_path"]}/#{@@now.year}/#{@@now.month}/#{@@now.day}"
+      unless Dir.exist? @@dir
+        FileUtils.mkdir_p @@dir
+      end
+    end
+
+    # 备份数据库
+    def database_backup
+      _filename = "#{@@config["database"]}-#{@@now.strftime("%Y%m%d%H%M%S")}"
+      filename = @@config["adapter"] == "oracle_enhanced" ? "#{_filename}.dmp" : "#{_filename}.sql"
+      if @@config["adapter"] == "mysql2"
+        system("mysqldump -u#{@@config["username"]} -p#{@@config["password"]} -d #{@@config["database"]}>#{filename}")
+      elsif @@config["adapter"] == "postgresql"
+        system("pg_dump -U #{@@config["username"]} -d #{@@config["database"]} -E utf8 -f #{filename} -w")
+      elsif @@config["adapter"] == "oracle_enhanced"
+        system("exp #{@@config["username"]}/#{@@config["password"]}@#{@@config["database"]} file=#{filename} full=y")
+      end
+      Struggle::ZipTool.file(filename, "#{@@dir}/#{_filename}.zip")
+      File.delete filename
+    end
+
+    # 备份文件
+    def file_backup
+      @@config["asset_paths"].each do |assetPath|
+        assetPath = "#{Rails.root}/#{assetPath}"
+        ridx = assetPath.rindex("/") || 0
+        Struggle::ZipTool.dir(assetPath, "#{@@dir}/#{assetPath[ridx..assetPath.length - 1]}-#{@@now.strftime("%Y%m%d%H%M%S")}.zip")
+      end
+    end
+
+    # ftp上传
+    def ftp_backup
+      _filename = "backup-#{@@now.strftime("%Y%m%d%H%M%S")}.zip"
+      ftp_config = @@config["ftp"]
+      Struggle::ZipTool.dir(@@dir, _filename)
+      Struggle::FtpTool.new(ftp_config["ip"], ftp_config["username"], ftp_config["password"]).put(_filename, ftp_config["backup_path"])
+      File.delete _filename
+    end
+
+    # 备份
+    def do
+      database_backup
+      file_backup
+      if @@config["mode"] == "ftp"
+        ftp_backup
+      end
+    end
+  end
+end

data/lib/struggle/sql.rb

@@ -1,4 +1,5 @@
 # 导出sql文件，生成insert语句
+# 生成配置文件命令 rails g struggle:sql_config
 module Struggle
   class Sql
     class << self

data/lib/struggle.rb

@@ -23,6 +23,7 @@ require 'struggle/concerns/time_extend'
 require "struggle/ftp_tool"
 require "struggle/zip_tool"
 require 'struggle/sql'
+require 'struggle/backup'
 require 'pay/jd_gateway'
 String.send :include, Struggle::StringExtend
 Integer.send :include, Struggle::IntExtend

data/lib/templates/backup.yml

@@ -0,0 +1,10 @@
+asset_paths: ["/public/system"]                                #rails项目根目录，备份静态文件路径，如果没有填[]
+backup_path: "../backups"                                      #rails项目根目录，备份目录
+env: "production"                                              #产品环境
+mode: "local"                                                  #备份模式：local | ftp
+ftp: {                                                         #ftp配置
+    ip: "139.129.195.138",                                          #ftp ip地址
+    username: "ftpuser",                                            #ftp 账号
+    password: "ftp123",                                             #ftp 密码
+    backup_path: "/backups/nanguanzhujian_images/"                    #ftp 服务器备份路径
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes,rsa,ftp_tool,zip_tool,sql;
+description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes,rsa,ftp_tool,zip_tool,sql,backup;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -60,10 +60,12 @@ extra_rdoc_files:
 - README.md
 files:
 - README.md
+- lib/generators/struggle/backup_config_generator.rb
 - lib/generators/struggle/sql_config_generator.rb
 - lib/pay/jd_gateway.rb
 - lib/struggle.rb
 - lib/struggle/aes.rb
+- lib/struggle/backup.rb
 - lib/struggle/code.rb
 - lib/struggle/concerns/decimal_extend.rb
 - lib/struggle/concerns/int_extend.rb
@@ -82,6 +84,7 @@ files:
 - lib/struggle/tfile.rb
 - lib/struggle/tmagick.rb
 - lib/struggle/zip_tool.rb
+- lib/templates/backup.yml
 - lib/templates/tsql_config.yml
 homepage: http://rubygems.org/gems/struggle
 licenses: