platform_sh 0.2.6.pre → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c66403efc02ad1eb05b048c1f667cf7f5b2b99
-  data.tar.gz: 59ab8cc66bfc0408f1566a5e1a72bf96899f2f20
+  metadata.gz: c7eaa8d84c009896dfc9bc3e68cd2f98c85045fe
+  data.tar.gz: 952d74292f13f8b8db7eadea39f0d6631780c2eb
 SHA512:
-  metadata.gz: d970fd9ccb319decd295dc086f5f62006516aefe20a9c350f86028b732dc6815e4d5f18a2e5a915d4bea96cb7096da10a2ad3c8cef2f88b7e73b4adfe115067c
-  data.tar.gz: 9e6af8337ed65aad6b0a8d87c5f93f08c598fc774e041887db103f7c5019a1883022c1f375c8fa74b76abb0196c758db867d0355b7c6259f49ee9d336d673f78
+  metadata.gz: 518bb82a01b507509380df30ec02b722ea60f755b82cb6429805f0fd395dcf8a6b3afb741b51ea790692d0022a611b2494705e710112e9d9af5c0f6ee0dea4f9
+  data.tar.gz: cb118a34499833de5245f6aebb1d2cdc7fbac85949d6827346035306c928469ebc34e4b837b03c1ad4b7a876a541fb54ecb894c789be870247c8c3cbd719070d

data/lib/platform_sh.rb

@@ -1,18 +1,17 @@
 require "platform_sh/version"
 require "base64"
 require 'json'
-require 'open3'
+require 'logger'
+
+$logger = Logger.new(STDOUT)
+$logger.level = Logger::WARN
 
 class PlatformSH
   'use strict'
   # Reads Platform.sh configuration from environment and returns a single object
   def self.config
-    conf = {}
-    if platform_local_development?
-      conf["relationships"] = JSON.parse(Base64.decode64(tunnel_info))
-      return conf
-    end
     if on_platform?
+      conf = {}
       conf["application"] = read_base64_json('PLATFORM_APPLICATION')
       conf["application_name"] =ENV["PLATFORM_APPLICATION_NAME"] || nil
       conf["app_dir"] =ENV["PLATFORM_APP_DIR"] || nil
@@ -27,12 +26,12 @@ class PlatformSH
         conf["variables"] = read_base64_json('PLATFORM_VARIABLES')
       end
     else
-      $stderr.puts "This is not running on platform.sh"
+      $logger.warn "This is not running on platform.sh"
       return nil
     end
     conf
   end
-
+  
   def self.on_platform?
     ENV.has_key? 'PLATFORM_PROJECT'
   end
@@ -40,7 +39,7 @@ class PlatformSH
   def self.is_build_environment?
     (!ENV.has_key?('PLATFORM_ENVIRONMENT') && ENV.has_key?('PLATFORM_PROJECT'))
   end
-
+  
   def self.relationship rel_name, attr
     on_platform? ? config["relationships"][rel_name].first[attr] : nil
   end
@@ -50,63 +49,64 @@ class PlatformSH
     begin
       return JSON.parse(Base64.decode64(ENV[var_name]))
     rescue
-      $stderr.puts "no " + var_name + " environment variable"
+      $logger.error "no " + var_name + " environment variable"
       return nil
     end
   end
 
 
   def self.read_app_config
+    #FIXME we should be able to get 
     JSON.parse(File.read('/run/config.json'))
   end
-
-
+  
+  
   #Tries to guess relational database url
   def self.guess_database_url
     postgresql_url = self.guess_postgresql_url
     mysql_url = self.guess_mysql_url
     if !mysql_url.nil? && !postgresql_url.nil?
-      $stderr.puts "More than one relational database, giving up, set configuration by hand"
+      $logger.info "More than one relational database, giving up, set configuration by hand"
       return nil
     end
     if (mysql_url.nil? && postgresql_url.nil?)
-      $stderr.puts "Could not find a relational database"
+      $logger.info "Could not find a relational database"
       return nil
     end
     return mysql_url || postgresql_url
   end
 
-  def self.guess_url(service_type, platform_scheme, url_template)
-    services = PlatformSH::config["relationships"].select {|k,v| v[0]["scheme"]==platform_scheme}
-    case services.length
-    when 0
-      $stderr.puts "Could not find an #{service_type}"
-      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
-      $stderr.puts "More than one #{service_type}, giving up, set configuration by hand"
-    end
+  def self.guess_url(platform_service, url_template)
+      services = PlatformSH::config["relationships"].select {|k,v| v[0]["service"]==platform_service}
+      case services.length
+        when 0
+          $logger.info "Could not find an #{platform_service}"
+          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"
+      end
   end
-
+  
   def self.guess_elasticsearch_url
-    self.guess_url("elasticsearch", "http", "http://%{host}:%{port}")
+    self.guess_url("elasticsearch", "http://%{host}:%{port}")
   end
-
+  
   def self.guess_redis_url
-    self.guess_url("redis", "redis", "redis://%{host}:%{port}")
+    self.guess_url("redis", "redis://%{host}:%{port}")
   end
-
+  
   def self.guess_mongodb_url
-    self.guess_url("mongodb", "mongodb", "mongodb://%{username}:%{password}@%{host}:%{port}/%{path}")
+    self.guess_url("mongodb", "mongodb://%{username}:%{password}@%{host}:%{port}/%{path}")
   end
-
+  
   def self.guess_solr_url
-    self.guess_url("solr", "solr", "http://%{host}:%{port}/%{path}")
+    self.guess_url( "solr", "http://%{host}:%{port}/%{path}")
   end
