aris-control 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc9b2350949da64d9361170d4408babe8dd77fd
-  data.tar.gz: 20d3cce981bceddaf96070f3ec30f6b43a89ff3d
+  metadata.gz: bc8d35cb9bb2b5c37bee23c4670d833bd3f4eb2f
+  data.tar.gz: 412e501ff0d538c18edd2fa988cdd550b17a9827
 SHA512:
-  metadata.gz: eb4410226c47d6e7ee8f0d13b53cff492609ac255d6cc6353a72ad042db2963b0118beeac5d82e7239e64aa3edb67a8892e4db49c8fc0730716e29e4d86574d7
-  data.tar.gz: d95e36bb4ff59644b9f9d946b0c45e8ae6663bd60adbcdcbd8eec2407bdb8b735df5fcf564a9679b3dea40df747126e110f25a43fa37648af3b8a1f20943004e
+  metadata.gz: 36d18242ef129581d0bc0354508b54dd857156273c8bd252e3bffd6a30182ef37596da37b5a93d0ff3b80f5cac0a279c1ad10f16d5d882713783fa5338e6ab30
+  data.tar.gz: 2e0f98c55500a6a6d664bdb79f5a2c40f35a4af3e89053da07516a039dd29846c46d2b2bcf40e76e2ebdcdf43c39fc39ec9cf04d4ae059191c5357af4063d6de

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+pkg/

data/lib/aris-control/bookkeeper.rb

@@ -1,8 +1,6 @@
 require_relative 'persistence'
 
 module ArisControl
-  ModificationError = Class.new(StandardError)
-
   class Bookkeeper
     attr_reader :persistence, :users
 
@@ -16,8 +14,9 @@ module ArisControl
     end
 
     def add(name:, email:, **opts)
-      raise ArisControl::ModificationError if users.has_key?(name)
-      users[name] = opts.merge(email: email)
+      email or raise ArgumentError
+      user = users[name] || {}
+      users[name] = user.merge(opts).merge(email: email)
       persistence.store_users(users)
     end
 

data/lib/aris-control/thor.rb

@@ -2,11 +2,13 @@ require 'thor'
 require 'pp'
 
 class ArisControl::Thor < Thor
-  desc 'add username email', 'Adds a new aris user'
-  method_option :ssh_key, type: :string, desc: 'The users ssh public key for git access'
-  def add(name, email)
-    bookkeeper.add(name: name, email: email, **options.dup)
-    puts "Added user: #{name}, #{email}"
+  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 :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)
+    bookkeeper.add(name: name, **options)
+    puts "Added/Updated user: #{name}, #{options}"
     puts "-----------------------------"
     print_current_aris_users
   end

data/lib/aris-control/version.rb

@@ -1,3 +1,3 @@
 module ArisControl
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aris-control
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregory Igelmund
@@ -97,7 +97,6 @@ files:
 - aris-control.gemspec
 - bin/aris-control
 - bin/console
-- lib/aris-control-thor.rb
 - lib/aris-control.rb
 - lib/aris-control/bookkeeper.rb
 - lib/aris-control/persistence.rb