contrast-agent-lib 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c48f5ba49fc4230ebce12b9ac7b9cd5e3821d9443ed26c990845ea435b17876
-  data.tar.gz: 302b23aae1691c39ae6e4b1b09e88d61442ec859ec4b3ef56792f9fc3e32e496
+  metadata.gz: 33852f7c0ff32dda5f1bb383ea6e22cccbe9f6a8e9eb86d931d42fd87f4ba97d
+  data.tar.gz: f8d8483d5eccf6dac6a4c0d14fc0db4cd7a6310b0edaa6ee48d1e6cf2036637d
 SHA512:
-  metadata.gz: b2f22e6e14cd583bd3660d754e5ac5473b654a6a59891d3dd4d27f4a3dd6c1d3f37b59a1e698dd26d819118580775dca0825a7860840afbd444a2204d6bbd201
-  data.tar.gz: b38273a663ad3bc522a7390444c709f5dee5401387a27dd22a2fbbbfa0e0cfc50248c40b82b11ec6dad6c88cdc20cc2e7ff2073c3b79c54137dca2d0a69b8f29
+  metadata.gz: 6223cc990aef9e0c680ff225a7e2a497fc1deb9760b2518a24d1d2dc7f7298f5806bdc6cc1caf1d2691248d13fe1f9a2f13e685e4eca6a539b383fe6be993505
+  data.tar.gz: 64d87019fb7f61c59d613efda6f06540261c8c52ae56918a70472f6d0edfaead92f24e54be21109550c14ce44a60429eb0a30ef8a83c3b2c886af5a8bdd93a05

data/contrast-agent-lib.gemspec

@@ -60,9 +60,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.homepage     = 'https://www.contrastsecurity.com'
   spec.license      = 'CONTRAST SECURITY (see license file)'
-  spec.required_ruby_version = ['>= 2.7.0', '< 3.2.0']
+  spec.required_ruby_version = ['>= 2.7.0', '<= 3.2.0']
 
   add_authors(spec)
   add_files(spec)
   add_development_dependencies(spec)
-end
+end

data/lib/contrast-agent-lib.rb

@@ -10,12 +10,13 @@ module ContrastAgentLib
   include ContrastAgentLib::OS
   LINUX_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c.so')
   MAC_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c.dylib')
+  MAC_M1_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_darwin_arm.dylib')
   ALPINE_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c_musl.so')
   # Since we need two different extensions for each platform we
   # need to detect the used OS before loading the dynamic library.
   CONTRAST_C = if ContrastAgentLib::OS.linux?
                 ContrastAgentLib::OS.alpine? ? ALPINE_LIB : LINUX_LIB
               else
-                MAC_LIB
+                ContrastAgentLib::OS.m1_mac? ? MAC_M1_LIB : MAC_LIB
               end
-end
+end

data/lib/utils/os.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
+require 'rbconfig'
+
 module ContrastAgentLib
   module OS
     class << self
@@ -17,6 +19,10 @@ module ContrastAgentLib
         @_mac
       end
 
+      def m1_mac?
+        mac? && RbConfig::CONFIG['host_cpu'].include?('arm64')
+      end
+
       def unix?
         !windows?
       end

data/lib/utils/version.rb

@@ -3,6 +3,6 @@
 
 module ContrastAgentLib
     module Version
-        VERSION='0.1.3'
+        VERSION='0.1.4'
     end
 end

data/scripts/build_gem.sh

@@ -5,6 +5,4 @@ set -Eeuo pipefail
 gem build contrast-agent-lib.gemspec
 
 # Push to RubyGems
-# Preferably will be moved as pipeline step on tag only
-#curl -u username https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials;
-#chmod 0600 ~/.gem/credentials
+# This is moved as separate job in the pipeline

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent-lib
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - teodor.raychev@contrastsecurity.com
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -54,6 +54,7 @@ files:
 - usage_files/libcontrast_c.dylib
 - usage_files/libcontrast_c.so
 - usage_files/libcontrast_c_musl.so
+- usage_files/libcontrast_darwin_arm.dylib
 homepage: https://www.contrastsecurity.com
 licenses:
 - CONTRAST SECURITY (see license file)
@@ -67,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.7.0
-  - - "<"
+  - - "<="
     - !ruby/object:Gem::Version
       version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: This is the Ruby Interface for Rust Agent Library