subbundle 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: becbb56b5711721febdcec6b3beb98ce112a836773ba61a8cb243ffd260b5354
-  data.tar.gz: 93e1ea03033b96b6af57bebec8a13ca9fe26a3b9eaadf0647fdb70d5790ef942
+  metadata.gz: f314bee2a82122f608dd196ca7d585040228d34a6384cd91fb241bd5f8a26024
+  data.tar.gz: 86bfe4f35f803cf3ccad15033180799a7651b7b9857e1ee87adecf3195a09ddd
 SHA512:
-  metadata.gz: '058f77db697842bd92bc086df81d58fec633b59e2dcd21f3f9dbd10cbcc837bb2b4f7ca73ee19a376266936a3e585b7ea38436b8736df2651cbc55bcd2d6037b'
-  data.tar.gz: c3d15af9d81f1bd96260cca07a6bce13d8b1686ef145b40e318fb66ae71c18ac0f2abf9b77e6e19d60ba54e5719de04ca5da8dc78cb3a73754fdff115ba8ed39
+  metadata.gz: d873244bbed04592e5820e85f3087479cb474b65668f17ac5617fc17797d8ea6621b561b06b9e316dfea893704c576586371f856f34d26a412d43be2300e90d9
+  data.tar.gz: 5f744728a2e2aabb5f574fe3c5a2ba041feb84e5de4ba99c82ac45586e7497d124db0c594361cb52d4f9f079f0f2b8cf846bca6fdbd717ba57532a4e308e7eea

data/lib/subbundle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Subbundle
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/subbundle.rb

@@ -1,78 +1,22 @@
 # frozen_string_literal: true
 
 require_relative "subbundle/version"
+require "bundler"
 
 module Subbundle
-  def self.setup(*gems, name: nil)
-    require "bundler"
-    require "digest/md5"
+  def self.setup(*gems)
+    # Don't write to the lockfile.
+    Bundler::Definition.no_lock = true
 
-    name ||= File.basename($PROGRAM_NAME)
-    gems = gems.map(&:to_s)
+    Bundler.definition.tap do |definition|
+      definition.dependencies.keep_if { |dependency| gems.include?(dependency.name) }
+      definition.locked_deps.keep_if { |name, _| gems.include?(name) }
 
-    digest = Digest::MD5.new
-    digest << Bundler.default_lockfile.to_s
-    digest.file(Bundler.default_lockfile)
-    gems.sort.each { |dep| digest << dep }
-
-    subbundle_lockfile_path = Bundler.app_config_path.join("subbundles/#{name}.#{digest.hexdigest}.lock")
-
-    if subbundle_lockfile_path.exist?
-      return if setup_from_subbundle(gems, subbundle_lockfile_path)
+      # Overrides the specs
+      spec_set = Bundler::SpecSet.new(definition.instance_variable_get(:@locked_specs).for(definition.dependencies, false, true))
+      definition.instance_variable_set(:@locked_specs, spec_set)
     end
 
-    default_lockfile = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
-    required_dependencies = default_lockfile.dependencies.slice(*gems).values
-    spec_set = Bundler::SpecSet.new(default_lockfile.specs)
-    specs = spec_set.for(required_dependencies, false, true)
-    dependencies = default_lockfile.dependencies.slice(*specs.map(&:name)).values
-    source_list = build_source_list(specs.map(&:source).uniq)
-    definition = Bundler::Definition.new(Bundler.default_lockfile, dependencies, source_list, {})
-    subbundle_lockfile_path.dirname.mkpath
-    subbundle_lockfile_path.write(Bundler.ui.silence { definition.to_lock })
-
-    # Delete old caches.
-    Bundler.app_config_path.glob("subbundles/#{name}.*.lock").each do |path|
-      path.delete if path != subbundle_lockfile_path
-    end
-
-    setup_from_subbundle(gems, subbundle_lockfile_path)
-  end
-
-  def self.setup_from_subbundle(gems, subbundle_lockfile_path)
-    subbundle_lockfile = Bundler::LockfileParser.new(Bundler.read_file(subbundle_lockfile_path))
-    dependencies = subbundle_lockfile.dependencies.slice(*gems).values
-    source_list = build_source_list(subbundle_lockfile.sources)
-    definition = Bundler::Definition.new(subbundle_lockfile_path, dependencies, source_list, {})
-    if definition.nothing_changed?
-      setup_runtime(definition)
-      true
-    else
-      subbundle_lockfile_path.delete
-      false
-    end
-  end
-
-  def self.build_source_list(sources)
-    sources.compact.each_with_object(Bundler::SourceList.new) do |source, source_list|
-      case source
-      when Bundler::Source::Git
-        source_list.add_git_source(source.options)
-      when Bundler::Source::Path, Bundler::Source::Gemspec
-        source_list.add_path_source(source.options)
-      when Bundler::Source::Rubygems
-        next if source.remotes.empty?
-        source_list.add_rubygems_source(source.options)
-      else
-        raise "unhandled: #{source.inspect}"
-      end
-    end
-  end
-
-  def self.setup_runtime(definition)
-    runtime = Bundler::Runtime.new(Bundler.root, definition)
-    # This is not ideal, let's revisit later.
-    Bundler.instance_variable_set(:@load, runtime)
-    Bundler.ui.silence { runtime.setup }
+    Bundler.require
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subbundle
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ngan Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email: