diffend 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b14e2973870903bee26272a50713c543934f7dbe5c0f2aab495dba99d6ee177
-  data.tar.gz: 900edb2cd152dce431f81029becec9e76662ef2bd5f19a7b082f9276bf9050cc
+  metadata.gz: 8e0efaea5a8bb4c724e24057821578b6c257a5eb313c472ac17dd60747fe10e4
+  data.tar.gz: af3b702fa128eabcc8f6f054895c0e64097f38672b650697e292ab705b749b69
 SHA512:
-  metadata.gz: 33eb4745a8a8e909c266efdbd6a06647c7377e480886eb5d03aa6dbc78a65ce567ad3533df24c85e93cef714094c528f6f15c2738cd512874af4d09bbbe74173
-  data.tar.gz: ee68d0977516bce252304aa150ff2b6bde0788b06a135e9485ad5b22a351637f293fe533ea771e09f81446bac1a39b06427b0bf305ab575ce3f41ecbd0b97608
+  metadata.gz: 00e60e3f610e03cad43a65b11c1b7f17d839d4b43009dde4436b9eebd96b82bdbf0035860eb85fb0e57c7042221403894a1aaf5f89cb606a86dd15e94f65bc58
+  data.tar.gz: f45b310e0e376b50e27b7a1876f3704a3f282dbadac5c868b4548a4a6a2d582632aeb3f204e47fda5545f47807446e648b0bf2fe70b4a0abdefb17ea40cf1ff1

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased][master]
 
+## [0.2.32] (2020-10-02)
+- fix how we build platform from `Gem::Platform` ([#56](https://github.com/diffend-io/diffend-ruby/pull/56))
+- introduce `Diffend::LatestVersion` ([#57](https://github.com/diffend-io/diffend-ruby/pull/57))
+- refactor `Diffend::Config` ([#58](https://github.com/diffend-io/diffend-ruby/pull/58))
+- set command in `Diffend::Config` ([#59](https://github.com/diffend-io/diffend-ruby/pull/59))
+- introduce `Diffend::Logger` ([#60](https://github.com/diffend-io/diffend-ruby/pull/60))
+- set severity to `FATAL` in `Diffend::Monitor` ([#61](https://github.com/diffend-io/diffend-ruby/pull/61))
+- handle `Bundler::VersionConflict` ([#62](https://github.com/diffend-io/diffend-ruby/pull/62))
+
 ## [0.2.31] (2020-09-24)
 - change request timeout to 15 seconds ([#53](https://github.com/diffend-io/diffend-ruby/pull/53))
 - report request issues as warnings ([#54](https://github.com/diffend-io/diffend-ruby/pull/54))

data/Gemfile.lock

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

data/lib/diffend/build_bundler_definition.rb

@@ -6,7 +6,7 @@ module Diffend
     class << self
       # Build clean instance of bundler definition, as we don't want to pollute the main one
       #
-      # @param command [String] bundler command that we are executing
+      # @param command [String] command executed via bundler
       # @param gemfile [String] path to Gemfile
       # @param lockfile [String] path to Gemfile.lock
       #

data/lib/diffend/config.rb

@@ -2,18 +2,80 @@
 
 module Diffend
   # Diffend config object
-  module Config
-    class << self
-      # Build diffend config object
-      #
-      # @return [OpenStruct, nil]
-      #
-      # @raise [Errors::MissingConfigurationFile] when no config file
-      def call
-        Diffend::Config::Fetcher.call(
-          File.expand_path('..', ::Bundler.bin_path)
-        )
-      end
+  class Config
+    attr_reader :project_id, :shareable_id, :shareable_key, :build_path, :env, :command
+
+    # Build diffend config object
+    #
+    # @return [Diffend::Config]
+    #
+    # @raise [Errors::MissingConfigurationFile] when no config file
+    def initialize(command: nil, severity: nil, build_path: nil)
+      @log_level = severity
+      build(command, build_path)
+      validate
+    end
+
+    def logger
+      @logger ||= Diffend::Logger.new(@log_level)
+    end
+
+    def ignore_errors?
+      @ignore_errors
+    end
+
+    def development?
+      @development
+    end
+
+    # Provides diffend commands endpoint url
+    #
+    # @return [String]
+    def commands_url
+      return ENV['DIFFEND_COMMANDS_URL'] if ENV.key?('DIFFEND_COMMANDS_URL')
+
+      "https://my.diffend.io/api/projects/#{project_id}/bundle/#{command}"
+    end
+
+    # Provides diffend errors endpoint url
+    #
+    # @return [String]
+    def errors_url
+      return ENV['DIFFEND_ERRORS_URL'] if ENV.key?('DIFFEND_ERRORS_URL')
+
+      "https://my.diffend.io/api/projects/#{project_id}/errors"
+    end
+
+    # @param request_id [String]
+    #
+    # @return [String]
+    def track_url(request_id)
+      "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
+    end
+
+    private
+
+    def build(command, build_path)
+      build_path ||= File.expand_path('..', ::Bundler.bin_path)
+      hash = Diffend::Configs::Fetcher.call(logger, build_path)
+      hash['build_path'] = build_path
+      hash['env'] = ENV['DIFFEND_ENV'] || 'development'
+      hash['ignore_errors'] = ENV['DIFFEND_IGNORE_ERRORS'] == 'true'
+      hash['development'] = ENV['DIFFEND_DEVELOPMENT'] == 'true'
+      hash['command'] = command || build_command
+
+      hash.each { |key, value| instance_variable_set(:"@#{key}", value) }
+    end
+
+    def validate
+      Diffend::Configs::Validator.call(self)
+    end
+
+    # Command that was run with bundle
+    #
+    # @return [String]
+    def build_command
+      ARGV.first || ::Bundler.feature_flag.default_cli_command.to_s
     end
   end
 end

data/lib/diffend/{config → configs}/fetcher.rb

@@ -4,41 +4,33 @@ require 'yaml'
 
 module Diffend
   # Module for all the components related to setting up the config
-  module Config
+  module Configs
     # Class responsible for fetching the config from .diffend.yml
     module Fetcher
-      # All the errors for missing keys in the configuration file
-      MISSING_KEY_ERRORS = [
-        Errors::ProjectIdMissingInConfigurationFile,
-        Errors::ShareableIdMissingInConfigurationFile,
-        Errors::ShareableKeyMissingInConfigurationFile,
-        Errors::BuildPathMissingInConfigurationFile
-      ].freeze
-
       class << self
+        # @param logger [Diffend::Logger]
         # @param build_path [String] path of the current build
         #
-        # @return [OpenStruct] open struct with config details
+        # @return [Hash] details from configuration file
         #
         # @example
         #   details = Fetcher.new.call('./')
         #   details.build_path #=> './'
-        def call(build_path)
+        def call(logger, build_path)
           build(build_path)
         rescue Errors::MissingConfigurationFile
-          Bundler.ui.error(build_missing_error_message(build_path))
+          build_missing_error_message(build_path)
+            .tap(&logger.method(:fatal))
 
           raise Diffend::Errors::HandledException
         rescue Errors::EmptyConfigurationFile
-          Bundler.ui.error(build_empty_error_message(build_path))
+          build_empty_error_message(build_path)
+            .tap(&logger.method(:fatal))
 
           raise Diffend::Errors::HandledException
         rescue Errors::MalformedConfigurationFile
-          Bundler.ui.error(build_malformed_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue *MISSING_KEY_ERRORS => e
-          Bundler.ui.error(build_missing_key_error_message(e))
+          build_malformed_error_message(build_path)
+            .tap(&logger.method(:fatal))
 
           raise Diffend::Errors::HandledException
         end
@@ -57,8 +49,7 @@ module Diffend
 
           raise Errors::EmptyConfigurationFile if content.empty?
 
-          OpenStruct.new(parse_file(content).merge(build_path: build_path))
-            .tap(&Validator.method(:call))
+          parse_file(content)
         end
 
         def parse_file(content)
@@ -92,25 +83,6 @@ module Diffend
             Please re-setup.\n
           MSG
         end
-
-        # @return [String] malformed configuration file message
-        def build_missing_key_error_message(exception)
-          missing_key = missing_key_from_exception(exception)
-
-          <<~MSG
-            \nYour Diffend configuration file is missing #{missing_key} key.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        def missing_key_from_exception(exception)
-          case exception
-          when Errors::ProjectIdMissingInConfigurationFile then 'project_id'
-          when Errors::ShareableIdMissingInConfigurationFile then 'shareable_id'
-          when Errors::ShareableKeyMissingInConfigurationFile then 'shareable_key'
-          when Errors::BuildPathMissingInConfigurationFile then 'build_path'
-          end
-        end
       end
     end
   end

data/lib/diffend/{config → configs}/file_finder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Diffend
-  module Config
+  module Configs
     # Class used to figure out the file from which we should load the settings
     module FileFinder
       # Names of the files or paths where we will look for the settings

data/lib/diffend/configs/validator.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Module for all the components related to setting up the config
+  module Configs
+    # Class responsible for validating the config from .diffend.yml
+    module Validator
+      KNOWN_KEYS = {
+        project_id: [String],
+        shareable_id: [String],
+        shareable_key: [String],
+        build_path: [String],
+        env: [String],
+        command: [String],
+        ignore_errors?: [TrueClass, FalseClass],
+        development?: [TrueClass, FalseClass]
+      }.freeze
+
+      class << self
+        # @param config [Diffend::Config]
+        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
+            end
+
+            if invalid?(config, key)
+              invalid_key_message(config, key)
+                .tap(&config.logger.method(:fatal))
+
+              raise Diffend::Errors::HandledException
+            end
+          end
+        end
+
+        private
+
+        # @param config [Diffend::Config]
+        # @param key [String]
+        #
+        # @return [Boolean] true if we are missing a key, false otherwise
+        def missing?(config, key)
+          value = config.public_send(key)
+
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+
+        # @param config [Diffend::Config]
+        # @param key [String]
+        #
+        # @return [Boolean] true if we are missing a key, false otherwise
+        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
+end

data/lib/diffend/execute.rb

@@ -6,12 +6,11 @@ module Diffend
     class << self
       # Build verdict
       #
-      # @param command [String] either install or update
-      # @param config [OpenStruct] diffend config
-      def call(command, config)
+      # @param config [Diffend::Config]
+      def call(config)
         Diffend::RequestVerdict
-          .call(command, config, build_definition(command))
-          .tap { |response| build_message(command, config, response) }
+          .call(config, build_definition(config.command))
+          .tap { |response| build_message(config, response) }
       rescue Diffend::Errors::DependenciesResolveException
         # We are unable to resolve dependencies, no message will be printed
       end
@@ -27,14 +26,13 @@ module Diffend
         )
       end
 
-      # @param command [String] either install or update
-      # @param config [OpenStruct] diffend config
+      # @param config [Diffend::Config]
       # @param response [Hash] response from diffend API
-      def build_message(command, config, response)
+      def build_message(config, response)
         if response.key?('error')
-          build_error(response)
+          build_error(config, response)
         elsif response.key?('action')
-          build_verdict(command, config, response)
+          build_verdict(config, response)
         else
           Diffend::HandleErrors::Report.call(
             config: config,
@@ -48,25 +46,24 @@ module Diffend
       # @param response [Hash] response from diffend API
       def build_error(response)
         build_error_message(response)
-          .tap(&Bundler.ui.method(:error))
+          .tap(&config.logger.method(:error))
 
         raise Diffend::Errors::HandledException
       end
 
-      # @param command [String] either install or update
-      # @param config [OpenStruct] diffend config
+      # @param config [Diffend::Config]
       # @param response [Hash] response from diffend API
-      def build_verdict(command, config, response)
+      def build_verdict(config, response)
         case response['action']
         when 'allow'
-          build_allow_message(command, response)
-            .tap(&Bundler.ui.method(:confirm))
+          build_allow_message(config.command, response)
+            .tap(&config.logger.method(:info))
         when 'warn'
-          build_warn_message(command, response)
-            .tap(&Bundler.ui.method(:warn))
+          build_warn_message(config.command, response)
+            .tap(&config.logger.method(:warn))
         when 'deny'
-          build_deny_message(command, response)
-            .tap(&Bundler.ui.method(:error))
+          build_deny_message(config.command, response)
+            .tap(&config.logger.method(:error))
 
           exit 1
         else
@@ -89,7 +86,7 @@ module Diffend
         MSG
       end
 
-      # @param command [String] either install or update
+      # @param command [String] command executed via bundler
       # @param response [Hash] response from diffend API
       #
       # @return [String]
@@ -101,7 +98,7 @@ module Diffend
         MSG
       end
 
-      # @param command [String] either install or update
+      # @param command [String] command executed via bundler
       # @param response [Hash] response from diffend API
       #
       # @return [String]
@@ -113,7 +110,7 @@ module Diffend
         MSG
       end
 
-      # @param command [String] either install or update
+      # @param command [String] command executed via bundler
       # @param response [Hash] response from diffend API
       #
       # @return [String]
@@ -126,7 +123,7 @@ module Diffend
       end
 
       # @param type [String] verdict type
-      # @param command [String] either install or update
+      # @param command [String] command executed via bundler
       #
       # @return [String]
       def build_message_header(type, command)

data/lib/diffend/handle_errors/report.rb

@@ -7,10 +7,10 @@ module Diffend
       class << self
         # Execute request to Diffend
         #
+        # @param config [Diffend::Config]
+        # @param message [Symbol] message that we want to display
         # @param exception [Exception] expection that was raised
         # @param payload [Hash] with versions to check
-        # @param config [OpenStruct] Diffend config
-        # @param message [Symbol] message that we want to display
         # @param report [Boolean] if true we will report the issue to diffend
         # @param raise_exception [Boolean] if true we will raise an exception
         #
@@ -18,8 +18,11 @@ module Diffend
         def call(config:, message:, exception: nil, payload: {}, report: false, raise_exception: true)
           exception_payload = prepare_exception_payload(exception, payload)
 
-          Bundler.ui.error(Diffend::HandleErrors::Messages::PAYLOAD_DUMP)
-          Bundler.ui.error(Diffend::HandleErrors::Messages.const_get(message.to_s.upcase))
+          Diffend::HandleErrors::Messages::PAYLOAD_DUMP
+            .tap(&config.logger.method(:error))
+          Diffend::HandleErrors::Messages
+            .const_get(message.to_s.upcase)
+            .tap(&config.logger.method(:error))
 
           if report
             Diffend::Request.call(
@@ -30,14 +33,14 @@ module Diffend
           raise Diffend::Errors::HandledException if raise_exception
         end
 
-        # @param config [OpenStruct] diffend config
+        # @param config [Diffend::Config]
         # @param payload [Hash]
         #
         # @return [Diffend::RequestObject]
         def build_request_object(config, payload)
           Diffend::RequestObject.new(
             config: config,
-            url: errors_url(config.project_id),
+            url: config.errors_url,
             payload: payload,
             request_method: :post
           )
@@ -54,17 +57,6 @@ module Diffend
             .call(exception, payload)
             .tap(&Diffend::HandleErrors::DisplayToStdout.method(:call))
         end
-
-        # Provides diffend errors endpoint url
-        #
-        # @param project_id [String] diffend project_id
-        #
-        # @return [String] diffend endpoint
-        def errors_url(project_id)
-          return ENV['DIFFEND_ERROR_URL'] if ENV.key?('DIFFEND_ERROR_URL')
-
-          "https://my.diffend.io/api/projects/#{project_id}/errors"
-        end
       end
     end
   end

data/lib/diffend/latest_version.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Verify if we are running latest version of the plugin
+  module LatestVersion
+    class << self
+      # Verify if we are running latest version of the plugin
+      #
+      # @param config [Diffend::Config]
+      def call(config)
+        return if config.development?
+        return if installed_version == Diffend::VERSION
+
+        print_message(config, installed_version)
+
+        exit 2
+      end
+
+      private
+
+      # @return [String] installed plugin version
+      def installed_version
+        ::Bundler::Plugin
+          .index
+          .plugin_path('diffend')
+          .basename
+          .to_s
+          .split('-')
+          .last
+      end
+
+      # @param config [Diffend::Config]
+      # @param version [Hash] installed version
+      def print_message(config, version)
+        build_message(version)
+          .tap(&config.logger.method(:error))
+      end
+
+      # @param version [Hash] installed version
+      #
+      # @return [String]
+      def build_message(version)
+        <<~MSG
+          \nYou are running an outdated version (#{version}) of the plugin, which will lead to issues.
+          \nPlease upgrade to the latest one (#{Diffend::VERSION}) by executing "rm -rf .bundle/plugin".\n
+        MSG
+      end
+    end
+  end
+end

data/lib/diffend/local_context.rb

@@ -6,16 +6,15 @@ module Diffend
     class << self
       # Build diffend, host, packages, and platform specific information
       #
-      # @param command [String] either install or update
-      # @param project_id [String] diffend project_id
+      # @param config [Diffend::Config]
       # @param definition [Bundler::Definition] definition for your source
       #
       # @return [Hash] payload for diffend endpoint
-      def call(command, project_id, definition)
+      def call(config, definition)
         {
-          'diffend' => Diffend.call(project_id),
+          'diffend' => Diffend.call(config),
           'host' => Host.call,
-          'packages' => Packages.call(command, definition),
+          'packages' => Packages.call(config.command, definition),
           'platform' => Platform.call
         }.freeze
       end

data/lib/diffend/local_context/diffend.rb

@@ -15,14 +15,14 @@ module Diffend
       class << self
         # Build diffend information
         #
-        # @param project_id [String, nil] diffend project_id
+        # @param config [Diffend::Config]
         #
         # @return [Hash]
-        def call(project_id)
+        def call(config)
           {
             'api_version' => API_VERSION,
-            'environment' => ENV['DIFFEND_ENV'],
-            'project_id' => project_id,
+            'environment' => config.env,
+            'project_id' => config.project_id,
             'type' => PLATFORM_TYPE,
             'version' => ::Diffend::VERSION
           }.freeze

data/lib/diffend/local_context/packages.rb

@@ -31,7 +31,7 @@ module Diffend
       }.freeze
 
       class << self
-        # @param command [String] either install or update
+        # @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! }
@@ -161,7 +161,7 @@ module Diffend
       def parse_platform(platform)
         case platform
         when String then platform
-        when Gem::Platform then platform.os
+        when Gem::Platform then platform.to_s
         end
       end
 

data/lib/diffend/logger.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Diffend logging
+  class Logger
+    # Low-level information, mostly for developers.
+    DEBUG = 0
+    # Generic (useful) information about system operation.
+    INFO = 1
+    # A warning.
+    WARN = 2
+    # A handleable error condition.
+    ERROR = 3
+    # An unhandleable error that results in a program crash.
+    FATAL = 4
+    # An unknown message that should always be logged.
+    UNKNOWN = 5
+
+    # @param level [Integer] logging severity threshold
+    def initialize(level = INFO)
+      @level = level
+    end
+
+    # @param message [String]
+    def debug(message)
+      log(DEBUG, message)
+    end
+
+    # @param message [String]
+    def info(message)
+      log(INFO, message)
+    end
+
+    # @param message [String]
+    def warn(message)
+      log(WARN, message)
+    end
+
+    # @param message [String]
+    def error(message)
+      log(ERROR, message)
+    end
+
+    # @param message [String]
+    def fatal(message)
+      log(FATAL, message)
+    end
+
+    private
+
+    # @param severity [Integer]
+    # @param message [String]
+    def log(severity, message)
+      return if severity < @level
+
+      case severity
+      when INFO
+        Bundler.ui.confirm(message)
+      when WARN
+        Bundler.ui.warn(message)
+      when ERROR, FATAL
+        Bundler.ui.error(message)
+      end
+    end
+  end
+end

data/lib/diffend/monitor.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-ENV['DIFFEND_ENV'] ||= 'development'
-
 %w[
   version
+  logger
   errors
   build_bundler_definition
   commands
   config
-  config/fetcher
-  config/file_finder
-  config/validator
+  configs/fetcher
+  configs/file_finder
+  configs/validator
   handle_errors/messages
   handle_errors/build_exception_payload
   handle_errors/display_to_stdout
@@ -27,10 +26,14 @@ ENV['DIFFEND_ENV'] ||= 'development'
   track
 ].each { |file| require "diffend/#{file}" }
 
-return if ENV['DIFFEND_ENV'].strip.empty?
-return if %w[development test].include?(ENV['DIFFEND_ENV'])
+config = Diffend::Config.new(
+  command: Diffend::Commands::EXEC,
+  severity: Diffend::Logger::FATAL
+)
+
+return if %w[development test].include?(config.env)
 
 Thread.new do
-  track = Diffend::Track.new
+  track = Diffend::Track.new(config)
   track.start
 end

data/lib/diffend/plugin.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-ENV['DIFFEND_ENV'] ||= 'development'
-
 %w[
   bundler
 ].each(&method(:require))
 
 %w[
   version
+  logger
+  latest_version
   errors
   build_bundler_definition
   commands
   config
-  config/fetcher
-  config/file_finder
-  config/validator
+  configs/fetcher
+  configs/file_finder
+  configs/validator
   handle_errors/messages
   handle_errors/build_exception_payload
   handle_errors/display_to_stdout
@@ -45,13 +45,13 @@ module Diffend
       def execute
         return unless enabled?
 
-        verify_version
+        config = Diffend::Config.new(severity: Diffend::Logger::INFO)
 
-        config = Diffend::Config.call
+        Diffend::LatestVersion.call(config)
 
-        Diffend::Execute.call(command, config)
+        Diffend::Execute.call(config)
       rescue Diffend::Errors::HandledException
-        return if ENV['DIFFEND_IGNORE_ERRORS'] == 'true'
+        return if config.ignore_errors?
 
         exit 255
       rescue StandardError => e
@@ -63,32 +63,11 @@ module Diffend
           raise_exception: false
         )
 
-        return if ENV['DIFFEND_IGNORE_ERRORS'] == 'true'
+        return if config.ignore_errors?
 
         exit 255
       end
 
-      def verify_version
-        return if ENV['DIFFEND_DEVELOPMENT'] == 'true'
-        return if installed_version == Diffend::VERSION
-
-        build_outdated_version_message(installed_version)
-          .tap(&::Bundler.ui.method(:error))
-
-        exit 2
-      end
-
-      # @return [String] installed plugin version
-      def installed_version
-        ::Bundler::Plugin
-          .index
-          .plugin_path('diffend')
-          .basename
-          .to_s
-          .split('-')
-          .last
-      end
-
       # Checks if plugin is enabled
       #
       # @return [Boolean] true if enabled, false otherwise
@@ -102,23 +81,6 @@ module Diffend
           .select { |line| line.start_with?('plugin') }
           .any? { |line| line.include?('diffend') }
       end
-
-      # @param version [Hash] installed version
-      #
-      # @return [String]
-      def build_outdated_version_message(version)
-        <<~MSG
-          \nYou are running an outdated version (#{version}) of the plugin, which will lead to issues.
-          \nPlease upgrade to the latest one (#{VERSION}) by executing "rm -rf .bundle/plugin".\n
-        MSG
-      end
-
-      # Command that was run with bundle
-      #
-      # @return [String]
-      def command
-        ARGV.first || ::Bundler.feature_flag.default_cli_command.to_s
-      end
     end
   end
 end

data/lib/diffend/request.rb

@@ -67,7 +67,7 @@ module Diffend
       rescue Diffend::Errors::RequestServerError => e
         retry_count += 1
 
-        retry if handle_retry(SERVER_ERROR_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, SERVER_ERROR_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -78,7 +78,7 @@ module Diffend
       rescue *CONNECTION_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(CONNECTION_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, CONNECTION_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -89,7 +89,7 @@ module Diffend
       rescue *TIMEOUT_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(TIMEOUT_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, TIMEOUT_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -101,12 +101,13 @@ module Diffend
 
       # Handle retry
       #
+      # @param config [Diffend::Config]
       # @param message [String] message we want to display
       # @param retry_count [Integer]
-      def handle_retry(message, retry_count)
+      def handle_retry(config, message, retry_count)
         return false if retry_count == RETRIES
 
-        Bundler.ui.warn(message)
+        config.logger.warn(message)
         sleep(exponential_backoff(retry_count))
 
         retry_count < RETRIES
@@ -132,7 +133,7 @@ module Diffend
       #
       # @param uri [URI::HTTPS]
       # @param request_method [Symbol]
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       # @param payload [Hash] with versions to check
       #
       # @return [Net::HTTP::Post, Net::HTTP::Put]
@@ -160,9 +161,8 @@ module Diffend
       # Assigns basic authorization if provided in the config
       #
       # @param request [Net::HTTP::Post] prepared http post
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       def assign_auth(request, config)
-        return unless config
         return unless config.shareable_id
         return unless config.shareable_key
 

data/lib/diffend/request_verdict.rb

@@ -6,18 +6,17 @@ module Diffend
   # Module responsible for fetching diffend verdict on local context
   module RequestVerdict
     class << self
-      # @param command [String] either install or update
+      # @param config [Diffend::Config]
       # @param definition [Bundler::Definition] definition for your source
-      # @param config [OpenStruct] diffend config
-      def call(command, config, definition)
-        payload = Diffend::LocalContext.call(command, config.project_id, definition)
+      def call(config, definition)
+        payload = Diffend::LocalContext.call(config, definition)
 
         response = Diffend::Request.call(
-          build_request_object(command, config, payload)
+          build_request_object(config, payload)
         )
 
         JSON.parse(response.body)
-      rescue Bundler::GemNotFound
+      rescue Bundler::GemNotFound, Bundler::VersionConflict
         raise ::Diffend::Errors::DependenciesResolveException
       rescue StandardError => e
         Diffend::HandleErrors::Report.call(
@@ -29,31 +28,18 @@ module Diffend
         )
       end
 
-      # @param command [String] either install or update
-      # @param config [OpenStruct] diffend config
+      # @param config [Diffend::Config]
       # @param payload [Hash]
       #
       # @return [Diffend::RequestObject]
-      def build_request_object(command, config, payload)
+      def build_request_object(config, payload)
         Diffend::RequestObject.new(
           config: config,
-          url: commands_url(command, config.project_id),
+          url: config.commands_url,
           payload: payload,
           request_method: :post
         )
       end
-
-      # Provides diffend command endpoint url
-      #
-      # @param command [String] either install or update
-      # @param project_id [String] diffend project_id
-      #
-      # @return [String] diffend endpoint
-      def commands_url(command, project_id)
-        return ENV['DIFFEND_COMMAND_URL'] if ENV.key?('DIFFEND_COMMAND_URL')
-
-        "https://my.diffend.io/api/projects/#{project_id}/bundle/#{command}"
-      end
     end
   end
 end

data/lib/diffend/track.rb

@@ -9,14 +9,16 @@ module Diffend
     RETRY_SLEEP = 15
 
     # Initialize tracking
-    def initialize
+    #
+    # @param config [Diffend::Config]
+    def initialize(config)
       @mutex = Mutex.new
-      @config = Diffend::Config.call
+      @config = config
     end
 
     # Start tracking
     def start
-      response = exec_request
+      response = Diffend::Execute.call(@config)
 
       perform(response['id'])
     rescue Diffend::Errors::HandledException
@@ -40,19 +42,12 @@ module Diffend
     # @param request_id [String]
     def perform(request_id)
       loop do
-        @mutex.synchronize do
-          track_request(request_id)
-        end
+        @mutex.synchronize { track_request(request_id) }
 
         sleep(TRACK_SLEEP)
       end
     end
 
-    # Perform an exec request
-    def exec_request
-      Diffend::Execute.call(Diffend::Commands::EXEC, @config)
-    end
-
     # Perform a track request
     #
     # @param request_id [String]
@@ -68,18 +63,10 @@ module Diffend
     def build_request_object(request_id)
       Diffend::RequestObject.new(
         config: @config,
-        url: track_url(@config.project_id, request_id),
+        url: @config.track_url(request_id),
         payload: { id: request_id }.freeze,
         request_method: :put
       ).freeze
     end
-
-    # @param project_id [String] diffend project_id
-    # @param request_id [String]
-    #
-    # @return [String]
-    def track_url(project_id, request_id)
-      "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
-    end
   end
 end

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.31'
+  VERSION = '0.2.32'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,20 +95,22 @@ files:
 - lib/diffend/build_bundler_definition.rb
 - lib/diffend/commands.rb
 - lib/diffend/config.rb
-- lib/diffend/config/fetcher.rb
-- lib/diffend/config/file_finder.rb
-- lib/diffend/config/validator.rb
+- lib/diffend/configs/fetcher.rb
+- lib/diffend/configs/file_finder.rb
+- lib/diffend/configs/validator.rb
 - lib/diffend/errors.rb
 - lib/diffend/execute.rb
 - lib/diffend/handle_errors/build_exception_payload.rb
 - lib/diffend/handle_errors/display_to_stdout.rb
 - lib/diffend/handle_errors/messages.rb
 - lib/diffend/handle_errors/report.rb
+- lib/diffend/latest_version.rb
 - lib/diffend/local_context.rb
 - lib/diffend/local_context/diffend.rb
 - lib/diffend/local_context/host.rb
 - lib/diffend/local_context/packages.rb
 - lib/diffend/local_context/platform.rb
+- lib/diffend/logger.rb
 - lib/diffend/monitor.rb
 - lib/diffend/plugin.rb
 - lib/diffend/request.rb

data/lib/diffend/config/validator.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Diffend
-  # Module for all the components related to setting up the config
-  module Config
-    # Class responsible for validating the config from .diffend.yml
-    module Validator
-      class << self
-        # @param config [OpenStruct] path of the current build
-        def call(config)
-          raise Errors::ProjectIdMissingInConfigurationFile if missing?(config, 'project_id')
-          raise Errors::ShareableIdMissingInConfigurationFile if missing?(config, 'shareable_id')
-          raise Errors::ShareableKeyMissingInConfigurationFile if missing?(config, 'shareable_key')
-          raise Errors::BuildPathMissingInConfigurationFile if missing?(config, 'build_path')
-        end
-
-        private
-
-        def missing?(config, key)
-          config.public_send(key).nil? || config.public_send(key).empty?
-        end
-      end
-    end
-  end
-end