diffend-monitor 0.2.46 → 0.2.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a9ce0136a3adc532898cdabc5972be7ed152c0479a7ad724ec66a5a563777a
-  data.tar.gz: ece9ff8f2226deff51cb670b0cb985247fd4b497d0538015d736192bb0548b01
+  metadata.gz: 5b6bf6709bc22ef240c6c1d49c05582da2b76b6f6e2906aa34fb31140c001b2a
+  data.tar.gz: 749ec381873f1f8ff49795887ae7609bd344b8a98a50da05805986f0fc7e611d
 SHA512:
-  metadata.gz: a2b69a6ca6aacb8a99d45c6333f6da252b4a952d939d704b75f6d122e9cb5c383bb222992488226ebc3a400bd9db91a310365279141d612524c191b67a5b2d69
-  data.tar.gz: fe78cb956b12566737ab17dd092c2a42eab82cafd9dd5ca81f409978b0f837c28b4ff99d0617aeae847085390dc173736f3786d31d5973b54f856cfa7cc35261
+  metadata.gz: '00589108430c94fea832377badc604b0d48bfc5dd6e72b57e380353390e0a5ec797bfd7d68332a5a94db65755cc2e3786c5449cffdd94071e0c4ecdcc958ce13'
+  data.tar.gz: c2680fd00e8f79f84d9f79c6950f61d7297709087772351e1b2036cf8dd9419d4fb04ff623b8bf5030a06295403968fb29dfa8f129745c1dd3dc9cafb830dde8

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 
-## [Unreleased][master]
+## [0.2.51] (2021-09-09)
+- Fix #172 - `bundle secure` not working without `.diffend.yml`
+
+## [0.2.50] (2021-08-19)
+- Fix #132 - `bundle` without command name fails to recognize that first argument is an option
+- Bundler 2.2.26 specs support
+- Bundler 2.2.27 specs support
+
+## [0.2.49] (2021-08-11)
+- Bundler 2.2.20 specs support
+- Bundler 2.2.21 specs support
+- Bundler 2.2.22 specs support
+- Bundler 2.2.23 specs support
+- Bundler 2.2.24 specs support
+- Bundler 2.2.25 specs support
+
+## [0.2.48] (2021-05-31)
+- Add Windows host user detection
+
+## [0.2.47] (2021-05-31)
+- Bundler 2.2.18 support
+- Bundler 2.2.19 support
+- Windows support
 
 ## [0.2.46] (2021-05-05)
 - Optimized file selection to make releases smaller and easier to read through.

data/certs/mensfeld.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhtYWNp
-ZWovREM9bWVuc2ZlbGQvREM9cGwwHhcNMjAwODExMDkxNTM3WhcNMjEwODExMDkx
-NTM3WjAjMSEwHwYDVQQDDBhtYWNpZWovREM9bWVuc2ZlbGQvREM9cGwwggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDCpXsCgmINb6lHBXXBdyrgsBPSxC4/
-2H+weJ6L9CruTiv2+2/ZkQGtnLcDgrD14rdLIHK7t0o3EKYlDT5GhD/XUVhI15JE
-N7IqnPUgexe1fbZArwQ51afxz2AmPQN2BkB2oeQHXxnSWUGMhvcEZpfbxCCJH26w
-hS0Ccsma8yxA6hSlGVhFVDuCr7c2L1di6cK2CtIDpfDaWqnVNJEwBYHIxrCoWK5g
-sIGekVt/admS9gRhIMaIBg+Mshth5/DEyWO2QjteTodItlxfTctrfmiAl8X8T5JP
-VXeLp5SSOJ5JXE80nShMJp3RFnGw5fqjX/ffjtISYh78/By4xF3a25HdWH9+qO2Z
-tx0wSGc9/4gqNM0APQnjN/4YXrGZ4IeSjtE+OrrX07l0TiyikzSLFOkZCAp8oBJi
-Fhlosz8xQDJf7mhNxOaZziqASzp/hJTU/tuDKl5+ql2icnMv5iV/i6SlmvU29QNg
-LCV71pUv0pWzN+OZbHZKWepGhEQ3cG9MwvkCAwEAAaN3MHUwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFImGed2AXS070ohfRidiCEhXEUN+MB0GA1Ud
+ZWovREM9bWVuc2ZlbGQvREM9cGwwHhcNMjEwODExMTQxNTEzWhcNMjIwODExMTQx
+NTEzWjAjMSEwHwYDVQQDDBhtYWNpZWovREM9bWVuc2ZlbGQvREM9cGwwggGiMA0G
+CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDV2jKH4Ti87GM6nyT6D+ESzTI0MZDj
+ak2/TEwnxvijMJyCCPKT/qIkbW4/f0VHM4rhPr1nW73sb5SZBVFCLlJcOSKOBdUY
+TMY+SIXN2EtUaZuhAOe8LxtxjHTgRHvHcqUQMBENXTISNzCo32LnUxweu66ia4Pd
+1mNRhzOqNv9YiBZvtBf7IMQ+sYdOCjboq2dlsWmJiwiDpY9lQBTnWORnT3mQxU5x
+vPSwnLB854cHdCS8fQo4DjeJBRZHhEbcE5sqhEMB3RZA3EtFVEXOxlNxVTS3tncI
+qyNXiWDaxcipaens4ObSY1C2HTV7OWb7OMqSCIybeYTSfkaSdqmcl4S6zxXkjH1J
+tnjayAVzD+QVXGijsPLE2PFnJAh9iDET2cMsjabO1f6l1OQNyAtqpcyQcgfnyW0z
+g7tGxTYD+6wJHffM9d9txOUw6djkF6bDxyqB8lo4Z3IObCx18AZjI9XPS9QG7w6q
+LCWuMG2lkCcRgASqaVk9fEf9yMc2xxz5o3kCAwEAAaN3MHUwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFBqUFCKCOe5IuueUVqOB991jyCLLMB0GA1Ud
 EQQWMBSBEm1hY2llakBtZW5zZmVsZC5wbDAdBgNVHRIEFjAUgRJtYWNpZWpAbWVu
