factorix 0.5.1 → 0.6.0

data/lib/factorix/cli/commands/mod/show.rb

@@ -32,7 +32,7 @@ module Factorix
             "some-mod          # Show details for some-mod"
           ]
 
-          argument :mod_name, type: :string, required: true, desc: "MOD name to show"
+          argument :mod_name, required: true, desc: "MOD name to show"
 
           # Execute the show command
           #
@@ -75,10 +75,10 @@ module Factorix
           end
 
           private def display_header(mod_info)
-            puts TITLE_STYLE[mod_info.title]
-            puts
-            puts mod_info.summary unless mod_info.summary.empty?
-            puts
+            out.puts TITLE_STYLE[mod_info.title]
+            out.puts
+            out.puts mod_info.summary unless mod_info.summary.empty?
+            out.puts
           end
 
           private def display_basic_info(mod_info, local_status)
@@ -103,9 +103,9 @@ module Factorix
 
             max_label_width = rows.map {|label, _| label.length }.max
             rows.each do |label, value|
-              puts "#{label.ljust(max_label_width)}  #{value}"
+              out.puts "#{label.ljust(max_label_width)}  #{value}"
             end
-            puts
+            out.puts
           end
 
           private def format_status(local_status)
@@ -123,18 +123,18 @@ module Factorix
           end
 
           private def display_links(mod_info)
-            puts HEADER_STYLE["Links"]
-            puts "  MOD Portal: https://mods.factorio.com/mod/#{mod_info.name}"
+            out.puts HEADER_STYLE["Links"]
+            out.puts "  MOD Portal: https://mods.factorio.com/mod/#{mod_info.name}"
 
             if mod_info.detail
               if mod_info.detail.source_url
-                puts "  Source: #{mod_info.detail.source_url}"
+                out.puts "  Source: #{mod_info.detail.source_url}"
               end
               if mod_info.detail.homepage
-                puts "  Homepage: #{mod_info.detail.homepage}"
+                out.puts "  Homepage: #{mod_info.detail.homepage}"
               end
             end
-            puts
+            out.puts
           end
 
           private def display_dependencies(mod_info)
@@ -149,16 +149,16 @@ module Factorix
             optional = parsed.select {|d| d[:type] == :optional }
 
             unless required.empty?
-              puts HEADER_STYLE["Dependencies"]
+              out.puts HEADER_STYLE["Dependencies"]
               required.each {|dep| display_dependency(dep) }
-              puts
+              out.puts
             end
 
             return if optional.empty?
 
-            puts HEADER_STYLE["Optional Dependencies"]
+            out.puts HEADER_STYLE["Optional Dependencies"]
             optional.each {|dep| display_dependency(dep) }
-            puts
+            out.puts
           end
 
           private def parse_dependency(dep_str)
@@ -178,7 +178,7 @@ module Factorix
           end
 
           private def display_dependency(dep)
-            puts "  #{dep[:spec]}"
+            out.puts "  #{dep[:spec]}"
           end
 
           private def display_incompatibilities(mod_info)
@@ -191,9 +191,9 @@ module Factorix
 
             return if incompatible.empty?
 
-            puts HEADER_STYLE["Incompatibilities"]
-            incompatible.each {|dep| puts "  #{INCOMPATIBLE_MOD_STYLE[dep[:spec]]}" }
-            puts
+            out.puts HEADER_STYLE["Incompatibilities"]
+            incompatible.each {|dep| out.puts "  #{INCOMPATIBLE_MOD_STYLE[dep[:spec]]}" }
+            out.puts
           end
         end
       end

data/lib/factorix/cli/commands/mod/sync.rb

@@ -31,15 +31,16 @@ module Factorix
             "-j 8 save.zip      # Use 8 parallel downloads"
           ]
 
-          argument :save_file, type: :string, required: true, desc: "Path to Factorio save file (.zip)"
-          option :jobs, type: :integer, aliases: ["-j"], default: 4, desc: "Number of parallel downloads"
+          argument :save_file, required: true, desc: "Path to Factorio save file (.zip)"
+          option :jobs, aliases: ["-j"], default: "4", desc: "Number of parallel downloads"
 
           # Execute the sync command
           #
           # @param save_file [String] Path to save file
           # @param jobs [Integer] Number of parallel downloads
           # @return [void]
-          def call(save_file:, jobs: 4, **)
+          def call(save_file:, jobs: "4", **)
+            jobs = Integer(jobs)
             # Load save file
             say "Loading save file: #{save_file}", prefix: :info
             save_data = SaveFile.load(Pathname(save_file))
