capistrano-uberspace 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c2d875c084e86b2d9db6d56bd941c06f0beda8e
-  data.tar.gz: 49ee6fc7b0a41590ebc6b8f67762a8eb2da791ba
+  metadata.gz: 9279b0a94cee432653c9d7ef20685975d517c9ff
+  data.tar.gz: 55d26b6a9feed82248028278cd33a8f647dfcfc9
 SHA512:
-  metadata.gz: 7a8c406bb5d312fdd51aaa6e131e4157ef9bf62cbbd0b3f9d023f9de665c923dc0355151292fb92d02fced31f68fc7f19b926fe24b95800a7447877e664e8fc9
-  data.tar.gz: 2ba85a422a1f039fd6644c3af6875c6888999d04a2f4bebb92ac992630ab3886f6d2bcd48c47885f614971cd7eaedc2dfc891430bbd9bf4eb539aff0b2125276
+  metadata.gz: 8e060adbce9400163de29a59cedd3d02efda82c83beef2e657a872b45e24dd3816ade014d932983a908f8fe1ef94e2cd4263f6a4ee2c746380f80c554923d331
+  data.tar.gz: b970bdb307a3552f107f33ae4de19d164a642c2b7e8260e064fb6622762448c782d2f7090f2f71cc27f7707d0c00151a1211d2b858b8d4f2845ed62ad7e60af1

data/capistrano-uberspace.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'capistrano-uberspace'
-  gem.version       = '1.0.0'
+  gem.version       = '1.0.2'
   gem.authors       = ['Philipp Tessenow']
   gem.email         = ['philipp@tessenow.org']
   gem.description   = %q{uberspace support for your rails app for Capistrano 3.x}
@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'capistrano', '~> 3.4.0'
   gem.add_dependency 'capistrano-rails'
   gem.add_dependency 'capistrano-bundler'
+  gem.add_dependency 'inifile', '~> 3.0.0'
 
   # dependencies for passenger on Uberspace
   gem.add_dependency 'passenger', '~> 5.0'

data/lib/capistrano/tasks/uberspace/mysql.rake

@@ -1,8 +1,11 @@
+require 'inifile'
+
 namespace :uberspace do
   namespace :mysql do
     task :setup_database_and_config do
       on roles fetch(:uberspace_roles) do
         my_cnf = capture('cat ~/.my.cnf')
+        my_sql_config = IniFile.new(content: my_cnf)['client']
         config = {}
         stages.each do |env|
           config[env] = {
@@ -12,14 +15,9 @@ namespace :uberspace do
             'host' => 'localhost'
           }
 
-          my_cnf.match(/^user=(\w+)/)
-          config[env]['username'] = $1
-
-          my_cnf.match(/^password=(\w+)/)
-          config[env]['password'] = $1
-
-          my_cnf.match(/^port=(\d+)/)
-          config[env]['port'] = $1.to_i
+          config[env]['username'] = my_sql_config['user']
+          config[env]['password'] = my_sql_config['password']
+          config[env]['port'] = my_sql_config['port'].to_i
 
           execute "mysql -e 'CREATE DATABASE IF NOT EXISTS #{config[env]['database']} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-uberspace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Philipp Tessenow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: passenger
   requirement: !ruby/object:Gem::Requirement