atl_config 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b7ac6cf93cc8b9885e9f3592e678939b4fc1bd
-  data.tar.gz: 42a118ecd86cf61b994920e0f41ab41f0e3dfe85
+  metadata.gz: 816e2a8bee15734535cb9fee7f917b61a4a70a52
+  data.tar.gz: 1d36325668175bc6c17c5275d6477639e0893793
 SHA512:
-  metadata.gz: 5efdc50944611ea5e668bb657d13682d017788ecb8420ab8eaef8bbce628ddfd2dc3b8f82c2a2f63d6e2925a1ef69b50c7ca6de4c68a2fc5f9fcc56233180854
-  data.tar.gz: 035a9a335f998410ec2ff4d827fefca58486788c2d47217ace7c73b3e294bbbcbf05fd1c1518b828e4ec5729430d3093aab1ac06dc76e6c9afacd606af3906e0
+  metadata.gz: db6131e084339bf9b73f7062104e84ef15c9bc3ca35cccdc034f9a924d68454f302d204e2a3700bc57d33c1f01e88d9458165c25089ab57f9419bfa2b920cfcc
+  data.tar.gz: 1814c75a945c5ed933d879e01f5b4a96c1d79200f35ed13fe80f069c218fd264e3f9c0e02a16572e3b0776957646fe3a86979e10b4d8656be06cd8595fbecfc0

data/lib/atl_config.rb

@@ -7,5 +7,5 @@ require "atl_config/appinfo"
 
 module AtlConfig
 	# Struct containing database connection info.
-	DBInfo = Struct.new :datasource, :user, :password, :dbtype, :host, :port, :database
+	DBInfo = Struct.new :datasource, :user, :password, :dbtype, :host, :port, :database, :jdbcurl, :dburl
 end

data/lib/atl_config/confluencecfg.rb

@@ -12,8 +12,11 @@ module AtlConfig
 				base = config.xpath("/confluence-configuration/properties")
 				r.user = base.xpath("property[@name='hibernate.connection.username']/text()").first&.to_s
 				r.password = base.xpath("property[@name='hibernate.connection.password']/text()").first&.to_s
-				url = base.xpath("property[@name='hibernate.connection.url']/text()").first&.to_s
-				urlparts = AtlConfig::JDBCURL.parse(url)
+				# jdbcurl is the URL in Java/JDBC format. dburl is the URL in Ruby format
+				r.jdbcurl = base.xpath("property[@name='hibernate.connection.url']/text()").first&.to_s
+				# FIXME: it's probably more complex than this..
+				r.dburl = r.jdbcurl.gsub("jdbc:postgresql", "postgres")
+				urlparts = AtlConfig::JDBCURL.parse(r.jdbcurl)
 				r.dbtype = urlparts[:dbtype]
 				r.host = urlparts[:host]
 				r.port = if urlparts[:port] then urlparts[:port].to_i

data/lib/atl_config/jiraconfig.rb

@@ -12,8 +12,11 @@ module AtlConfig
 				base = config.xpath("/jira-database-config/jdbc-datasource")
 				r.user = base.xpath("username/text()").first&.to_s
 				r.password = base.xpath("password/text()").first&.to_s
-				url = base.xpath("url/text()").first&.to_s
-				urlparts = AtlConfig::JDBCURL.parse(url)
+				# jdbcurl is the URL in Java/JDBC format. dburl is the URL in Ruby format
+				r.jdbcurl = base.xpath("url/text()").first&.to_s
+				# FIXME: it's probably more complex than this..
+				r.dburl = r.jdbcurl.gsub("jdbc:postgresql", "postgres")
+				urlparts = AtlConfig::JDBCURL.parse(r.jdbcurl)
 				r.dbtype = urlparts[:dbtype]
 				r.host = urlparts[:host]
 				r.port = if urlparts[:port] then urlparts[:port].to_i

data/lib/atl_config/serverxml.rb

@@ -14,9 +14,10 @@ module AtlConfig
 				r = DBInfo.new
 				r.user = datasource.xpath("@username")&.to_s
 				r.password = datasource.xpath("@password")&.to_s
-				url = datasource.xpath("@url")&.to_s
-				if url then
-					urlparts = AtlConfig::JDBCURL.parse(url)
+				r.jdbcurl = datasource.xpath("@url")&.to_s
+				r.dburl = r.jdbcurl.gsub("jdbc:postgresql", "postgres")
+				if r.jdbcurl then
+					urlparts = AtlConfig::JDBCURL.parse(r.jdbcurl)
 					r.dbtype = urlparts[:dbtype]
 					r.host = urlparts[:host]
 					r.port = if urlparts[:port] then urlparts[:port].to_i

data/lib/atl_config/version.rb

@@ -1,3 +1,3 @@
 module AtlConfig
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atl_config
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jeff Turner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler