diffend 0.2.39 → 0.2.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329d0035ee4b67c704f2bdd5fd200d64f9ae8e1becbed313d8dd92a0e16df80b
-  data.tar.gz: 8033441ed7c7932b687a0f9cbaae5c4da3aa2daa8398358ba5d20251eb27126d
+  metadata.gz: 07bae52f686cd3e88f10c37295b5cebe4227aa58f22af34c3dc81468e644324f
+  data.tar.gz: 6aa9385bc4d9f3db721df93ca8cab6896da38deb91c96d458fe98922323663ad
 SHA512:
-  metadata.gz: 63912e6f594a0569bf7ac80f1c3e10ef86c7d4a5e9c2bc4f8b7df52cc2307954668cc50494b854b1cc27cce10ef12792104ca7890921a96d5a669f379321f5c7
-  data.tar.gz: 7b45d8ffe0cd139578fa6c6e4b156b816662467d48a3ab3c4bf66a10a3eb43439aa16b2f79b88e8222f7949daaad6efa17d8f9749aa4cf01dfb58e9fe6c4389b
+  metadata.gz: ef8e5536b559884c981b27a228719bf3b8f6d6f81e32c4dd8ae4cf3485fa0e7da61ca6ab09e4596992e3c27e5b68b3f8fefaa7b18c606ffe99c30e4f0f896fd5
+  data.tar.gz: 38ba600074cc62b4c23ab4a6f0604afa45d94f5a299dc4428a24441d84b82e1c3982442a27dd659c349056992978f334d1f8e45e069c8780fee39d7dca17b740

data/.github/workflows/ci.yml

@@ -18,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'
@@ -48,6 +48,8 @@ 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

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [Unreleased][master]
 
+## [0.2.44] (2021-03-31)
+- `project_id`, `shareable_id` and `shareable_key` need to be a valid UUID
+
+## [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))
 
@@ -122,7 +141,12 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.39...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.44...HEAD
+[0.2.44]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.43...v0.2.44
+[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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.39)
+    diffend (0.2.44)
 
 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/configs/error_messages.rb

@@ -32,6 +32,17 @@ module Diffend
             Expected #{Validator::KNOWN_KEYS[key].join(' or ')}, was #{config.public_send(key).class}.
           MSG
         end
+
+        # Invalid uuid value message
+        #
+        # @param key [String] invalid key
+        #
+        # @return [String]
+        def invalid_uuid(key)
+          <<~MSG
+            Diffend configuration value for #{key} is invalid.
+          MSG
+        end
       end
     end
   end

data/lib/diffend/configs/validator.rb

@@ -17,6 +17,14 @@ module Diffend
         development?: [TrueClass, FalseClass]
       }.freeze
 
+      # List of known uuid keys
+      UUID_KEYS = %i[project_id shareable_id shareable_key].freeze
+
+      # Imported from https://github.com/assaf/uuid/blob/master/lib/uuid.rb#L199
+      UUID_FORMAT = /\A[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i
+
+      private_constant :UUID_KEYS, :UUID_FORMAT
+
       class << self
         # @param config [Diffend::Config]
         def call(config)
@@ -28,6 +36,12 @@ module Diffend
 
             config.errors << ErrorMessages.invalid_key(config, key) if invalid?(config, key)
           end
+
+          UUID_KEYS.each do |key|
+            next if valid_uuid?(config, key)
+
+            config.errors << ErrorMessages.invalid_uuid(key)
+          end
         end
 
         private
@@ -49,6 +63,14 @@ module Diffend
         def invalid?(config, key)
           !KNOWN_KEYS[key].include?(config.public_send(key).class)
         end
+
+        # @param config [Diffend::Config]
+        # @param key [String]
+        #
+        # @return [Boolean] true if key has a valid uuid, false otherwise
+        def valid_uuid?(config, key)
+          UUID_FORMAT.match?(config.public_send(key))
+        end
       end
     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 }