diffend 0.2.23 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce266f8f72de49360adc1e6e1f79c8bf5fa08727ffc990292877c015e1040ee
-  data.tar.gz: 1a71a4a519b1f2afb9bc993726c045b4db5b87833459ba8f7192c2a2f4232aa6
+  metadata.gz: 0c100adca589f5e4e22488ecc8d12a865b2ec8a5bb6be4bf15f3b4bf5d5ad089
+  data.tar.gz: 8e5820badb850ee24606874e8de80a8e19114a08276f9fca3933a54e4fb825bc
 SHA512:
-  metadata.gz: '08dd6da1d3984200d9ac07fd9fd1f9a0adf6b7746f86a77ab560b77b356dc6fad819513adea6fe2d714b1f06ed8cf5441d796681fd507b64247a2db3560d3138'
-  data.tar.gz: 2155bbba6da089606b38d36fcec4259054f6cac053bf56eefb303d6d3aa223ba4253ca771249a2543696c636e8c509aa75ceb3ab50f055dd18a2ba9715e5cb9f
+  metadata.gz: 70b2798f074676511abc75974db24ee116dcbf9fc87983a4cfc6d9e69246c12b0970c376ced03e08a6fb0a9ba09fa9cd11a3da5d728715c6ec676030bd7ebccd
+  data.tar.gz: fd130a1283b65d6487bab7323eb2a7d7c9d3db6cea7c777e4c7a023f77e9b0d0ee4078cd38c9228fe18b1555ee9e9ec9efd0fa1033a7c8ed5e19859cb8e11970

data/.github/workflows/ci.yml

@@ -34,6 +34,8 @@ jobs:
         run: |
           gem install bundler --no-document
       - name: Bundle install
+        env:
+          DIFFEND_DEVELOPMENT: true
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3

data/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Changelog
 
 ## [Unreleased][master]
