aris-control 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5a7051810e77cacf1b9d3893bbbba869252172
-  data.tar.gz: 4e3da98479265243b83078f4fdc61a12474fb560
+  metadata.gz: 5d6ea4084e8e8ef5e2231a1703549d83694a1b40
+  data.tar.gz: b5ffad423578b924b83a937364fd17f77e1a0955
 SHA512:
-  metadata.gz: 0ba27e958f9a875c0491cb24b76011f3cbbacc4de421f766575646762f868ea6f1a4d7a89c981721f7610882cba7fb19a0173f73953e6b691239e85cbf5182b6
-  data.tar.gz: 9191e7672e45b884f7e2fa6150f2d6a3eaab2e86b2346f256fa03be72ea10f7e9cd56580971538f010d61fc33f293979c6640a6ea4ae3084dd0e876a683083d9
+  metadata.gz: 61f44aa24b942529f5761c223ffe46a594584d49f18268a2c255628f94d4cd06dc3eebccb3a022daebbfac2408a4b70ab6c327f629074818beaddda78206ae26
+  data.tar.gz: d3b3f2674e04f2b6edde27351e1ce761163b70d6d49701dc1d880b000f7dc8f9daec7c85aea4053da61e537388ecd714b58ed9d886a35225d742dfcd93cf3337

data/aris-control.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["gregory.igelmund@gmail.com"]
 
   spec.summary       = 'Aris utility'
-  spec.description   = 'Manage aris users from the command line. Add, delete or list them.'
+  spec.description   = 'Manage aris apps from the command line. Add, delete or list them.'
   spec.homepage      = 'https://github.com/grekko/aris-control'
   spec.license       = 'MIT'
 

data/lib/aris-control/bookkeeper.rb

@@ -2,35 +2,35 @@ require_relative 'persistence'
 
 module ArisControl
   class Bookkeeper
-    attr_reader :persistence, :users
+    attr_reader :persistence, :apps
 
     def initialize(persistence = default_persistence)
       @persistence = persistence
-      @users = persistence.load_users
+      @apps = persistence.load_apps
     end
 
     def list
-      users
+      apps
     end
 
     def add(name, opts = {})
-      user     = users[name] || {}
+      app     = apps[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 || user['ssh_key'] || ''
+        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
       end
 
-      users[name] = user.merge(_opts)
-      persistence.store_users(users)
+      apps[name] = app.merge(_opts)
+      persistence.store_apps(apps)
     end
 
     def delete(name)
-      users.delete(name)
-      persistence.store_users(users)
+      apps.delete(name)
+      persistence.store_apps(apps)
     end
 
     def default_persistence

data/lib/aris-control/persistence.rb

@@ -3,36 +3,36 @@ require 'pathname'
 
 module ArisControl
   class Persistence
-    attr_reader :users_file_path
+    attr_reader :apps_file_path
 
-    def initialize(users_file_path = default_users_file_path)
-      @users_file_path = Pathname.new(users_file_path)
+    def initialize(apps_file_path = default_apps_file_path)
+      @apps_file_path = Pathname.new(apps_file_path)
     end
 
-    def store_users(users)
-      users ||= {}
-      IO.binwrite(users_file_path, serialized_users(users))
-      users
+    def store_apps(apps)
+      apps ||= {}
+      IO.binwrite(apps_file_path, serialized_apps(apps))
+      apps
     end
 
-    def load_users
-      store_users({}) unless users_file_path.exist?
-      deserialized_users(IO.binread(users_file_path))
+    def load_apps
+      store_apps({}) unless apps_file_path.exist?
+      deserialized_apps(IO.binread(apps_file_path))
     end
 
-    def default_users_file_path
-      '/opt/aris/config/users.yml'
+    def default_apps_file_path
+      '/opt/aris/config/apps.yml'
     end
 
     private
 
-    def serialized_users(users)
-      YAML.dump({ 'aris_users' => users })
+    def serialized_apps(apps)
+      YAML.dump({ 'aris_apps' => apps })
     end
 
-    def deserialized_users(string)
+    def deserialized_apps(string)
       yaml = YAML.load(string) || {}
-      yaml['aris_users'] || {}
+      yaml['aris_apps'] || {}
     end
   end
 end

data/lib/aris-control/thor.rb

@@ -2,10 +2,10 @@ require 'thor'
 require 'pp'
 
 class ArisControl::Thor < Thor
-  desc 'add/update username', 'Adds/Updates  an aris user.'
-  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].'
+  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 :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]
@@ -13,28 +13,28 @@ class ArisControl::Thor < Thor
       h[:env_vars] = options[:env_vars] if options[:env_vars]
     end
     bookkeeper.add(name, **opts)
-    puts "Added/Updated user: #{name}, #{opts}"
+    puts "Added/Updated app: #{name}, #{opts}"
     puts "-----------------------------"
-    print_current_aris_users
+    print_current_aris_apps
   end
 
-  desc 'delete name', 'Deletes aris user'
+  desc 'delete name', 'Deletes aris app'
   def delete(name)
     bookkeeper.delete(name)
-    puts "Removed user: #{name}"
+    puts "Removed app: #{name}"
     puts "-----------------------------"
-    print_current_aris_users
+    print_current_aris_apps
   end
 
-  desc 'list', 'Lists current aris-users'
+  desc 'list', 'Lists current aris-apps'
   def list
-    print_current_aris_users
+    print_current_aris_apps
   end
 
-  desc 'rollout', 'Runs ansible to provision the current users.yml state'
+  desc 'rollout', 'Runs ansible to provision the current apps.yml state'
   def rollout
     provsioner.rollout
-    print_current_aris_users
+    print_current_aris_apps
   end
 
   desc 'version', 'Prints out aris-control version'
@@ -44,8 +44,8 @@ class ArisControl::Thor < Thor
 
   private
 
-  def print_current_aris_users
-    puts "Current aris user database"
+  def print_current_aris_apps
+    puts "Current aris app database"
     puts "-----------------------------"
     pp bookkeeper.list
   end

data/lib/aris-control/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aris-control
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Gregory Igelmund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-description: Manage aris users from the command line. Add, delete or list them.
+description: Manage aris apps from the command line. Add, delete or list them.
 email:
 - gregory.igelmund@gmail.com
 executables: