diffend 0.2.38 → 0.2.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed7ecefedc323c4c100a510bfc19adb8cab765fecb20c08b0acf01fd025b020e
-  data.tar.gz: 556a46bcd3f6785ae10a835ac6f700c716cd42204f6f9252125c79f49621e812
+  metadata.gz: 00ff9a1819f62275a52e0d531ac9a3d9061e388867ec5e73ea0dc923a9ba30ed
+  data.tar.gz: '092ac2a98fd88ca4c8cc014aec5a2e485c6a280b17e44e3000b99d5dddbb0bf3'
 SHA512:
-  metadata.gz: 31420d29f75f7e41506fd351d10600fe2abed95d7f227cce8d16728cef75dfb10001e4ab2eb2e4eee429848e0ceb2aa1b42d0975e6db3021e820734055381de9
-  data.tar.gz: b41cbc3a817d913912905e39e758da419406808a47d59b5fcd8ee12460fdbaccb7087c96e9270677c4fe739bfbbda9e987d395bbe3ed30ebf95305ec67152161
+  metadata.gz: 6f6d630a67a621c4a92c1835340ef2195834ba9c2717de4d4da4256b31cbf709347d2129593b167de4dfb8bdf27d771127b9fcefdde2e3b4ee5cfe05b8f2e666
+  data.tar.gz: feee0a4cd775f6aa3a7324294975e20c9edb51fb9bc733c33765bc0f3c31a130315f94d92779acab7d5ac6f3b3783d9b9ed992f48fd741a5069e58d88cbcdd03

data/.github/workflows/ci.yml

@@ -2,8 +2,11 @@ name: ci
 
 jobs:
   specs:
-    runs-on: ubuntu-latest
+    needs:
+      - diffend
+      - coditsu
 
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -15,7 +18,7 @@ jobs:
           - 'jruby-9.2.14.0'
         bundler:
           - '2.1.4'
-          - '2.2.5'
+          - '2.2.7'
         include:
           - ruby: '2.7'
             coverage: 'true'
@@ -45,6 +48,27 @@ jobs:
         env:
           GITHUB_COVERAGE: ${{matrix.coverage}}
         run: bundle _${{matrix.bundler}}_ exec rspec
+      - name: Run integration tests
+        run: bundle _${{matrix.bundler}}_ exec rake integration_suite
+
+  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

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [Unreleased][master]
 
+## [0.2.43] (2021-03-16)
+- introduce `DIFFEND_TAGS` ([#119](https://github.com/diffend-io/diffend-ruby/pull/119))
+- add support for `bundle add` command ([#118](https://github.com/diffend-io/diffend-ruby/pull/118))
+
+## [0.2.42] (2021-03-09)
+- introduce `DIFFEND_SKIP_DENY` flag
+- fix config not being passed properly to `build_error` in `Diffend::Execute` ([#116](https://github.com/diffend-io/diffend-ruby/pull/116))
+
+## [0.2.41] (2021-03-09)
+- introduce integration specs ([#107](https://github.com/diffend-io/diffend-ruby/pull/107))
+- use `Bundler::Definition.resolve` for specs ([#112](https://github.com/diffend-io/diffend-ruby/pull/112))
+
+## [0.2.40] (2021-02-23)
+- don't expose ips, we can identify instance by a hostname ([#108](https://github.com/diffend-io/diffend-ruby/pull/108))
+- don't set `verify_mode` when creating request in `Diffend::Request`, use default value set by `use_ssl` flag instead ([#109](https://github.com/diffend-io/diffend-ruby/pull/109))
+
+## [0.2.39] (2021-01-18)
+- handle a case if we start to fast and some gems require things it may break the execution ([#101](https://github.com/diffend-io/diffend-ruby/pull/101))
+
 ## [0.2.38] (2021-01-15)
 - allow executing `bundle secure` without plugin being present in the Gemfile ([#96](https://github.com/diffend-io/diffend-ruby/pull/96))
 - be explicit about `Bundler` scope ([#97](https://github.com/diffend-io/diffend-ruby/pull/97))
@@ -119,7 +138,12 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.38...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.43...HEAD
+[0.2.43]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.42...v0.2.43
+[0.2.42]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.41...v0.2.42
+[0.2.41]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.40...v0.2.41
+[0.2.40]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.39...v0.2.40
+[0.2.39]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.38...v0.2.39
 [0.2.38]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.37...v0.2.38
 [0.2.37]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.36...v0.2.37
 [0.2.36]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.35...v0.2.36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.38)
+    diffend (0.2.43)
 
 GEM
   remote: https://rubygems.org/
@@ -18,10 +18,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
 
 PLATFORMS
   java
@@ -37,4 +37,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.5
+   2.2.7

data/Rakefile

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+%w[
+  bundler/setup
+].each(&method(:require))
+
+require 'diffend/errors'
+require 'diffend/config'
+require 'diffend/shell'
+require 'diffend/repository'
+require 'diffend/integration_repository'
+
+task :integration_suite do
+  Diffend::Repository::SUPPORTED.each do |command, repositories|
+    repositories.each do |repository_name|
+      repository = Diffend::IntegrationRepository.new(command, repository_name)
+      repository.repository.isolate do |path|
+        start = Time.now.to_f
+
+        repository.config?(path)
+
+        Bundler.with_unbundled_env do
+          repository.install_plugin(path)
+
+          cmd = Diffend::Shell.call_in_path(path, "bundle #{command}")
+
+          unless cmd[:exit_code].zero?
+            puts "#{repository.full_name} FAILED"
+            puts cmd[:stderr]
+            exit 1
+          end
+        end
+
+        took = Time.now.to_f - start
+
+        puts "#{repository.full_name} OK, took #{took.round(1)}s"
+      end
+    end
+  end
+end

data/lib/diffend/commands.rb

@@ -11,5 +11,7 @@ module Diffend
     EXEC = 'exec'
     # Bundler secure command introduced by diffend plugin
     SECURE = 'secure'
+    # Bundler add command
+    ADD = 'add'
   end
 end

data/lib/diffend/errors.rb

@@ -21,5 +21,7 @@ module Diffend
     HandledException = Class.new(BaseError)
     # Raised when we are unable to resolve dependencies
     DependenciesResolveException = Class.new(BaseError)
+    # Failure of a shell command execution
+    FailedShellCommand = Class.new(BaseError)
   end
 end

data/lib/diffend/execute.rb

@@ -43,8 +43,9 @@ module Diffend
         end
       end
 
+      # @param config [Diffend::Config]
       # @param response [Hash] response from diffend API
-      def build_error(response)
+      def build_error(config, response)
         build_error_message(response)
           .tap(&config.logger.method(:error))
 
@@ -65,7 +66,7 @@ module Diffend
           build_deny_message(config.command, response)
             .tap(&config.logger.method(:error))
 
-          exit 1
+          exit 1 unless ENV.key?('DIFFEND_SKIP_DENY')
         else
           Diffend::HandleErrors::Report.call(
             config: config,

data/lib/diffend/handle_errors/report.rb

@@ -39,10 +39,10 @@ module Diffend
         # @return [Diffend::RequestObject]
         def build_request_object(config, payload)
           Diffend::RequestObject.new(
-            config: config,
-            url: config.errors_url,
-            payload: payload,
-            request_method: :post
+            config,
+            config.errors_url,
+            payload,
+            :post
           )
         end
 

data/lib/diffend/integration_repository.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Repository for integrations
+  class IntegrationRepository
+    # Plugin code entry in Gemfile
+    GEMFILE_PLUGIN_ENTRY = 'plugin \'diffend\''
+    # Gemfile file name
+    GEMFILE_FILE_NAME = 'Gemfile'
+    # Gemfile backup file name
+    GEMFILE_BACKUP_FILE_NAME = 'Gemfile.backup'
+    # Plugin install command
+    PLUGIN_INSTALL_COMMAND = 'bundle plugin install diffend'
+
+    attr_reader :command, :name, :repository
+
+    # @param command [String] command executed via bundler
+    # @param name [String] repository name
+    def initialize(command, name)
+      @command = command
+      @name = name
+      @repository = Diffend::Repository.new(command, name)
+    end
+
+    # @return [String] full name of the repository with command
+    def full_name
+      "#{command}_#{name}"
+    end
+
+    # @param path [String] path to the repository
+    def config?(path)
+      # check if .diffend.yml exists
+      return if File.exist?(File.join(path, Diffend::Config::FILENAME))
+
+      puts "Diffend configuration does not exist for #{command} #{name}"
+      exit 1
+    end
+
+    # @param path [String] path to the repository
+    def install_plugin(path)
+      cmd = Diffend::Shell.call_in_path(path, PLUGIN_INSTALL_COMMAND)
+
+      unless cmd[:exit_code].zero?
+        puts "#{PLUGIN_INSTALL_COMMAND} failed"
+        puts cmd[:stderr]
+        exit 1
+      end
+
+      switch_plugin_to_development(path, cmd[:stdout])
+      add_plugin_to_gemfile(path)
+    end
+
+    private
+
+    # @param path [String] path to the repository
+    # @param stdout [String] stdout from plugin install command
+    def switch_plugin_to_development(path, stdout)
+      installed_version = stdout.scan(/Installing diffend (\d*\.\d*\.\d*)/)[0][0]
+      diffend_working_path = File.expand_path('..', Bundler.bin_path)
+      bundler_plugins_path = File.join(path, '.bundle/plugin/gems')
+      bundler_diffend_plugin_path = File.join(bundler_plugins_path, "diffend-#{installed_version}")
+      FileUtils.mv(bundler_diffend_plugin_path, "#{bundler_diffend_plugin_path}-")
+      FileUtils.ln_s(diffend_working_path, bundler_diffend_plugin_path)
+    end
+
+    # @param path [String] path to the repository
+    def add_plugin_to_gemfile(path)
+      gemfile_path = File.join(path, GEMFILE_FILE_NAME)
+
+      FileUtils.mv(gemfile_path, File.join(path, GEMFILE_BACKUP_FILE_NAME))
+      file = File.open(gemfile_path, 'w')
+      source_detected = nil
+
+      File.readlines(
+        File.join(path, GEMFILE_BACKUP_FILE_NAME)
+      ).each do |line|
+        if line.start_with?('source') && source_detected.nil?
+          source_detected = true
+        elsif source_detected
+          source_detected = false
+          file.write("\n#{GEMFILE_PLUGIN_ENTRY}\n")
+        end
+
+        file.write(line)
+      end
+
+      file.close
+
+      FileUtils.rm(File.join(path, GEMFILE_BACKUP_FILE_NAME))
+    end
+  end
+end

data/lib/diffend/local_context/host.rb

@@ -16,7 +16,6 @@ module Diffend
 
           {
             'command' => command,
-            'ips' => ips,
             'name' => uname[:nodename],
             'system' => {
               'machine' => uname[:machine],
@@ -53,22 +52,11 @@ module Diffend
           end
         end
 
-        # Build host ips, except localhost and loopback
-        #
-        # @return [Array<String>]
-        def ips
-          Socket.ip_address_list.map do |ip|
-            next if ip.ipv4_loopback? || ip.ipv6_loopback? || ip.ipv6_linklocal?
-
-            ip.ip_address
-          end.compact
-        end
-
         # Build host tags
         #
         # @return [Array]
         def tags
-          tags = []
+          tags = prepare_user_tags
 
           if ENV.key?('GITHUB_ACTIONS')
             tags << 'ci'
@@ -83,6 +71,17 @@ module Diffend
           tags
         end
 
+        # Prepare user tags
+        #
+        # @return [Array]
+        def prepare_user_tags
+          if ENV.key?('DIFFEND_TAGS')
+            ENV['DIFFEND_TAGS'].split(',')
+          else
+            []
+          end
+        end
+
         # @param str [String] that we want to clean and truncate
         def clean(str)
           str

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
@@ -65,35 +64,15 @@ module Diffend
         @cached ? @definition.resolve_with_cache! : @definition.resolve_remotely!
       end
 
-      # Build install specification
+      # Build specification
       #
       # @return [Hash]
-      def build_install
+      def build
         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
-      end
-
-      # Build update specification
-      #
-      # @return [Hash]
-      def build_update
-        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 }

data/lib/diffend/monitor.rb

@@ -39,6 +39,10 @@ Thread.new do
   config = nil
   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(
       command: Diffend::Commands::EXEC,

data/lib/diffend/plugin.rb

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