aris-control 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6ea4084e8e8ef5e2231a1703549d83694a1b40
-  data.tar.gz: b5ffad423578b924b83a937364fd17f77e1a0955
+  metadata.gz: 47f5a4b25d09aa4971c478f813b664ed6b32ced1
+  data.tar.gz: 53e740ce9a4947fdffe9233c5749ef6c7e75caac
 SHA512:
-  metadata.gz: 61f44aa24b942529f5761c223ffe46a594584d49f18268a2c255628f94d4cd06dc3eebccb3a022daebbfac2408a4b70ab6c327f629074818beaddda78206ae26
-  data.tar.gz: d3b3f2674e04f2b6edde27351e1ce761163b70d6d49701dc1d880b000f7dc8f9daec7c85aea4053da61e537388ecd714b58ed9d886a35225d742dfcd93cf3337
+  metadata.gz: bdb0f2f7749ffe4b374c160269b0e39696053d69fc3207ec0d5d27f5a754145cf3f4915e1d20486c3ede1855fb4408e0dd5fc307956e8b5fcf1427c504e2b1c7
+  data.tar.gz: ede15203756193ac6eb025d112528bb3c21f2b6e98a1a9ff9675463148a280e9a187009d1c9439affce9ca0dd90a3262b1965c699abc645e1e34362c385e1195

data/lib/aris-control/bookkeeper.rb

@@ -14,17 +14,15 @@ module ArisControl
     end
 
     def add(name, opts = {})
-      app     = apps[name] || {}
-      ssh_key  = opts[:ssh_key]
       env_vars = opts[:env_vars]
-
-      _opts = Hash.new.tap do |h|
-        h['email']       = opts[:email] || app.fetch('email')
-        h['ssh_key']     = ssh_key || app['ssh_key'] || ''
-        h['env_vars']    = with_upcased_keys(env_vars) if env_vars
+      app = apps[name] || {}
+      apps[name] = app.dup.tap do |h|
+        h['email']    = opts[:email] || app.fetch('email')
+        h['ssh_key']  = opts[:ssh_key] if opts[:ssh_key]
+        h['pg_role']  = opts[:pg_role] if opts[:pg_role]
+        h['pg_pass']  = opts[:pg_pass] if opts[:pg_pass]
+        h['env_vars'] = with_upcased_keys(env_vars) if env_vars
       end
-
-      apps[name] = app.merge(_opts)
       persistence.store_apps(apps)
     end
 

data/lib/aris-control/thor.rb

@@ -5,12 +5,16 @@ class ArisControl::Thor < Thor
   desc 'add/update appname', 'Adds/Updates  an aris app.'
   method_option :email,    type: :string, desc: 'The apps email address. Used for web login.'
   method_option :ssh_key,  type: :string, desc: 'The apps ssh public key. Used for git access via ssh.'
+  method_option :pg_role,  type: :string, desc: 'The apps postgres role.'
+  method_option :pg_pass,  type: :string, desc: 'The apps postgres password.'
   method_option :env_vars, type: :hash,   desc: 'The apps app env vars. Env vars will be accessible inside the app via ENV[VAR-NAME].'
   def add(name)
-    opts = Hash.new.tap do |h|
-      h[:email]    = options[:email]
-      h[:ssh_key]  = options[:ssh_key]  if options[:ssh_key]
-      h[:env_vars] = options[:env_vars] if options[:env_vars]
+    opts = Hash.new.tap do |o|
+      o[:email]    = options[:email]
+      o[:ssh_key]  = options[:ssh_key]  if options[:ssh_key]
+      o[:pg_role]  = options[:pg_role]  if options[:pg_role]
+      o[:pg_pass]  = options[:pg_pass]  if options[:pg_pass]
+      o[:env_vars] = options[:env_vars] if options[:env_vars]
     end
     bookkeeper.add(name, **opts)
     puts "Added/Updated app: #{name}, #{opts}"

data/lib/aris-control/version.rb

@@ -1,3 +1,3 @@
 module ArisControl
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aris-control
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Gregory Igelmund