diffend 0.2.35 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0780c79922b3857482318780ad968af290af191fd0c59e032f9a0f94d671ad6d'
-  data.tar.gz: d2f91acc6e7ea5d3a59bd8b86c49c5c4d763eff6bf3af3ecf6b00d99730da36b
+  metadata.gz: 76c744c4aef5eaa735b131f3f866f9e89d01b9ae79e04cfa1a922419f4be4a3c
+  data.tar.gz: 3ebbd02c2a0b693e57d9b4d7d73c8c9e490236189983a30e7c24caaffb7b5843
 SHA512:
-  metadata.gz: 15ec791f3eea3e174ad8a09d68f9f5b20511e9728c3f4481b9b2c97e377cdb5eb6e0faee215a24979b18f846e8a2bd01cc9569634c4307ccf448e4bcb73e035d
-  data.tar.gz: a5b7b8ab500fa6dcb187f46137d89337bc1f4bd3eaa006c5ba43dada667ffbce01ea61a68678a5f04a211b91cbdc8e73f55fcb3350db7bb74a93dc50d3051cd7
+  metadata.gz: a166de7306a536d75d20d50c5fe27f27fe77cc4a3332446a85543f42a617b180d3bc97a1a0800c5ada0189eb59d923e8d0a7bd823d3f2f9e31ef2113263a616f
+  data.tar.gz: 5b1890d48842a54166c3eae9d500d43f8c81172f66df9b5f768460fd65e97a2460f542eba99970db8fceb630c97a6fd71f1dd9fe7170c425d5f89b06f448499c

data.tar.gz.sig

@@ -1 +1,3 @@
-�2��oa�)qN���Q�6���@`Sb-��8��!=4
+E�|��i�,u+i��J�P*��Z�
��Ѝc����kPZv���3#=�I�.�|��?������k���u[NZ����my?�`vQ�o:����S��T�H�1�����S�.�����Z3��J
+��������/}T+[{J����؊����E�T�'��U�� ��ˋ�:R�b�/8�e��L_��s��U
+�g{?~��?4_���|�pII�T�F��+fo���>������7�j��\5R�;N�<���P�`�?W$O�JqL�Y�؜`�[��e��>\��*�-J2�腜e{�12\h\���9h�6W�l?���h���k�Tx�}h�-�p/$��x�#��|㋴>���^���hi�tĞЗ	�T��X��x

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased][master]
 
+## [0.2.36] (2020-12-06)
+- handle `Bundler::PermissionError` ([#79](https://github.com/diffend-io/diffend-ruby/pull/79))
+- use cache to resolve dependencies in exec mode ([#78](https://github.com/diffend-io/diffend-ruby/pull/78))
+
 ## [0.2.35] (2020-11-04)
 - clean command name and title of a process ([#76](https://github.com/diffend-io/diffend-ruby/pull/76))
 - handle `uninitialized constant #<Class:Diffend::Configs::Fetcher>::ERB` ([#75](https://github.com/diffend-io/diffend-ruby/pull/75))
@@ -98,7 +102,8 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.35...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.36...HEAD
+[0.2.36]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.35...v0.2.36
 [0.2.35]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.34...v0.2.35
 [0.2.34]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.33...v0.2.34
 [0.2.33]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.32...v0.2.33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.35)
+    diffend (0.2.36)
 
 GEM
   remote: https://rubygems.org/

data/lib/diffend/local_context/packages.rb

@@ -34,9 +34,9 @@ module Diffend
         # @param command [String] command executed via bundler
         # @param definition [Bundler::Definition] definition for your source
         def call(command, definition)
-          Bundler.ui.silence { definition.resolve_remotely! }
+          instance = new(command, definition)
 
-          instance = new(definition)
+          Bundler.ui.silence { instance.resolve }
 
           case command
           when Commands::INSTALL, Commands::EXEC then instance.build_install
@@ -47,14 +47,22 @@ module Diffend
         end
       end
 
+      # @param command [String] command executed via bundler
       # @param definition [Bundler::Definition] definition for your source
       #
       # @return [Hash] local dependencies
-      def initialize(definition)
+      def initialize(command, definition)
+        @command = command
         @definition = definition
         @direct_dependencies = Hash[definition.dependencies.map { |val| [val.name, val] }]
         # Support case without Gemfile.lock
         @locked_specs = @definition.locked_gems ? @definition.locked_gems.specs : []
+        @cached = command == Commands::EXEC
+      end
+
+      # Resolve definition
+      def resolve
+        @cached ? @definition.resolve_with_cache! : @definition.resolve_remotely!
       end
 
       # Build install specification
@@ -209,12 +217,7 @@ module Diffend
 
         case spec.source
         when Bundler::Source::Rubygems
-          spec
-            .source
-            .send(:remote_specs)
-            .search(Bundler::Dependency.new(spec.name, spec.version))
-            .last
-            .remote
+          Bundler::Source::Rubygems::Remote.new(spec.source.remotes.last)
         when Bundler::Source::Metadata, Bundler::Source::Git, Bundler::Source::Path
           spec.source
         else

data/lib/diffend/request_verdict.rb

@@ -8,8 +8,9 @@ module Diffend
     # Exceptions that we handle when there is a resolve issue
     RESOLVE_EXCEPTIONS = [
       Bundler::GemNotFound,
-      Bundler::VersionConflict,
-      Bundler::GitError
+      Bundler::GitError,
+      Bundler::PermissionError,
+      Bundler::VersionConflict
     ].freeze
 
     class << self

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.35'
+  VERSION = '0.2.36'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler