gitee_pack 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4e4fc20534e610006456f1253a49882b4d7366579141ab00268e8fc77b8f9d
-  data.tar.gz: d4e748f744e3f468974e86d1a9ae3458a0b6d4e534ee836d709eafb9eb54be7e
+  metadata.gz: b9ce148ff6e484fdb94e4aa8277d04cffb7f0eabb5898231d991c47448217cb4
+  data.tar.gz: aef311b7bec117c679374c73293b6b97f89485357013aaea24cabc5c721c2660
 SHA512:
-  metadata.gz: 131088c837eef33d4e89c723348540fb9413ecf8d4fddd87277a6cc78aeeb6e88bcef4b195020e8b46876cb041b3e9abc00e0bb54aee277b3634f88528c25eae
-  data.tar.gz: 51d709aba694a05a51d6f19c5ea08e080eb19f2827c16ea17d3606f85f5a85235b9fd4aa72bc2d280e593b3a83a1da72c19fad45ff967b7cd7e04acbb4166612
+  metadata.gz: 6a282102f070862ae173c4717a8529fbf6aa5a1dfc561e3435f493bd276cdae265dc5daab4c5362143e079b599446743ac7e31e9a16c135ed6e82b2a68dc6b81
+  data.tar.gz: 72cf6760cc6549e0bca93e23cf910de8e784a0b0991bbd14c3cb8d7de984afee8e5d0b89ae80ca540000c86f23039c869da39104ba9a6911dc8ae426d0ecad80

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 TODO: Write your name
+Copyright (c) 2020 jk-sun
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -51,3 +51,10 @@ gitee-path: gitee-premium的绝对路径
 $ ./update.sh /home/gite/gitee-premium/gitee
 ```
 
+## TODO
+
+- 支持中文文件名打包
+- 支持gem打包
+- 源码中记录版本信息功能
+- ~~备份功能~~
+

data/bin/gitee_pack

@@ -2,6 +2,15 @@
 
 require 'gitee_pack'
 
+HELP_CMD = ['-v', '-h', '--help'].freeze
+
+if HELP_CMD.include?(ARGV[0])
+  GiteePack.logger.debug "Usage: #{File.basename($0)} [base] [head]"
+  GiteePack.logger.debug "Version: #{GiteePack::VERSION}"
+  exit 0
+end
+
+
 base, head = ARGV[0], ARGV[1]
 
 start_at = Time.now

data/{lib/gitee_pack/exe → exe}/update.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Check parameter
 GITEE_PATH=$1
 if [ ! $GITEE_PATH ]; then
   printf "\033[31mERROR: gitee-path cannot not be empty.\033[0m\n"
@@ -11,6 +12,7 @@ if [ $FINAL = '/' ]; then
   GITEE_PATH=${GITEE_PATH%?}
 fi
 
+# Check path
 APP_PATH=$GITEE_PATH/app
 CONFIG_APTH=$GITEE_PATH/config
 DB_APTH=$GITEE_PATH/db
@@ -19,9 +21,25 @@ if [ ! -d $APP_PATH ] || [ ! -d $CONFIG_PATH ] || [ ! -d $DB_PATH ]; then
   exit 1
 fi
 
-cp -r files/* $GITEE_PATH
-echo cp -r files/\* $GITEE_PATH
+# Backup
+BACKUP_DIR="$(dirname $GITEE_PATH)/backup/`date "+%Y%m%d%H%M%S"`"
+echo mkdir -p $BACKUP_DIR
+mkdir -p $BACKUP_DIR
+echo cp -r $GITEE_PATH $BACKUP_DIR
+cp -r $GITEE_PATH $BACKUP_DIR
+if [ $? -ne 0 ]; then
+  printf "\033[31mERROR: Gitee backup failed.\033[0m\n"
+  exit 1
+fi
 
+# Delete webpacks dir
+WEBPACK_PATH=$GITEE_PATH/public/webpacks
+if [ -d files/public/webpacks  ] && [ -d $WEBPACK_PATH  ]; then
+  rm -rf $WEBPACK_PATH
+  echo rm -rf $WEBPACK_PATH
+fi
+
+# Delete files with delete.txt
 DELETE_FILE=delete.txt
 if [ -f $DELETE_FILE ]; then
   while read LINE
@@ -31,5 +49,9 @@ if [ -f $DELETE_FILE ]; then
   done < $DELETE_FILE
 fi
 
+# Update files
+cp -rf files/* $GITEE_PATH
+echo cp -rf files/\* $GITEE_PATH
+
 exit 0
 

data/lib/gitee_pack/diff.rb

@@ -1,9 +1,10 @@
 module GiteePack
   class Diff
-    attr_reader :empty_folders, :delete_files, :cp_files
+    attr_reader :empty_folders, :delete_files, :cp_files, :webpack_files
 
     IGNORE_FILES = [
       'config/gitee.yml',
+      'config/gitee.yml.example',
       'config/database.yml',
       'config/startup.yml',
       'app/assets/javascripts/webpack/webide'
@@ -12,10 +13,10 @@ module GiteePack
     def initialize(base, head)
       @base          = base
       @head          = head
-      @precompile    = false
       @empty_folders = []
       @delete_files  = []
       @cp_files      = []
+      @webpack_files = []
 
       init_list_by_files
     end
@@ -34,8 +35,8 @@ module GiteePack
       result.split("\n")
     end
 
-    def precompile?
-      @precompile
+    def has_webpack_file?
+      !webpack_files.empty?
     end
 
     private
@@ -55,7 +56,9 @@ module GiteePack
       diff_files.each do |file|
         next if IGNORE_FILES.include?(file)
 
-        file.start_with?('app/assets/javascripts/webpack') && @precompile = true
+        if file.start_with?('app/assets/javascripts/webpack')
+          @webpack_files << file
+        end
 
         if Dir.exist?(file)
           @empty_folders << file

data/lib/gitee_pack/filer.rb

@@ -18,7 +18,7 @@ module GiteePack
       end
 
       def cp_update_file
-        filepath = File.join(File.dirname(__FILE__), 'exe/update.sh')
+        filepath = File.join(File.expand_path('../../../', __FILE__), 'exe/update.sh')
         FileUtils.cp filepath, Folder.upgrade_dir
         GiteePack.logger.debug "cp #{filepath} #{Folder.upgrade_dir}"
       end
@@ -36,6 +36,10 @@ module GiteePack
       def g_diff_file(content = [])
         g_file(File.join(Folder.upgrade_dir, 'diff.txt'), content)
       end
+
+      def g_commit_file(content = [])
+        g_file(File.join(Folder.upgrade_dir, 'commit.txt'), content)
+      end
     end
   end
 end

data/lib/gitee_pack/precompile.rb

@@ -3,8 +3,7 @@ module GiteePack
     class << self
       def with_webpack
         Folder.rm_dir('public/webpacks')
-        `npm run build-vendor`
-        `npm run f-build`
+        `npm run build-vendor && npm run f-build`
       end
     end
   end

data/lib/gitee_pack/version.rb

@@ -1,3 +1,3 @@
 module GiteePack
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/gitee_pack/worker.rb

@@ -10,13 +10,14 @@ module GiteePack
       Folder.mkdir_upgrade
       Filer.cp_diff_files(@diff.cp_files)
 
-      if @diff.precompile?
+      if @diff.has_webpack_file?
         Precompile.with_webpack
         Filer.cp_webpack_files
       end
 
       Filer.g_diff_file(@diff.diff_files_with_status)
       Filer.g_delete_file(@diff.delete_files)
+      Filer.g_commit_file(["old: #{@base}", "new: #{@head}"])
       Filer.cp_update_file
 
       puts_empty_folders

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitee_pack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - jk-sun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -23,13 +23,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/gitee_pack
-- bin/setup
+- exe/update.sh
 - gitee_pack.gemspec
 - lib/gitee_pack.rb
 - lib/gitee_pack/diff.rb
-- lib/gitee_pack/exe/update.sh
 - lib/gitee_pack/filer.rb
 - lib/gitee_pack/folder.rb
 - lib/gitee_pack/logger.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "gitee_pack"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here