diffend 0.2.19 → 0.2.27

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
@@ -65,18 +64,16 @@ module Diffend
         def build_install
           hash = build_main
 
-          @definition.requested_specs.each do |spec|
+          @definition.specs.each do |spec|
             next if skip?(spec.source)
 
             locked_spec = @locked_specs.find { |s| s.name == spec.name }
 
-            spec2 = locked_spec || spec
-
-            hash['dependencies'][spec2.name] = {
-              'platform' => build_spec_platform(spec2),
-              'source' => build_spec_source(spec2),
-              'type' => build_dependency_type(spec2.name),
-              'versions' => build_versions(spec2)
+            hash['dependencies'][spec.name] = {
+              'platform' => build_spec_platform(spec, locked_spec),
+              'source' => build_spec_source(spec),
+              'type' => build_dependency_type(spec.name),
+              'versions' => build_versions(spec, locked_spec)
             }
           end
 
@@ -89,13 +86,13 @@ module Diffend
         def build_update
           hash = build_main
 
-          @definition.requested_specs.each do |spec|
+          @definition.specs.each do |spec|
             next if skip?(spec.source)
 
             locked_spec = @locked_specs.find { |s| s.name == spec.name }
 
             hash['dependencies'][spec.name] = {
-              'platform' => build_spec_platform(spec),
+              'platform' => build_spec_platform(spec, locked_spec),
               'source' => build_spec_source(spec),
               'type' => build_dependency_type(spec.name),
               'versions' => build_versions(spec, locked_spec)
@@ -126,7 +123,11 @@ module Diffend
         #
         # @return [Array<String>]
         def build_versions(spec, locked_spec = nil)
-          locked_spec ? [locked_spec.version.to_s, spec.version.to_s] : [spec.version.to_s]
+          if locked_spec && locked_spec.version.to_s != spec.version.to_s
+            [locked_spec.version.to_s, spec.version.to_s]
+          else
+            [spec.version.to_s]
+          end
         end
 
         # @param specs [Array] specs that are direct dependencies
@@ -144,10 +145,25 @@ module Diffend
         # Build gem platform
         #
         # @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)
+          parse_platform(
+            spec.platform || locked_spec&.platform || spec.send(:generic_local_platform)
+          )
+        end
+
+        # Parse gem platform
+        #
+        # @param platform [String, Gem::Platform]
         #
         # @return [String]
-        def build_spec_platform(spec)
-          spec.platform || spec.send(:generic_local_platform)
+        def parse_platform(platform)
+          case platform
+          when String then platform
+          when Gem::Platform then platform.os
+          end
         end
 
         # Build gem source type
@@ -159,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]
@@ -190,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
 
@@ -206,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
@@ -217,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
@@ -229,17 +255,17 @@ module Diffend
         # @return [Array<Hash>]
         def build_sources
           sources = @definition.send(:sources).rubygems_sources
-          hash = []
+          hash = {}
 
           sources.each do |source|
             type = build_source_type(source.remotes)
 
             source.remotes.each do |src|
-              hash << { 'name' => source_name(src), 'type' => type }
+              hash[source_name(src)] = type
             end
           end
 
-          hash
+          hash.map { |name, type| { 'name' => name, 'type' => type } }
         end
 
         # Build gem source type

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

@@ -20,14 +20,37 @@ 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 = Request.call(
-              command, payload(command, config&.project_id, definition), config
+            response = Diffend::Request.call(
+              build_request_object(command, config, payload)
             )
 
             JSON.parse(response.body)
+          rescue StandardError => e
+            Diffend::HandleErrors::Report.call(
+              exception: e,
+              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
@@ -85,6 +108,9 @@ module Diffend
             }.freeze
           end
 
+          # Build platform ruby information
+          #
+          # @return [Hash]
           def build_platform_ruby
             if defined?(JRUBY_VERSION)
               revision = JRUBY_REVISION.to_s
@@ -117,7 +143,7 @@ module Diffend
             uname = Etc.uname
 
             {
-              'command' => { 'name' => '', 'options' => '' },
+              'command' => build_host_command,
               'ips' => build_host_ips,
               'name' => uname[:nodename],
               'system' => {
@@ -127,10 +153,24 @@ module Diffend
                 'version' => uname[:version]
               },
               'tags' => build_host_tags,
-              'user' => Etc.getpwuid(Process.uid).name
+              'user' => Etc.getpwuid(Process.uid).name,
+              'pid' => Process.pid
             }.freeze
           end
 
+          # Build host command information
+          #
+          # @return [Hash]
+          def build_host_command
+            {
+              'name' => $PROGRAM_NAME.split('/').last.strip,
+              'options' => ARGV.join(' ')
+            }
+          end
+
+          # Build host ips, except localhost and loopback
+          #
+          # @return [Array<String>]
           def build_host_ips
             Socket.ip_address_list.map do |ip|
               next if ip.ipv4_loopback? || ip.ipv6_loopback? || ip.ipv6_linklocal?
@@ -139,6 +179,9 @@ module Diffend
             end.compact
           end
 
+          # Build host tags
+          #
+          # @return [Array]
           def build_host_tags
             tags = []
 
@@ -155,15 +198,16 @@ module Diffend
             tags
           end
 
-          # Fetch coditsu config file
+          # Provides diffend command endpoint url
           #
-          # @return [OpenStruct, nil] configuration object
+          # @param command [String] either install or update
+          # @param project_id [String] diffend project_id
           #
-          # @raise [Errors::MissingConfigurationFile] when no config file
-          def fetch_config
-            Config::Fetcher.call(
-              File.expand_path('..', Bundler.bin_path)
-            )
+          # @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

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.19
+  version: 0.2.27
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,13 +92,21 @@ files:
 - certs/tomaszpajor.pem
 - diffend.gemspec
 - lib/diffend.rb
+- lib/diffend/build_bundler_definition.rb
 - lib/diffend/commands.rb
 - lib/diffend/config/fetcher.rb
 - lib/diffend/config/file_finder.rb
 - lib/diffend/config/validator.rb
 - lib/diffend/errors.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/monitor.rb
+- lib/diffend/request.rb
+- lib/diffend/request_object.rb
+- lib/diffend/track.rb
 - lib/diffend/voting.rb
-- lib/diffend/voting/request.rb
 - lib/diffend/voting/versions/local.rb
 - lib/diffend/voting/versions/remote.rb
 - plugins.rb

data/lib/diffend/voting/request.rb

@@ -1,191 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-require 'openssl'
-require 'json'
-require 'securerandom'
-
-module Diffend
-  module Voting
-    # Module responsible for doing request to Diffend
-    module Request
-      # List of connection exceptions
-      CONNECTION_EXCEPTIONS = [
-        Errno::ECONNRESET,
-        Errno::ENETUNREACH,
-        Errno::EHOSTUNREACH,
-        Errno::ECONNREFUSED
-      ].freeze
-      # List of timeout exceptions
-      TIMEOUT_EXCEPTIONS = [
-        Net::OpenTimeout,
-        Net::ReadTimeout
-      ].freeze
-      # Request headers
-      HEADERS = { 'Content-Type': 'application/json' }.freeze
-
-      private_constant :HEADERS
-
-      class << self
-        # Execute request to Diffend
-        #
-        # @param command [String] either install or update
-        # @param payload [Hash] with versions to check
-        # @param config [OpenStruct] Diffend config
-        #
-        # @return [Net::HTTPResponse] response from Diffend
-        def call(command, payload, config)
-          retry_count ||= 0
-
-          build_http(commands_url(command, config.project_id)) do |http, uri|
-            http.request(build_request(uri, config, payload))
-          end
-        rescue *CONNECTION_EXCEPTIONS => e
-          Bundler.ui.error('We experienced a connection issue, retrying...')
-          sleep(exponential_backoff(retry_count))
-          retry_count += 1
-
-          retry if retry_count < 3
-
-          output_report(build_report(payload, e))
-          Bundler.ui.error('^^^ Above is the dump of your request ^^^')
-          Bundler.ui.error(build_request_error_message)
-
-          exit 1
-        rescue *TIMEOUT_EXCEPTIONS => e
-          Bundler.ui.error('We experienced a timeout issue, retrying...')
-          sleep(exponential_backoff(retry_count))
-          retry_count += 1
-
-          retry if retry_count < 3
-
-          output_report(build_report(payload, e))
-          Bundler.ui.error('^^^ Above is the dump of your request ^^^')
-          Bundler.ui.error(build_request_error_message)
-
-          exit 1
-        rescue StandardError => e
-          exception_payload = build_report(payload, e)
-          output_report(exception_payload)
-          Bundler.ui.error('^^^ Above is the dump of your request ^^^')
-          Bundler.ui.error(build_unhandled_exception_message)
-
-          build_http(errors_url(config.project_id)) do |http, uri|
-            http.request(build_request(uri, config, exception_payload))
-          end
-
-          exit 1
-        end
-
-        # Builds http connection object
-        #
-        # @param url [String] command endpoint url
-        def build_http(url)
-          uri = URI(url)
-
-          Net::HTTP.start(
-            uri.host,
-            uri.port,
-            use_ssl: uri.scheme == 'https',
-            verify_mode: OpenSSL::SSL::VERIFY_NONE,
-            open_timeout: 5,
-            read_timeout: 5
-          ) { |http| yield(http, uri) }
-        end
-
-        # Build http post request and assigns headers and payload
-        #
-        # @param uri [URI::HTTPS]
-        # @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
-            .new(uri.request_uri, HEADERS)
-            .tap { |request| assign_auth(request, config) }
-            .tap { |request| assign_payload(request, payload) }
-        end
-
-        # Assigns basic authorization if provided in the config
-        #
-        # @param request [Net::HTTP::Post] prepared http post
-        # @param config [OpenStruct] Diffend config
-        def assign_auth(request, config)
-          return unless config
-          return unless config.shareable_id
-          return unless config.shareable_key
-
-          request.basic_auth(config.shareable_id, config.shareable_key)
-        end
-
-        # Assigns payload as json
-        #
-        # @param request [Net::HTTP::Post] prepared http post
-        # @param payload [Hash] with versions to check
-        def assign_payload(request, payload)
-          request.body = JSON.dump(payload: payload)
-        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
-
-        # 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
-
-        def exponential_backoff(retry_count)
-          2**(retry_count + 1)
-        end
-
-        def build_request_error_message
-          <<~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
-            Create an issue on https://github.com/diffend-io/diffend-ruby/issues\n
-          MSG
-        end
-
-        def build_unhandled_exception_message
-          <<~MSG
-            \nSomething went really wrong. We recorded this incident in our system and will review it.\n
-            This is a bug, don't hesitate.\n
-            Create an issue on https://github.com/diffend-io/diffend-ruby/issues\n
-          MSG
-        end
-
-        def build_report(payload, exception)
-          {
-            request_id: SecureRandom.uuid,
-            payload: payload,
-            exception: {
-              class: exception.class,
-              message: exception.message,
-              backtrace: exception.backtrace
-            }
-          }
-        end
-
-        def output_report(report)
-          puts report.to_json
-        end
-      end
-    end
-  end
-end