diffend 0.2.36 → 0.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c744c4aef5eaa735b131f3f866f9e89d01b9ae79e04cfa1a922419f4be4a3c
-  data.tar.gz: 3ebbd02c2a0b693e57d9b4d7d73c8c9e490236189983a30e7c24caaffb7b5843
+  metadata.gz: cc35a87fc80048201e46cf210e72c4359849b9c17b3208a885e151c2384be274
+  data.tar.gz: c438271e070263543f0cc7ae84911631bc8f57dd4804d2fe58d529caf7929e49
 SHA512:
-  metadata.gz: a166de7306a536d75d20d50c5fe27f27fe77cc4a3332446a85543f42a617b180d3bc97a1a0800c5ada0189eb59d923e8d0a7bd823d3f2f9e31ef2113263a616f
-  data.tar.gz: 5b1890d48842a54166c3eae9d500d43f8c81172f66df9b5f768460fd65e97a2460f542eba99970db8fceb630c97a6fd71f1dd9fe7170c425d5f89b06f448499c
+  metadata.gz: 6e41e7343c6c0f1137dab1999ceebc1c8df54c2950e92f68b592d4f2b03c5fc2e5817b9443068423f2ea1508cc78884c169a4551a61e2723bb5c931d6ce05ed4
+  data.tar.gz: 877952bdb836a09034b0e72862cf374a8049a46ee4b416125beaad3a9102b14a1d22878b4128e6efded825d0bc896fcf1873f046f111da9d5ced03907c2d3a1b

data/.github/workflows/ci.yml

@@ -2,16 +2,23 @@ name: ci
 
 jobs:
   specs:
-    runs-on: ubuntu-latest
+    needs:
+      - diffend
+      - coditsu
 
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - '3.0'
           - '2.7'
           - '2.6'
           - '2.5'
-          - 'jruby'
+          - 'jruby-9.2.14.0'
+        bundler:
+          - '2.1.4'
+          - '2.2.7'
         include:
           - ruby: '2.7'
             coverage: 'true'
@@ -30,19 +37,38 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
-      - name: Install latest bundler
-        run: |
-          gem install bundler --no-document
+          bundler: ${{matrix.bundler}}
       - name: Bundle install
         env:
           DIFFEND_DEVELOPMENT: true
         run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          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 exec rspec
+        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/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.0

data/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Changelog
 
 ## [Unreleased][master]
