diffend 0.2.37 → 0.2.42

data/lib/diffend/local_context/platform.rb

@@ -12,7 +12,7 @@ module Diffend
         def call
           {
             'bundler' => {
-              'version' => Bundler::VERSION
+              'version' => ::Bundler::VERSION
             },
             'environment' => environment,
             'ruby' => ruby_information,

data/lib/diffend/logger.rb

@@ -55,11 +55,11 @@ module Diffend
 
       case severity
       when INFO
-        Bundler.ui.confirm(message)
+        ::Bundler.ui.confirm(message)
       when WARN
-        Bundler.ui.warn(message)
+        ::Bundler.ui.warn(message)
       when ERROR, FATAL
-        Bundler.ui.error(message)
+        ::Bundler.ui.error(message)
       end
     end
   end

data/lib/diffend/monitor.rb

@@ -26,9 +26,22 @@
   track
 ].each { |file| require "diffend/#{file}" }
 
+# Calculate exponential backoff
+#
+# @param retry_count [Integer]
+#
+# @return [Float] backoff value
+def exponential_backoff(retry_count)
+  (0.25 * 1.5**retry_count.to_f).round(2)
+end
+
 Thread.new do
   config = nil
-  config_iterations = 0
+  retry_count = 0
+
+  # There is an issue if we start to fast and there are gems that require things,
+  # it may break the execution. That's why we want to give the application time to boot.
+  sleep(0.5)
 
   loop do
     config = Diffend::Config.new(
@@ -37,12 +50,11 @@ Thread.new do
     )
 
     break if config.valid?
+    break if retry_count == 12
 
-    config_iterations += 1
-
-    break if config_iterations == 12
+    sleep(exponential_backoff(retry_count))
 
-    sleep 5
+    retry_count += 1
   end
 
   Thread.exit unless config.valid?

data/lib/diffend/plugin.rb

@@ -30,6 +30,9 @@
   request_verdict
   execute
   track
+  shell
+  repository
+  integration_repository
 ].each { |file| require "diffend/#{file}" }
 
 module Diffend

data/lib/diffend/repository.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+%w[
+  tmpdir
+  securerandom
+].each(&method(:require))
+
+module Diffend
+  # Repository for specs
+  class Repository
+    # Repositories path
+    REPOSITORIES_PATH = File.join(
+      File.expand_path('..', Bundler.bin_path),
+      'repositories'
+    ).freeze
+    # List of supported repositories split by command
+    SUPPORTED = {
+      'install' => %w[
+        with_gemfile_lock
+        with_gemfile_lock_with_added_gem
+        with_gemfile_lock_with_changed_gem_version
+        with_gemfile_lock_with_locked_gem_version
+        with_gemfile_lock_with_removed_gem
+        with_gemfile_lock_with_two_platforms
+        with_gemfile_lock_with_two_primary_sources
+        with_gemfile_lock_with_two_sources
+        without_gemfile_lock
+      ].freeze,
+      'update' => %w[
+        with_gemfile_lock
+        with_gemfile_lock_with_added_gem
+        with_gemfile_lock_with_removed_gem
+        with_gemfile_lock_with_two_primary_sources
+        with_gemfile_lock_with_two_sources
+        without_gemfile_lock
+      ].freeze
+    }.freeze
+
+    attr_reader :name, :path
+
+    # @param command [String] command executed via bundler
+    # @param name [String] repository name
+    def initialize(command, name)
+      @command = command
+      @name = name
+      @path = File.join(Dir.tmpdir, SecureRandom.uuid)
+    end
+
+    # Build repository path
+    #
+    # @return [String]
+    def orig_path
+      @orig_path ||= global_file_path(
+        File.join(
+          bundler_version_string,
+          "#{@command}_#{name}"
+        )
+      )
+    end
+
+    # Setup an isolated instance of a repository
+    def setup
+      FileUtils.cp_r(orig_path, path)
+    end
+
+    # Clean isolated instance of a repository
+    def clean
+      FileUtils.rm_rf(path)
+    end
+
+    # Execute tasks in an isolated instance of a repository
+    def isolate
+      setup
+      yield(path)
+      clean
+    end
+
+    # Build the path to a specified file within the repository
+    #
+    # @param file_name [String]
+    #
+    # @return [String]
+    def file_path(file_name)
+      File.join(
+        path,
+        file_name
+      )
+    end
+
+    # Build global path
+    #
+    # @param file_name [String]
+    #
+    # @return [String]
+    def global_file_path(file_name)
+      File.join(
+        REPOSITORIES_PATH,
+        file_name
+      )
+    end
+
+    # Build bundler version string
+    #
+    # @return [String]
+    def bundler_version_string
+      @bundler_version_string ||= "bundler_#{Bundler::VERSION.tr('.', '_')}"
+    end
+  end
+end

data/lib/diffend/request.rb

@@ -124,7 +124,6 @@ module Diffend
           uri.host,
           uri.port,
           use_ssl: uri.scheme == 'https',
-          verify_mode: OpenSSL::SSL::VERIFY_NONE,
           open_timeout: 15,
           read_timeout: 15
         ) { |http| yield(http, uri) }

data/lib/diffend/request_object.rb

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

data/lib/diffend/request_verdict.rb

@@ -7,15 +7,15 @@ module Diffend
   module RequestVerdict
     # Exceptions that we handle when there is a resolve issue
     RESOLVE_EXCEPTIONS = [
-      Bundler::GemNotFound,
-      Bundler::GitError,
-      Bundler::PermissionError,
-      Bundler::VersionConflict
+      ::Bundler::GemNotFound,
+      ::Bundler::GitError,
+      ::Bundler::PermissionError,
+      ::Bundler::VersionConflict
     ].freeze
 
     class << self
       # @param config [Diffend::Config]
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       def call(config, definition)
         payload = Diffend::LocalContext.call(config, definition)
 
