diffend 0.2.37 → 0.2.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6882244ccac8c68c4b0eef0e1ffceeda710c6202b28a7608e7b6502dc9c8f694
-  data.tar.gz: efd83185b8af53f813204f3265567ed2ed44b6d9e40328d13f613254e3865857
+  metadata.gz: 358cc105e2ad7cf14855c23c3f661c9473fcdc6bdf46ccd38c37a6239df84063
+  data.tar.gz: 6aee0be769db07c076d190aefb35c10ab432296c78b63221a76d82bf48aecaae
 SHA512:
-  metadata.gz: 82509d763d303aad433d329c761d1c36e422314dfb0f55999793829a5c1d1e0a9bdcc4e23a3b4b47dd340fd97129eef567eee23320a5249c0cea956a5fd05468
-  data.tar.gz: bfff54f76c8d02c108c4416756be710991948cd3cebf35143c8ecd98e0a13777a8d445963d2986388db5a480a31094250a2ef9334bd3e58558acdd36bb12e0a7
+  metadata.gz: b9f396679d536dab840175ac5a80c65a25f6edb05a38830586c517afca1c9951ad57460fe396e581c4f25c53b3778dab59b9070c7a8d18bfd5ea5d9fada2d958
+  data.tar.gz: 6b104626a4f76adcfbbcc0a209245265c96afff5bba585f9d81eaedbffa17862174abaca664860d46096176b9a821ad8e2c5c127ce6d9247c1fd9f9fe5c557e6

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:
@@ -12,10 +15,10 @@ jobs:
           - '2.7'
           - '2.6'
           - '2.5'
-          - 'jruby-9.2.13.0'
+          - 'jruby-9.2.14.0'
         bundler:
           - '2.1.4'
-          - '2.2.4'
+          - '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,26 @@
 
 ## [Unreleased][master]
 
