diffend-monitor 0.2.34 → 0.2.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c739e4cbf06a1ef55576728e684ab0bb639b4889748faa1d688ef1406024c0
-  data.tar.gz: fe58c9466fe5a532d445e8b5a0a8948b87489fbc9d49974aabb272bfd0ab14ed
+  metadata.gz: aad29d6d630d04366e4421991bfdd26d1725878fe5986e240a36e26e9840bab3
+  data.tar.gz: 69ac92f632883cf7bcc9e8bf42f3193cc0f034098401e037be143f8b2dce95fd
 SHA512:
-  metadata.gz: e44b5cd37e26197b11cb67dd3703984949a15d372b0623c2cc38ef346b47d14aad76ce1956d093304b3cc5cc6f6f952b7b45bce2808afed2fee76fbc124f0f9c
-  data.tar.gz: 28cb79ac18dc1aad9d535ab80d7c665aadea70cc77b35e6a04c63196a6844c7c62418a28bbdaa4a0e3b7c06480d36b4334fb9ad8023bf512faf1b51b74bdc421
+  metadata.gz: 526ee6bc6e464d15bff85944cbec34d072a4a4fce8b3658423526cb7ec60c44413769e2b84b778c9f7e6291ac98afcc2c06f05af385c787198cd3c3798ff30c1
+  data.tar.gz: adf72aa9eb79f43aca61022172f2323e0a0f859b4954df63dbe62631b0e9713ff775f712032dda5e65fc04d82ae66b6d37d06a7f4567a5d4f54d5664c47b9d15

data/.github/workflows/ci.yml

@@ -2,16 +2,23 @@ name: ci
 
 jobs:
   specs:
-    runs-on: ubuntu-latest
+    needs:
+      - diffend
+      - coditsu
 
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - '3.0'
           - '2.7'
           - '2.6'
           - '2.5'
-          - 'jruby'
+          - 'jruby-9.2.14.0'
+        bundler:
+          - '2.1.4'
+          - '2.2.5'
         include:
           - ruby: '2.7'
             coverage: 'true'
@@ -30,19 +37,36 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
-      - name: Install latest bundler
-        run: |
-          gem install bundler --no-document
+          bundler: ${{matrix.bundler}}
       - name: Bundle install
         env:
           DIFFEND_DEVELOPMENT: true
         run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundle _${{matrix.bundler}}_ config path vendor/bundle
+          bundle _${{matrix.bundler}}_ install --jobs 4 --retry 3
       - name: Run all tests
         env:
           GITHUB_COVERAGE: ${{matrix.coverage}}
-        run: bundle exec rspec
+        run: bundle _${{matrix.bundler}}_ exec rspec
+
+  diffend:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - name: Install latest bundler
+        run: gem install bundler --no-document
+      - name: Install Diffend plugin
+        run: bundle plugin install diffend
+      - name: Bundle Secure
+        run: bundle secure
 
   coditsu:
     runs-on: ubuntu-latest

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.0

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## [Unreleased][master]
 