@@ -47,7 +48,7 @@ module Factorix
 
             # Load current state
             mod_list = MODList.load
-            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: $stderr)
+            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: err)
             handler = Progress::ScanHandler.new(presenter)
             installed_mods = InstalledMOD.all(handler:)
             graph = Dependency::Graph::Builder.build(installed_mods:, mod_list:)
@@ -109,7 +110,7 @@ module Factorix
           # @return [Array<Hash>] Installation targets with MOD info and releases
           private def plan_installation(mods_to_install, graph, jobs)
             # Create progress presenter for info fetching
-            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Fetching MOD info", output: $stderr)
+            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Fetching MOD info", output: err)
 
             # Fetch info for MODs to install
             target_infos = fetch_target_mod_info(mods_to_install, jobs, presenter)

data/lib/factorix/cli/commands/mod/uninstall.rb

@@ -45,7 +45,7 @@ module Factorix
 
             # Load current state (without validation to allow fixing issues)
             mod_list = MODList.load
-            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: $stderr)
+            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: err)
             handler = Progress::ScanHandler.new(presenter)
             installed_mods = InstalledMOD.all(handler:)
             graph = Dependency::Graph::Builder.build(installed_mods:, mod_list:)

data/lib/factorix/cli/commands/mod/update.rb

@@ -32,15 +32,16 @@ module Factorix
           ]
 
           argument :mod_names, type: :array, required: false, desc: "MOD names to update (all if not specified)"
-          option :jobs, type: :integer, aliases: ["-j"], default: 4, desc: "Number of parallel downloads"
+          option :jobs, aliases: ["-j"], default: "4", desc: "Number of parallel downloads"
 
           # Execute the update command
           #
           # @param mod_names [Array<String>] MOD names to update
           # @param jobs [Integer] Number of parallel downloads
           # @return [void]
-          def call(mod_names: [], jobs: 4, **)
-            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: $stderr)
+          def call(mod_names: [], jobs: "4", **)
+            jobs = Integer(jobs)
+            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Scanning MOD(s)", output: err)
             handler = Progress::ScanHandler.new(presenter)
             installed_mods = InstalledMOD.all(handler:)
             mod_list = MODList.load
@@ -98,7 +99,7 @@ module Factorix
           # @param jobs [Integer] Number of parallel jobs
           # @return [Array<Hash>] Update targets with current and latest versions
           private def find_update_targets(target_mods, installed_mods, jobs)
-            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Checking for updates", output: $stderr)
+            presenter = Progress::Presenter.new(title: "\u{1F50D}\u{FE0E} Checking for updates", output: err)
             presenter.start(total: target_mods.size)
 
             pool = Concurrent::FixedThreadPool.new(jobs)
@@ -189,13 +190,13 @@ module Factorix
           # @param jobs [Integer] Number of parallel jobs
           # @return [void]
           private def download_mods(targets, jobs)
