platform_sh 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6af1db4bf930f94f759a2c575532f76c8e0b8cfb9f31be4a65fc4b9f422409
-  data.tar.gz: e984ea591ecda012d3f569fe3f05dd5aa58b423cc6508e8b4176246a3b6d1e77
+  metadata.gz: 8efa540d7fa320ebed86198301fd0f4dbdd67f254296b5e9d5842b59bde9ef1b
+  data.tar.gz: ee662935f81bf55da217f33e3699b5aefa423b662d439ec2080c7b7a9a641aa1
 SHA512:
-  metadata.gz: edd2a3c6b3711f8ecd193968aecbd198fbf93428f78a72d3361d76432bd51a728ed199005f2a90e0a1ceae6d34780f444f55161a79776919bbb8e01c434c5034
-  data.tar.gz: ebf82517232fdf704d9b5d517fb6049af604301235f96b88a298600178dfb1238294d707968edf44c12623385f5617a443595c5e5b7745fad4810d8753ffab70
+  metadata.gz: e6ee450b5383b5d8aa02771942ea9f192affe0dca9e0b7115c61552cd286f9ea88a97f726f0dd073234df5d24dac6f1ebe2de5c9e4419097b372533300f851e2
+  data.tar.gz: 3dc69475a823389401b291c34e0eb667e9749e6c31067d66d189e014eb290f2e88f5cba95a883bb3879a7adb90ed55ecd3603380b23e5a61f2bf694320b9e163

data/lib/platform_sh.rb

@@ -13,26 +13,25 @@ class PlatformSH
   'use strict'
   # Reads Platform.sh configuration from environment and returns a single object
   def self.config
-    if on_platform?
-      conf = {}
-      conf["application"] = read_base64_json('PLATFORM_APPLICATION')
-      conf["routes"] = read_base64_json('PLATFORM_ROUTES')
-      conf["application_name"] =ENV["PLATFORM_APPLICATION_NAME"] || nil
-      conf["app_dir"] =ENV["PLATFORM_APP_DIR"] || nil
-      conf["project"] =ENV["PLATFORM_PROJECT"] || nil
-      conf["document_root"] =ENV["PLATFORM_DOCUMENT_ROOT"] || nil
-      if !is_build_environment?
-        conf["environment"] =ENV["PLATFORM_ENVIRONMENT"] || nil
-        conf["project_entropy"] =ENV["PLATFORM_PROJECT_ENTROPY"] || nil
-        conf["port"] =ENV["PORT"] || nil
-        conf["socket"] =ENV["SOCKET"] || nil
-        conf["relationships"] = read_base64_json('PLATFORM_RELATIONSHIPS')
-        conf["variables"] = read_base64_json('PLATFORM_VARIABLES')
-      end
-    else
+    if !on_platform?
       $logger.info "This is not running on platform.sh"
       return nil
     end
+    conf = {}
+    conf["application"] = read_base64_json('PLATFORM_APPLICATION')
+    conf["routes"] = read_base64_json('PLATFORM_ROUTES')
+    conf["application_name"] =ENV["PLATFORM_APPLICATION_NAME"] || nil
+    conf["app_dir"] =ENV["PLATFORM_APP_DIR"] || nil
+    conf["project"] =ENV["PLATFORM_PROJECT"] || nil
+    conf["document_root"] =ENV["PLATFORM_DOCUMENT_ROOT"] || nil
+    if !is_build_environment?
+      conf["environment"] =ENV["PLATFORM_ENVIRONMENT"] || nil
+      conf["project_entropy"] =ENV["PLATFORM_PROJECT_ENTROPY"] || nil
+      conf["port"] =ENV["PORT"] || nil
+      conf["socket"] =ENV["SOCKET"] || nil
+      conf["relationships"] = read_base64_json('PLATFORM_RELATIONSHIPS')
+      conf["variables"] = read_base64_json('PLATFORM_VARIABLES')
+    end
     conf
   end
   
@@ -60,12 +59,25 @@ class PlatformSH
 
 
   def self.read_app_config
+    if !on_platform?
+      $logger.info "This is not running on platform.sh"
+      return nil
+    end
     #FIXME we should be able to get 
     JSON.parse(File.read('/run/config.json'))
   end
   
   #Tries to guess the hostname it takes the first upstream
   def self.guess_hostname
+    if !on_platform?
+      $logger.info "This is not running on platform.sh"
+      return nil
+    end
+    if is_build_environment?
+      $logger.info "No hostname in build environment"
+      return nil
+    end
+    
     upstreams = PlatformSH::config["routes"].select {|k,v| v["type"]=="upstream"}
     begin 
     if upstreams.length > 1
@@ -85,6 +97,14 @@ class PlatformSH
   
   #Tries to guess relational database url
   def self.guess_database_url
+    if !on_platform?
+      $logger.info "This is not running on platform.sh"
+      return nil
+    end
+    if is_build_environment?
+      $logger.info "No relationships in build environment"
+      return nil
+    end
     postgresql_url = self.guess_postgresql_url
     mysql_url = self.guess_mysql_url
     if !mysql_url.nil? && !postgresql_url.nil?
@@ -99,19 +119,27 @@ class PlatformSH
   end
 
   def self.guess_url(scheme, url_template, port=nil)
-      services = PlatformSH::config["relationships"].select {|k,v| v[0]["scheme"]==scheme && (!port || v[0]["port"].to_s==port.to_s )} #For ElasticSearch and InfluxDB both on HTTP we also look at the port
-      case services.length
-        when 0
-          $logger.info "Could not find an #{scheme}"
-          return nil
-        when 1
-          service = services.first[1][0]
-          service =  service.each_with_object({}){|(k,v), h| h[k.to_sym] = v} #keys need to be symbols
-          return url_template % service
-        else
-          $logger.warn "More than one #{scheme}, giving up, set configuration by hand"
-          return nil
-      end
+    if !on_platform?
+      $logger.info "This is not running on platform.sh"
+      return nil
+    end
+    if is_build_environment?
+      $logger.info "No relationships in build environment"
+      return nil
+    end
+    services = PlatformSH::config["relationships"].select {|k,v| v[0]["scheme"]==scheme && (!port || v[0]["port"].to_s==port.to_s )} #For ElasticSearch and InfluxDB both on HTTP we also look at the port
+    case services.length
+      when 0
+        $logger.info "Could not find an #{scheme}"
+        return nil
+      when 1
+        service = services.first[1][0]
+        service =  service.each_with_object({}){|(k,v), h| h[k.to_sym] = v} #keys need to be symbols
+        return url_template % service
+      else
+        $logger.warn "More than one #{scheme}, giving up, set configuration by hand"
+        return nil
+    end
   end
   
   def self.guess_elasticsearch_url

data/lib/platform_sh/version.rb

@@ -1,3 +1,3 @@
 class PlatformSH
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: platform_sh
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Ori Pekelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler