toys-core 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a552244c25e03216c7bf958a7ccd2a35bb7fb3795a02e77c4a839b7720e258
-  data.tar.gz: 58513ce7d5d60646a1b9e51235d04df470ee5d9317a9a72048a8e95872227da0
+  metadata.gz: 7d34e973aef54758dbd85e689d69bd68660024a41e344c40bdc64b84459e5b31
+  data.tar.gz: 1c488073e098663bf9b2e6b9434c8c1932eeb66411855a4810cb57eca4ea1445
 SHA512:
-  metadata.gz: 299c193de07d0802046029c7b305a1e4cecac715eee32d259a917b6ecc2505975ba10a2aca90b510036076d9f32b58849a02381ae61837336eee5361cd2126ea
-  data.tar.gz: b42a4d81db4a71a136deafd4a62f0e7087325097a1c3e7473a5b7edda699b08ee1c8d81377765a70d8a18fd0a2693874781418f9953ca52f92cced670bec1421
+  metadata.gz: '09e199be2b41bc50a6a8e2d8a03f91be92c2f04f022abc5a6a64f4077f745a445777369e4a20787a4754fe8b709e5cfde138e65eee84ec3f4f6d21ca089072fc'
+  data.tar.gz: b874efa699f0c7d76ffaa6848fb30668d830b9a1b8a342fed13283586829069cefdbe7a379a90749c365c510affa06394d82d21e601c3b6bd868f001f4287350

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+### v0.13.1 / 2022-03-01
+
+* FIXED: Toys::Utils::Gems no longer fails to install a bundle if it had locked to a different version of a builtin gem
+
 ### v0.13.0 / 2022-02-08
 
 Toys-Core 0.13.0 is a major release with significant improvements to the git cache, along with compatibility improvements and bug fixes.

data/lib/toys/core.rb

@@ -9,7 +9,7 @@ module Toys
     # Current version of Toys core.
     # @return [String]
     #
-    VERSION = "0.13.0"
+    VERSION = "0.13.1"
   end
 
   ##

data/lib/toys/utils/gems.rb

@@ -372,16 +372,24 @@ module Toys
       end
 
       def modified_gemfile_content(gemfile_path)
-        is_running_toys = ::Toys.const_defined?(:VERSION)
         content = [::File.read(gemfile_path)]
-        content << "has_toys_dep = dependencies.any? { |dep| dep.name == 'toys' }" unless is_running_toys
-        content << "dependencies.delete_if { |dep| dep.name == 'toys-core' || dep.name == 'toys' }"
-        repo_root = ::File.dirname(::File.dirname(::Toys::CORE_LIB_PATH)) if ::ENV["TOYS_DEV"]
-        path = repo_root ? ::File.join(repo_root, "toys-core") : nil
-        content << "gem 'toys-core', #{::Toys::Core::VERSION.inspect}, path: #{path.inspect}"
-        path = repo_root ? ::File.join(repo_root, "toys") : nil
-        guard = is_running_toys ? "" : " if has_toys_dep"
-        content << "gem 'toys', #{::Toys::Core::VERSION.inspect}, path: #{path.inspect}#{guard}"
+
+        custom_paths = {}
+        if ::ENV["TOYS_DEV"]
+          repo_root = ::File.dirname(::File.dirname(::Toys::CORE_LIB_PATH))
+          custom_paths["toys-core"] = ::File.join(repo_root, "toys-core")
+          custom_paths["toys"] = ::File.join(repo_root, "toys")
+        end
+
+        loaded_gems = ::Gem.loaded_specs.values.sort_by(&:name)
+        content << "toys_loaded_gems = #{loaded_gems.map(&:name).inspect}"
+        content << "dependencies.delete_if { |dep| toys_loaded_gems.include?(dep.name) }"
+        loaded_gems.each do |spec|
+          path = custom_paths[spec.name]
+          path_suffix = path ? ", path: '#{path}'" : ""
+          content << "gem '#{spec.name}', '= #{spec.version}'#{path_suffix}"
+        end
+
         content
       end
 
@@ -422,13 +430,16 @@ module Toys
         args << "--retry=#{retries}" if retries.positive?
         bundler_bin = ::Gem.bin_path("bundler", "bundle", ::Bundler::VERSION)
         result = exec_util.exec_ruby([bundler_bin, "install"] + args)
-        if result.error?
-          terminal.puts("Failed to install. Trying update...")
-          result = exec_util.exec_ruby([bundler_bin, "update"] + args)
-          unless result.success?
-            raise ::Bundler::InstallError, "Failed to install or update bundle: #{gemfile_path}"
-          end
-        end
+        return if result.success?
+        terminal.puts("Failed to install. Trying update...")
+        result = exec_util.exec_ruby([bundler_bin, "update"] + args)
+        return if result.success?
+        terminal.puts("Failed to update. Trying update with clean lockfile...")
+        lockfile_path = find_lockfile_path(gemfile_path)
+        ::File.delete(lockfile_path) if ::File.exist?(lockfile_path)
+        result = exec_util.exec_ruby([bundler_bin, "update"] + args)
+        return if result.success?
+        raise ::Bundler::InstallError, "Failed to install or update bundle: #{gemfile_path}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Toys-Core is the command line tool framework underlying Toys. It can
   be used to create command line executables using the Toys DSL and classes.
@@ -76,10 +76,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.13.0/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.13.1/file.CHANGELOG.html
   source_code_uri: https://github.com/dazuma/toys/tree/main/toys-core
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.13.0
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.13.1
 post_install_message: 
 rdoc_options: []
 require_paths: