rexer 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a1f270989ff656e5fd97e105ecd8d21be59755e2f3112746db636c5b2a9e7c
-  data.tar.gz: 42154270a3d8684f58ec80537cd2d5237dd0cde468bd44b3db0dd89fe7084a7c
+  metadata.gz: a65472e424f27d1a96fa1be7093fcb9eac2f59606dd9b93c907dfec412b8309d
+  data.tar.gz: b56d1515e26fd98f800c772f64511bd241c83e1e0b706f4bbdd6b2cbf734a375
 SHA512:
-  metadata.gz: 3b7544710bb51bb0a6e5cb6de61deac2c6fbea1116d11b62f064c76a844af5664037083dbe30685421af467f7346676ba9655ceb59e2310a455e435ea7f7274b
-  data.tar.gz: 91d31bf09b9dd719760ab4cc88c32542cc441f215ce68e7d95831e8e0789695215dbf49d70279e51d43c5a45886d6d6f6045540d0210c577153b706d3dcf0fa6
+  metadata.gz: bdeb0d3f7855f8fef1710f0d7918ce2b24c39004ac2cc0fa3ddd3c1e201eb5bf3afef7c08531caa539842189eb95fa99fd11166bdbcfc8fbef4ea5345541d2c8
+  data.tar.gz: 160d63e6239cd0d417443d2935c35a826340040cc917c28f29d3827e5e9db53bcacdc28a45c9a665f12e4087a88b436407258fe995dfd1ab08a30a25cd057783

data/lib/rexer/commands/envs.rb

@@ -10,8 +10,12 @@ module Rexer
         defined_envs.each.with_index do |env, i|
           puts env
 
-          definition_with(env).then { _1.themes + _1.plugins }.each do
-            puts "  #{_1.name} (#{Source.from_definition(_1.source).info})"
+          themes_in(env) do
+            print_extension_definition(_1)
+          end
+
+          plugins_in(env) do
+            print_extension_definition(_1)
           end
 
           puts if i < defined_envs.size - 1
@@ -22,11 +26,20 @@ module Rexer
 
       attr_reader :definition
 
-      def definition_with(env)
-        definition.with(
-          plugins: definition.plugins.select { _1.env == env },
-          themes: definition.themes.select { _1.env == env }
-        )
+      def print_extension_definition(extension_def)
+        puts "  #{extension_def.name} (#{Source.from_definition(extension_def.source).info})"
+      end
+
+      def themes_in(env)
+        definition.themes.each do
+          yield _1 if _1.env == env
+        end
+      end
+
+      def plugins_in(env)
+        definition.plugins.each do
+          yield _1 if _1.env == env
+        end
       end
     end
   end

data/lib/rexer/commands/state.rb

@@ -20,29 +20,27 @@ module Rexer
       attr_reader :lock_definition
 
       def print_plugins
-        plugins = lock_definition.plugins
-        return if plugins.empty?
+        plugin_defs = lock_definition.plugins
+        return if plugin_defs.empty?
 
         puts "\nPlugins:"
-        plugins.each do
-          puts " * #{_1.name} (#{source_info(_1.source)})"
+        plugin_defs.each do
+          plugin = Extension::Entity::Plugin.new(_1)
+          puts " * #{plugin.name} (#{plugin.source_info})"
         end
       end
 
       def print_themes
-        themes = lock_definition.themes
-        return if themes.empty?
+        theme_defs = lock_definition.themes
+        return if theme_defs.empty?
 
         puts "\nThemes:"
-        themes.each do
-          puts " * #{_1.name} (#{source_info(_1.source)})"
+        theme_defs.each do
+          theme = Extension::Entity::Theme.new(_1)
+          puts " * #{theme.name} (#{theme.source_info})"
         end
       end
 
-      def source_info(definition_source)
-        Source.from_definition(definition_source).info
-      end
-
       def no_lock_file_found
         lock_definition.nil?.tap { |result|
           puts "No lock file found" if result

data/lib/rexer/commands/switch.rb

@@ -7,7 +7,7 @@ module Rexer
 
       def call(env)
         return if no_lock_file_found
-        return if already_on(env)
+        return if already_in(env)
 
         Uninstall.new.call
         Install.new.call(env)
@@ -23,9 +23,9 @@ module Rexer
         }
       end
 
-      def already_on(env)
+      def already_in(env)
         (lock_definition.env == env).tap do |result|
-          puts "Already on #{env} environment" if result
+          puts "Already in #{env} environment" if result
         end
       end
     end

data/lib/rexer/extension/entity.rb

@@ -0,0 +1,55 @@
+require "active_support/core_ext/class/attribute"
+
+module Rexer
+  module Extension
+    module Entity
+      class Base
+        class_attribute :root_dir
+
+        def initialize(definition)
+          @definition = definition
+          @hooks = definition.hooks || {}
+          @name = definition.name
+        end
+
+        attr_reader :hooks, :name
+
+        def exist?
+          path.exist? && !path.empty?
+        end
+
+        def path
+          @path ||= root_dir.join(name.to_s)
+        end
+
+        def source_info
+          @source_info ||= source.info(path)
+        end
+
+        def source
+          @source ||= Source.from_definition(definition.source)
+        end
+
+        private
+
+        attr_reader :definition
+      end
+
+      class Plugin < Base
+        self.root_dir = Pathname.new("plugins")
+
+        def contains_db_migrations?
+          path.join("db", "migrate").then { _1.exist? && !_1.empty? }
+        end
+
+        def contains_gemfile?
+          path.join("Gemfile").exist?
+        end
+      end
+
+      class Theme < Base
+        self.root_dir = Pathname.new("themes")
+      end
+    end
+  end
+end

data/lib/rexer/extension/plugin/action.rb

@@ -9,36 +9,21 @@ module Rexer
 
         def initialize(definition)
           @definition = definition
-          @name = definition.name
-          @hooks = definition.hooks || {}
+          @plugin = Entity::Plugin.new(definition)
         end
 
         private
 
-        attr_reader :name, :hooks, :definition
-
-        def plugin_root_dir
-          Pathname.new("plugins")
-        end
-
-        def plugin_dir
-          @plugin_dir ||= plugin_root_dir.join(name.to_s)
-        end
-
-        def plugin_exists?
-          plugin_dir.exist? && !plugin_dir.empty?
-        end
+        attr_reader :plugin
 
         def needs_db_migration?
-          plugin_dir.join("db", "migrate").then {
-            _1.exist? && !_1.empty?
-          }
+          plugin.contains_db_migrations?
         end
 
         def run_db_migrate(extra_envs = {})
           return unless needs_db_migration?
 
-          envs = {"NAME" => name.to_s}.merge(extra_envs)
+          envs = {"NAME" => plugin.name.to_s}.merge(extra_envs)
           cmds = build_cmd("bundle", "exec", "rake", Rexer.verbosity.debug? ? nil : "-q", "redmine:plugins:migrate", envs:)
 
           broadcast(:processing, "Execute #{cmds}")
@@ -51,10 +36,6 @@ module Rexer
           end
         end
 
-        def source
-          @source ||= Source.from_definition(definition.source)
-        end
-
         def build_cmd(*command, envs: {})
           envs_str = envs.map { [_1, _2].join("=") }
           [Rexer.config.command_prefix, *command, *envs_str].compact.join(" ")

data/lib/rexer/extension/plugin/install.rb

@@ -3,9 +3,9 @@ module Rexer
     module Plugin
       class Install < Action
         def call
-          broadcast(:started, "Install #{name}")
+          broadcast(:started, "Install #{plugin.name}")
 
-          if plugin_exists?
+          if plugin.exist?
             broadcast(:skipped, "Already exists")
             return
           end
@@ -13,7 +13,7 @@ module Rexer
           load_from_source
           run_bundle_install
           run_db_migrate
-          hooks[:installed]&.call
+          call_installed_hook
 
           broadcast(:completed)
         end
@@ -21,11 +21,11 @@ module Rexer
         private
 
         def load_from_source
-          source.load(plugin_dir.to_s)
+          plugin.source.load(plugin.path.to_s)
         end
 
         def run_bundle_install
-          return unless plugin_dir.join("Gemfile").exist?
+          return unless plugin.contains_gemfile?
 
           cmds = build_cmd("bundle", "install", Rexer.verbosity.debug? ? nil : "--quiet")
 
@@ -33,6 +33,10 @@ module Rexer
 
           system(cmds, exception: true)
         end
+
+        def call_installed_hook
+          plugin.hooks[:installed]&.call
+        end
       end
     end
   end

data/lib/rexer/extension/plugin/reload_source.rb

@@ -3,9 +3,9 @@ module Rexer
     module Plugin
       class ReloadSource < Action
         def call
-          return unless plugin_exists?
+          return unless plugin.exist?
 
-          broadcast(:started, "Reload #{name} source")
+          broadcast(:started, "Reload #{plugin.name} source")
 
           reload_source
           run_db_migrate
