redmine_with_git 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58274eb6dc1553a0fc31d5b096d9a01793cb7c87d23936c3efc08d71362482ac
-  data.tar.gz: 3b49e6376dc0235caa9e8f7a425058e78b7fe4e971c6db47250da4773d336b04
+  metadata.gz: a34a6641c46dca0c41d62bdc1e816c9f4570092c09115b2e51976e6a42f27faf
+  data.tar.gz: 4d4e3099dae281d66f3b8dd5fd6fa19dff1e9f460eae9edcd6778b0a9d851cd7
 SHA512:
-  metadata.gz: 07cd5541197837d3f9fde3025e0f5f2d7d14e9f06360799b13870b3a2bcecd48217abc2aa4b2b33d2a8636091cd17f5bc98dc749218afeb76c8b58af0f8af47a
-  data.tar.gz: 53ae4211b01ea05301056b3cb86c0b18428a07f46ae4075fbaf38d1eb1b3becf0f39a1f22e6924e1532d2694b37fd2e75090a933a134ac2ed444d4514f96e99e
+  metadata.gz: e96d18022267e48569eb1b41195bb68b8684d6a7ce935ba22af72c28d37fb1377a48e152e1a8a00fd48f434fa6f27d2936602731811540b0126adc5679dcf08d
+  data.tar.gz: 5d34f055c0a6ff833f242d63e520d0a9ec9bd2dff7cccf468a1acc8df7183017385b56cbc5b7beba449a4dff7d039ceaa8d65b5a446cc149de3c791feb4be772

data/app/controllers/redmine_with_git_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RedmineWithGitController < ApplicationController
   before_filter :require_admin
 
@@ -42,7 +44,8 @@ class RedmineWithGitController < ApplicationController
 
   def import_params
     ps = params[::RedmineWithGit::Tableless::Load.model_name.param_key]
-    return {} unless ps.present?
+    return {} if ps.blank?
+
     ps.permit(:path)
   end
 end

data/app/helpers/redmine_with_git_helper.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module RedmineWithGitHelper
   def export_api_curl_command
     curl_command("curl -JLO '#{export_redmine_with_git_url(key: User.current.api_key)}'")
   end
 
   def import_api_curl_command
-    curl_command(<<IMPORT_CURL)
-curl -X POST \\
-  -F '#{import_param_key}=@<PATH_TO_BACKUP_FILE>' \\
-  -F 'key=#{User.current.api_key}' \\
-  #{import_redmine_with_git_url(format: 'json')}
-IMPORT_CURL
+    curl_command(<<~IMPORT_CURL)
+      curl -X POST \\
+        -F '#{import_param_key}=@<PATH_TO_BACKUP_FILE>' \\
+        -F 'key=#{User.current.api_key}' \\
+        #{import_redmine_with_git_url(format: 'json')}
+    IMPORT_CURL
   end
 
   private

data/app/models/redmine_with_git/tableless/load.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Tableless
     class Load < ::EacRailsUtils::TablelessModel
@@ -7,10 +9,11 @@ module RedmineWithGit
 
       def save
         return false unless valid?
+
         ::RedmineWithGit::Load::All.new(path.path)
         true
-      rescue StandardError => ex
-        errors.add(:path, ex.message)
+      rescue StandardError => e
+        errors.add(:path, e.message)
         false
       end
 

data/config/initializers/000_dependencies.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Redmine::Plugin.post_register :redmine_with_git do
   # Source: https://github.com/esquilo-azul/redmine_plugins_helper
-  requires_redmine_plugin(:redmine_plugins_helper, version_or_higher: '0.4.0')
+  requires_redmine_plugin(:redmine_plugins_helper, version_or_higher: '0.5.0')
   # Source: https://github.com/jbox-web/redmine_bootstrap_kit.git
   # Note: redmine_bootstrap_kit is a redmine_git_hosting's dependency.
   requires_redmine_plugin(:redmine_bootstrap_kit, version_or_higher: '0.2.5')

data/config/initializers/001_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 patches_root = ::File.dirname(::File.dirname(__dir__))
 Dir["#{patches_root}/lib/**/*.rb"].each do |f|
   load(f)

data/config/locales/en.yml

@@ -1,2 +1,10 @@
 en:
+  eac_ruby_utils:
+    listable:
+      redmine_with_git/dump/base:
+        overwrite:
+          allowed:
+            label: Allowed
+          denied:
+            label: Denied
   field_path: Path

data/config/locales/pt-BR.yml

@@ -1,2 +1,10 @@
 pt-BR:
+  eac_ruby_utils:
+    listable:
+      redmine_with_git/dump/base:
+        overwrite:
+          allowed:
+            label: Permitido
+          denied:
+            label: Negado
   field_path: Caminho

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RedmineApp::Application.routes.draw do
   get '/redmine_with_git', to: 'redmine_with_git#index', as: 'redmine_with_git'
   get '/redmine_with_git/export', to: 'redmine_with_git#export', as: 'export_redmine_with_git'

data/init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redmine'
 require 'redmine_with_git/version'
 

data/lib/redmine_with_git/dump/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Dump
     class All < ::RedmineWithGit::Dump::Base
@@ -7,13 +9,13 @@ module RedmineWithGit
 
       def run_command
         on_temp_dir do
-          RESOURCES.each { |a| build_sub(a) }
+          RESOURCES.each { |resource| build_sub(resource) }
           super
         end
       end
 
-      def build_sub(a)
-        resource_class(a).new(resource_file_path(a), overwrite)
+      def build_sub(resource)
+        resource_class(resource).new(resource_file_path(resource), overwrite)
       end
 
       def build_command

data/lib/redmine_with_git/dump/base.rb

@@ -1,21 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/files/rotate'
+require 'eac_ruby_utils/listable'
+
 module RedmineWithGit
   module Dump
     class Base < ::RedmineWithGit::DumpLoad::Base
-      def initialize(path, overwrite)
-        @overwrite = overwrite
+      include ::EacRubyUtils::Listable
+
+      lists.add_integer :overwrite, 1 => :denied, 2 => :allowed, 3 => :rotate
+
+      def initialize(path, options = {})
+        @options = options
+        validate_overwrite
         super(path)
       end
 
-      private
+      def overwrite
+        v = @options[:overwrite]
+        v.present? ? v.to_i : OVERWRITE_DENIED
+      end
 
-      attr_reader :overwrite
+      private
 
       def run
         start_banner
-        if ::File.exist?(path) && !overwrite
-          Rails.logger.warn "File \"#{path}\" already exists"
-          return
-        end
+        return unless run_if_overwrite_denied
+        return unless run_if_rotate
+
         run_command
         validate_exported
         end_banner
@@ -23,29 +35,56 @@ module RedmineWithGit
 
       def start_banner
         Rails.logger.info "Dumping resource \"#{resource_name}\" to \"#{path}\"..."
+        Rails.logger.info "Overwrite: #{overwrite}"
       end
 
       def end_banner
         Rails.logger.info("#{path}: #{number_to_human_size(::File.size(path))}, #{path_type}")
       end
 
+      def run_if_overwrite_denied
+        if ::File.exist?(path) && overwrite == OVERWRITE_DENIED
+          Rails.logger.warn "File \"#{path}\" already exists"
+          false
+        else
+          true
+        end
+      end
+
+      def run_if_rotate
+        if ::File.exist?(path) && overwrite == OVERWRITE_ROTATE
+          rotate = ::Avm::Files::Rotate.new(path)
+          ::Rails.logger.info "Rotating \"#{rotate.source_path}\"..."
+          rotate.run
+          ::Rails.logger.info "Rotated to \"#{rotate.target_path}\""
+        end
+        true
+      end
+
       def run_command
         build_command.execute!(output_file: path)
       end
 
       def create_tar_command(dir, compression = true)
         tar = "cd #{Shellwords.escape(dir)}; tar -c *"
-        tar << " | #{compress_args.join(' ')}" if compression
+        tar += " | #{compress_args.join(' ')}" if compression
         env.command(['bash', '-c', tar])
       end
 
       def compress_args
-        %w(gzip -9 -c -)
+        %w[gzip -9 -c -]
       end
 
       def validate_exported
         raise "File \"#{path}\" was not generated" unless ::File.exist?(path)
-        raise "File \"#{path}\" has zero size" unless ::File.size(path) > 0
+        raise "File \"#{path}\" has zero size" unless ::File.size(path).positive?
+      end
+
+      def validate_overwrite
+        klass = ::RedmineWithGit::Dump::Base
+        return if klass.lists.overwrite.values.include?(overwrite)
+
+        raise "Invalid overwrite value: \"#{overwrite}\" (Valid: #{klass.lists.overwrite.values})"
       end
     end
   end

