aris-control 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3922ebdfa479a051e783e808fed3442b4019e6e
-  data.tar.gz: d0105e8bbd6c2b2ca5fec3052df6fdf6a8af4e76
+  metadata.gz: d9a61dd46a5d85a26cdaca8ea0e1e06b9cbab795
+  data.tar.gz: 87daf1c8bd1f7b82d0f425fcc911024a61365ba1
 SHA512:
-  metadata.gz: 92c0967e51a656c13287e6304318151de9e651e200d129aadccd3ded6b5b0a2e832fbfb9f372277f0acafab3125514e9a5f3ab36c984a3fed21b0b77eb6a3c3b
-  data.tar.gz: 5893fc6fb03513b2da0ea994b59577c35eabd66c2aa2cc5817401b89258c74b035b7247160babba3b00cad815e672aac389b8c293d303d7d3489358d44efb597
+  metadata.gz: 0a9ce91d47604d931069a34412636284be00818006bafc560338c422457c51cb77000e4e3ba4695183c5cc433685a5e72c0b42a8bfd19f5f0e6106e7270081be
+  data.tar.gz: ccc9c11c12d61d0a36ab97ab86d9cccebd264b69dab282cc051276de57eb269df217612881cc032735a88de248f0176881c9de460b2671476aa543aa30b04152

data/lib/aris-control/bookkeeper.rb

@@ -13,10 +13,18 @@ module ArisControl
       users
     end
 
-    def add(name:, email:, **opts)
-      email or raise ArgumentError
-      user = users[name] || {}
-      users[name] = user.merge(opts).merge(email: email)
+    def add(name, opts = {})
+      user     = users[name] || {}
+      ssh_key  = opts[:ssh_key]
+      env_vars = opts[:env_vars]
+
+      _opts = Hash.new.tap do |h|
+        h[:email]    = opts[:email] || user.fetch(:email)
+        h[:ssh_key]  = ssh_key if ssh_key
+        h[:env_vars] = with_upcased_keys(env_vars) if env_vars
+      end
+
+      users[name] = user.merge(_opts)
       persistence.store_users(users)
     end
 
@@ -28,5 +36,12 @@ module ArisControl
     def default_persistence
       ArisControl::Persistence.new
     end
+
+    private
+
+    def with_upcased_keys(hash)
+      hash or return
+      hash.each_with_object({}) {|(k,v),h| h[k.to_s.upcase] = v }
+    end
   end
 end

data/lib/aris-control/thor.rb

@@ -3,7 +3,7 @@ require 'pp'
 
 class ArisControl::Thor < Thor
   desc 'add/update username', 'Adds/Updates  an aris user.'
-  method_option :email,    type: :string, required: true, desc: 'The users email address. Used for web login.'
+  method_option :email,    type: :string, desc: 'The users email address. Used for web login.'
   method_option :ssh_key,  type: :string, desc: 'The users ssh public key. Used for git access via ssh.'
   method_option :env_vars, type: :hash,   desc: 'The users app env vars. Env vars will be accessible inside the app via ENV[VAR-NAME].'
   def add(name)
@@ -12,8 +12,8 @@ class ArisControl::Thor < Thor
       h[:ssh_key]  = options[:ssh_key]  if options[:ssh_key]
       h[:env_vars] = options[:env_vars] if options[:env_vars]
     end
-    bookkeeper.add(name: name, **opts)
-    puts "Added/Updated user: #{name}, #{options}"
+    bookkeeper.add(name, **opts)
+    puts "Added/Updated user: #{name}, #{opts}"
     puts "-----------------------------"
     print_current_aris_users
   end

data/lib/aris-control/version.rb

@@ -1,3 +1,3 @@
 module ArisControl
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

metadata

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