diffend 0.2.16 → 0.2.23

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

@@ -23,11 +23,23 @@ module Diffend
           def call(command, definition)
             config = fetch_config
 
-            response = Request.call(
-              command, payload(command, config&.project_id, definition), config
+            payload = payload(command, config.project_id, definition)
+
+            response = Diffend::Request.call(
+              config,
+              commands_url(command, config.project_id),
+              payload
             )
 
             JSON.parse(response.body)
+          rescue StandardError => e
+            Diffend::HandleErrors::Report.call(
+              exception: e,
+              payload: payload,
+              config: config,
+              message: :unhandled_exception,
+              report: true
+            )
           end
 
           # Build diffend, host, packages, and platform specific information
@@ -85,6 +97,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 +132,7 @@ module Diffend
             uname = Etc.uname
 
             {
-              'command' => { 'name' => '', 'options' => '' },
+              'command' => build_host_command,
               'ips' => build_host_ips,
               'name' => uname[:nodename],
               'system' => {
@@ -127,10 +142,24 @@ module Diffend
                 'version' => uname[:version]
               },
               'tags' => build_host_tags,
-              'user' => Etc.getlogin
+              '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 +168,9 @@ module Diffend
             end.compact
           end
 
+          # Build host tags
+          #
+          # @return [Array]
           def build_host_tags
             tags = []
 
@@ -155,7 +187,7 @@ module Diffend
             tags
           end
 
-          # Fetch coditsu config file
+          # Fetch diffend config file
           #
           # @return [OpenStruct, nil] configuration object
           #
@@ -164,8 +196,18 @@ module Diffend
             Config::Fetcher.call(
               File.expand_path('..', Bundler.bin_path)
             )
-          rescue Errors::MissingConfigurationFile
-            nil
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.23
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,9 +77,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.md
 - README.md
 - bin/bundle
 - bin/byebug
@@ -91,12 +92,18 @@ 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/request.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