+## [0.2.39] (2021-01-18)
+- handle a case if we start to fast and some gems require things it may break the execution ([#101](https://github.com/diffend-io/diffend-ruby/pull/101))
+
+## [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))
+- add `bundle secure` command ([#90](https://github.com/diffend-io/diffend-ruby/pull/90))
+- test against bundler 2.1 and 2.2 ([#83](https://github.com/diffend-io/diffend-ruby/pull/83))
+- test against ruby 3.0.0 ([#89](https://github.com/diffend-io/diffend-ruby/pull/89))
+- simplify how we build full json in specs  ([#82](https://github.com/diffend-io/diffend-ruby/pull/82))
+- simplify how we build bundler json in specs ([#84](https://github.com/diffend-io/diffend-ruby/pull/84))
+- simplify how we build diffend json in specs ([#85](https://github.com/diffend-io/diffend-ruby/pull/85))
+- simplify how we build rubygems json in specs ([#86](https://github.com/diffend-io/diffend-ruby/pull/86))
+- simplify how we build packages platforms json in specs ([#87](https://github.com/diffend-io/diffend-ruby/pull/87))
+
+## [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))
+
 ## [0.2.34] (2020-10-25)
 - handle `Bundler::GitError` ([#72](https://github.com/diffend-io/diffend-ruby/pull/72))
 
@@ -94,7 +122,12 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.34...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.39...HEAD
+[0.2.39]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.38...v0.2.39
+[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
 [0.2.33]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.32...v0.2.33
 [0.2.32]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.31...v0.2.32

data/Gemfile

@@ -7,5 +7,6 @@ plugin 'diffend'
 gemspec
 
 group :development, :test do
+  gem 'byebug', platform: :ruby
   gem 'rspec'
 end

data/Gemfile.lock

@@ -1,36 +1,40 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.34)
+    diffend (0.2.39)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     diff-lcs (1.4.4)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
 
 PLATFORMS
   java
   ruby
+  universal-java-13
+  x86_64-darwin-19
 
 DEPENDENCIES
   bundler
+  byebug
   diffend!
   rake
   rspec
 
 BUNDLED WITH
-   2.1.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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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)
+
+    # Execute diffend check
+    #
+    # @param _name [String] command name
+    # @param _args [Array] arguments from ARGV
+    def exec(_name, _args)
+      config = Diffend::Config.new(
+        command: Diffend::Commands::SECURE,
+        severity: Diffend::Logger::INFO
+      )
+
+      Diffend::LatestVersion.call(config)
+
+      Diffend::Execute.call(config)
+    end
+  end
+end

data/lib/diffend/commands.rb

@@ -9,5 +9,7 @@ module Diffend
     UPDATE = 'update'
     # Bundler exec command
     EXEC = 'exec'
+    # Bundler secure command introduced by diffend plugin
+    SECURE = 'secure'
   end
 end

data/lib/diffend/config.rb

@@ -3,29 +3,50 @@
 module Diffend
   # Diffend config object
   class Config
-    attr_reader :project_id, :shareable_id, :shareable_key, :build_path, :env, :command
+    # Name of the diffend config file
+    FILENAME = '.diffend.yml'
+
+    attr_reader :project_id, :shareable_id, :shareable_key, :build_path, :env, :command, :errors
 
     # Build diffend config object
     #
+    # @param command [String] command executed via bundler
+    # @param severity [Integer] logging severity threshold
+    # @param build_path [String] path of the current build
+    #
     # @return [Diffend::Config]
     def initialize(command: nil, severity: nil, build_path: nil)
       @log_level = severity
+      @errors = []
       build(command, build_path)
-      validate
+      Diffend::Configs::Validator.call(self)
     end
 
+    # Initialize logger
     def logger
       @logger ||= Diffend::Logger.new(@log_level)
     end
 
+    # @return [Boolean] true if config is valid, false otherwise
+    def valid?
+      @errors.empty?
+    end
+
+    # @return [Boolean] true if we want to ignore errors, false otherwise
     def ignore_errors?
       @ignore_errors
     end
 
+    # @return [Boolean] true if we are in development mode, false otherwise
     def development?
       @development
     end
 
+    # @return [Boolean] true if we are in deployment mode, false otherwise
+    def deployment?
+      !%w[development test].include?(env)
+    end
+
     # Provides diffend commands endpoint url
     #
     # @return [String]
@@ -51,19 +72,24 @@ module Diffend
       "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
     end
 
+    # Print config errors
+    def print_errors
+      @errors.each { |error| logger.fatal(error) }
+    end
+
     private
 
+    # @param command [String] command executed via bundler
+    # @param build_path [String] path of the current build
     def build(command, build_path)
       build_path ||= File.expand_path('..', ::Bundler.bin_path)
-      hash = Diffend::Configs::Fetcher.call(logger, plugin_path, build_path)
+      hash = Diffend::Configs::Fetcher.call(plugin_path, build_path)
       hash['build_path'] = build_path
       hash['command'] = command || build_command
 
       hash.each { |key, value| instance_variable_set(:"@#{key}", value) }
-    end
-
-    def validate
-      Diffend::Configs::Validator.call(self)
+    rescue Errors::MalformedConfigurationFile
+      @errors << Diffend::Configs::ErrorMessages.malformed_file
     end
 
     # Command that was run with bundle
@@ -73,6 +99,7 @@ module Diffend
       ARGV.first || ::Bundler.feature_flag.default_cli_command.to_s
     end
 
+    # @return [String] path to the plugin
     def plugin_path
       Pathname.new(File.expand_path('../..', __dir__))
     end

data/lib/diffend/configs/error_messages.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Module for all the components related to setting up the config
+  module Configs
+    # Class responsible for config error messages
+    module ErrorMessages
+      class << self
+        # @return [String] malformed configuration file message
+        def malformed_file
+          'Your Diffend configuration file is malformed. Please re-setup.'
+        end
+
+        # Missing key message
+        #
+        # @param key [String] missing key
+        #
+        # @return [String]
+        def missing_key(key)
+          "Diffend configuration is missing #{key} key"
+        end
+
+        # Invalid key message
+        #
+        # @param config [Diffend::Config]
+        # @param key [String] invalid key
+        #
+        # @return [String]
+        def invalid_key(config, key)
+          <<~MSG
+            Diffend configuration value for #{key} is invalid.
+            Expected #{Validator::KNOWN_KEYS[key].join(' or ')}, was #{config.public_send(key).class}.
+          MSG
+        end
+      end
+    end
+  end
+end

data/lib/diffend/configs/fetcher.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require 'yaml'
+%w[
+  erb
+  yaml
+].each(&method(:require))
 
 module Diffend
   # Module for all the components related to setting up the config
@@ -8,7 +11,6 @@ module Diffend
     # Class responsible for fetching the config from .diffend.yml
     module Fetcher
       class << self
-        # @param logger [Diffend::Logger]
         # @param plugin_path [String] path of the plugin
         # @param build_path [String] path of the current build
         #
@@ -17,24 +19,9 @@ module Diffend
         # @example
         #   details = Fetcher.new.call('./')
         #   details.build_path #=> './'
-        def call(logger, plugin_path, build_path)
-          build(plugin_path, build_path)
-        rescue Errors::MalformedConfigurationFile
-          build_malformed_error_message(build_path)
-            .tap(&logger.method(:fatal))
-
-          raise Diffend::Errors::HandledException
-        end
-
-        private
-
-        # @param plugin_path [String] path of the plugin
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        def build(plugin_path, build_path)
+        def call(plugin_path, build_path)
           default_config = File.join(plugin_path, 'config', 'diffend.yml')
-          project_config = File.join(build_path, '.diffend.yml')
+          project_config = File.join(build_path, Diffend::Config::FILENAME)
 
           hash = read_file(default_config)
 
@@ -45,19 +32,18 @@ module Diffend
           hash
         end
 
-        def read_file(path)
-          YAML.safe_load(ERB.new(File.read(path)).result)
+        private
+
+        # Load config file
+        #
+        # @param file_path [String]
+        #
+        # @return [Hash]
+        def read_file(file_path)
+          YAML.safe_load(ERB.new(File.read(file_path)).result)
         rescue Psych::SyntaxError
           raise Errors::MalformedConfigurationFile
         end
-
-        # @return [String] malformed configuration file message
-        def build_malformed_error_message
-          <<~MSG
-            \nYour Diffend configuration file is malformed.\n
-            Please re-setup.\n
-          MSG
-        end
       end
     end
   end

data/lib/diffend/configs/validator.rb

@@ -5,6 +5,7 @@ module Diffend
   module Configs
     # Class responsible for validating the config from .diffend.yml
     module Validator
+      # List of known config keys
       KNOWN_KEYS = {
         project_id: [String],
         shareable_id: [String],
@@ -21,18 +22,11 @@ module Diffend
         def call(config)
           KNOWN_KEYS.each_key do |key|
             if missing?(config, key)
-              missing_key_message(key)
-                .tap(&config.logger.method(:fatal))
-
-              raise Diffend::Errors::HandledException
+              config.errors << ErrorMessages.missing_key(key)
+              next
             end
 
-            if invalid?(config, key)
-              invalid_key_message(config, key)
-                .tap(&config.logger.method(:fatal))
-
-              raise Diffend::Errors::HandledException
-            end
+            config.errors << ErrorMessages.invalid_key(config, key) if invalid?(config, key)
           end
         end
 
@@ -55,30 +49,6 @@ module Diffend
         def invalid?(config, key)
           !KNOWN_KEYS[key].include?(config.public_send(key).class)
         end
-
-        # Missing key message
-        #
-        # @param key [String] missing key
-        #
-        # @return [String]
-        def missing_key_message(key)
-          <<~MSG
-            \nDiffend configuration is missing #{key} key.\n
-          MSG
-        end
-
-        # Invalid key message
-        #
-        # @param hash [Hash] config hash
-        # @param key [String] invalid key
-        #
-        # @return [String]
-        def invalid_key_message(hash, key)
-          <<~MSG
-            \nDiffend configuration value for #{key} is invalid.\n
-            It should be #{KNOWN_KEYS[key].join(' or ')} but is #{hash.public_send(key).class}.\n
-          MSG
-        end
       end
     end
   end

data/lib/diffend/enabled.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Verify if the plugin is enabled
+  module Enabled
+    class << self
+      # Checks if plugin is enabled
+      #
+      # @return [Boolean] true if enabled, false otherwise
+      def call
+        ::Bundler
+          .default_gemfile
+          .read
+          .split("\n")
+          .reject(&:empty?)
+          .map(&:strip)
+          .select { |line| line.start_with?('plugin') }
+          .any? { |line| line.include?('diffend') }
+      end
+    end
+  end
+end

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/host.rb

@@ -47,9 +47,9 @@ module Diffend
               command = "#{name} #{array.join(' ')}"
             end
 
-            { 'name' => command, 'title' => '' }
+            { 'name' => clean(command), 'title' => '' }
           else
-            { 'name' => ARGV.join(' '), 'title' => $PROGRAM_NAME }
+            { 'name' => clean(ARGV.join(' ')), 'title' => clean($PROGRAM_NAME) }
           end
         end
 
@@ -82,6 +82,14 @@ module Diffend
 
           tags
         end
+
+        # @param str [String] that we want to clean and truncate
+        def clean(str)
+          str
+            .dup
+            .gsub(/[[:space:]]+/, ' ')
+            .strip[0...255]
+        end
       end
     end
   end

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,14 +32,14 @@ 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)
-          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
+          when Commands::INSTALL, Commands::EXEC, Commands::SECURE then instance.build_install
           when Commands::UPDATE then instance.build_update
           else
             raise ArgumentError, "invalid command: #{command}"
@@ -47,14 +47,22 @@ module Diffend
         end
       end
 
-      # @param definition [Bundler::Definition] definition for your source
+      # @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
@@ -117,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)
@@ -143,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)
@@ -167,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}"
@@ -187,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)
@@ -201,21 +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
-          spec
-            .source
-            .send(:remote_specs)
-            .search(Bundler::Dependency.new(spec.name, spec.version))
-            .last
-            .remote
-        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}"
@@ -224,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)
@@ -269,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)
@@ -278,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)
@@ -289,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

@@ -3,17 +3,17 @@
 module Diffend
   # Diffend logging
   class Logger
-    # Low-level information, mostly for developers.
+    # Low-level information, mostly for developers
     DEBUG = 0
-    # Generic (useful) information about system operation.
+    # Generic (useful) information about system operation
     INFO = 1
-    # A warning.
+    # A warning
     WARN = 2
-    # A handleable error condition.
+    # A handleable error condition
     ERROR = 3
-    # An unhandleable error that results in a program crash.
+    # An error that we are unable to handle that results in a program crash
     FATAL = 4
-    # An unknown message that should always be logged.
+    # An unknown message that should always be logged
     UNKNOWN = 5
 
     # @param level [Integer] logging severity threshold
@@ -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

@@ -6,6 +6,7 @@
   errors
   build_bundler_definition
   commands
+  configs/error_messages
   config
   configs/fetcher
   configs/validator
@@ -25,19 +26,40 @@
   track
 ].each { |file| require "diffend/#{file}" }
 
-begin
-  config = Diffend::Config.new(
-    command: Diffend::Commands::EXEC,
-    severity: Diffend::Logger::FATAL
-  )
-rescue Diffend::Errors::HandledException
-  # we silent exit here because we don't want to break client boot
-  return
+# 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
 
-return if %w[development test].include?(config.env)
-
 Thread.new do
+  config = nil
+  retry_count = 0
+
+  # There is an issue if we start to fast and there are gems that require things,
+  # it may break the execution. That's why we want to give the application time to boot.
+  sleep(0.5)
+
+  loop do
+    config = Diffend::Config.new(
+      command: Diffend::Commands::EXEC,
+      severity: Diffend::Logger::FATAL
+    )
+
+    break if config.valid?
+    break if retry_count == 12
+
+    sleep(exponential_backoff(retry_count))
+
+    retry_count += 1
+  end
+
+  Thread.exit unless config.valid?
+  Thread.exit unless config.deployment?
+
   track = Diffend::Track.new(config)
   track.start
 end

data/lib/diffend/plugin.rb

@@ -7,10 +7,12 @@
 %w[
   version
   logger
+  enabled
   latest_version
   errors
   build_bundler_definition
   commands
+  configs/error_messages
   config
   configs/fetcher
   configs/validator
@@ -42,10 +44,16 @@ module Diffend
 
       # Execute diffend plugin
       def execute
-        return unless enabled?
+        return unless Diffend::Enabled.call
 
         config = Diffend::Config.new(severity: Diffend::Logger::INFO)
 
+        unless config.valid?
+          config.print_errors
+
+          exit 255
+        end
+
         Diffend::LatestVersion.call(config)
 
         Diffend::Execute.call(config)
@@ -67,20 +75,6 @@ module Diffend
 
         exit 255
       end
-
-      # Checks if plugin is enabled
-      #
-      # @return [Boolean] true if enabled, false otherwise
-      def enabled?
-        ::Bundler
-          .default_gemfile
-          .read
-          .split("\n")
-          .reject(&:empty?)
-          .map(&:strip)
-          .select { |line| line.start_with?('plugin') }
-          .any? { |line| line.include?('diffend') }
-      end
     end
   end
 end

data/lib/diffend/request_verdict.rb

@@ -7,14 +7,15 @@ module Diffend
   module RequestVerdict
     # Exceptions that we handle when there is a resolve issue
     RESOLVE_EXCEPTIONS = [
-      Bundler::GemNotFound,
-      Bundler::VersionConflict,
-      Bundler::GitError
+      ::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.34'
+  VERSION = '0.2.39'
 end

data/plugins.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require 'diffend/plugin'
+require 'diffend/bundle_secure'
 
 Diffend::Plugin.register

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend-monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.34
+  version: 0.2.39
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,10 +94,13 @@ files:
 - diffend.gemspec
 - lib/diffend.rb
 - lib/diffend/build_bundler_definition.rb
+- lib/diffend/bundle_secure.rb
 - lib/diffend/commands.rb
 - lib/diffend/config.rb
+- lib/diffend/configs/error_messages.rb
 - lib/diffend/configs/fetcher.rb
 - lib/diffend/configs/validator.rb
+- lib/diffend/enabled.rb
 - lib/diffend/errors.rb
 - lib/diffend/execute.rb
 - lib/diffend/handle_errors/build_exception_payload.rb
@@ -139,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: OSS supply chain security and management platform