@@ -16,10 +16,8 @@ module Rexer
         private
 
         def reload_source
-          plugin_dir.to_s.then { |dir|
-            FileUtils.rm_rf(dir)
-            source.load(dir)
-          }
+          plugin.path.rmtree
+          plugin.source.load(plugin.path.to_s)
         end
       end
     end

data/lib/rexer/extension/plugin/uninstall.rb

@@ -3,16 +3,16 @@ module Rexer
     module Plugin
       class Uninstall < Action
         def call
-          broadcast(:started, "Uninstall #{name}")
+          broadcast(:started, "Uninstall #{plugin.name}")
 
-          unless plugin_exists?
+          unless plugin.exist?
             broadcast(:skipped, "Not exists")
             return
           end
 
           reset_db_migration
           remove_plugin
-          hooks[:uninstalled]&.call
+          call_uninstalled_hook
 
           broadcast(:completed)
         end
@@ -24,7 +24,11 @@ module Rexer
         end
 
         def remove_plugin
-          plugin_dir.rmtree
+          plugin.path.rmtree
+        end
+
+        def call_uninstalled_hook
+          plugin.hooks[:uninstalled]&.call
         end
       end
     end

data/lib/rexer/extension/plugin/update.rb

@@ -3,11 +3,11 @@ module Rexer
     module Plugin
       class Update < Action
         def call
-          return unless plugin_exists?
+          return unless plugin.exist?
 
-          broadcast(:started, "Update #{name}")
+          broadcast(:started, "Update #{plugin.name}")
 
-          unless source.updatable?
+          unless plugin.source.updatable?
             broadcast(:skipped, "Not updatable")
             return
           end
@@ -21,7 +21,7 @@ module Rexer
         private
 
         def update_source
-          source.update(plugin_dir.to_s)
+          plugin.source.update(plugin.path)
         end
       end
     end

data/lib/rexer/extension/theme/action.rb

@@ -8,36 +8,12 @@ module Rexer
 
         def initialize(definition)
           @definition = definition
-          @name = definition.name
-          @hooks = definition.hooks || {}
+          @theme = Entity::Theme.new(definition)
         end
 
         private
 
-        attr_reader :name, :hooks, :definition
-
-        def theme_root_dir
-          public_themes = Pathname.pwd.join("public", "themes")
-
-          if public_themes.exist?
-            # When Redmine version is v5.1 or older, public/themes is used.
-            public_themes
-          else
-            Pathname.new("themes")
-          end
-        end
-
-        def theme_dir
-          @theme_dir ||= theme_root_dir.join(name.to_s)
-        end
-
-        def theme_exists?
-          theme_dir.exist? && !theme_dir.empty?
-        end
-
-        def source
-          @source ||= Source.from_definition(definition.source)
-        end
+        attr_reader :theme
       end
     end
   end

data/lib/rexer/extension/theme/install.rb

@@ -3,15 +3,15 @@ module Rexer
     module Theme
       class Install < Action
         def call
-          broadcast(:started, "Install #{name}")
+          broadcast(:started, "Install #{theme.name}")
 
-          if theme_exists?
+          if theme.exist?
             broadcast(:skipped, "Already exists")
             return
           end
 
           load_from_source
-          hooks[:installed]&.call
+          call_installed_hook
 
           broadcast(:completed)
         end
@@ -19,7 +19,11 @@ module Rexer
         private
 
         def load_from_source
-          source.load(theme_dir.to_s)
+          theme.source.load(theme.path.to_s)
+        end
+
+        def call_installed_hook
+          theme.hooks[:installed]&.call
         end
       end
     end

data/lib/rexer/extension/theme/reload_source.rb

@@ -3,9 +3,9 @@ module Rexer
     module Theme
       class ReloadSource < Action
         def call
-          return unless theme_exists?
+          return unless theme.exist?
 
-          broadcast(:started, "Reload #{name} source")
+          broadcast(:started, "Reload #{theme.name} source")
 
           reload_source
 
@@ -15,10 +15,8 @@ module Rexer
         private
 
         def reload_source
-          theme_dir.to_s.then { |dir|
-            FileUtils.rm_rf(dir)
-            source.load(dir)
-          }
+          theme.path.rmtree
+          theme.source.load(theme.path.to_s)
         end
       end
     end

data/lib/rexer/extension/theme/uninstall.rb

@@ -3,15 +3,15 @@ module Rexer
     module Theme
       class Uninstall < Action
         def call
-          broadcast(:started, "Uninstall #{name}")
+          broadcast(:started, "Uninstall #{theme.name}")
 