-c2ZlbGQucGwwDQYJKoZIhvcNAQELBQADggGBAKiHpwoENVrMi94V1zD4o8/6G3AU
-gWz4udkPYHTZLUy3dLznc/sNjdkJFWT3E6NKYq7c60EpJ0m0vAEg5+F5pmNOsvD3
-2pXLj9kisEeYhR516HwXAvtngboUcb75skqvBCU++4Pu7BRAPjO1/ihLSBexbwSS
-fF+J5OWNuyHHCQp+kGPLtXJe2yUYyvSWDj3I2//Vk0VhNOIlaCS1+5/P3ZJThOtm
-zJUBI7h3HgovwRpcnmk2mXTmU4Zx/bCzX8EA6VY0khEvnmiq7S6eBF0H9qH8KyQ6
-EkVLpvmUDFcf/uNaBQdazEMB5jYtwoA8gQlANETNGPi51KlkukhKgaIEDMkBDJOx
-65N7DzmkcyY0/GwjIVIxmRhcrCt1YeCUElmfFx0iida1/YRm6sB2AXqScc1+ECRi
-2DND//YJUikn1zwbz1kT70XmHd97B4Eytpln7K+M1u2g1pHVEPW4owD/ammXNpUy
-nt70FcDD4yxJQ+0YNiHd0N8IcVBM1TMIVctMNQ==
+c2ZlbGQucGwwDQYJKoZIhvcNAQELBQADggGBADD0/UuTTFgW+CGk2U0RDw2RBOca
+W2LTF/G7AOzuzD0Tc4voc7WXyrgKwJREv8rgBimLnNlgmFJLmtUCh2U/MgxvcilH
+yshYcbseNvjkrtYnLRlWZR4SSB6Zei5AlyGVQLPkvdsBpNegcG6w075YEwzX/38a
+8V9B/Yri2OGELBz8ykl7BsXUgNoUPA/4pHF6YRLz+VirOaUIQ4JfY7xGj6fSOWWz
+/rQ/d77r6o1mfJYM/3BRVg73a3b7DmRnE5qjwmSaSQ7u802pJnLesmArch0xGCT/
+fMmRli1Qb+6qOTl9mzD6UDMAyFR4t6MStLm0mIEqM0nBO5nUdUWbC7l9qXEf8XBE
+2DP28p3EqSuS+lKbAWKcqv7t0iRhhmaod+Yn9mcrLN1sa3q3KSQ9BCyxezCD4Mk2
+R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
+pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
 -----END CERTIFICATE-----

data/config/diffend.yml

@@ -4,3 +4,4 @@ shareable_key: <%= ENV['DIFFEND_SHAREABLE_KEY'] %>
 env: <%= ENV['DIFFEND_ENV'] || 'development' %>
 ignore_errors: <%= ENV['DIFFEND_IGNORE_ERRORS'] || 'true' %>
 development: <%= ENV['DIFFEND_DEVELOPMENT'] || 'true' %>
+execute: <%= ENV['DIFFEND_EXECUTE'] || 'true' %>

data/diffend.gemspec

@@ -14,7 +14,7 @@ files_locations = %w[
 ]
 
 Gem::Specification.new do |spec|
-  spec.name          = 'diffend-monitor'
+  spec.name          = 'diffend'
   spec.version       = Diffend::VERSION
   spec.authors       = ['Tomasz Pajor', 'Maciej Mensfeld']
   spec.email         = ['contact@diffend.io']
@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://diffend.io'
   spec.license       = 'Prosperity Public License'
 
+  spec.required_ruby_version = '>= 2.5.0'
+
   if $PROGRAM_NAME.end_with?('gem')
     spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
   end

data/lib/diffend/bundle_secure.rb

@@ -17,7 +17,32 @@ module Diffend
 
       Diffend::LatestVersion.call(config)
 
+      return unless config.execute?
+
+      unless config.valid?
+        config.print_errors
+
+        exit 255
+      end
+
       Diffend::Execute.call(config)
