diffend-monitor 0.2.40 → 0.2.46

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.46'
 end

metadata

@@ -1,40 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: diffend-monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.40
+  version: 0.2.46
 platform: ruby
 authors:
 - Tomasz Pajor
-autorequire:
+- Maciej Mensfeld
+autorequire: 
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIERDCCAqygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBt0b21l
-  ay9EQz1wb2xpc2hnZWVrcy9EQz1jb20wHhcNMjAwNzA3MTY0NjU0WhcNMjEwNzA3
-  MTY0NjU0WjAmMSQwIgYDVQQDDBt0b21lay9EQz1wb2xpc2hnZWVrcy9EQz1jb20w
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDPRTvPuofdtL/wFEPOwPUr
-  vR0XHzM/ADb2GBuzu6fzgmoxaYXBe8A++0BbgFvK47T04i8bsbXnfkxrkz/nupQ5
-  SK2DPgS4HWnADuyBuyBY7LT4O1wwlytdlHtJgQV6NIcbprcOs/ZQKnimZpW9uByu
-  FoN3i94pAEQhuzK0S+wWPvSm22+6XGtCuOzyFGdnCJjGUOkCRno5Nx34MWz0NpJ3
-  9Ekkyy8g2cLvBcUdfeSrY7WsJ5cPCNrBs5cMuV426s1dDrhuvsW+sacwwY/4/LBw
-  JzEX4/zS+lsVIX+iOoIFGJdeGnpEWqKgWoaskxqseFi661td1n9UaMXxgoaYh/oX
-  3fJOy2jsZFboZ/eJ5rfciXLiCqSERGkEA+QcA2/jC/d77YJ1FfJW9uwJs3kptf4D
-  p6h8wuA3T6rN4QrxkGBYzOfUJ2zSQy1cFu0rTZiYdKo9X6BunnxhmUExNng7advu
-  qo8IDinyRlqA5+sOLXd4W3AS/RfF2nrayZNa3khTmmUCAwEAAaN9MHswCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHRFOZPwpgOd2m8FIOodOii+OiID
-  MCAGA1UdEQQZMBeBFXRvbWVrQHBvbGlzaGdlZWtzLmNvbTAgBgNVHRIEGTAXgRV0
-  b21la0Bwb2xpc2hnZWVrcy5jb20wDQYJKoZIhvcNAQELBQADggGBAKWFwYTGZVoy
-  Bj3L9lvGOXpz8VWNoptFNHdncpaw1MMhS8UHcPQOUEiExX5ZH7MARy1fBjMXzIh9
-  41ZpCjR+S6uCEpzUcg5Z/kEWa/wOW6tqrX+zfyxFATDI20pYaQWOLepjbDxePFMZ
-  GAlIX5UNsze04A+wArXAttZB4oPt6loS1ao0GNdMb+syYMLzZUTW/sY2rm8zP4Mz
-  Kt+zjoqMxQ1Jf+EwH+0uq8Tj5BJcmG6mWYM+ljvRbxBwfimoUBUCQe6KIDouF0Og
-  uwLMY7X3jSERta4SxyY+iY7qNLsmG370GIGYbHuIiCwubFXt8jiPJZEdPE1xuzVF
-  CLsYItzC28UQEWrVe6sJ0Fuqv5VHM6t8jNClkXDwzf95efFlGSCFN4t+/dywVIK8
-  9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
-  LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
+  MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhtYWNp
+  ZWovREM9bWVuc2ZlbGQvREM9cGwwHhcNMjAwODExMDkxNTM3WhcNMjEwODExMDkx
+  NTM3WjAjMSEwHwYDVQQDDBhtYWNpZWovREM9bWVuc2ZlbGQvREM9cGwwggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDCpXsCgmINb6lHBXXBdyrgsBPSxC4/
+  2H+weJ6L9CruTiv2+2/ZkQGtnLcDgrD14rdLIHK7t0o3EKYlDT5GhD/XUVhI15JE
+  N7IqnPUgexe1fbZArwQ51afxz2AmPQN2BkB2oeQHXxnSWUGMhvcEZpfbxCCJH26w
+  hS0Ccsma8yxA6hSlGVhFVDuCr7c2L1di6cK2CtIDpfDaWqnVNJEwBYHIxrCoWK5g
+  sIGekVt/admS9gRhIMaIBg+Mshth5/DEyWO2QjteTodItlxfTctrfmiAl8X8T5JP
+  VXeLp5SSOJ5JXE80nShMJp3RFnGw5fqjX/ffjtISYh78/By4xF3a25HdWH9+qO2Z
+  tx0wSGc9/4gqNM0APQnjN/4YXrGZ4IeSjtE+OrrX07l0TiyikzSLFOkZCAp8oBJi
+  Fhlosz8xQDJf7mhNxOaZziqASzp/hJTU/tuDKl5+ql2icnMv5iV/i6SlmvU29QNg
+  LCV71pUv0pWzN+OZbHZKWepGhEQ3cG9MwvkCAwEAAaN3MHUwCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFImGed2AXS070ohfRidiCEhXEUN+MB0GA1Ud
+  EQQWMBSBEm1hY2llakBtZW5zZmVsZC5wbDAdBgNVHRIEFjAUgRJtYWNpZWpAbWVu
+  c2ZlbGQucGwwDQYJKoZIhvcNAQELBQADggGBAKiHpwoENVrMi94V1zD4o8/6G3AU
+  gWz4udkPYHTZLUy3dLznc/sNjdkJFWT3E6NKYq7c60EpJ0m0vAEg5+F5pmNOsvD3
+  2pXLj9kisEeYhR516HwXAvtngboUcb75skqvBCU++4Pu7BRAPjO1/ihLSBexbwSS
+  fF+J5OWNuyHHCQp+kGPLtXJe2yUYyvSWDj3I2//Vk0VhNOIlaCS1+5/P3ZJThOtm
+  zJUBI7h3HgovwRpcnmk2mXTmU4Zx/bCzX8EA6VY0khEvnmiq7S6eBF0H9qH8KyQ6
+  EkVLpvmUDFcf/uNaBQdazEMB5jYtwoA8gQlANETNGPi51KlkukhKgaIEDMkBDJOx
+  65N7DzmkcyY0/GwjIVIxmRhcrCt1YeCUElmfFx0iida1/YRm6sB2AXqScc1+ECRi
+  2DND//YJUikn1zwbz1kT70XmHd97B4Eytpln7K+M1u2g1pHVEPW4owD/ammXNpUy
+  nt70FcDD4yxJQ+0YNiHd0N8IcVBM1TMIVctMNQ==
   -----END CERTIFICATE-----
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,32 +65,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - contact@diffend.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coditsu/ci.yml"
-- ".diffend.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
-- bin/bundle
-- bin/byebug
-- bin/htmldiff
-- bin/ldiff
-- bin/rake
-- bin/rspec
 - certs/mensfeld.pem
-- certs/tomaszpajor.pem
 - config/diffend.yml
 - diffend.gemspec
 - lib/diffend.rb
@@ -107,6 +93,7 @@ files:
 - lib/diffend/handle_errors/display_to_stdout.rb
 - lib/diffend/handle_errors/messages.rb
 - lib/diffend/handle_errors/report.rb
+- lib/diffend/integration_repository.rb
 - lib/diffend/latest_version.rb
 - lib/diffend/local_context.rb
 - lib/diffend/local_context/diffend.rb
@@ -116,18 +103,19 @@ files:
 - lib/diffend/logger.rb
 - lib/diffend/monitor.rb
 - lib/diffend/plugin.rb
+- lib/diffend/repository.rb
 - lib/diffend/request.rb
 - lib/diffend/request_object.rb
 - lib/diffend/request_verdict.rb
+- lib/diffend/shell.rb
 - lib/diffend/track.rb
 - lib/diffend/version.rb
 - plugins.rb
-- scripts/generate_payload_for_file.rb
 homepage: https://diffend.io
 licenses:
 - Prosperity Public License
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,15 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: OSS supply chain security and management platform
 test_files: []

data/.coditsu/ci.yml

@@ -1,3 +0,0 @@
-repository_id: '376dd725-895a-4221-9de5-de8ede1b30a6'
-api_key: <%= ENV['CODITSU_API_KEY'] %>
-api_secret: <%= ENV['CODITSU_API_SECRET'] %>

data/.diffend.yml

@@ -1,3 +0,0 @@
-project_id: '78703667-6612-476e-9718-ae573983358e'
-shareable_id: '432691a9-92c8-4a40-91a1-b63b09ec4123'
-shareable_key: '34a19a31-06c5-4941-a32e-aceb006f3730'

data/.github/workflows/ci.yml

@@ -1,88 +0,0 @@
-name: ci
-
-jobs:
-  specs:
-    needs:
-      - diffend
-      - coditsu
-
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-          - 'jruby-9.2.14.0'
-        bundler:
-          - '2.1.4'
-          - '2.2.7'
-        include:
-          - ruby: '2.7'
-            coverage: 'true'
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Install package dependencies
-        run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-          bundler: ${{matrix.bundler}}
-      - name: Bundle install
-        env:
-          DIFFEND_DEVELOPMENT: true
-        run: |
-          bundle _${{matrix.bundler}}_ config path vendor/bundle
-          bundle _${{matrix.bundler}}_ install --jobs 4 --retry 3
-      - name: Run all tests
-        env:
-          GITHUB_COVERAGE: ${{matrix.coverage}}
-        run: bundle _${{matrix.bundler}}_ exec rspec
-
-  diffend:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0
-      - name: Install latest bundler
-        run: gem install bundler --no-document
-      - name: Install Diffend plugin
-        run: bundle plugin install diffend
-      - name: Bundle Secure
-        run: bundle secure
-
-  coditsu:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Run Coditsu
-        env:
-          CODITSU_API_KEY: ${{ secrets.CODITSU_API_KEY }}
-          CODITSU_API_SECRET: ${{ secrets.CODITSU_API_SECRET }}
-        run: \curl -sSL https://api.coditsu.io/run/ci | bash
-
-on:
-  push:
-  schedule:
-    - cron:  '0 1 * * *'