-          unless theme_exists?
+          unless theme.exist?
             broadcast(:skipped, "Not exists")
             return
           end
 
           remove_theme
-          hooks[:uninstalled]&.call
+          call_uninstalled_hook
 
           broadcast(:completed)
         end
@@ -19,7 +19,11 @@ module Rexer
         private
 
         def remove_theme
-          theme_dir.rmtree
+          theme.path.rmtree
+        end
+
+        def call_uninstalled_hook
+          theme.hooks[:uninstalled]&.call
         end
       end
     end

data/lib/rexer/extension/theme/update.rb

@@ -3,9 +3,9 @@ module Rexer
     module Theme
       class Update < Action
         def call
-          return unless theme_exists?
+          return unless theme.exist?
 
-          broadcast(:started, "Update #{name}")
+          broadcast(:started, "Update #{theme.name}")
 
           update_source
 
@@ -15,7 +15,7 @@ module Rexer
         private
 
         def update_source
-          source.update(theme_dir.to_s)
+          theme.source.update(theme.path.to_s)
         end
       end
     end

data/lib/rexer/source/base.rb

@@ -17,7 +17,7 @@ module Rexer
       end
 
       # Return the status of the source.
-      def info = ""
+      def info(_work_dir = nil) = ""
     end
   end
 end

data/lib/rexer/source/git.rb

@@ -9,7 +9,6 @@ module Rexer
         @branch = branch
         @tag = tag
         @ref = ref
-        @reference = branch || tag || ref
       end
 
       def load(path)
@@ -25,27 +24,35 @@ module Rexer
         branch || reference.nil?
       end
 
-      def info
-        URI.parse(url).then do |uri|
-          "#{uri.host}#{uri.path}@#{reference_name}"
-        end
+      def info(work_dir = nil)
+        uri = URI.parse(url).then { "#{_1.host}#{_1.path}" }
+        ref = reference(short_ref: true) || current_branch(work_dir)
+
+        [uri, ref].compact.join("@")
       end
 
       private
 
-      attr_reader :url, :reference, :branch, :tag, :ref
+      attr_reader :url, :branch, :tag
 
       def checkout(git)
         reference&.then { git.checkout(_1) }
       end
 
-      def reference_name
-        branch || tag || short_ref || "main"
+      def reference(short_ref: false)
+        branch || tag || ref(short: short_ref)
+      end
+
+      def ref(short: false)
+        return nil unless @ref
+        return @ref unless short
+
+        @ref.match?(/^[a-z0-9]+$/) ? @ref.slice(0, 7) : @ref
       end
 
-      def short_ref
-        return unless ref
-        ref.match?(/^[a-z0-9]+$/) ? ref.slice(0, 7) : ref
+      def current_branch(work_dir)
+        return nil unless work_dir
+        ::Git.open(work_dir).current_branch
       end
     end
   end

data/lib/rexer/source/github.rb

@@ -6,8 +6,8 @@ module Rexer
         super(url: "https://github.com/#{repo}", branch: branch, tag: tag, ref: ref)
       end
 
-      def info
-        "#{@repo}@#{reference_name}"
+      def info(work_dir = nil)
+        [@repo, reference(short_ref: true) || current_branch(work_dir)].compact.join("@")
       end
     end
   end

data/lib/rexer/version.rb

@@ -1,3 +1,3 @@
 module Rexer
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

data/lib/rexer.rb

@@ -1,12 +1,4 @@
 module Rexer
-  def self.definition_file
-    ".extensions.rb"
-  end
-
-  def self.definition_lock_file
-    ".extensions.lock"
-  end
-
   Config = Data.define(
     # The prefix of the command such as bundle install and bin/rails redmine:plugins:migrate.
     #
@@ -21,6 +13,14 @@ module Rexer
   class << self
     attr_accessor :verbosity
 
+    def definition_file
+      ".extensions.rb"
+    end
+
+    def definition_lock_file
+      ".extensions.lock"
+    end
+
     def config
       @config ||= Config.new(command_prefix: ENV["REXER_COMMAND_PREFIX"])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexer
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Katsuya Hidaka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,6 +139,7 @@ files:
 - lib/rexer/definition/diff.rb
 - lib/rexer/definition/dsl.rb
 - lib/rexer/definition/lock.rb
+- lib/rexer/extension/entity.rb
 - lib/rexer/extension/plugin/action.rb
 - lib/rexer/extension/plugin/install.rb
 - lib/rexer/extension/plugin/reload_source.rb