-
+  
   def self.guess_mysql_url
     #fallback to mysql url if mysql2 gem is not loaded
     if Gem::Specification::find_all_by_name("mysql2").empty?
@@ -114,96 +114,29 @@ class PlatformSH
     else
       template = "mysql2://%{username}:%{password}@%{host}:%{port}/%{path}"
     end
-    self.guess_url("mysql", "mysql",template)
+    self.guess_url("mysql", template)
   end
-
+  
   def self.guess_rabbitmq_url
-    self.guess_url("rabbitmq", "amqp","amqp://%{username}:%{password}@%{host}:%{port}")
+    self.guess_url("rabbitmq","amqp://%{username}:%{password}@%{host}:%{port}")
   end
-
+  
   def self.guess_postgresql_url
-    self.guess_url("postgresql", "pgsql","postgresql://%{username}:%{password}@%{host}:%{port}")
-  end
-
-  def self.export_services_urls
-    if (on_platform? || platform_local_development?) && !is_build_environment?
-      ENV['DATABASE_URL']=PlatformSH::guess_database_url
-      ENV['MONGODB_URL']=PlatformSH::guess_mongodb_url
-      ENV['REDIS_URL']=PlatformSH::guess_redis_url
-      ENV['ELASTICSEARCH_URL']=PlatformSH::guess_elasticsearch_url
-      ENV['RABBITMQ_URL']=PlatformSH::guess_rabbitmq_url
-      ENV['SOLR_URL']=PlatformSH::guess_solr_url
-    else
-      $stderr.puts "Can not guess URLS when not on platform"
-    end
-  end
-
-  def self.platform_local_development?
-    dev_environment = ENV["RACK_ENV"] != "production" && ENV["RAILS_ENV"] != "production"
-    dev_environment && cli_installed? && !on_platform?
-  end
-
-  def self.cli_installed?
-    begin
-      Open3.popen3("platform --version --yes") do |stdin, stdout, stderr, wait_thr|
-        err = stdout.gets
-        return (err.nil? && err.start_with?("Platform.sh CLI"))
-      end
-    rescue
-      $stderr.puts "WHATTT"
-    end
-  end
-
-  def self.tunnel_open?
-    Open3.popen3("platform --yes tunnel:info") do |stdin, stdout, stderr, wait_thr|
-      err = stderr.gets
-      return !(!err.nil? && err.start_with?("No tunnels found"))
-    end
+    self.guess_url("postgresql","postgresql://%{username}:%{password}@%{host}:%{port}")
   end
-
-  def self.tunnel_info
-    %x(platform tunnel:info -c --yes)
-  end
-
-  def self.tunnel_open
-    %x(platform tunnel:open --yes)
-  end
-
-  def self.tunnel_close
-    %x(platform tunnel:close --yes)
+  
+  def self.guess_influxdb_url
+    self.guess_url("influxdb","http://%{host}:%{port}")
   end
   
-  def self.local_tunnel_env
-    puts "This is an experimental feature\n"
-    %w(INT TERM).each do |sig|
-          begin
-            trap sig do
-              shut_down
-            end
-          rescue ArgumentError
-            puts "Signal #{sig} not supported"
-          end
-        end
-    def self.shut_down
-      puts "\nShutting down gracefully..."
-      puts tunnel_close
-      exit
-    end
-
-    command = ARGV[1]
-    if command.nil?
-      $stderr.puts "You must supply an executable to run"
-      return nil
-    end
-    if !tunnel_open?
-      puts tunnel_open
-    else 
-      puts tunnel_info
-    end
-    export_services_urls
-    Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-      puts "stdout is:" + stdout.read
-      $stderr.puts "stderr is:" + stderr.read
-    end
+  def self.export_services_urls
+    ENV['DATABASE_URL']=PlatformSH::guess_database_url
+    ENV['MONGODB_URL']=PlatformSH::guess_mongodb_url
+    ENV['REDIS_URL']=PlatformSH::guess_redis_url
+    ENV['ELASTICSEARCH_URL']=PlatformSH::guess_elasticsearch_url
+    ENV['RABBITMQ_URL']=PlatformSH::guess_rabbitmq_url
+    ENV['SOLR_URL']=PlatformSH::guess_solr_url
+    ENV['INFLUXDB_URL']=PlatformSH::guess_influxdb_url
   end
+  
 end

data/lib/platform_sh/version.rb

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

data/platform.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/platform.*}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: platform_sh
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre
+  version: 0.2.6
 platform: ruby
 authors:
 - Ori Pekelman
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,8 +69,7 @@ dependencies:
 description: Platform.sh helper gem to ease interacting with the environment
 email:
 - ori@platform.sh
-executables:
-- platform_local_tunnel_env
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,11 +81,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/platform_local_tunnel_env
 - bin/setup
 - lib/platform_sh.rb
 - lib/platform_sh/version.rb
-- lib/tasks/local_development.rake
 - platform.gemspec
 homepage: https://platform.sh
 licenses:
@@ -103,12 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Platform.sh helper gem to ease interacting with the environment

data/bin/platform_local_tunnel_env

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "platform_sh"
-
-PlatformSH::local_tunnel_env

data/lib/tasks/local_development.rake

@@ -1,11 +0,0 @@
-require 'rake'
-require "platform_sh"
-
-task :default => [:local_tunnel_env]
-
-namespace :platform_sh do
-  desc 'Open Tunnels, set services env variables to remote Platform.sh services and runs a command with the env'
-  task :local_tunnel_env do
-    PlatformSH::local_tunnel_env
-  end
-end