splitclient-rb 7.0.1.pre.rc4-java → 7.0.1.pre.rc5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7fb0aac1322c96814f636b8b14ab290e360387
-  data.tar.gz: bc03504719ee0679e6574cab51afd87ea595375e
+  metadata.gz: b8851d02a7b01b4cd2933cfe1fe7ed85400e4c48
+  data.tar.gz: c52ba01e2dff817ed45518a18abbf90fe2084f9d
 SHA512:
-  metadata.gz: 20b148bdaf3420f5958d0056e6ffd5c07bdb32afdf7e47161f524b46b5cac4865bc960b752d31b05fbbb2ef05e7a17ca1e754b1b2ef38d49af1840ef91fbc673
-  data.tar.gz: 41096dd760d13ec1be83418bd6e00ded008cfbf18dda533f182683544d8d2aae92eef3fbf558ebc4fb12e6d043b83ec5327654bc3d6aed2aef88042134dfdd26
+  metadata.gz: 9b6e7eed98aa235f9b0171cd0298f6402a8edc1efc404f150cdfb97b40756d19c0f94a3e3c72913e9a085a5de4ed160a31cb9a53c8080655457e7301e325b50c
+  data.tar.gz: 6da978ca6ff7f456c293cf3a7a960751cb8e808ca49b96a29f72cde4df5eb79171afe94f61932b2bfab0886fc3ddd0954768adc8ef9051427d62361d430912b0

data/.travis.yml

@@ -6,6 +6,15 @@ rvm:
 services:
   - redis-server
 
+addons:
+  sonarqube: true
+
+git:
+  depth: false
+
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2'
+
+after_success:
+  - bash sonar-scanner.sh

data/CHANGES.txt

@@ -1,4 +1,4 @@
-7.0.1 (Oct 25, 2019)
+7.0.1 (Oct 31, 2019)
  - Updated localhost mode so that parsing of test files results in JSON data for splits analogous to that returned by the Split backend.
  - Resulting localhost data is now used indifferently from actual backend data by the SDK code.
  - Removed specific spare code dealing with localhost operations.

data/lib/splitclient-rb/engine/api/client.rb

@@ -30,9 +30,12 @@ module SplitIoClient
           req.headers = common_headers(api_key)
                         .merge('Content-Type' => 'application/json')
                         .merge(headers)
-                        
-          req.headers = req.headers.merge('SplitSDKMachineIP' => @config.machine_ip) unless @config.machine_ip.empty?
-          req.headers = req.headers.merge('SplitSDKMachineName' => @config.machine_name) unless @config.machine_name.empty?
+          
+          machine_ip = @config.machine_ip
+          machine_name = @config.machine_name
+
+          req.headers = req.headers.merge('SplitSDKMachineIP' => machine_ip) unless machine_ip.empty? || machine_ip == 'unknown'
+          req.headers = req.headers.merge('SplitSDKMachineName' => machine_name) unless machine_name.empty? || machine_name == 'unknown'
 
           req.body = data.to_json
 

data/lib/splitclient-rb/split_config.rb

@@ -511,10 +511,10 @@ module SplitIoClient
     # gets the ip where the sdk gem is running
     #
     # @return [string]
-    def self.machine_ip(ip_addresses_enabled, machine_ip, adapter)
+    def self.machine_ip(ip_addresses_enabled, ip, adapter)
       if ip_addresses_enabled
-        begin
-          return machine_ip unless machine_ip.blank?
+        begin          
+          return ip unless ip.nil? || ip.to_s.empty?
 
           loopback_ip = Socket.ip_address_list.find { |ip| ip.ipv4_loopback? }
           private_ip = Socket.ip_address_list.find { |ip| ip.ipv4_private? }

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.0.1.pre.rc4'
+  VERSION = '7.0.1.pre.rc5'
 end

data/sonar-scanner.sh

@@ -0,0 +1,42 @@
+#/bin/bash -e
+
+sonar_scanner() {
+  local params=$@
+
+  sonar-scanner \
+    -Dsonar.host.url='https://sonarqube.split-internal.com' \
+    -Dsonar.login="$SONAR_TOKEN" \
+    -Dsonar.ws.timeout='300' \
+    -Dsonar.sources='lib' \
+    -Dsonar.projectName='ruby-client' \
+    -Dsonar.projectKey='ruby-client' \
+    -Dsonar.ruby.coverage.reportPaths='coverage/.resultset.json' \
+    -Dsonar.links.ci='https://travis-ci.com/splitio/ruby-client' \
+    -Dsonar.links.scm='https://github.com/splitio/ruby-client' \
+    ${params}
+
+  return $?
+}
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+  sonar_scanner \
+    -Dsonar.pullrequest.provider='GitHub' \
+    -Dsonar.pullrequest.github.repository='splitio/ruby-client' \
+    -Dsonar.pullrequest.key=$TRAVIS_PULL_REQUEST \
+    -Dsonar.pullrequest.branch=$TRAVIS_PULL_REQUEST_BRANCH \
+    -Dsonar.pullrequest.base=$TRAVIS_BRANCH
+else
+  if [ "$TRAVIS_BRANCH" == 'master' ]; then
+    sonar_scanner \
+      -Dsonar.branch.name=$TRAVIS_BRANCH
+  else
+    if [ "$TRAVIS_BRANCH" == 'development' ]; then
+      TARGET_BRANCH='master'
+    else
+      TARGET_BRANCH='development'
+    fi
+    sonar_scanner \
+      -Dsonar.branch.name=$TRAVIS_BRANCH \
+      -Dsonar.branch.target=$TARGET_BRANCH
+  fi
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.0.1.pre.rc4
+  version: 7.0.1.pre.rc5
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +383,7 @@ files:
 - lib/splitclient-rb/utilitites.rb
 - lib/splitclient-rb/validators.rb
 - lib/splitclient-rb/version.rb
+- sonar-scanner.sh
 - splitclient-rb.gemspec
 - tasks/benchmark_get_treatment.rake
 - tasks/irb.rake