+
+## [0.2.28] (2020-09-19)
+- start `Diffend::Monitor` only if not in development or test ([#44](https://github.com/diffend-io/diffend-ruby/pull/44))
+- better host command expose ([#45](https://github.com/diffend-io/diffend-ruby/pull/45))
+
+## [0.2.27] (2020-09-16)
+- introduce `Diffend::RequestObject` ([#40](https://github.com/diffend-io/diffend-ruby/pull/40))
+- clean up error codes and introduce `DIFFEND_INGORE_EXCEPTIONS` ([#41](https://github.com/diffend-io/diffend-ruby/pull/41))
+- introduce `Diffend::Monitor` and `Diffend::Track` ([#15](https://github.com/diffend-io/diffend-ruby/pull/15))
+
+## [0.2.26] (2020-09-10)
+- introduce `DIFFEND_DEVELOPMENT` environment variable ([#36](https://github.com/diffend-io/diffend-ruby/pull/36))
+- adjust message for allow verdict ([#37](https://github.com/diffend-io/diffend-ruby/pull/37))
+- do not run the plugin when it is not enabled ([#38](https://github.com/diffend-io/diffend-ruby/pull/38))
+
+## [0.2.25] (2020-09-09)
+- add support for a warn verdict ([#34](https://github.com/diffend-io/diffend-ruby/pull/34))
+
+## [0.2.24] (2020-09-08)
+- better error handling of response ([#28](https://github.com/diffend-io/diffend-ruby/pull/28))
+- fix jruby specs ([#29](https://github.com/diffend-io/diffend-ruby/pull/29))
+- handle request server errors ([#30](https://github.com/diffend-io/diffend-ruby/pull/30))
+- better detection of gem source ([#31](https://github.com/diffend-io/diffend-ruby/pull/31))
+- detect if we are running outdated version of the plugin ([#32](https://github.com/diffend-io/diffend-ruby/pull/32))
+
+## [0.2.23] (2020-09-06)
 - fix how we build gem platform ([#26](https://github.com/diffend-io/diffend-ruby/pull/26))
 - test against jruby, ruby-2.5 and ruby-2.6 ([#25](https://github.com/diffend-io/diffend-ruby/pull/25))
 
@@ -38,7 +64,13 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.22...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.28...HEAD
+[0.2.28]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.27...v0.2.28
+[0.2.27]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.26...v0.2.27
+[0.2.26]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.25...v0.2.26
+[0.2.25]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.24...v0.2.25
+[0.2.24]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.23...v0.2.24
+[0.2.23]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.22...v0.2.23
 [0.2.22]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.21...v0.2.22
 [0.2.21]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.20...v0.2.21
 [0.2.20]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.19...v0.2.20

data/Gemfile.lock

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

data/lib/diffend.rb

@@ -15,8 +15,10 @@
   handle_errors/build_exception_payload
   handle_errors/display_to_stdout
   handle_errors/report
+  request_object
   request
   voting
+  track
 ].each { |file| require "diffend/#{file}" }
 
 %w[
@@ -27,7 +29,7 @@
 # Diffend main namespace
 module Diffend
   # Current plugin version
-  VERSION = '0.2.23'
+  VERSION = '0.2.28'
   # Diffend homepage
   HOMEPAGE = 'https://diffend.io'
 
@@ -41,23 +43,82 @@ module Diffend
 
     # Execute diffend plugin
     def execute
+      return unless enabled?
+
+      verify_version
+
       config = fetch_config
 
       Diffend::Voting.call(
         command,
+        config,
         Diffend::BuildBundlerDefinition.call(
           command,
           Bundler.default_gemfile,
           Bundler.default_lockfile
         )
       )
+    rescue Diffend::Errors::HandledException
+      return if ENV['DIFFEND_IGNORE_ERRORS'] == 'true'
+
+      exit 255
     rescue StandardError => e
       Diffend::HandleErrors::Report.call(
         exception: e,
         config: config,
         message: :unhandled_exception,
-        report: true
+        report: true,
+        raise_exception: false
       )
+
+      return if ENV['DIFFEND_IGNORE_ERRORS'] == 'true'
+
+      exit 255
+    end
+
+    def verify_version
+      return if ENV['DIFFEND_DEVELOPMENT'] == 'true'
+      return if installed_version == 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
+    def enabled?
+      Bundler
+        .default_gemfile
+        .read
+        .split("\n")
+        .reject(&:empty?)
+        .map(&:strip)
+        .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

data/lib/diffend/commands.rb

@@ -3,9 +3,11 @@
 module Diffend
   # Modules grouping supported bundler commands
   module Commands
-    # Install bundler command
+    # Bundler install command
     INSTALL = 'install'
-    # Update bundler command
+    # Bundler update command
     UPDATE = 'update'
+    # Bundler exec command
+    EXEC = 'exec'
   end
 end

data/lib/diffend/config/fetcher.rb

@@ -27,16 +27,20 @@ module Diffend
           build(build_path)
         rescue Errors::MissingConfigurationFile
           Bundler.ui.error(build_missing_error_message(build_path))
-          exit 1
+
+          raise Diffend::Errors::HandledException
         rescue Errors::EmptyConfigurationFile
           Bundler.ui.error(build_empty_error_message(build_path))
-          exit 1
+
+          raise Diffend::Errors::HandledException
         rescue Errors::MalformedConfigurationFile
           Bundler.ui.error(build_malformed_error_message(build_path))
-          exit 1
+
+          raise Diffend::Errors::HandledException
         rescue *MISSING_KEY_ERRORS => e
           Bundler.ui.error(build_missing_key_error_message(e))
-          exit 1
+
+          raise Diffend::Errors::HandledException
         end
 
         private

data/lib/diffend/errors.rb

@@ -19,9 +19,9 @@ module Diffend
     ShareableKeyMissingInConfigurationFile = Class.new(BaseError)
     # Raised when build_path is missing in configuration file
     BuildPathMissingInConfigurationFile = Class.new(BaseError)
-    # When unsupported response returned from the endpoint
-    UnsupportedResponse = Class.new(BaseError)
-    # When unsupported action returned from the endpoint
-    UnsupportedAction = Class.new(BaseError)
+    # Raised when server-side error occurs
+    RequestServerError = Class.new(BaseError)
+    # Raised when we had an exception that we know how to handle
+    HandledException = Class.new(BaseError)
   end
 end

data/lib/diffend/handle_errors/build_exception_payload.rb

@@ -9,7 +9,7 @@ module Diffend
       class << self
         # Build exception payload
         #
-        # @param exception [Exception] expection that was raised
+        # @param exception [Exception, NilClass] expection that was raised
         # @param payload [Hash] with versions to check
         #
         # @return [Hash]
@@ -18,9 +18,9 @@ module Diffend
             request_id: SecureRandom.uuid,
             payload: payload,
             exception: {
-              class: exception.class,
-              message: exception.message,
-              backtrace: exception.backtrace
+              class: exception&.class,
+              message: exception&.message,
+              backtrace: exception&.backtrace
             }
           }.freeze
         end

data/lib/diffend/handle_errors/messages.rb

@@ -9,6 +9,16 @@ module Diffend
         This is a bug, don't hesitate.\n
         Create an issue at https://github.com/diffend-io/diffend-ruby/issues\n
       MSG
+      UNSUPPORTED_RESPONSE = <<~MSG
+        \nAPI returned an unsupported response. We recorded this incident in our system and will review it.\n
+        This is a bug, don't hesitate.\n
+        Create an issue at https://github.com/diffend-io/diffend-ruby/issues\n
+      MSG
+      UNSUPPORTED_VERDICT = <<~MSG
+        \nAPI returned an unsupported verdict. We recorded this incident in our system and will review it.\n
+        This is a bug, don't hesitate.\n
+        Create an issue at https://github.com/diffend-io/diffend-ruby/issues\n
+      MSG
       REQUEST_ERROR = <<~MSG
         \nWe were unable to process your request at this time. We recorded this incident in our system and will review it.\n
         If you think that this is a bug, don't hesitate.\n

data/lib/diffend/handle_errors/report.rb

@@ -12,9 +12,10 @@ module Diffend
         # @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
         #
         # @return [Net::HTTPResponse] response from Diffend
-        def call(exception:, payload: {}, config:, message:, report: false)
+        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)
@@ -22,13 +23,24 @@ module Diffend
 
           if report
             Diffend::Request.call(
-              config,
-              errors_url(config.project_id),
-              exception_payload
+              build_request_object(config, exception_payload)
             )
           end
 
-          exit 1
+          raise Diffend::Errors::HandledException if raise_exception
+        end
+
+        # @param config [OpenStruct] 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),
+            payload: payload,
+            request_method: :post
+          )
         end
 
         # Prepare exception payload and display it to stdout

data/lib/diffend/monitor.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+%w[
+  build_bundler_definition
+  errors
+  config/fetcher
+  config/file_finder
+  config/validator
+  commands
+  handle_errors/messages
+  handle_errors/build_exception_payload
+  handle_errors/display_to_stdout
+  handle_errors/report
+  request_object
+  request
+  voting
+  track
+].each { |file| require "diffend/#{file}" }
+
+%w[
+  versions/local
+  versions/remote
+].each { |file| require "diffend/voting/#{file}" }
+
+unless %w[development test].include?(ENV['DIFFEND_ENV'])
+  Thread.new do
+    track = Diffend::Track.new
+    track.start
+  end
+end

data/lib/diffend/request.rb

@@ -23,6 +23,15 @@ module Diffend
       Net::OpenTimeout,
       Net::ReadTimeout
     ].freeze
+    # Message displayed when server issue occured and we will retry
+    SERVER_ERROR_MESSAGE = 'We experienced a server-side issue, retrying...'
+    # List of server issues
+    #
+    # 500 - Internal Server Error
+    # 502 - Bad Gateway
+    # 503 - Service Unavailable
+    # 504 - Gateway Timeout
+    SERVER_ERRORS = [500, 502, 503, 504].freeze
     # Number of retries
     RETRIES = 3
     # Request headers
@@ -33,17 +42,39 @@ module Diffend
     class << self
       # Execute request
       #
-      # @param config [OpenStruct] diffend config
-      # @param endpoint_url [String]
-      # @param payload [Hash]
+      # @param request_object [Diffend::RequestObject]
       #
       # @return [Net::HTTPResponse] response from Diffend
-      def call(config, endpoint_url, payload)
+      def call(request_object)
         retry_count ||= -1
 
-        build_http(endpoint_url) do |http, uri|
-          http.request(build_request(uri, config, payload))
+        build_http(request_object.url) do |http, uri|
+          response = http.request(
+            build_request(
+              uri,
+              request_object.request_method,
+              request_object.config,
+              request_object.payload
+            )
+          )
+
+          if SERVER_ERRORS.include?(response.code.to_i)
+            raise Diffend::Errors::RequestServerError, response.code.to_i
+          end
+
+          response
         end
+      rescue Diffend::Errors::RequestServerError => e
+        retry_count += 1
+
+        retry if handle_retry(SERVER_ERROR_MESSAGE, retry_count)
+
+        Diffend::HandleErrors::Report.call(
+          exception: e,
+          payload: request_object.payload,
+          config: request_object.config,
+          message: :request_error
+        )
       rescue *CONNECTION_EXCEPTIONS => e
         retry_count += 1
 
@@ -51,8 +82,8 @@ module Diffend
 
         Diffend::HandleErrors::Report.call(
           exception: e,
-          payload: payload,
-          config: config,
+          payload: request_object.payload,
+          config: request_object.config,
           message: :request_error
         )
       rescue *TIMEOUT_EXCEPTIONS => e
@@ -62,8 +93,8 @@ module Diffend
 
         Diffend::HandleErrors::Report.call(
           exception: e,
-          payload: payload,
-          config: config,
+          payload: request_object.payload,
+          config: request_object.config,
           message: :request_error
         )
       end
@@ -100,17 +131,32 @@ module Diffend
       # Build http post request and assigns headers and payload
       #
       # @param uri [URI::HTTPS]
+      # @param request_method [Symbol]
       # @param config [OpenStruct] Diffend config
       # @param payload [Hash] with versions to check
       #
-      # @return [Net::HTTP::Post]
-      def build_request(uri, config, payload)
-        Net::HTTP::Post
+      # @return [Net::HTTP::Post, Net::HTTP::Put]
+      def build_request(uri, request_method, config, payload)
+        pick_request_method(request_method)
           .new(uri.request_uri, HEADERS)
           .tap { |request| assign_auth(request, config) }
           .tap { |request| assign_payload(request, payload) }
       end
 
+      # Pick request method
+      #
+      # @param request_method [Symbol]
+      #
+      # @return [Net::HTTP::Post, Net::HTTP::Put]
+      def pick_request_method(request_method)
+        case request_method
+        when :post
+          Net::HTTP::Post
+        when :put
+          Net::HTTP::Put
+        end
+      end
+
       # Assigns basic authorization if provided in the config
       #
       # @param request [Net::HTTP::Post] prepared http post

data/lib/diffend/request_object.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Class responsible for preparing diffend request object
+  RequestObject = Struct.new(:config, :url, :payload, :request_method, keyword_init: true)
+end

data/lib/diffend/track.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Track what is run in production
+  class Track
+    # Time that we want to wait between track requests
+    TRACK_SLEEP = 15
+    # Time that we want to wait before we retry
+    RETRY_SLEEP = 15
+
+    # Initialize tracking
+    def initialize
+      @mutex = Mutex.new
+      @config = fetch_config
+    end
+
+    # Start tracking
+    def start
+      response = exec_request
+
+      perform(response['id'])
+    rescue Diffend::Errors::HandledException
+      sleep(RETRY_SLEEP)
+
+      retry
+    rescue StandardError => e
+      Diffend::HandleErrors::Report.call(
+        exception: e,
+        config: @config,
+        message: :unhandled_exception,
+        report: true,
+        raise_exception: false
+      )
+
+      sleep(RETRY_SLEEP)
+
+      retry
+    end
+
+    # @param request_id [String]
+    def perform(request_id)
+      loop do
+        @mutex.synchronize do
+          track_request(request_id)
+        end
+
+        sleep(TRACK_SLEEP)
+      end
+    end
+
+    # Perform an exec request
+    def exec_request
+      Diffend::Voting.call(
+        Diffend::Commands::EXEC,
+        @config,
+        Diffend::BuildBundlerDefinition.call(
+          Diffend::Commands::EXEC,
+          Bundler.default_gemfile,
+          Bundler.default_lockfile
+        )
+      )
+    end
+
+    # Perform a track request
+    #
+    # @param request_id [String]
+    def track_request(request_id)
+      Diffend::Request.call(
+        build_request_object(request_id)
+      )
+    end
+
+    # @param request_id [String]
+    #
+    # @return [Diffend::RequestObject]
+    def build_request_object(request_id)
+      Diffend::RequestObject.new(
+        config: @config,
+        url: track_url(@config.project_id, request_id),
+        payload: { id: request_id }.freeze,
+        request_method: :put
+      ).freeze
+    end
+
+    # Fetch diffend config file
+    #
+    # @return [OpenStruct, nil] configuration object
+    #
+    # @raise [Errors::MissingConfigurationFile] when no config file
+    def fetch_config
+      Config::Fetcher.call(
+        File.expand_path('..', Bundler.bin_path)
+      )
+    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/voting.rb

@@ -7,45 +7,69 @@ module Diffend
       # Build verdict
       #
       # @param command [String] either install or update
+      # @param config [OpenStruct] diffend config
       # @param definition [Bundler::Definition] definition for your source
-      def call(command, definition)
+      def call(command, config, definition)
         Versions::Remote
-          .call(command, definition)
-          .tap { |response| build_message(command, response) }
+          .call(command, config, definition)
+          .tap { |response| build_message(command, config, response) }
       end
 
-      def build_message(command, response)
+      # @param command [String] either install or update
+      # @param config [OpenStruct] diffend config
+      # @param response [Hash] response from diffend API
+      def build_message(command, config, response)
         if response.key?('error')
           build_error(response)
         elsif response.key?('action')
-          build_verdict(command, response)
+          build_verdict(command, config, response)
         else
-          raise UnsupportedResponse, response['action']
+          Diffend::HandleErrors::Report.call(
+            config: config,
+            message: :unsupported_response,
+            payload: response,
+            report: true
+          )
         end
       end
 
+      # @param response [Hash] response from diffend API
       def build_error(response)
         build_error_message(response)
           .tap(&Bundler.ui.method(:error))
 
-        exit 1
+        raise Diffend::Errors::HandledException
       end
 
-      def build_verdict(command, response)
+      # @param command [String] either install or update
+      # @param config [OpenStruct] diffend config
+      # @param response [Hash] response from diffend API
+      def build_verdict(command, config, response)
         case response['action']
         when 'allow'
           build_allow_message(command, response)
             .tap(&Bundler.ui.method(:confirm))
+        when 'warn'
+          build_warn_message(command, response)
+            .tap(&Bundler.ui.method(:warn))
         when 'deny'
           build_deny_message(command, response)
             .tap(&Bundler.ui.method(:error))
 
           exit 1
         else
-          raise UnsupportedAction, response['action']
+          Diffend::HandleErrors::Report.call(
+            config: config,
+            message: :unsupported_verdict,
+            payload: response,
+            report: true
+          )
         end
       end
 
+      # @param response [Hash] response from diffend API
+      #
+      # @return [String]
       def build_error_message(response)
         <<~MSG
           \nDiffend returned an error for your request.\n
@@ -53,21 +77,56 @@ module Diffend
         MSG
       end
 
+      # @param command [String] either install or update
+      # @param response [Hash] response from diffend API
+      #
+      # @return [String]
       def build_allow_message(command, response)
         <<~MSG
-          \nDiffend reported an allow verdict for #{command} command for this project.\n
-          All of our #{response['allows_count'] + response['denies_count']} checks succeeded.\n
+          #{build_message_header('an allow', command)}
+          #{build_message_info(response)}\n
           #{response['review_url']}\n
         MSG
       end
 
+      # @param command [String] either install or update
+      # @param response [Hash] response from diffend API
+      #
+      # @return [String]
+      def build_warn_message(command, response)
+        <<~MSG
+          #{build_message_header('a warn', command)}
+          #{build_message_info(response)} Please go to the url below and review the issues.\n
+          #{response['review_url']}\n
+        MSG
+      end
+
+      # @param command [String] either install or update
+      # @param response [Hash] response from diffend API
+      #
+      # @return [String]
       def build_deny_message(command, response)
         <<~MSG
-          \nDiffend reported a deny verdict for #{command} command for this project.\n
-          #{response['denies_count']} out of our #{response['allows_count'] + response['denies_count']} checks failed. Please go to the url below and review the issues.\n
+          #{build_message_header('a deny', command)}
+          #{build_message_info(response)} Please go to the url below and review the issues.\n
           #{response['review_url']}\n
         MSG
       end
+
+      # @param type [String] verdict type
+      # @param command [String] either install or update
+      #
+      # @return [String]
+      def build_message_header(type, command)
+        "\nDiffend reported #{type} verdict for #{command} command for this project."
+      end
+
+      # @param response [Hash] response from diffend API
+      #
+      # @return [String]
+      def build_message_info(response)
+        "\nQuality score: #{response['quality_score']}, allows: #{response['allows_count']}, warnings: #{response['warns_count']}, denies: #{response['denies_count']}."
+      end
     end
   end
 end

data/lib/diffend/voting/versions/local.rb

@@ -40,7 +40,7 @@ module Diffend
             instance = new(definition)
 
             case command
-            when Commands::INSTALL then instance.build_install
+            when Commands::INSTALL, Commands::EXEC then instance.build_install
             when Commands::UPDATE then instance.build_update
             else
               raise ArgumentError, "invalid command: #{command}"
@@ -54,7 +54,6 @@ module Diffend
         def initialize(definition)
           @definition = definition
           @direct_dependencies = Hash[definition.dependencies.map { |val| [val.name, val] }]
-          @main_source = definition.send(:sources).rubygems_sources.last
           # Support case without Gemfile.lock
           @locked_specs = @definition.locked_gems ? @definition.locked_gems.specs : []
         end
@@ -150,17 +149,17 @@ module Diffend
         #
         # @return [String]
         def build_spec_platform(spec, locked_spec)
-          spec.platform || locked_spec&.platform || build_spec_generic_platform(spec)
+          parse_platform(
+            spec.platform || locked_spec&.platform || spec.send(:generic_local_platform)
+          )
         end
 
-        # Build gem generic platform
+        # Parse gem platform
         #
-        # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+        # @param platform [String, Gem::Platform]
         #
         # @return [String]
-        def build_spec_generic_platform(spec)
-          platform = spec.send(:generic_local_platform)
-
+        def parse_platform(platform)
           case platform
           when String then platform
           when Gem::Platform then platform.os
@@ -176,7 +175,7 @@ module Diffend
           case source
           when Bundler::Source::Metadata
             GEM_SOURCES_TYPES[:local]
-          when Bundler::Source::Rubygems
+          when Bundler::Source::Rubygems, Bundler::Source::Rubygems::Remote
             GEM_SOURCES_TYPES[:gemfile_source]
           when Bundler::Source::Git
             GEM_SOURCES_TYPES[:gemfile_git]
@@ -207,10 +206,20 @@ module Diffend
         #
         # @return [Bundler::Source] gem source type
         def source_for_spec(spec)
-          if @direct_dependencies.key?(spec.name)
-            @direct_dependencies[spec.name].source || @main_source
-          else
+          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
             spec.source
+          else
+            raise ArgumentError, "unknown source #{spec.source.class}"
           end
         end
 
@@ -223,10 +232,10 @@ module Diffend
           case source
           when Bundler::Source::Metadata
             ''
-          when Bundler::Source::Rubygems
-            source_name(source.remotes.first)
+          when Bundler::Source::Rubygems::Remote
+            source_name(source.anonymized_uri)
           when Bundler::Source::Git
-            source.uri
+            source.instance_variable_get(:@safe_uri)
           when Bundler::Source::Path
             source.path
           else
@@ -234,11 +243,11 @@ module Diffend
           end
         end
 
-        # @param name [Bundler::URI]
+        # @param uri [Bundler::URI]
         #
-        # @return [String] cleaned source name
-        def source_name(name)
-          name.to_s[0...-1]
+        # @return [String]
+        def source_name(uri)
+          uri.to_s[0...-1]
         end
 
         # Build sources used in the Gemfile

data/lib/diffend/voting/versions/remote.rb

@@ -20,28 +20,39 @@ module Diffend
         class << self
           # @param command [String] either install or update
           # @param definition [Bundler::Definition] definition for your source
-          def call(command, definition)
-            config = fetch_config
-
+          # @param config [OpenStruct] diffend config
+          def call(command, config, definition)
             payload = payload(command, config.project_id, definition)
 
             response = Diffend::Request.call(
-              config,
-              commands_url(command, config.project_id),
-              payload
+              build_request_object(command, config, payload)
             )
 
             JSON.parse(response.body)
           rescue StandardError => e
             Diffend::HandleErrors::Report.call(
               exception: e,
-              payload: payload,
+              payload: payload || {},
               config: config,
               message: :unhandled_exception,
               report: true
             )
           end
 
+          # @param command [String] either install or update
+          # @param config [OpenStruct] diffend config
+          # @param payload [Hash]
+          #
+          # @return [Diffend::RequestObject]
+          def build_request_object(command, config, payload)
+            Diffend::RequestObject.new(
+              config: config,
+              url: commands_url(command, config.project_id),
+              payload: payload,
+              request_method: :post
+            )
+          end
+
           # Build diffend, host, packages, and platform specific information
           #
           # @param command [String] either install or update
@@ -151,10 +162,16 @@ module Diffend
           #
           # @return [Hash]
           def build_host_command
-            {
-              'name' => $PROGRAM_NAME.split('/').last.strip,
-              'options' => ARGV.join(' ')
-            }
+            if File.exist?($PROGRAM_NAME)
+              array = `ps -p #{Process.pid} -o command=`.strip.split(' ')
+              array.shift if array.first.end_with?('bin/ruby')
+              name = array.shift.split('/').last.strip
+              command = "#{name} #{array.join(' ')}"
+
+              { 'name' => command, 'title' => '' }
+            else
+              { 'name' => ARGV.join(' '), 'title' => $PROGRAM_NAME }
+            end
           end
 
           # Build host ips, except localhost and loopback
@@ -187,17 +204,6 @@ module Diffend
             tags
           end
 
-          # Fetch diffend config file
-          #
-          # @return [OpenStruct, nil] configuration object
-          #
-          # @raise [Errors::MissingConfigurationFile] when no config file
-          def fetch_config
-            Config::Fetcher.call(
-              File.expand_path('..', Bundler.bin_path)
-            )
-          end
-
           # Provides diffend command endpoint url
           #
           # @param command [String] either install or update

data/scripts/generate_payload_for_file.rb

@@ -10,6 +10,6 @@ project_id = nil
 gemfile = ARGV[0]
 lockfile = ARGV[1]
 
-definition = Bundler::Definition.build(gemfile, lockfile, true)
+definition = Diffend::BuildBundlerDefinition.call(command, gemfile lockfile)
 
 pp Diffend::Voting::Versions::Remote.payload(command, project_id, definition)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.28
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,10 @@ files:
 - lib/diffend/handle_errors/display_to_stdout.rb
 - lib/diffend/handle_errors/messages.rb
 - lib/diffend/handle_errors/report.rb
+- lib/diffend/monitor.rb
 - lib/diffend/request.rb
+- lib/diffend/request_object.rb
+- lib/diffend/track.rb
 - lib/diffend/voting.rb
 - lib/diffend/voting/versions/local.rb
 - lib/diffend/voting/versions/remote.rb