rexer 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8718806ffc0a827890d574a6396e88904059b58b5087b6ac09740da7bd39be42
-  data.tar.gz: b651388f82e418b597bbdf59016bf5a392b86593a462db1248eee5e6c101239f
+  metadata.gz: 35c79e74d0ffb8e149f5d608a67bd6c9fa709bb5da7d4442e6851453e5a66a43
+  data.tar.gz: f216971952e8e873e7959f8861fc55c674e0e22765cc2e12cd485793b6d65c8e
 SHA512:
-  metadata.gz: ba24fbdc765bc378b6fd024c9e9215db5476c40cb77890da0468343374d79049d2bbb18d2a216377c71d4cc42d77a221c75493f3783f553521b29b27c8a1641d
-  data.tar.gz: fde4958f98ae92922e07a16b8b0564897a7449ab8f16b5102c9ca77389614290a7e5c59128af436843e028783094ba017af9ef59b4fd99250ca494f00845dff5
+  metadata.gz: 52467965bc3cdfe91c72af5ea5504681e2fc12d2be7179309d464e131e7b766fc0efc6aeea7affcda9c287af129550828cf64ec5cd3b94c38deb1b880cf5d7e1
+  data.tar.gz: bcbffc9a28d139cf185cd068bed5ca594a163d97d054c33b62463794aec39f453d162e9e9f1abf071d7f2d81efcd910aa6a25c765cb185a653234ff7c666f0e0

data/README.md

@@ -80,13 +80,13 @@ This command uninstalls the extensions and deletes the `.extensions.lock`.
 ```
 $ rex
 Commands:
-  rex envs            # Show the list of defined environments in .extensions.rb
+  rex envs            # Show the list of environments and their extensions defined in .extensions.rb
   rex help [COMMAND]  # Describe available commands or one specific command
   rex init            # Create a new .extensions.rb file
   rex install [ENV]   # Install the definitions in .extensions.rb for the specified environment
   rex state           # Show the current state of the installed extensions
-  rex switch [ENV]    # Uninstall extensions for the currently installed environment and install ext...
-  rex uninstall       # Uninstall extensions for the currently installed environment based on the st...
+  rex switch [ENV]    # Uninstall extensions for the currently installed environment and install extensions for the specified environment
+  rex uninstall       # Uninstall extensions for the currently installed environment based on the state in .extensions.lock and remove the lock file
   rex update          # Update extensions for the currently installed environment to the latest version
   rex version         # Show Rexer version
 
@@ -166,7 +166,12 @@ In addition, you can define as many environments as you like, and list the defin
 ```
 $ rex envs
 default
+  bleuclair (support-propshaft)
+  redmine_issues_panel (master)
+
 stable