data/lib/redmine_with_git/dump/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Dump
     class Database < ::RedmineWithGit::Dump::Base

data/lib/redmine_with_git/dump/files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Dump
     class Files < ::RedmineWithGit::Dump::Base

data/lib/redmine_with_git/dump/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Dump
     class Git < ::RedmineWithGit::Dump::Base

data/lib/redmine_with_git/dump_load/all.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module DumpLoad
     module All
-      DATABASE = 'database.gz'.freeze
-      FILES = 'files.tar.gz'.freeze
-      GIT = 'git.tar.gz'.freeze
+      DATABASE = 'database.gz'
+      FILES = 'files.tar.gz'
+      GIT = 'git.tar.gz'
 
-      RESOURCES = %w(database files git).freeze
+      RESOURCES = %w[database files git].freeze
 
       private
 

data/lib/redmine_with_git/dump_load/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module DumpLoad
     class Base

data/lib/redmine_with_git/dump_load/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module DumpLoad
     module Database

data/lib/redmine_with_git/dump_load/files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module DumpLoad
     module Files

data/lib/redmine_with_git/dump_load/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module DumpLoad
     module Git

data/lib/redmine_with_git/load/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Load
     class All < ::RedmineWithGit::Load::Base

data/lib/redmine_with_git/load/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Load
     class Base < ::RedmineWithGit::DumpLoad::Base

data/lib/redmine_with_git/load/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'redmine_plugins_helper'
 
 module RedmineWithGit
@@ -8,9 +10,10 @@ module RedmineWithGit
       private
 
       def before_clear
-        raise(<<EOS) unless ::RedminePluginsHelper.settings_table_exist?
-Settings table does not exist.
-EOS
+        raise(<<~MESSAGE) unless ::RedminePluginsHelper.settings_table_exist?
+          Settings table does not exist.
+        MESSAGE
+
         @redmine_git_hosting_setting = ::Setting.plugin_redmine_git_hosting
       end
 

data/lib/redmine_with_git/load/files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Load
     class Files < ::RedmineWithGit::Load::Base

data/lib/redmine_with_git/load/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Load
     class Git < ::RedmineWithGit::Load::Base

data/lib/redmine_with_git/patches/redmine_git_hosting/commands/git/git_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineWithGit
   module Patches
     module RedmineGitHosting

data/lib/redmine_with_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.2.0'
 end

data/lib/tasks/redmine_with_git.rake

@@ -1,11 +1,21 @@
+# frozen_string_literal: true
+
 namespace :redmine_with_git do
-  %w(database files git all).each do |a|
+  %w[database files git all].each do |a|
     namespace :dump do
-      task a, [:path, :overwrite] => :environment do |_t, args|
-        ::RedmineWithGit::Dump.const_get(a.camelize).new(args.path, args.overwrite.present?)
+      desc <<~DESCRIPTION
+        Dump backup file for \"#{a}\" resource(s).
+
+        Arguments:
+        * <path>: path to the dump.
+        * [overwrite]: 1: denied, 2: allowed, 3: rotate (Default: 1).
+      DESCRIPTION
+      task a, %i[path overwrite] => :environment do |_t, args|
+        ::RedmineWithGit::Dump.const_get(a.camelize).new(args.path, overwrite: args.overwrite)
       end
     end
     namespace :load do
+      desc "Load backup file for \"#{a}\" resource(s)"
       task a, [:path] => :environment do |_t, args|
         ::RedmineWithGit::Load.const_get(a.camelize).new(args.path)
       end
@@ -13,10 +23,10 @@ namespace :redmine_with_git do
   end
 
   desc 'Executa as operações de "Rescue" da configuração do plugin RedmineGitHosting'
-  task rescue: [:'redmine_git_hosting:install_hook_parameters',
-                :'redmine_git_hosting:migration_tools:update_repositories_type',
-                :'redmine_git_hosting:install_hook_files',
-                :'redmine_git_hosting:fetch_changesets'] do |_t, _args|
+  task rescue: %i[redmine_git_hosting:install_hook_parameters
+                  redmine_git_hosting:migration_tools:update_repositories_type
+                  redmine_git_hosting:install_hook_files
+                  redmine_git_hosting:fetch_changesets] do |_t, _args|
     RedmineGitHosting::GitoliteAccessor.update_projects(
       'all',
       message: 'Forced resync of all projects (active, closed, archived)...',

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: avm-tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -30,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.10'
 description: 
 email: 
 executables: []