diffend-monitor 0.2.37 → 0.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa341aa9b12c2f69cb0969e0389520a76a4671b5c6327ce18ab4d118906aef09
-  data.tar.gz: d437b9819524b22a2f5b3c8f7d07c46c3718b9e89eb495970619419e4ad1cc66
+  metadata.gz: b99c8d891fed663d4b7aec5213e3618eb406b5aa7a94ab5943aac352c830b346
+  data.tar.gz: a5b96e89b3d16b84d9dfa963f3de5aa2c60d616238b42ebb6fe61cbf54be7120
 SHA512:
-  metadata.gz: 214128a06ab0e08bd584efd7d0798646202ea98a3e3b5bdf6ded87c90abce17b4baefc88b519fe9e2988c9ae3a9e6f25e8438838d17d5fa538542a5d5e14f41d
-  data.tar.gz: 57c3f35405209ee2e651fa9f21105fe40bc57e402ea3ddbfd91f4032f218aad7cd7b2b7d02edb2a53128a9a472b462d8c34bdae3d9f498b5b1cf9d84921a142d
+  metadata.gz: 6e08f8e02f760d7b5ec8e3f7f33c2a3b840c5a3bdd5a64b4174c01c02fa0dce16c7ccf4ff540f42dad89cc3916b1bd82409e5f80ad03bde078f8c251bf0769a7
+  data.tar.gz: 16c6e6fab056f811ec6e46fd20e0252ca201a82d106a6bae3ce42b715fbaf5ae88c16cd3c5e6423358f39ff9457e2d5d4001613646303a448e9f3470fb35aaf1

data/.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
           - '2.7'
           - '2.6'
           - '2.5'
-          - 'jruby-9.2.13.0'
+          - 'jruby-9.2.14.0'
         bundler:
           - '2.1.4'
-          - '2.2.4'
+          - '2.2.5'
         include:
           - ruby: '2.7'
             coverage: 'true'

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased][master]
 