+    rescue Diffend::Errors::HandledException
+      # config will not be initialized when configuration file is missing
+      return if config&.ignore_errors?
+
+      exit 255
+    rescue StandardError => e
+      Diffend::HandleErrors::Report.call(
+        exception: e,
+        config: config,
+        message: :unhandled_exception,
+        report: true,
+        raise_exception: false
+      )
+
+      return if config.ignore_errors?
+
+      exit 255
     end
   end
 end

data/lib/diffend/config.rb

@@ -42,6 +42,14 @@ module Diffend
       @development
     end
 
+    # This method is provided just in case something would go wrong with Diffend but there would be
+    # a need to run Bundler anyhow. Please don't use unless aware of the downsides.
+    #
+    # @return [Boolean] should we run Diffend or skip it and continue without it.
+    def execute?
+      @execute
+    end
+
     # @return [Boolean] true if we are in deployment mode, false otherwise
     def deployment?
       !%w[development test].include?(env)
@@ -96,7 +104,14 @@ module Diffend
     #
     # @return [String]
     def build_command
-      ARGV.first || ::Bundler.feature_flag.default_cli_command.to_s
+      default = ::Bundler.feature_flag.default_cli_command.to_s
+
+      return default unless ARGV.first
+      # There is a case where no command may be provided and the first argument is the first option
+      # In a case like this we fallback to default command
+      return default if ARGV.first.start_with?('-')
+
+      ARGV.first
     end
 
     # @return [String] path to the plugin

data/lib/diffend/handle_errors/build_exception_payload.rb

@@ -3,6 +3,7 @@
 require 'securerandom'
 
 module Diffend
+  # Errors handlers namespace
   module HandleErrors
     # Module responsible for building exception payload
     module BuildExceptionPayload

data/lib/diffend/integration_repository.rb

@@ -10,7 +10,14 @@ module Diffend
     # Gemfile backup file name
     GEMFILE_BACKUP_FILE_NAME = 'Gemfile.backup'
     # Plugin install command
-    PLUGIN_INSTALL_COMMAND = 'bundle plugin install diffend'
+    PLUGIN_INSTALL_COMMAND = [
+      'bundle',
+      "_#{Bundler::VERSION}_",
+      'plugin',
+      'install',
+      'diffend',
+      '--source https://rubygems.org'
+    ].join(' ').freeze
 
     attr_reader :command, :name, :repository
 

data/lib/diffend/local_context/host.rb

@@ -7,6 +7,11 @@ module Diffend
   module LocalContext
     # Module responsible for building host information from local context
     module Host
+      # Regexp that checks if we're running under Windows
+      WINDOWS_REGEXP = /cygwin|mswin|mingw|bccwin|wince|emx/
+
+      private_constant :WINDOWS_REGEXP
+
       class << self
         # Build host information
         #
@@ -24,7 +29,7 @@ module Diffend
               'version' => uname[:version]
             },
             'tags' => tags,
-            'user' => Etc.getpwuid(Process.uid).name,
+            'user' => Etc.getpwuid(Process.uid)&.name || ENV['USERNAME'],
             'pid' => Process.pid
           }.freeze
         end
@@ -36,7 +41,7 @@ module Diffend
         # @return [Hash]
         def command
           if File.exist?($PROGRAM_NAME)
-            if defined?(JRUBY_VERSION)
+            if defined?(JRUBY_VERSION) || WINDOWS_REGEXP =~ RUBY_PLATFORM
               name = $PROGRAM_NAME.split('/').last.strip
               command = "#{name} #{ARGV.join(' ')}"
             else

data/lib/diffend/plugin.rb

@@ -51,6 +51,8 @@ module Diffend
 
         config = Diffend::Config.new(severity: Diffend::Logger::INFO)
 
+        return unless config.execute?
+
         unless config.valid?
           config.print_errors
 

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.46'
+  VERSION = '0.2.51'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend-monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.46
+  version: 0.2.51
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -12,30 +12,30 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
-  nt70FcDD4yxJQ+0YNiHd0N8IcVBM1TMIVctMNQ==
+  c2ZlbGQucGwwDQYJKoZIhvcNAQELBQADggGBADD0/UuTTFgW+CGk2U0RDw2RBOca
+  W2LTF/G7AOzuzD0Tc4voc7WXyrgKwJREv8rgBimLnNlgmFJLmtUCh2U/MgxvcilH
+  yshYcbseNvjkrtYnLRlWZR4SSB6Zei5AlyGVQLPkvdsBpNegcG6w075YEwzX/38a
+  8V9B/Yri2OGELBz8ykl7BsXUgNoUPA/4pHF6YRLz+VirOaUIQ4JfY7xGj6fSOWWz
+  /rQ/d77r6o1mfJYM/3BRVg73a3b7DmRnE5qjwmSaSQ7u802pJnLesmArch0xGCT/
+  fMmRli1Qb+6qOTl9mzD6UDMAyFR4t6MStLm0mIEqM0nBO5nUdUWbC7l9qXEf8XBE
+  2DP28p3EqSuS+lKbAWKcqv7t0iRhhmaod+Yn9mcrLN1sa3q3KSQ9BCyxezCD4Mk2
+  R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
+  pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,14 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: OSS supply chain security and management platform