+- 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))
+- add `bundle secure` command ([#90](https://github.com/diffend-io/diffend-ruby/pull/90))
+- test against bundler 2.1 and 2.2 ([#83](https://github.com/diffend-io/diffend-ruby/pull/83))
+- test against ruby 3.0.0 ([#89](https://github.com/diffend-io/diffend-ruby/pull/89))
+- simplify how we build full json in specs  ([#82](https://github.com/diffend-io/diffend-ruby/pull/82))
+- simplify how we build bundler json in specs ([#84](https://github.com/diffend-io/diffend-ruby/pull/84))
+- simplify how we build diffend json in specs ([#85](https://github.com/diffend-io/diffend-ruby/pull/85))
+- simplify how we build rubygems json in specs ([#86](https://github.com/diffend-io/diffend-ruby/pull/86))
+- simplify how we build packages platforms json in specs ([#87](https://github.com/diffend-io/diffend-ruby/pull/87))
 
 ## [0.2.36] (2020-12-06)
 - handle `Bundler::PermissionError` ([#79](https://github.com/diffend-io/diffend-ruby/pull/79))
@@ -102,7 +128,11 @@
 
 - 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.40...HEAD
+[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

@@ -7,5 +7,6 @@ plugin 'diffend'
 gemspec
 
 group :development, :test do
+  gem 'byebug', platform: :ruby
   gem 'rspec'
 end

data/Gemfile.lock

@@ -1,36 +1,40 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.36)
+    diffend (0.2.41)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     diff-lcs (1.4.4)
-    rake (13.0.1)
+    rake (13.0.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   java
   ruby
+  universal-java-13
+  x86_64-darwin-19
 
 DEPENDENCIES
   bundler
+  byebug
   diffend!
   rake
   rspec
 
 BUNDLED WITH
-   2.1.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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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)
+
+    # Execute diffend check
+    #
+    # @param _name [String] command name
+    # @param _args [Array] arguments from ARGV
+    def exec(_name, _args)
+      config = Diffend::Config.new(
+        command: Diffend::Commands::SECURE,
+        severity: Diffend::Logger::INFO
+      )
+
+      Diffend::LatestVersion.call(config)
+
+      Diffend::Execute.call(config)
+    end
+  end
+end

data/lib/diffend/commands.rb

@@ -9,5 +9,7 @@ module Diffend
     UPDATE = 'update'
     # Bundler exec command
     EXEC = 'exec'
+    # Bundler secure command introduced by diffend plugin
+    SECURE = 'secure'
   end
 end

data/lib/diffend/config.rb

@@ -3,29 +3,50 @@
 module Diffend
   # Diffend config object
   class Config
-    attr_reader :project_id, :shareable_id, :shareable_key, :build_path, :env, :command
+    # Name of the diffend config file
+    FILENAME = '.diffend.yml'
+
+    attr_reader :project_id, :shareable_id, :shareable_key, :build_path, :env, :command, :errors
 
     # Build diffend config object
     #
+    # @param command [String] command executed via bundler
+    # @param severity [Integer] logging severity threshold
+    # @param build_path [String] path of the current build
+    #
     # @return [Diffend::Config]
     def initialize(command: nil, severity: nil, build_path: nil)
       @log_level = severity
+      @errors = []
       build(command, build_path)
-      validate
+      Diffend::Configs::Validator.call(self)
     end
 
+    # Initialize logger
     def logger
       @logger ||= Diffend::Logger.new(@log_level)
     end
 
+    # @return [Boolean] true if config is valid, false otherwise
+    def valid?
+      @errors.empty?
+    end
+
+    # @return [Boolean] true if we want to ignore errors, false otherwise
     def ignore_errors?
       @ignore_errors
     end
 
+    # @return [Boolean] true if we are in development mode, false otherwise
     def development?
       @development
     end
 
+    # @return [Boolean] true if we are in deployment mode, false otherwise
+    def deployment?
+      !%w[development test].include?(env)
+    end
+
     # Provides diffend commands endpoint url
     #
     # @return [String]
@@ -51,19 +72,24 @@ module Diffend
       "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
     end
 
+    # Print config errors
+    def print_errors
+      @errors.each { |error| logger.fatal(error) }
+    end
+
     private
 
+    # @param command [String] command executed via bundler
+    # @param build_path [String] path of the current build
     def build(command, build_path)
       build_path ||= File.expand_path('..', ::Bundler.bin_path)
-      hash = Diffend::Configs::Fetcher.call(logger, plugin_path, build_path)
+      hash = Diffend::Configs::Fetcher.call(plugin_path, build_path)
       hash['build_path'] = build_path
       hash['command'] = command || build_command
 
       hash.each { |key, value| instance_variable_set(:"@#{key}", value) }
-    end
-
-    def validate
-      Diffend::Configs::Validator.call(self)
+    rescue Errors::MalformedConfigurationFile
+      @errors << Diffend::Configs::ErrorMessages.malformed_file
     end
 
     # Command that was run with bundle
@@ -73,6 +99,7 @@ module Diffend
       ARGV.first || ::Bundler.feature_flag.default_cli_command.to_s
     end
 
+    # @return [String] path to the plugin
     def plugin_path
       Pathname.new(File.expand_path('../..', __dir__))
     end

data/lib/diffend/configs/error_messages.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Module for all the components related to setting up the config
+  module Configs
+    # Class responsible for config error messages
+    module ErrorMessages
+      class << self
+        # @return [String] malformed configuration file message
+        def malformed_file
+          'Your Diffend configuration file is malformed. Please re-setup.'
+        end
+
+        # Missing key message
+        #
+        # @param key [String] missing key
+        #
+        # @return [String]
+        def missing_key(key)
+          "Diffend configuration is missing #{key} key"
+        end
+
+        # Invalid key message
+        #
+        # @param config [Diffend::Config]
+        # @param key [String] invalid key
+        #
+        # @return [String]
+        def invalid_key(config, key)
+          <<~MSG
+            Diffend configuration value for #{key} is invalid.
+            Expected #{Validator::KNOWN_KEYS[key].join(' or ')}, was #{config.public_send(key).class}.
+          MSG
+        end
+      end
+    end
+  end
+end

data/lib/diffend/configs/fetcher.rb

@@ -11,7 +11,6 @@ module Diffend
     # Class responsible for fetching the config from .diffend.yml
     module Fetcher
       class << self
-        # @param logger [Diffend::Logger]
         # @param plugin_path [String] path of the plugin
         # @param build_path [String] path of the current build
         #
@@ -20,24 +19,9 @@ module Diffend
         # @example
         #   details = Fetcher.new.call('./')
         #   details.build_path #=> './'
-        def call(logger, plugin_path, build_path)
-          build(plugin_path, build_path)
-        rescue Errors::MalformedConfigurationFile
-          build_malformed_error_message(build_path)
-            .tap(&logger.method(:fatal))
-
-          raise Diffend::Errors::HandledException
-        end
-
-        private
-
-        # @param plugin_path [String] path of the plugin
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        def build(plugin_path, build_path)
+        def call(plugin_path, build_path)
           default_config = File.join(plugin_path, 'config', 'diffend.yml')
-          project_config = File.join(build_path, '.diffend.yml')
+          project_config = File.join(build_path, Diffend::Config::FILENAME)
 
           hash = read_file(default_config)
 
@@ -48,19 +32,18 @@ module Diffend
           hash
         end
 
-        def read_file(path)
-          YAML.safe_load(ERB.new(File.read(path)).result)
+        private
+
+        # Load config file
+        #
+        # @param file_path [String]
+        #
+        # @return [Hash]
+        def read_file(file_path)
+          YAML.safe_load(ERB.new(File.read(file_path)).result)
         rescue Psych::SyntaxError
           raise Errors::MalformedConfigurationFile
         end
-
-        # @return [String] malformed configuration file message
-        def build_malformed_error_message
-          <<~MSG
-            \nYour Diffend configuration file is malformed.\n
-            Please re-setup.\n
-          MSG
-        end
       end
     end
   end