+## [0.2.38] (2021-01-15)
+- allow executing `bundle secure` without plugin being present in the Gemfile ([#96](https://github.com/diffend-io/diffend-ruby/pull/96))
+- be explicit about `Bundler` scope ([#97](https://github.com/diffend-io/diffend-ruby/pull/97))
+- switch to exponential backoff in `Diffend::Monitor` ([#98](https://github.com/diffend-io/diffend-ruby/pull/98))
+
 ## [0.2.37] (2021-01-05)
 - add support for ENV loaded at runtime ([#92](https://github.com/diffend-io/diffend-ruby/pull/92))
 - allow us to have more control over config errors ([#91](https://github.com/diffend-io/diffend-ruby/pull/91))
@@ -114,7 +119,9 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.36...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.38...HEAD
+[0.2.38]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.37...v0.2.38
+[0.2.37]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.36...v0.2.37
 [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.37)
+    diffend (0.2.38)
 
 GEM
   remote: https://rubygems.org/
@@ -37,4 +37,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.4
+   2.2.5

data/lib/diffend/build_bundler_definition.rb

@@ -10,14 +10,14 @@ module Diffend
       # @param gemfile [String] path to Gemfile
       # @param lockfile [String] path to Gemfile.lock
       #
-      # @return [Bundler::Definition]
+      # @return [::Bundler::Definition]
       def call(command, gemfile, lockfile)
         unlock = command == 'update' ? true : nil
 
-        Bundler.configure
-        Bundler::Fetcher.disable_endpoint = nil
+        ::Bundler.configure
+        ::Bundler::Fetcher.disable_endpoint = nil
 
-        Bundler::Definition
+        ::Bundler::Definition
           .build(gemfile, lockfile, unlock)
           .tap(&:validate_runtime!)
       end

data/lib/diffend/bundle_secure.rb

@@ -3,15 +3,13 @@
 module Diffend
   # Extend bundler with a new secure command to be able to run Diffend separately
   class BundleSecure
-    Bundler::Plugin::API.command(Diffend::Commands::SECURE, self)
+    ::Bundler::Plugin::API.command(Diffend::Commands::SECURE, self)
 
     # Execute diffend check
     #
     # @param _name [String] command name
     # @param _args [Array] arguments from ARGV
     def exec(_name, _args)
-      return unless Diffend::Enabled.call
-
       config = Diffend::Config.new(
         command: Diffend::Commands::SECURE,
         severity: Diffend::Logger::INFO

data/lib/diffend/execute.rb

@@ -17,12 +17,12 @@ module Diffend
 
       # Build bundler definition
       #
-      # @return [Bundler::Definition]
+      # @return [::Bundler::Definition]
       def build_definition(command)
         Diffend::BuildBundlerDefinition.call(
           command,
-          Bundler.default_gemfile,
-          Bundler.default_lockfile
+          ::Bundler.default_gemfile,
+          ::Bundler.default_lockfile
         )
       end
 

data/lib/diffend/local_context.rb

@@ -7,7 +7,7 @@ module Diffend
       # Build diffend, host, packages, and platform specific information
       #
       # @param config [Diffend::Config]
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       #
       # @return [Hash] payload for diffend endpoint
       def call(config, definition)

data/lib/diffend/local_context/packages.rb

@@ -9,8 +9,8 @@ module Diffend
       ME_PATH = '.'
       # Sources that we expect to match ourselves too
       ME_SOURCES = [
-        Bundler::Source::Gemspec,
-        Bundler::Source::Path
+        ::Bundler::Source::Gemspec,
+        ::Bundler::Source::Path
       ].freeze
       # List of dependency types
       DEPENDENCIES_TYPES = {
@@ -32,11 +32,11 @@ module Diffend
 
       class << self
         # @param command [String] command executed via bundler
-        # @param definition [Bundler::Definition] definition for your source
+        # @param definition [::Bundler::Definition] definition for your source
         def call(command, definition)
           instance = new(command, definition)
 
-          Bundler.ui.silence { instance.resolve }
+          ::Bundler.ui.silence { instance.resolve }
 
           case command
           when Commands::INSTALL, Commands::EXEC, Commands::SECURE then instance.build_install
@@ -48,7 +48,7 @@ module Diffend
       end
 
       # @param command [String] command executed via bundler
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       #
       # @return [Hash] local dependencies
       def initialize(command, definition)
@@ -125,8 +125,8 @@ module Diffend
 
       # Build gem versions
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
-      # @param locked_spec [Bundler::LazySpecification, Gem::Specification, NilClass]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
+      # @param locked_spec [::Bundler::LazySpecification, Gem::Specification, NilClass]
       #
       # @return [Array<String>]
       def build_versions(spec, locked_spec = nil)
@@ -151,8 +151,8 @@ module Diffend
 
       # Build gem platform
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
-      # @param locked_spec [Bundler::LazySpecification, Gem::Specification, NilClass]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
+      # @param locked_spec [::Bundler::LazySpecification, Gem::Specification, NilClass]
       #
       # @return [String]
       def build_spec_platform(spec, locked_spec)
@@ -175,18 +175,18 @@ module Diffend
 
       # Build gem source type
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Integer] internal gem source type
       def build_spec_gem_source_type(source)
         case source
-        when Bundler::Source::Metadata
+        when ::Bundler::Source::Metadata
           GEM_SOURCES_TYPES[:local]
-        when Bundler::Source::Rubygems, Bundler::Source::Rubygems::Remote
+        when ::Bundler::Source::Rubygems, ::Bundler::Source::Rubygems::Remote
           GEM_SOURCES_TYPES[:gemfile_source]
-        when Bundler::Source::Git
+        when ::Bundler::Source::Git
           GEM_SOURCES_TYPES[:gemfile_git]
-        when Bundler::Source::Path
+        when ::Bundler::Source::Path
           GEM_SOURCES_TYPES[:gemfile_path]
         else
           raise ArgumentError, "unknown source #{source.class}"
@@ -195,7 +195,7 @@ module Diffend
 
       # Build gem source
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
       #
       # @return [Hash]
       def build_spec_source(spec)
@@ -209,16 +209,16 @@ module Diffend
 
       # Figure out source for gem
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
       #
-      # @return [Bundler::Source] gem source type
+      # @return [::Bundler::Source] gem source type
       def source_for_spec(spec)
         return spec.remote if spec.remote
 
         case spec.source
-        when Bundler::Source::Rubygems
-          Bundler::Source::Rubygems::Remote.new(spec.source.remotes.last)
-        when Bundler::Source::Metadata, Bundler::Source::Git, Bundler::Source::Path
+        when ::Bundler::Source::Rubygems
+          ::Bundler::Source::Rubygems::Remote.new(spec.source.remotes.last)
+        when ::Bundler::Source::Metadata, ::Bundler::Source::Git, ::Bundler::Source::Path
           spec.source
         else
           raise ArgumentError, "unknown source #{spec.source.class}"
@@ -227,25 +227,25 @@ module Diffend
 
       # Build gem source name
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [String]
       def source_name_from_source(source)
         case source
-        when Bundler::Source::Metadata
+        when ::Bundler::Source::Metadata
           ''
-        when Bundler::Source::Rubygems::Remote
+        when ::Bundler::Source::Rubygems::Remote
           source_name(source.anonymized_uri)
-        when Bundler::Source::Git
+        when ::Bundler::Source::Git
           source.instance_variable_get(:@safe_uri)
-        when Bundler::Source::Path
+        when ::Bundler::Source::Path
           source.path
         else
           raise ArgumentError, "unknown source #{source.class}"
         end
       end
 
-      # @param uri [Bundler::URI]
+      # @param uri [::Bundler::URI]
       #
       # @return [String]
       def source_name(uri)
@@ -272,7 +272,7 @@ module Diffend
 
       # Build gem source type
       #
-      # @param remotes [Array<Bundler::URI>]
+      # @param remotes [Array<::Bundler::URI>]
       #
       # @return [Integer] internal source type
       def build_source_type(remotes)
@@ -281,7 +281,7 @@ module Diffend
 
       # Checks if we should skip a source
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Boolean] true if we should skip this source, false otherwise
       def skip?(source)
@@ -292,7 +292,7 @@ module Diffend
 
       # Checks if it's a self source, this happens for repositories that are a gem
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Boolean] true if it's a self source, false otherwise
       def me?(source)

data/lib/diffend/local_context/platform.rb

@@ -12,7 +12,7 @@ module Diffend
         def call
           {
             'bundler' => {
-              'version' => Bundler::VERSION
+              'version' => ::Bundler::VERSION
             },
             'environment' => environment,
             'ruby' => ruby_information,

data/lib/diffend/logger.rb

@@ -55,11 +55,11 @@ module Diffend
 
       case severity
       when INFO
-        Bundler.ui.confirm(message)
+        ::Bundler.ui.confirm(message)
       when WARN
-        Bundler.ui.warn(message)
+        ::Bundler.ui.warn(message)
       when ERROR, FATAL
-        Bundler.ui.error(message)
+        ::Bundler.ui.error(message)
       end
     end
   end

data/lib/diffend/monitor.rb

@@ -26,9 +26,18 @@
   track
 ].each { |file| require "diffend/#{file}" }
 
+# Calculate exponential backoff
+#
+# @param retry_count [Integer]
+#
+# @return [Float] backoff value
+def exponential_backoff(retry_count)
+  (0.25 * 1.5**retry_count.to_f).round(2)
+end
+
 Thread.new do
   config = nil
-  config_iterations = 0
+  retry_count = 0
 
   loop do
     config = Diffend::Config.new(
@@ -37,12 +46,11 @@ Thread.new do
     )
 
     break if config.valid?
+    break if retry_count == 12
 
-    config_iterations += 1
-
-    break if config_iterations == 12
+    sleep(exponential_backoff(retry_count))
 
-    sleep 5
+    retry_count += 1
   end
 
   Thread.exit unless config.valid?

data/lib/diffend/request_verdict.rb

@@ -7,15 +7,15 @@ module Diffend
   module RequestVerdict
     # Exceptions that we handle when there is a resolve issue
     RESOLVE_EXCEPTIONS = [
-      Bundler::GemNotFound,
-      Bundler::GitError,
-      Bundler::PermissionError,
-      Bundler::VersionConflict
+      ::Bundler::GemNotFound,
+      ::Bundler::GitError,
+      ::Bundler::PermissionError,
+      ::Bundler::VersionConflict
     ].freeze
 
     class << self
       # @param config [Diffend::Config]
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       def call(config, definition)
         payload = Diffend::LocalContext.call(config, definition)
 

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.37'
+  VERSION = '0.2.38'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend-monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.37
+  version: 0.2.38
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler