gitee_pack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9167ffab00077990f5de2a6dedbf981ebf86c5e246cb94fdff655177e7d61656
-  data.tar.gz: 3cb23c0cdc089eeda2021a1bfcf91ee53827993166341e4e9b2975a44f865191
+  metadata.gz: 3f4e4fc20534e610006456f1253a49882b4d7366579141ab00268e8fc77b8f9d
+  data.tar.gz: d4e748f744e3f468974e86d1a9ae3458a0b6d4e534ee836d709eafb9eb54be7e
 SHA512:
-  metadata.gz: 15cbca079fb2b48658af5116bcd4978431a846a81b41c2c10fe2d2a8ebdb19b33307bbb3196ce3ae097922c958cb809f58102a70eb325d56552d417cdc0a474b
-  data.tar.gz: 65a87e0230a236f586471d2294dfdea6e744fd0066b7f69c9a458b96f9f03031b8fcf5a5a62cddb181814737dfd2b8f8876914f55380d13443cc2645a1c4bcc0
+  metadata.gz: 131088c837eef33d4e89c723348540fb9413ecf8d4fddd87277a6cc78aeeb6e88bcef4b195020e8b46876cb041b3e9abc00e0bb54aee277b3634f88528c25eae
+  data.tar.gz: 51d709aba694a05a51d6f19c5ea08e080eb19f2827c16ea17d3606f85f5a85235b9fd4aa72bc2d280e593b3a83a1da72c19fad45ff967b7cd7e04acbb4166612

data/README.md

@@ -6,13 +6,17 @@
 
 在gitee-premium目录执行：
 
-    $ gem install gitee_pack
+```shell
+$ gem install gitee_pack
+```
 
 ## 使用
 
+### 打包
+
 在gitee-premium目录执行：
 
-```
+```shell
 $ gitee_pack [base] [head]
 ```
 
@@ -22,7 +26,28 @@ head: Commit提交的SHA值作为对比终点
 
 示例：
 
-```
+```shell
 $ gitee_pack a9b6296 6ac0f97
 ```
 
+执行后会在当前目录下生成一个增量文件的升级包，例如 upgrade-20200430
+
+### 部署
+
+先备份原有文件
+
+在升级包中执行update.sh脚本，一键自动部署
+
+```shell
+$ cd upgrade-20200430
+$ ./update.sh [gitee-path]
+```
+
+gitee-path: gitee-premium的绝对路径
+
+示例
+
+```shell
+$ ./update.sh /home/gite/gitee-premium/gitee
+```
+

data/bin/gitee_pack

@@ -8,4 +8,4 @@ start_at = Time.now
 GiteePack.execute(base, head)
 end_at = Time.now
 
-puts "\033[32mComplete! cost time: #{end_at - start_at} seconds.\033[0m"
+GiteePack.logger.success "Complete! cost time: #{end_at - start_at} seconds."

data/lib/gitee_pack.rb

@@ -5,6 +5,7 @@ require 'gitee_pack/diff'
 require 'gitee_pack/folder'
 require 'gitee_pack/filer'
 require 'gitee_pack/precompile'
+require 'gitee_pack/logger'
 require 'gitee_pack/worker'
 
 module GiteePack
@@ -13,4 +14,8 @@ module GiteePack
   def self.execute(base, head, options = {})
     Worker.new(base, head).execute
   end
+
+  def self.logger
+    @logger ||= Logger.new
+  end
 end

data/lib/gitee_pack/diff.rb

@@ -2,6 +2,13 @@ module GiteePack
   class Diff
     attr_reader :empty_folders, :delete_files, :cp_files
 
+    IGNORE_FILES = [
+      'config/gitee.yml',
+      'config/database.yml',
+      'config/startup.yml',
+      'app/assets/javascripts/webpack/webide'
+    ].freeze
+
     def initialize(base, head)
       @base          = base
       @head          = head
@@ -10,7 +17,7 @@ module GiteePack
       @delete_files  = []
       @cp_files      = []
 
-      init_diff_status
+      init_list_by_files
     end
 
     def diff_files
@@ -33,21 +40,29 @@ module GiteePack
 
     private
 
-    def init_diff_status
+    def init_list_by_files
+      init_empty_folders_and_cp_files
+      init_delete_files
+    end
+
+    def init_delete_files
+      @delete_files = diff_files_with_status.map do |file|
+        file.sub("D\t", '') if file.start_with?('D')
+      end.compact
+    end
+
+    def init_empty_folders_and_cp_files
       diff_files.each do |file|
-        if file.start_with?('app/assets/javascripts/webpack')
-          @precompile = true
-        end
+        next if IGNORE_FILES.include?(file)
+
+        file.start_with?('app/assets/javascripts/webpack') && @precompile = true
 
         if Dir.exist?(file)
           @empty_folders << file
           next
         end
 
-        unless File.exist?(file)
-          @delete_files << file
-          next
-        end
+        next unless File.exist?(file)
 
         @cp_files << file
       end

data/lib/gitee_pack/exe/update.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+GITEE_PATH=$1
+if [ ! $GITEE_PATH ]; then
+  printf "\033[31mERROR: gitee-path cannot not be empty.\033[0m\n"
+  exit 1
+fi
+
+FINAL=${GITEE_PATH: -1}
+if [ $FINAL = '/' ]; then
+  GITEE_PATH=${GITEE_PATH%?}
+fi
+
+APP_PATH=$GITEE_PATH/app
+CONFIG_APTH=$GITEE_PATH/config
+DB_APTH=$GITEE_PATH/db
+if [ ! -d $APP_PATH ] || [ ! -d $CONFIG_PATH ] || [ ! -d $DB_PATH ]; then
+  printf "\033[31mERROR: $GITEE_PATH is not the gitee-path.\033[0m\n"
+  exit 1
+fi
+
+cp -r files/* $GITEE_PATH
+echo cp -r files/\* $GITEE_PATH
+
+DELETE_FILE=delete.txt
+if [ -f $DELETE_FILE ]; then
+  while read LINE
+  do
+    rm -rf $GITEE_PATH/$LINE
+    echo rm -rf $GITEE_PATH/$LINE
+  done < $DELETE_FILE
+fi
+
+exit 0
+

data/lib/gitee_pack/filer.rb

@@ -6,7 +6,7 @@ module GiteePack
           dirname = File.join(Folder.upgrade_files_dir, File.dirname(file))
           FileUtils.mkdir_p dirname
           FileUtils.cp file, dirname
-          puts "cp #{file} #{dirname}"
+          GiteePack.logger.debug "cp #{file} #{dirname}"
         end
       end
 
@@ -14,13 +14,19 @@ module GiteePack
         dirname = File.join(Folder.upgrade_files_dir, 'public/webpacks')
         FileUtils.mkdir_p dirname
         FileUtils.cp_r 'public/webpacks/.', dirname
-        puts "cp -r public/webpacks/. #{dirname}"
+        GiteePack.logger.debug "cp -r public/webpacks/. #{dirname}"
+      end
+
+      def cp_update_file
+        filepath = File.join(File.dirname(__FILE__), 'exe/update.sh')
+        FileUtils.cp filepath, Folder.upgrade_dir
+        GiteePack.logger.debug "cp #{filepath} #{Folder.upgrade_dir}"
       end
 
       def g_file(path, content = [])
         File.open(path, 'w') do |f|
           f.write("#{content.join("\n")}\n")
-        end
+        end unless content.empty?
       end
 
       def g_delete_file(content = [])

data/lib/gitee_pack/folder.rb

@@ -6,8 +6,8 @@ module GiteePack
       def mkdir_upgrade
         rm_dir(upgrade_dir)
         FileUtils.mkdir_p(upgrade_files_dir)
-        puts "mkdir #{upgrade_dir}"
-        puts "mkdir #{upgrade_files_dir}"
+        GiteePack.logger.debug "mkdir #{upgrade_dir}"
+        GiteePack.logger.debug "mkdir #{upgrade_files_dir}"
       end
 
       def upgrade_dir
@@ -21,7 +21,7 @@ module GiteePack
       def rm_dir(dir)
         if Dir.exist?(dir)
           `rm -rf #{dir}`
-          puts "rm -rf #{dir}"
+          GiteePack.logger.debug "rm -rf #{dir}"
         end
       end
     end

data/lib/gitee_pack/logger.rb

@@ -0,0 +1,23 @@
+module GiteePack
+  class Logger
+    def debug(content)
+      puts content
+    end
+
+    def info(content)
+      puts "\033[36m#{content}\033[0m"
+    end
+
+    def warn(content)
+      puts "\033[33m#{content}\033[0m"
+    end
+
+    def error(content)
+      puts "\033[31m#{content}\033[0m"
+    end
+
+    def success(content)
+      puts "\033[32m#{content}\033[0m"
+    end
+  end
+end

data/lib/gitee_pack/version.rb

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

data/lib/gitee_pack/worker.rb

@@ -17,6 +17,7 @@ module GiteePack
 
       Filer.g_diff_file(@diff.diff_files_with_status)
       Filer.g_delete_file(@diff.delete_files)
+      Filer.cp_update_file
 
       puts_empty_folders
       puts_delete_files
@@ -26,15 +27,15 @@ module GiteePack
 
     def puts_delete_files
       unless @diff.delete_files.empty?
-        puts "\n\033[33mDelete Files:\n"
-        puts "#{@diff.delete_files.join("\n")}\033[0m"
+        GiteePack.logger.warn "\nDelete Files:"
+        GiteePack.logger.warn "#{@diff.delete_files.join("\n")}"
       end
     end
 
     def puts_empty_folders
       unless @diff.empty_folders.empty?
-        puts "\n\033[33mEmpty Folders:\n"
-        puts "#{@diff.empty_folders.join("\n")}\033[0m"
+        GiteePack.logger.warn "\nEmpty Folders:"
+        GiteePack.logger.warn "#{@diff.empty_folders.join("\n")}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitee_pack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - jk-sun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -29,8 +29,10 @@ files:
 - 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
 - lib/gitee_pack/precompile.rb
 - lib/gitee_pack/version.rb
 - lib/gitee_pack/worker.rb