@@ -42,10 +42,10 @@ module Diffend
       # @return [Diffend::RequestObject]
       def build_request_object(config, payload)
         Diffend::RequestObject.new(
-          config: config,
-          url: config.commands_url,
-          payload: payload,
-          request_method: :post
+          config,
+          config.commands_url,
+          payload,
+          :post
         )
       end
     end

data/lib/diffend/shell.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+# Helper commands for running Linux shell commands
+module Diffend
+  module Shell
+    class << self
+      # Allows to execute shell commands and handle errors, etc later
+      #   (won't raise any errors but instead will catch all things)
+      # @param command_with_options [String] command that should be executed with
+      #   all the arguments and options
+      # @param raise_on_invalid_exit [Boolean] raise exception when exit code is not 0
+      # @return [Hash] hash with 3 keys describing output
+      #   (stdout, stderr, exit_code)
+      # @example Run ls
+      #   SupportEngine::Shell.('ls') =>
+      #   { stdout: "test.rb\n", stderr: '', exit_code: 0}
+      def call(command_with_options, raise_on_invalid_exit: true)
+        stdout_str, stderr_str, status = Open3.capture3(command_with_options)
+
+        result = {
+          stdout: stdout_str,
+          stderr: stderr_str,
+          exit_code: status.exitstatus
+        }
+
+        raise Diffend::Errors::FailedShellCommand, result.values.join(': ') \
+          if raise_on_invalid_exit && result[:exit_code] != 0
+
+        result
+      end
+
+      # @param path [String, Pathname] to a place where git repo is
+      # @param command [String] that we want to execute in path context
+      # @param raise_on_invalid_exit [Boolean] raise exception when exit code is not 0
+      # @return [Hash] hash with 3 keys describing output (stdout, stderr, exit_code)
+      def call_in_path(path, command, raise_on_invalid_exit: true)
+        command = ['cd', path.to_s, '&&', command]
+        call(command.join(' '), raise_on_invalid_exit: raise_on_invalid_exit)
+      end
+    end
+  end
+end

data/lib/diffend/track.rb

@@ -62,10 +62,10 @@ module Diffend
     # @return [Diffend::RequestObject]
     def build_request_object(request_id)
       Diffend::RequestObject.new(
-        config: @config,
-        url: @config.track_url(request_id),
-        payload: { id: request_id }.freeze,
-        request_method: :put
+        @config,
+        @config.track_url(request_id),
+        { id: request_id }.freeze,
+        :put
       ).freeze
     end
   end

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.37'
+  VERSION = '0.2.42'
 end

data/repositories/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: '0c097257-aadc-41ed-a74d-f7df2c449b15'
+shareable_id: '2e1ab878-19cb-4ffa-b4ee-3c158f17397d'
+shareable_key: '8f52d1ff-9555-4db3-bcb1-bb28bceb7f57'

data/repositories/bundler_2_1_4/install_with_gemfile_lock/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: 'c8c09047-fb8d-4530-b7f8-581af84c8b02'
+shareable_id: 'dbd6c13e-770b-4de9-a036-92ad049fdd6a'
+shareable_key: 'e99dafde-a1f0-4709-a474-bc7aadd9fb8b'

data/repositories/bundler_2_1_4/install_with_gemfile_lock/Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'dry-core'
+gem 'nokogiri'

data/repositories/bundler_2_1_4/install_with_gemfile_lock/Gemfile.lock

@@ -0,0 +1,22 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
+    dry-core (0.4.7)
+      concurrent-ruby (~> 1.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-java)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  dry-core
+  nokogiri
+
+BUNDLED WITH
+   2.1.4

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_added_gem/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: 'b3b7c55c-2364-4a87-8415-89acf3aefc5e'
+shareable_id: '441f8f3c-fcc0-4b70-b523-56e4bd65fc0e'
+shareable_key: '1a71a32d-10fe-4852-ba46-9c760f70c62a'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_added_gem/Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'dry-core'
+gem 'dry-struct'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_added_gem/Gemfile.lock

@@ -0,0 +1,16 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.1.6)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  dry-core
+
+BUNDLED WITH
+   2.1.4

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_changed_gem_version/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: 'e37fd9a0-b344-475c-a35c-fd64d6422392'
+shareable_id: 'e43000d8-e59e-4e2f-9122-49ea12f2ad99'
+shareable_key: 'e9c2e968-68d4-407e-acab-8d1c45fbb1b7'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_changed_gem_version/Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'dry-core', '0.4.8'
+gem 'dry-inflector'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_changed_gem_version/Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.0.5)
+    dry-core (0.4.7)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.1.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  dry-core (= 0.4.7)
+  dry-inflector
+
+BUNDLED WITH
+   2.1.4

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_changed_gem_version/README.md

@@ -0,0 +1 @@
+Bundle on both latest `ruby` and `jruby`

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_locked_gem_version/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: 'f885776d-d70b-4bf9-8bc8-48c39f0b7908'
+shareable_id: '373d5c64-477b-434a-93a1-0072db888803'
+shareable_key: 'cf25a756-b5af-4105-ad23-ccf7523d8472'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_locked_gem_version/Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'dry-core', '0.4.7'
+gem 'dry-inflector'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_locked_gem_version/Gemfile.lock

@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
+    dry-core (0.4.7)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.1.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  dry-core (= 0.4.7)
+  dry-inflector
+
+BUNDLED WITH
+   2.1.4