-            multi_presenter = Progress::MultiPresenter.new(title: "\u{1F4E5}\u{FE0E} Downloads")
+            multi_presenter = Progress::MultiPresenter.new(title: "\u{1F4E5}\u{FE0E} Downloads", output: err)
 
             pool = Concurrent::FixedThreadPool.new(jobs)
 
             futures = targets.map {|target|
               Concurrent::Future.execute(executor: pool) do
-                thread_portal = Application[:portal]
+                thread_portal = Container[:portal]
                 thread_downloader = thread_portal.mod_download_api.downloader
 
                 presenter = multi_presenter.register(

data/lib/factorix/cli/commands/mod/upload.rb

@@ -18,11 +18,11 @@ module Factorix
             "my-mod_1.0.0.zip --category automation     # Upload with category"
           ]
 
-          argument :file, type: :string, required: true, desc: "Path to MOD zip file"
-          option :description, type: :string, desc: "Markdown description"
-          option :category, type: :string, desc: "MOD category"
-          option :license, type: :string, desc: "License identifier"
-          option :source_url, type: :string, desc: "Repository URL"
+          argument :file, required: true, desc: "Path to MOD zip file"
+          option :description, desc: "Markdown description"
+          option :category, desc: "MOD category"
+          option :license, desc: "License identifier"
+          option :source_url, desc: "Repository URL"
 
           # Execute the upload command
           #
@@ -44,7 +44,7 @@ module Factorix
             mod_name = extract_mod_name(file_path)
             metadata = build_metadata(description:, category:, license:, source_url:)
 
-            presenter = Progress::Presenter.new(title: "\u{1F4E4} Uploading #{file_path.basename}", output: $stderr)
+            presenter = Progress::Presenter.new(title: "\u{1F4E4} Uploading #{file_path.basename}", output: err)
 
             uploader = portal.mod_management_api.uploader
             handler = Progress::UploadHandler.new(presenter)

data/lib/factorix/cli/commands/path.rb

@@ -61,7 +61,7 @@ module Factorix
           result = PATH_TYPES.transform_values {|method_name| runtime.public_send(method_name).to_s }
 
           if json
-            puts JSON.pretty_generate(result)
+            out.puts JSON.pretty_generate(result)
           else
             output_table(result)
           end
@@ -70,7 +70,7 @@ module Factorix
         private def output_table(result)
           key_width = result.keys.map(&:length).max
           result.each do |key, value|
-            puts "%-#{key_width}s  %s" % [key, value]
+            out.puts "%-#{key_width}s  %s" % [key, value]
           end
         end
       end

data/lib/factorix/cli/commands/version.rb

@@ -18,7 +18,7 @@ module Factorix
         # Outputs the current version of the Factorix gem to stdout.
         #
         # @return [void]
-        def call(**) = puts VERSION
+        def call(**) = out.puts VERSION
       end
     end
   end

data/lib/factorix/{application.rb → container.rb}

@@ -1,26 +1,17 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
 require "dry/core"
 require "dry/logger"
 
 module Factorix
-  # Application container and configuration
+  # DI container for dependency injection
   #
-  # Provides dependency injection container and configuration management
-  # using dry-core's Container and dry-configurable.
-  #
-  # @example Configure the application
-  #   Factorix::Application.configure do |config|
-  #     config.log_level = :debug
-  #     config.http.connect_timeout = 10
-  #   end
+  # Provides dependency injection container using dry-core's Container.
   #
   # @example Resolve dependencies
-  #   runtime = Factorix::Application[:runtime]
-  class Application
+  #   runtime = Factorix::Container[:runtime]
+  class Container
     extend Dry::Core::Container::Mixin
-    extend Dry::Configurable
 
     # Some items are registered with memoize: false to support independent event handlers
     # for each parallel download task (e.g., progress tracking).
@@ -46,7 +37,7 @@ module Factorix
       # Dispatcher level set to DEBUG to allow all messages through
       # Backend controls filtering based on --log-level option
       Dry.Logger(:factorix, level: :debug) do |dispatcher|
-        dispatcher.add_backend(level: config.log_level, stream: log_path.to_s, template: "[%<time>s] %<severity>s: %<message>s %<payload>s")
+        dispatcher.add_backend(level: Factorix.config.log_level, stream: log_path.to_s, template: "[%<time>s] %<severity>s: %<message>s %<payload>s")
       end
     end
 
@@ -57,19 +48,19 @@ module Factorix
 
     # Register download cache
     register(:download_cache, memoize: true) do
-      c = config.cache.download
+      c = Factorix.config.cache.download
       Cache::FileSystem.new(c.dir, **c.to_h.except(:dir))
     end
 
     # Register API cache (with compression for JSON responses)
     register(:api_cache, memoize: true) do
-      c = config.cache.api
+      c = Factorix.config.cache.api
       Cache::FileSystem.new(c.dir, **c.to_h.except(:dir))
     end
 
     # Register info.json cache (for MOD metadata from ZIP files)
     register(:info_json_cache, memoize: true) do
-      c = config.cache.info_json
+      c = Factorix.config.cache.info_json
       Cache::FileSystem.new(c.dir, **c.to_h.except(:dir))
     end
 
@@ -146,73 +137,5 @@ module Factorix
     register(:portal, memoize: false) do
       Portal.new
     end
-
-    # Log level (:debug, :info, :warn, :error, :fatal)
-    setting :log_level, default: :info
-
-    # Runtime settings (optional overrides for auto-detection)
-    setting :runtime do
-      setting :executable_path, constructor: ->(v) { v ? Pathname(v) : nil }
-      setting :user_dir, constructor: ->(v) { v ? Pathname(v) : nil }
-      setting :data_dir, constructor: ->(v) { v ? Pathname(v) : nil }
-    end
-
-    # HTTP timeout settings
-    setting :http do
-      setting :connect_timeout, default: 5
-      setting :read_timeout, default: 30
-      setting :write_timeout, default: 30
-    end
-
-    # Cache settings
-    setting :cache do
-      # Download cache settings (for MOD files)
-      setting :download do
-        setting :dir, constructor: ->(value) { Pathname(value) }
-        setting :ttl, default: nil # nil for unlimited (MOD files are immutable)
-        setting :max_file_size, default: nil # nil for unlimited
-        setting :compression_threshold, default: nil # nil for no compression (binary files)
-      end
-
-      # API cache settings (for API responses)
-      setting :api do
-        setting :dir, constructor: ->(value) { Pathname(value) }
-        setting :ttl, default: 3600 # 1 hour (API responses may change)
-        setting :max_file_size, default: 10 * 1024 * 1024 # 10MiB (JSON responses)
-        setting :compression_threshold, default: 0 # always compress (JSON is highly compressible)
-      end
-
-      # info.json cache settings (for MOD metadata from ZIP files)
-      setting :info_json do
-        setting :dir, constructor: ->(value) { Pathname(value) }
-        setting :ttl, default: nil # nil for unlimited (info.json is immutable within a MOD ZIP)
-        setting :max_file_size, default: nil # nil for unlimited (info.json is small)
-        setting :compression_threshold, default: 0 # always compress (JSON is highly compressible)
-      end
-    end
-
-    # Load configuration from file
-    #
-    # @param path [Pathname, String, nil] configuration file path
-    # @return [void]
-    # @raise [ConfigurationError] if explicitly specified path does not exist
-    def self.load_config(path=nil)
-      if path
-        # Explicitly specified path must exist
-        config_path = Pathname(path)
-        raise ConfigurationError, "Configuration file not found: #{config_path}" unless config_path.exist?
-      else
-        # Default path is optional
-        config_path = resolve(:runtime).factorix_config_path
-        return unless config_path.exist?
-      end
-
-      instance_eval(config_path.read, config_path.to_s)
-    end
-
-    runtime = resolve(:runtime)
-    config.cache.download.dir = runtime.factorix_cache_dir / "download"
-    config.cache.api.dir = runtime.factorix_cache_dir / "api"
-    config.cache.info_json.dir = runtime.factorix_cache_dir / "info_json"
   end
 end

data/lib/factorix/dependency/parser.rb

@@ -128,7 +128,7 @@ module Factorix
         MODVersionRequirement[operator:, version:]
       rescue VersionParseError => e
         # Skip version requirements with out-of-range version components
-        Application[:logger].warn("Skipping version requirement '#{version_string}': #{e.message}")
+        Container[:logger].warn("Skipping version requirement '#{version_string}': #{e.message}")
         nil
       end
 

data/lib/factorix/http/client.rb

@@ -162,9 +162,9 @@ module Factorix
         Net::HTTP.new(uri.host, uri.port).tap do |http|
           http.use_ssl = uri.scheme == "https"
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          http.open_timeout = Application.config.http.connect_timeout
-          http.read_timeout = Application.config.http.read_timeout
-          http.write_timeout = Application.config.http.write_timeout if http.respond_to?(:write_timeout=)
+          http.open_timeout = Factorix.config.http.connect_timeout
+          http.read_timeout = Factorix.config.http.read_timeout
+          http.write_timeout = Factorix.config.http.write_timeout if http.respond_to?(:write_timeout=)
         end
       end
 

data/lib/factorix/info_json.rb

@@ -47,8 +47,8 @@ module Factorix
     # @return [InfoJSON] parsed info.json from zip
     # @raise [FileFormatError] if zip is invalid or info.json not found
     def self.from_zip(zip_path)
-      cache = Application.resolve(:info_json_cache)
-      logger = Application.resolve(:logger)
+      cache = Container.resolve(:info_json_cache)
+      logger = Container.resolve(:logger)
       cache_key = cache.key_for(zip_path.to_s)
 
       if (cached_json = cache.read(cache_key, encoding: Encoding::UTF_8))

data/lib/factorix/mod_list.rb

@@ -18,7 +18,7 @@ module Factorix
     # @param path [Pathname] the path to the file to load the MOD list from (default: runtime.mod_list_path)
     # @return [Factorix::MODList] the loaded MOD list
     # @raise [MODSettingsError] if the base MOD is disabled
-    def self.load(path=Application[:runtime].mod_list_path)
+    def self.load(path=Container[:runtime].mod_list_path)
       raw_data = JSON.parse(path.read, symbolize_names: true)
       mods_hash = raw_data[:mods].to_h {|entry|
         mod = MOD[name: entry[:name]]
@@ -50,7 +50,7 @@ module Factorix
     #
     # @param path [Pathname] the path to the file to save the MOD list to (default: runtime.mod_list_path)
     # @return [void]
-    def save(path=Application[:runtime].mod_list_path)
+    def save(path=Container[:runtime].mod_list_path)
       mods_data = @mods.map {|mod, state|
         data = {name: mod.name, enabled: state.enabled?}
         # Only include version in the output if it exists

data/lib/factorix/mod_settings.rb

@@ -108,7 +108,7 @@ module Factorix
     #
     # @param path [Pathname] Path to the MOD settings file (default: runtime.mod_settings_path)
     # @return [MODSettings] New MODSettings instance
-    def self.load(path=Application[:runtime].mod_settings_path)
+    def self.load(path=Container[:runtime].mod_settings_path)
       path.open("rb") do |io|
         game_version, sections = load_settings_from_io(io)
         new(game_version, sections)
@@ -244,7 +244,7 @@ module Factorix
     #
     # @param path [Pathname] Path to save the MOD settings file (default: runtime.mod_settings_path)
     # @return [void]
-    def save(path=Application[:runtime].mod_settings_path)
+    def save(path=Container[:runtime].mod_settings_path)
       path.open("wb") do |file|
         serializer = SerDes::Serializer.new(file)
 

data/lib/factorix/runtime/user_configurable.rb

@@ -8,10 +8,10 @@ module Factorix
     # auto-detected paths via configuration. When a configured path is available,
     # it is used instead of platform-specific auto-detection.
     #
-    # Configuration is done via Application.config:
+    # Configuration is done via Factorix.config:
     #
     # @example Configure paths in config file
-    #   Factorix::Application.configure do |config|
+    #   Factorix.configure do |config|
     #     config.runtime.executable_path = "/opt/factorio/bin/x64/factorio"
     #     config.runtime.user_dir = "/home/user/.factorio"
     #   end
@@ -46,20 +46,20 @@ module Factorix
       def data_dir = configurable_path(:data_dir, example_path: "/path/to/factorio/data") { super }
 
       private def configurable_path(name, example_path:)
-        if (configured = Application.config.runtime.public_send(name))
-          Application[:logger].debug("Using configured #{name}", path: configured.to_s)
+        if (configured = Factorix.config.runtime.public_send(name))
+          Container[:logger].debug("Using configured #{name}", path: configured.to_s)
           configured
         else
-          Application[:logger].debug("No configuration for #{name}, using auto-detection")
-          yield.tap {|path| Application[:logger].debug("Auto-detected #{name}", path: path.to_s) }
+          Container[:logger].debug("No configuration for #{name}, using auto-detection")
+          yield.tap {|path| Container[:logger].debug("Auto-detected #{name}", path: path.to_s) }
         end
       rescue NotImplementedError => e
-        Application[:logger].error("Auto-detection failed and no configuration provided", error: e.message)
+        Container[:logger].error("Auto-detection failed and no configuration provided", error: e.message)
         raise ConfigurationError, <<~MESSAGE
           #{name} not configured and auto-detection is not supported for this platform.
-          Please configure it in #{Application[:runtime].factorix_config_path}:
+          Please configure it in #{Container[:runtime].factorix_config_path}:
 
-            Factorix::Application.configure do |config|
+            Factorix.configure do |config|
               config.runtime.#{name} = "#{example_path}"
             end
         MESSAGE

data/lib/factorix/service_credential.rb

@@ -39,7 +39,7 @@ module Factorix
       elsif username_env || token_env
         raise CredentialError, "Both #{ENV_USERNAME} and #{ENV_TOKEN} must be set (or neither)"
       else
-        runtime = Application[:runtime]
+        runtime = Container[:runtime]
         from_player_data(runtime:)
       end
     end
@@ -49,7 +49,7 @@ module Factorix
     # @return [ServiceCredential] new instance with credentials from environment
     # @raise [CredentialError] if username or token is not set or empty
     def self.from_env
-      logger = Application["logger"]
+      logger = Container["logger"]
       logger.debug "Loading service credentials from environment"
 
       username = ENV.fetch(ENV_USERNAME, nil)
@@ -83,7 +83,7 @@ module Factorix
     # @raise [Errno::ENOENT] if player-data.json does not exist
     # @raise [CredentialError] if username or token is missing in player-data.json
     def self.from_player_data(runtime:)
-      logger = Application["logger"]
+      logger = Container["logger"]
       logger.debug "Loading service credentials from player-data.json"
 
       player_data_path = runtime.player_data_path

data/lib/factorix/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Factorix
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
   public_constant :VERSION
 end