+## [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))
+- switch to exponential backoff in `Diffend::Monitor` ([#98](https://github.com/diffend-io/diffend-ruby/pull/98))
+
 ## [0.2.37] (2021-01-05)
 - add support for ENV loaded at runtime ([#92](https://github.com/diffend-io/diffend-ruby/pull/92))
 - allow us to have more control over config errors ([#91](https://github.com/diffend-io/diffend-ruby/pull/91))
@@ -114,7 +134,13 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.36...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.42...HEAD
+[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
 [0.2.35]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.34...v0.2.35
 [0.2.34]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.33...v0.2.34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.37)
+    diffend (0.2.42)
 
 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.4
+   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/build_bundler_definition.rb

@@ -10,14 +10,14 @@ module Diffend
       # @param gemfile [String] path to Gemfile
       # @param lockfile [String] path to Gemfile.lock
       #
-      # @return [Bundler::Definition]
+      # @return [::Bundler::Definition]
       def call(command, gemfile, lockfile)
         unlock = command == 'update' ? true : nil
 
-        Bundler.configure
-        Bundler::Fetcher.disable_endpoint = nil
+        ::Bundler.configure
+        ::Bundler::Fetcher.disable_endpoint = nil
 
-        Bundler::Definition
+        ::Bundler::Definition
           .build(gemfile, lockfile, unlock)
           .tap(&:validate_runtime!)
       end

data/lib/diffend/bundle_secure.rb

@@ -3,15 +3,13 @@
 module Diffend
   # Extend bundler with a new secure command to be able to run Diffend separately
   class BundleSecure
-    Bundler::Plugin::API.command(Diffend::Commands::SECURE, self)
+    ::Bundler::Plugin::API.command(Diffend::Commands::SECURE, self)
 
     # Execute diffend check
     #
     # @param _name [String] command name
     # @param _args [Array] arguments from ARGV
     def exec(_name, _args)
-      return unless Diffend::Enabled.call
-
       config = Diffend::Config.new(
         command: Diffend::Commands::SECURE,
         severity: Diffend::Logger::INFO

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

@@ -17,12 +17,12 @@ module Diffend
 
       # Build bundler definition
       #
-      # @return [Bundler::Definition]
+      # @return [::Bundler::Definition]
       def build_definition(command)
         Diffend::BuildBundlerDefinition.call(
           command,
-          Bundler.default_gemfile,
-          Bundler.default_lockfile
+          ::Bundler.default_gemfile,
+          ::Bundler.default_lockfile
         )
       end
 
@@ -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.rb

@@ -7,7 +7,7 @@ module Diffend
       # Build diffend, host, packages, and platform specific information
       #
       # @param config [Diffend::Config]
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       #
       # @return [Hash] payload for diffend endpoint
       def call(config, definition)

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,17 +52,6 @@ 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]

data/lib/diffend/local_context/packages.rb

@@ -9,8 +9,8 @@ module Diffend
       ME_PATH = '.'
       # Sources that we expect to match ourselves too
       ME_SOURCES = [
-        Bundler::Source::Gemspec,
-        Bundler::Source::Path
+        ::Bundler::Source::Gemspec,
+        ::Bundler::Source::Path
       ].freeze
       # List of dependency types
       DEPENDENCIES_TYPES = {
@@ -32,11 +32,11 @@ module Diffend
 
       class << self
         # @param command [String] command executed via bundler
-        # @param definition [Bundler::Definition] definition for your source
+        # @param definition [::Bundler::Definition] definition for your source
         def call(command, definition)
           instance = new(command, definition)
 
-          Bundler.ui.silence { instance.resolve }
+          ::Bundler.ui.silence { instance.resolve }
 
           case command
           when Commands::INSTALL, Commands::EXEC, Commands::SECURE then instance.build_install
@@ -48,7 +48,7 @@ module Diffend
       end
 
       # @param command [String] command executed via bundler
-      # @param definition [Bundler::Definition] definition for your source
+      # @param definition [::Bundler::Definition] definition for your source
       #
       # @return [Hash] local dependencies
       def initialize(command, definition)
@@ -71,7 +71,9 @@ module Diffend
       def build_install
         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 }
@@ -93,7 +95,9 @@ module Diffend
       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 }
@@ -125,8 +129,8 @@ module Diffend
 
       # Build gem versions
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
-      # @param locked_spec [Bundler::LazySpecification, Gem::Specification, NilClass]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
+      # @param locked_spec [::Bundler::LazySpecification, Gem::Specification, NilClass]
       #
       # @return [Array<String>]
       def build_versions(spec, locked_spec = nil)
@@ -151,8 +155,8 @@ module Diffend
 
       # Build gem platform
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
-      # @param locked_spec [Bundler::LazySpecification, Gem::Specification, NilClass]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
+      # @param locked_spec [::Bundler::LazySpecification, Gem::Specification, NilClass]
       #
       # @return [String]
       def build_spec_platform(spec, locked_spec)
@@ -175,18 +179,18 @@ module Diffend
 
       # Build gem source type
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Integer] internal gem source type
       def build_spec_gem_source_type(source)
         case source
-        when Bundler::Source::Metadata
+        when ::Bundler::Source::Metadata
           GEM_SOURCES_TYPES[:local]
-        when Bundler::Source::Rubygems, Bundler::Source::Rubygems::Remote
+        when ::Bundler::Source::Rubygems, ::Bundler::Source::Rubygems::Remote
           GEM_SOURCES_TYPES[:gemfile_source]
-        when Bundler::Source::Git
+        when ::Bundler::Source::Git
           GEM_SOURCES_TYPES[:gemfile_git]
-        when Bundler::Source::Path
+        when ::Bundler::Source::Path
           GEM_SOURCES_TYPES[:gemfile_path]
         else
           raise ArgumentError, "unknown source #{source.class}"
@@ -195,7 +199,7 @@ module Diffend
 
       # Build gem source
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
       #
       # @return [Hash]
       def build_spec_source(spec)
@@ -209,16 +213,16 @@ module Diffend
 
       # Figure out source for gem
       #
-      # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+      # @param spec [::Bundler::StubSpecification, ::Bundler::LazySpecification, Gem::Specification]
       #
-      # @return [Bundler::Source] gem source type
+      # @return [::Bundler::Source] gem source type
       def source_for_spec(spec)
         return spec.remote if spec.remote
 
         case spec.source
-        when Bundler::Source::Rubygems
-          Bundler::Source::Rubygems::Remote.new(spec.source.remotes.last)
-        when Bundler::Source::Metadata, Bundler::Source::Git, Bundler::Source::Path
+        when ::Bundler::Source::Rubygems
+          ::Bundler::Source::Rubygems::Remote.new(spec.source.remotes.last)
+        when ::Bundler::Source::Metadata, ::Bundler::Source::Git, ::Bundler::Source::Path
           spec.source
         else
           raise ArgumentError, "unknown source #{spec.source.class}"
@@ -227,25 +231,25 @@ module Diffend
 
       # Build gem source name
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [String]
       def source_name_from_source(source)
         case source
-        when Bundler::Source::Metadata
+        when ::Bundler::Source::Metadata
           ''
-        when Bundler::Source::Rubygems::Remote
+        when ::Bundler::Source::Rubygems::Remote
           source_name(source.anonymized_uri)
-        when Bundler::Source::Git
+        when ::Bundler::Source::Git
           source.instance_variable_get(:@safe_uri)
-        when Bundler::Source::Path
+        when ::Bundler::Source::Path
           source.path
         else
           raise ArgumentError, "unknown source #{source.class}"
         end
       end
 
-      # @param uri [Bundler::URI]
+      # @param uri [::Bundler::URI]
       #
       # @return [String]
       def source_name(uri)
@@ -272,7 +276,7 @@ module Diffend
 
       # Build gem source type
       #
-      # @param remotes [Array<Bundler::URI>]
+      # @param remotes [Array<::Bundler::URI>]
       #
       # @return [Integer] internal source type
       def build_source_type(remotes)
@@ -281,7 +285,7 @@ module Diffend
 
       # Checks if we should skip a source
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Boolean] true if we should skip this source, false otherwise
       def skip?(source)
@@ -292,7 +296,7 @@ module Diffend
 
       # Checks if it's a self source, this happens for repositories that are a gem
       #
-      # @param source [Bundler::Source] gem source type
+      # @param source [::Bundler::Source] gem source type
       #
       # @return [Boolean] true if it's a self source, false otherwise
       def me?(source)