huginn_agent 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff01c359c18a7262e7e5ae3e860f4dbf91dc1674e38153f9fdce89697189b823
-  data.tar.gz: dd76eac597d165beb77930df9eb84d1d179ad5b099d8ab456b0b06d03165960d
+  metadata.gz: a40e16107a7ac0b8d0d29861cb4cfbefda5efaba359a32b20e54315bfc298ad4
+  data.tar.gz: baed6d68490f6e42e1fafefe0422ec8788a154d47c7c2f58165141a235478f33
 SHA512:
-  metadata.gz: f9eeb5262cca23d22c08c07195460d1769b5a324479b2b74db69986ca2b1b1447e19686be9aaef3324209eebcfec8e7561f624e3b68effe43a9d8bc4259e25dc
-  data.tar.gz: 1903c328c30a797ad0470840c7c82e1c1a89f5e3ad806166a5c922d6183bf3c9bd50074dfbe3a2c38aca48e69a4b5bda9478fc4b243e84235263e9c36c753e08
+  metadata.gz: e1e31053c8d1f008099f17eeac1b56fffbb48ea7d1f0fef8524bb616545a68a16a1f602a3cfa78eb3aeab1aa410e1ab47da09463515b13b2edad482ee8e2a8ce
+  data.tar.gz: 85dba6e68caf47559e1bf9353ee5e523c33911763fc20611f1edba222db02b45832bbaf38655684bcd39fae6b4eff45361767df895141f241255ad0db0a7a7d6

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.6.4] - 2026-04-05
+
+### Changed
+
+- Require registered agent files directly
+
+### Fixed
+
+- Skip duplicate gems from Huginn when loading development dependencies
+
 ## [0.6.3] - 2026-04-05
 
 ### Added
@@ -114,7 +124,8 @@ All notable changes to this project will be documented in this file.
 - First official and working release
 
 
-[Unreleased]: https://github.com/huginn/huginn_agent/compare/v0.6.3...HEAD
+[Unreleased]: https://github.com/huginn/huginn_agent/compare/v0.6.4...HEAD
+[0.6.4]: https://github.com/huginn/huginn_agent/compare/v0.6.3...v0.6.4
 [0.6.3]: https://github.com/huginn/huginn_agent/compare/v0.6.2...v0.6.3
 [0.6.2]: https://github.com/huginn/huginn_agent/compare/v0.6.1...v0.6.2
 [0.6.1]: https://github.com/huginn/huginn_agent/compare/v0.6.0...v0.6.1

data/lib/huginn_agent/patches/gemfile_helper.rb

@@ -7,12 +7,9 @@ class GemfileHelper
     gemspec = Dir["#{base_path}/*.gemspec"].first
     previous_gems = Hash[dependencies.map { |dep| [dep.name, dep] }]
     Gem::Specification.load(gemspec).development_dependencies.each do |args|
-      previous_gem = previous_gems[args.name]
-      if previous_gem
-        abort "Gem #{args.to_s} in #{gemspec} conflicts with huginn/Gemfile" unless previous_gem.match?(args.to_spec)
-      else
-        yield args.name, *args.requirements_list
-      end
+      next if previous_gems.key?(args.name)
+
+      yield args.name, *args.requirements_list
     end
   end
 end

data/lib/huginn_agent/version.rb

@@ -1,3 +1,3 @@
 class HuginnAgent
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/huginn_agent.rb

@@ -27,7 +27,7 @@ class HuginnAgent
         require path
       end
       agent_paths.each do |path|
-        setup_zeitwerk_loader path
+        require path
         Agent::TYPES << "Agents::#{File.basename(path.to_s).camelize}"
       end
     end
@@ -41,17 +41,5 @@ class HuginnAgent
     def agent_paths
       @agent_paths ||= []
     end
-
-    def setup_zeitwerk_loader(gem_path)
-      gem, _, mod_path = gem_path.partition('/')
-      gemspec = Gem::Specification.find_by_name(gem)
-      gem_dir = Pathname.new(gemspec.gem_dir)
-      module_dir = gem_dir + gemspec.require_paths[0] + gem
-
-      loader = Zeitwerk::Loader.new
-      loader.tag = gem
-      loader.push_dir(module_dir, namespace: Agents)
-      loader.setup
-    end
   end
 end

data/spec/lib/huginn_agent/patches/gemfile_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'rubygems/dependency'
+
+describe 'gemfile_helper patch' do
+  let(:patch_path) { File.expand_path('../../../../lib/huginn_agent/patches/gemfile_helper.rb', __dir__) }
+  let(:rspec_dependency) { Gem::Dependency.new('rspec', '>= 0') }
+  let(:thor_dependency) { Gem::Dependency.new('thor', '~> 1.5') }
+  let(:gemspec) { instance_double(Gem::Specification, development_dependencies: [rspec_dependency, thor_dependency]) }
+
+  let(:context) do
+    Object.new.tap do |object|
+      object.instance_variable_set(:@dependencies, [Gem::Dependency.new('rspec', '~> 3.13')])
+      object.instance_variable_set(:@added_gems, [])
+
+      object.define_singleton_method(:dependencies) { @dependencies }
+      object.define_singleton_method(:gem) { |*args| @added_gems << args }
+      object.define_singleton_method(:added_gems) { @added_gems }
+    end
+  end
+
+  before do
+    allow(Gem::Specification).to receive(:load).and_return(gemspec)
+  end
+
+  it 'does not add development dependencies already present in Huginn' do
+    context.instance_eval(File.read(patch_path), patch_path)
+
+    expect(context.added_gems).to eq([['thor']])
+  end
+end

data/spec/lib/huginn_agent_spec.rb

@@ -37,12 +37,12 @@ describe HuginnAgent do
       HuginnAgent.require!
     end
 
-    it 'sets up Zeitwerk loader for registered paths and adds the class name to Agent::TYPES' do
+    it 'requires registered paths and adds the class name to Agent::TYPES' do
       class Agent; TYPES = []; end
       string_double = double('test_agent.rb', camelize: 'TestAgent')
       expect(File).to receive(:basename).and_return(string_double)
       HuginnAgent.register('/tmp/test_agent.rb')
-      expect(HuginnAgent).to receive(:setup_zeitwerk_loader).with('/tmp/test_agent.rb')
+      expect(HuginnAgent).to receive(:require).with('/tmp/test_agent.rb')
       HuginnAgent.require!
       expect(Agent::TYPES).to eq(['Agents::TestAgent'])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huginn_agent
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Andrew Cantino
@@ -125,6 +125,7 @@ files:
 - lib/tasks/spec.rake
 - spec/lib/huginn_agent/cli/new_spec.rb
 - spec/lib/huginn_agent/helper_spec.rb
+- spec/lib/huginn_agent/patches/gemfile_helper_spec.rb
 - spec/lib/huginn_agent/spec_runner_spec.rb
 - spec/lib/huginn_agent_spec.rb
 - spec/spec_helper.rb
@@ -152,6 +153,7 @@ summary: Helpers for making new Huginn Agents
 test_files:
 - spec/lib/huginn_agent/cli/new_spec.rb
 - spec/lib/huginn_agent/helper_spec.rb
+- spec/lib/huginn_agent/patches/gemfile_helper_spec.rb
 - spec/lib/huginn_agent/spec_runner_spec.rb
 - spec/lib/huginn_agent_spec.rb
 - spec/spec_helper.rb