platform_sh 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7eaa8d84c009896dfc9bc3e68cd2f98c85045fe
-  data.tar.gz: 952d74292f13f8b8db7eadea39f0d6631780c2eb
+  metadata.gz: 7aeb45fb5a76a1849fa9c9917499b282d803b33c
+  data.tar.gz: b261cf656d12ce56f54d8caea8ee57a58e363920
 SHA512:
-  metadata.gz: 518bb82a01b507509380df30ec02b722ea60f755b82cb6429805f0fd395dcf8a6b3afb741b51ea790692d0022a611b2494705e710112e9d9af5c0f6ee0dea4f9
-  data.tar.gz: cb118a34499833de5245f6aebb1d2cdc7fbac85949d6827346035306c928469ebc34e4b837b03c1ad4b7a876a541fb54ecb894c789be870247c8c3cbd719070d
+  metadata.gz: 853c31801c2445a14ed4e5e132d6251fb8b90463775e39f27fdf2a26bb74af89e20a2eaa46a5bdd07bf3dba1767f0474aa12d04852d98b02d35293dfc69d585c
+  data.tar.gz: 063cddeeb559054cd891ec84d8d96d8874b9b27b6cdda70f3e9cb0613eded2c0eb5cf7afaf4d884ea26bbfa32944c0ba23a4af50d2f56adee40fb1c121bd84b4

data/lib/platform_sh.rb

@@ -76,23 +76,24 @@ class PlatformSH
     return mysql_url || postgresql_url
   end
 
-  def self.guess_url(platform_service, url_template)
-      services = PlatformSH::config["relationships"].select {|k,v| v[0]["service"]==platform_service}
+  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 #{platform_service}"
+          $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 #{platform_service}, giving up, set configuration by hand"
+          $logger.warn "More than one #{scheme}, giving up, set configuration by hand"
+          return nil
       end
   end
   
   def self.guess_elasticsearch_url
-    self.guess_url("elasticsearch", "http://%{host}:%{port}")
+    self.guess_url("http", "http://%{host}:%{port}",9200)
   end
   
   def self.guess_redis_url
@@ -118,15 +119,15 @@ class PlatformSH
   end
   
   def self.guess_rabbitmq_url
-    self.guess_url("rabbitmq","amqp://%{username}:%{password}@%{host}:%{port}")
+    self.guess_url("amqp","amqp://%{username}:%{password}@%{host}:%{port}")
   end
   
   def self.guess_postgresql_url
-    self.guess_url("postgresql","postgresql://%{username}:%{password}@%{host}:%{port}")
+    self.guess_url("pgsql","postgresql://%{username}:%{password}@%{host}:%{port}")
   end
   
   def self.guess_influxdb_url
-    self.guess_url("influxdb","http://%{host}:%{port}")
+    self.guess_url("http","http://%{host}:%{port}", 8086)
   end
   
   def self.export_services_urls

data/lib/platform_sh/version.rb

@@ -1,3 +1,3 @@
 class PlatformSH
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: platform_sh
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ori Pekelman