+  bleuclair (support-propshaft)
+  redmine_issues_panel (v1.0.2)
 ```
 
 ### Defining hooks

data/lib/rexer/cli.rb

@@ -39,7 +39,7 @@ module Rexer
       Commands::State.new.call
     end
 
-    desc "envs", "Show the list of defined environments in .extensions.rb"
+    desc "envs", "Show the list of environments and their extensions defined in .extensions.rb"
     def envs
       Commands::Envs.new.call
     end

data/lib/rexer/commands/envs.rb

@@ -6,16 +6,27 @@ module Rexer
       end
 
       def call
-        puts(*defined_envs)
+        defined_envs = definition.envs
+        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})"
+          end
+
+          puts if i < defined_envs.size - 1
+        end
       end
 
       private
 
       attr_reader :definition
 
-      def defined_envs
-        all_envs = definition.plugins.map(&:env) + definition.themes.map(&:env)
-        all_envs.uniq.sort
+      def definition_with(env)
+        definition.with(
+          plugins: definition.plugins.select { _1.env == env },
+          themes: definition.themes.select { _1.env == env }
+        )
       end
     end
   end

data/lib/rexer/commands/install.rb

@@ -37,9 +37,12 @@ module Rexer
       end
 
       def load_definition(env)
-        Definition.load_data.tap { |data|
-          data.env = env
-        }
+        data = Definition.load_data
+        data.with(
+          plugins: data.plugins.select { _1.env == env },
+          themes: data.themes.select { _1.env == env },
+          env:
+        )
       end
 
       def load_lock_definition

data/lib/rexer/definition/data.rb

@@ -1,22 +1,12 @@
 module Rexer
   module Definition
-    class Data
-      attr_accessor :env
-      attr_reader :version
-
-      def initialize(plugins, themes, env: nil, version: nil)
-        @plugins = plugins
-        @themes = themes
-        @env = env
-        @version = version
-      end
-
-      def plugins
-        env ? @plugins.select { _1.env == env } : @plugins
+    Data = ::Data.define(:plugins, :themes, :env, :version) do
+      def initialize(plugins:, themes:, env: nil, version: nil)
+        super
       end
 
-      def themes
-        env ? @themes.select { _1.env == env } : @themes
+      def envs
+        (plugins.map(&:env) + themes.map(&:env)).uniq.sort
       end
 
       def diff(other)

data/lib/rexer/definition/dsl.rb

@@ -1,10 +1,17 @@
 module Rexer
   module Definition
     class Dsl
-      def initialize(env = :default)
+      def initialize
         @plugins = []
         @themes = []
-        @env = env
+        @env = :default
+      end
+
+      class EnvDsl < self
+        def initialize(env)
+          super()
+          @env = env
+        end
       end
 
       def plugin(name, **opts, &hooks)
@@ -27,7 +34,7 @@ module Rexer
 
       def env(*env_names, &dsl)
         env_names.each do |env_name|
-          data = self.class.new(env_name).tap { _1.instance_eval(&dsl) }.to_data
+          data = EnvDsl.new(env_name).tap { _1.instance_eval(&dsl) }.to_data
 
           @plugins += data.plugins
           @themes += data.themes

data/lib/rexer/definition/lock.rb

@@ -23,17 +23,20 @@ module Rexer
 
       class Dsl < Definition::Dsl
         def lock(env:, version:)
-          lock_state.update(env:, version:)
+          @lock_env = env
+          @lock_version = version
         end
 
         def to_data
-          Definition::Data.new(@plugins, @themes, **lock_state)
+          plugins = lock_by_env(@plugins)
+          themes = lock_by_env(@themes)
+          Definition::Data.new(plugins, themes, @lock_env, @lock_version)
         end
 
         private
 
-        def lock_state
-          @lock_state ||= {}
+        def lock_by_env(plugins_or_themes)
+          plugins_or_themes.select { _1.env == @lock_env }
         end
       end
     end

data/lib/rexer/extension/plugin.rb

@@ -39,14 +39,14 @@ module Rexer
           return unless needs_db_migration?
 
           envs = {"NAME" => name.to_s}.merge(extra_envs)
-          cmds = cmd("bundle", "exec", "rake", Rexer.verbosity.debug? ? nil : "-q", "redmine:plugins:migrate")
+          cmds = build_cmd("bundle", "exec", "rake", Rexer.verbosity.debug? ? nil : "-q", "redmine:plugins:migrate", envs:)
 
-          broadcast(:processing, "Execute #{cmds} with #{envs}")
+          broadcast(:processing, "Execute #{cmds}")
 
           if Rexer.verbosity.debug?
-            system(envs, cmds, exception: true)
+            system(cmds, exception: true)
           else
-            _, error, status = Open3.capture3(envs, cmds)
+            _, error, status = Open3.capture3(cmds)
             raise error unless status.success?
           end
         end
@@ -55,8 +55,9 @@ module Rexer
           @source ||= Source.from_definition(definition.source)
         end
 
-        def cmd(*command)
-          [Rexer.config.command_prefix, *command].compact.join(" ")
+        def build_cmd(*command, envs: {})
+          envs_str = envs.map { [_1, _2].join("=") }
+          [Rexer.config.command_prefix, *command, *envs_str].compact.join(" ")
         end
       end
 
@@ -86,7 +87,7 @@ module Rexer
         def run_bundle_install
           return unless plugin_dir.join("Gemfile").exist?
 
-          cmds = cmd("bundle", "install", Rexer.verbosity.debug? ? nil : "--quiet")
+          cmds = build_cmd("bundle", "install", Rexer.verbosity.debug? ? nil : "--quiet")
 
           broadcast(:processing, "Execute #{cmds}")
 

data/lib/rexer/version.rb

@@ -1,3 +1,3 @@
 module Rexer
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexer
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Katsuya Hidaka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-01 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor