diffend 0.2.36 → 0.2.41

data/lib/diffend/configs/validator.rb

@@ -5,6 +5,7 @@ module Diffend
   module Configs
     # Class responsible for validating the config from .diffend.yml
     module Validator
+      # List of known config keys
       KNOWN_KEYS = {
         project_id: [String],
         shareable_id: [String],
@@ -21,18 +22,11 @@ module Diffend
         def call(config)
           KNOWN_KEYS.each_key do |key|
             if missing?(config, key)
-              missing_key_message(key)
-                .tap(&config.logger.method(:fatal))
-
-              raise Diffend::Errors::HandledException
+              config.errors << ErrorMessages.missing_key(key)
+              next
             end
 
-            if invalid?(config, key)
-              invalid_key_message(config, key)
-                .tap(&config.logger.method(:fatal))
-
-              raise Diffend::Errors::HandledException
-            end
+            config.errors << ErrorMessages.invalid_key(config, key) if invalid?(config, key)
           end
         end
 
@@ -55,30 +49,6 @@ module Diffend
         def invalid?(config, key)
           !KNOWN_KEYS[key].include?(config.public_send(key).class)
         end
-
-        # Missing key message
-        #
-        # @param key [String] missing key
-        #
-        # @return [String]
-        def missing_key_message(key)
-          <<~MSG
-            \nDiffend configuration is missing #{key} key.\n
-          MSG
-        end
-
-        # Invalid key message
-        #
-        # @param hash [Hash] config hash
-        # @param key [String] invalid key
-        #
-        # @return [String]
-        def invalid_key_message(hash, key)
-          <<~MSG
-            \nDiffend configuration value for #{key} is invalid.\n
-            It should be #{KNOWN_KEYS[key].join(' or ')} but is #{hash.public_send(key).class}.\n
-          MSG
-        end
       end
     end
   end

data/lib/diffend/enabled.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Verify if the plugin is enabled
+  module Enabled
+    class << self
+      # Checks if plugin is enabled
+      #
+      # @return [Boolean] true if enabled, false otherwise
+      def call
+        ::Bundler
+          .default_gemfile
+          .read
+          .split("\n")
+          .reject(&:empty?)
+          .map(&:strip)
+          .select { |line| line.start_with?('plugin') }
+          .any? { |line| line.include?('diffend') }
+      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

@@ -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
 
@@ -30,7 +30,7 @@ module Diffend
       # @param response [Hash] response from diffend API
       def build_message(config, response)
         if response.key?('error')
-          build_error(config, response)
+          build_error(response)
         elsif response.key?('action')
           build_verdict(config, response)
         else

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,14 +32,14 @@ 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 then instance.build_install
+          when Commands::INSTALL, Commands::EXEC, Commands::SECURE then instance.build_install
           when Commands::UPDATE then instance.build_update
           else
             raise ArgumentError, "invalid command: #{command}"
@@ -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)