diffend 0.2.40 → 0.2.45

data/lib/diffend/local_context/packages.rb

@@ -39,8 +39,7 @@ module Diffend
           ::Bundler.ui.silence { instance.resolve }
 
           case command
-          when Commands::INSTALL, Commands::EXEC, Commands::SECURE then instance.build_install
-          when Commands::UPDATE then instance.build_update
+          when Commands::INSTALL, Commands::EXEC, Commands::SECURE, Commands::UPDATE, Commands::ADD then instance.build
           else
             raise ArgumentError, "invalid command: #{command}"
           end
@@ -63,37 +62,21 @@ module Diffend
       # Resolve definition
       def resolve
         @cached ? @definition.resolve_with_cache! : @definition.resolve_remotely!
-      end
-
-      # Build install specification
-      #
-      # @return [Hash]
-      def build_install
-        hash = build_main
-
-        @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, locked_spec),
-            'source' => build_spec_source(spec),
-            'type' => build_dependency_type(spec.name),
-            'versions' => build_versions(spec, locked_spec)
-          }
-        end
 
-        hash
+        # Despite bundler not materializing resolution, we always need to do so to get all the
+        # gems details
+        @definition.specs
       end
 
-      # Build update specification
+      # Build specification
       #
       # @return [Hash]
-      def build_update
+      def build
         hash = build_main
 
-        @definition.specs.each do |spec|
+        @definition.resolve.each do |spec|
+          # Skip metadata
+          next if spec.instance_variable_get(:@specification).nil?
           next if skip?(spec.source)
 
           locked_spec = @locked_specs.find { |s| s.name == spec.name }
@@ -117,8 +100,8 @@ module Diffend
       def build_main
         {
           'dependencies' => {},
-          'sources' => build_sources,
           'plugins' => {},
+          'sources' => build_sources,
           'platforms' => @definition.platforms.map(&:to_s)
         }
       end

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_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

@@ -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.40'
+  VERSION = '0.2.45'
 end

data/repositories/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

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

@@ -0,0 +1,3 @@
+project_id: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

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: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

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: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

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: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

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

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_removed_gem/.diffend.yml

@@ -0,0 +1,3 @@
+project_id: '6f346200-b6d0-4456-93d6-93f6ea64629f'
+shareable_id: 'a623a24f-c384-41ef-9b1f-020c902cee53'
+shareable_key: 'fea22506-bf19-404e-b6cd-fb26ffb08b0c'

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_removed_gem/Gemfile

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

data/repositories/bundler_2_1_4/install_with_gemfile_lock_with_removed_gem/Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.1.6)
+    dry-configurable (0.11.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (1.3.0)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-types (~> 1.3)
+      ice_nine (~> 0.11)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    ice_nine (0.11.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  dry-core
+  dry-struct
+
+BUNDLED WITH
+   2.1.4