toys-core 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2345d22178ad2ca256a6099f3b359abaf6641248c3a29256000e40204c618802
-  data.tar.gz: e9874795dd5057d7eca70164f221ec923c0ac17862146f1a9f15cba3c1cfc4e8
+  metadata.gz: 387c4a7088a856603e671a0c6156982eaa5639a41d1168a7912892b6ca9ca822
+  data.tar.gz: f47e0683edea4d3fcfa848e0517299648c0d6a0564b7d9316405487ed2e6d4dd
 SHA512:
-  metadata.gz: 852717f2545a44143185d168c374d871ba9495ccece98161b880d8fdf75b0f5929a97998f3d193c700963717c406567f3f365d73f9c6ad5af13270317b2a5a74
-  data.tar.gz: 3c2bb70a9512f058a9ead3feb55c4c658f7ac3357c51f39c47cb9bef081c1c5f876d08f8f45a2d0d716e6a884d22b156c64664177306041e85e411a18075ebd0
+  metadata.gz: f1a9e2501458d1c8cebeafc044a6fe9f4de131c687df533e73a8567aa81afef2a5ed02fbb769e0da9ed7f4632c2c4f9046efec21281a3bc8c8072437d4ecb844
+  data.tar.gz: f9c22a3b8d531825353d9eebc70735b3bdfddfc8f22ce55bc8bf62685bbbf9443fbb6d875b7671d70f8ee2ca1eb0990238d2b35b92289b5c1c3b7e392bae9537

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+### v0.11.4 / 2020-10-11
+
+* FIXED: Doesn't modify bundler lockfiles when adding Toys to a bundle
+
 ### v0.11.3 / 2020-09-13
 
 * FIXED: The Exec library recognizes the argv0 option, and logs it appropriately 

data/lib/toys/core.rb

@@ -9,7 +9,7 @@ module Toys
     # Current version of Toys core.
     # @return [String]
     #
-    VERSION = "0.11.3"
+    VERSION = "0.11.4"
   end
 
   ## @private deprecated

data/lib/toys/utils/gems.rb

@@ -185,7 +185,8 @@ module Toys
           if configure_gemfile(gemfile_path)
             activate("bundler", "~> 2.1")
             require "bundler"
-            setup_bundle(gemfile_path, groups || [])
+            lockfile_path = find_lockfile_path(gemfile_path)
+            setup_bundle(gemfile_path, lockfile_path, groups || [])
           end
         end
       end
@@ -287,21 +288,46 @@ module Toys
         true
       end
 
-      def setup_bundle(gemfile_path, groups)
+      def find_lockfile_path(gemfile_path)
+        if ::File.basename(gemfile_path) == "gems.rb"
+          ::File.join(::File.dirname(gemfile_path), "gems.locked")
+        else
+          gemfile_path + ".lock"
+        end
+      end
+
+      def setup_bundle(gemfile_path, lockfile_path, groups)
+        old_lockfile_contents = save_old_lockfile(lockfile_path)
         begin
-          modify_bundle_definition(gemfile_path)
+          modify_bundle_definition(gemfile_path, lockfile_path)
           ::Bundler.ui.silence { ::Bundler.setup(*groups) }
         rescue ::Bundler::GemNotFound, ::Bundler::VersionConflict
           restore_toys_libs
           install_bundle(gemfile_path)
+          old_lockfile_contents = save_old_lockfile(lockfile_path)
           ::Bundler.reset!
-          modify_bundle_definition(gemfile_path)
+          modify_bundle_definition(gemfile_path, lockfile_path)
           ::Bundler.ui.silence { ::Bundler.setup(*groups) }
         end
         restore_toys_libs
+      ensure
+        restore_old_lockfile(lockfile_path, old_lockfile_contents)
+      end
+
+      def save_old_lockfile(lockfile_path)
+        return nil unless ::File.readable?(lockfile_path) && ::File.writable?(lockfile_path)
+        ::File.read(lockfile_path)
+      end
+
+      def restore_old_lockfile(lockfile_path, contents)
+        if contents
+          ::File.open(lockfile_path, "w") do |file|
+            file.write(contents)
+          end
+        end
       end
 
-      def modify_bundle_definition(gemfile_path)
+      def modify_bundle_definition(gemfile_path, lockfile_path)
         builder = ::Bundler::Dsl.new
         builder.eval_gemfile(gemfile_path)
         toys_gems = ["toys-core"]
@@ -312,7 +338,7 @@ module Toys
           add_gem_to_definition(builder, "toys")
           toys_gems << "toys"
         end
-        definition = builder.to_definition(gemfile_path + ".lock", { gems: toys_gems })
+        definition = builder.to_definition(lockfile_path, { gems: toys_gems })
         ::Bundler.instance_variable_set(:@definition, definition)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-10-11 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.
@@ -69,10 +69,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.3/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.4/file.CHANGELOG.html
   source_code_uri: https://github.com/dazuma/toys
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.3
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.4
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Framework for creating command line executables