falkorlib 0.6.17 → 0.6.18

data/templates/gems/README.md

@@ -0,0 +1,192 @@
+-*- mode: markdown; mode: visual-line; fill-column: 80 -*-
+
+[![Licence](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)
+![By Falkor](https://img.shields.io/badge/by-Falkor-blue.svg) [![github](https://img.shields.io/badge/git-github-lightgray.svg)](https://github.com/Falkor/sysadmin-warrior) [![Issues](https://img.shields.io/badge/issues-github-green.svg)](https://github.com/Falkor/sysadmin-warrior/issues)
+
+       Time-stamp: <Mon 2016-02-22 22:04 svarrette>
+
+          _____                       _           _        __          __             _               _______    __          ___  
+         / ____|             /\      | |         (_)       \ \        / /            (_)             / / ____|  /\ \        / \ \ 
+        | (___  _   _ ___   /  \   __| |_ __ ___  _ _ __    \ \  /\  / /_ _ _ __ _ __ _  ___  _ __  | | (___   /  \ \  /\  / / | |
+         \___ \| | | / __| / /\ \ / _` | '_ ` _ \| | '_ \    \ \/  \/ / _` | '__| '__| |/ _ \| '__| | |\___ \ / /\ \ \/  \/ /  | |
+         ____) | |_| \__ \/ ____ \ (_| | | | | | | | | | |    \  /\  / (_| | |  | |  | | (_) | |    | |____) / ____ \  /\  /   | |
+        |_____/ \__, |___/_/    \_\__,_|_| |_| |_|_|_| |_|     \/  \/ \__,_|_|  |_|  |_|\___/|_|    | |_____/_/    \_\/  \/    | |
+                 __/ |                                                                               \_\                      /_/ 
+                |___/                                                                                                             
+       Copyright (c) 2016 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+
+
+## Synopsis
+
+SysAdmin Warrior (SAW) is a Command Line Interface (CLI) designed to make the life of system administrator easier
+
+## Installation / Repository Setup
+
+This repository is hosted on [Github](https://github.com/Falkor/sysadmin-warrior). 
+
+* To clone this repository, proceed as follows (adapt accordingly):
+
+        $> mkdir -p ~/git/github.com/Falkor
+        $> cd ~/git/github.com/Falkor
+        $> git clone https://github.com/Falkor/sysadmin-warrior.git
+
+Now ensure [RVM](https://rvm.io/) is correctly configured for this repository:
+
+     $> rvm current
+
+Configure the dependencies detailed in the [`Gemfile`](Gemfile) through the [Bundler](http://bundler.io/):
+
+     $> gem install bundler
+     $> bundle install
+     $> rake -T     # should work ;)
+
+**`/!\ IMPORTANT`**: Once cloned, initiate your local copy of the repository by running: 
+
+    $> cd sysadmin-warrior
+    $> rake setup
+
+This will initiate the [Git submodules of this repository](.gitmodules) and setup the [git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) layout for this repository.
+
+Later on, you can upgrade the [Git submodules](.gitmodules) to the latest version by running:
+
+    $> rake git:submodules:upgrade
+
+If upon pulling the repository, you end in a state where another collaborator have upgraded the Git submodules for this repository, you'll end in a dirty state (as reported by modifications within the `.submodules/` directory). In that case, just after the pull, you **have to run** the following to ensure consistency with regards the Git submodules:
+
+    $> rake git:submodules:update
+
+
+
+
+## Issues / Feature request
+
+You can submit bug / issues / feature request using the [`Falkor/sysadmin-warrior` Project Tracker](https://github.com/Falkor/sysadmin-warrior/issues)
+
+
+
+## Advanced Topics
+
+### Git
+
+This repository make use of [Git](http://git-scm.com/) such that you should have it installed on your working machine: 
+
+       $> apt-get install git-core # On Debian-like systems
+       $> yum install git          # On CentOS-like systems
+       $> brew install git         # On Mac OS, using [Homebrew](http://mxcl.github.com/homebrew/)
+       $> port install git         # On Mac OS, using MacPort
+
+Consider these resources to become more familiar (if not yet) with Git:
+
+* [Simple Git Guide](http://rogerdudler.github.io/git-guide/)
+* [Git book](http://book.git-scm.com/index.html)
+* [Github:help](http://help.github.com/mac-set-up-git/)
+* [Git reference](http://gitref.org/)
+
+At least, you shall configure the following variables
+
+       $> git config --global user.name "Your Name Comes Here"
+       $> git config --global user.email you@yourdomain.example.com
+       # configure colors
+       $> git config --global color.diff auto
+       $> git config --global color.status auto
+       $> git config --global color.branch auto
+
+Note that you can create git command aliases in `~/.gitconfig` as follows: 
+
+       [alias]
+           up = pull origin
+           pu = push origin
+           st = status
+           df = diff
+           ci = commit -s
+           br = branch
+           w  = whatchanged --abbrev-commit
+           ls = ls-files
+           gr = log --graph --oneline --decorate
+           amend = commit --amend
+
+Consider my personal [`.gitconfig`](https://github.com/Falkor/dotfiles/blob/master/git/.gitconfig) as an example -- if you decide to use it, simply copy it in your home directory and adapt the `[user]` section. 
+
+### [Git-flow](https://github.com/nvie/gitflow)
+
+The Git branching model for this repository follows the guidelines of
+[gitflow](http://nvie.com/posts/a-successful-git-branching-model/).
+In particular, the central repository holds two main branches with an infinite lifetime:
+
+* `production`: the *production-ready* branch
+* `devel`: the main branch where the latest developments interviene. This is the *default* branch you get when you clone the repository.
+
+Thus you are more than encouraged to install the [git-flow](https://github.com/nvie/gitflow) extensions following the [installation procedures](https://github.com/nvie/gitflow/wiki/Installation) to take full advantage of the proposed operations. The associated [bash completion](https://github.com/bobthecow/git-flow-completion) might interest you also.
+
+### Releasing mechanism
+
+The operation consisting of releasing a new version of this repository is automated by a set of tasks within the root `Rakefile`.
+
+In this context, a version number have the following format:
+
+      <major>.<minor>.<patch>[-b<build>]
+
+where:
+
+* `< major >` corresponds to the major version number
+* `< minor >` corresponds to the minor version number
+* `< patch >` corresponds to the patching version number
+* (eventually) `< build >` states the build number _i.e._ the total number of commits within the `devel` branch.
+
+Example: \`1.0.0-b28\`
+
+The current version number is stored in the root file `VERSION`. __/!\ NEVER MAKE ANY MANUAL CHANGES TO THIS FILE__
+
+For more information on the version, run:
+
+     $> rake version:info
+
+If a new version number such be bumped, you simply have to run:
+
+      $> rake version:bump:{major,minor,patch}
+
+This will start the release process for you using `git-flow`.
+Once you have finished to commit your last changes, make the release effective by running:
+
+      $> rake version:release
+
+It will finish the release using `git-flow`, create the appropriate tag in the `production` branch and merge all things the way they should be.
+
+### Ruby stuff: RVM, Rakefile and Ruby gems
+
+The various operations that can be conducted from this repository are piloted from a [`Rakefile`](https://github.com/ruby/rake) and assumes you have a running [Ruby](https://www.ruby-lang.org/en/) installation. You'll also need [Ruby Gems](https://rubygems.org/) to facilitate the installation of ruby libraries.
+
+       $> apt-get install ruby rubygems  # On Debian-like systems
+
+Install the [rake](https://rubygems.org/gems/rake) gem as follows:
+
+       $> gem install rake
+
+In order to have a consistent environment among the collaborators of this project, [Bundler](http://bundler.io/) is also used. Configuration of [Bundler](http://bundler.io/) is made via the [`Gemfile[.lock]` files](http://bundler.io/v1.3/gemfile.html).
+
+Last but not least, I like to work on [Sandboxed environments](https://hpc.uni.lu/blog/2014/create-a-sandboxed-python-slash-ruby-environment/) and a great tool for that is [RVM](https://rvm.io/).
+[RVM](https://rvm.io/) gives you compartmentalized independent ruby setups. 
+This means that ruby, gems and irb are all separate and self-contained - from the system, and from each other.  Sandboxing with [RVM](https://rvm.io/) is straight-forward via the [notion of gemsets](https://rvm.io/gemsets) and is managed via the `.ruby-{version,gemset}` files. 
+
+If things are fine, you should  be able to access the list of available tasks by running:
+
+       $> rake -T
+
+You probably want to activate the bash-completion for rake tasks.
+I personally use the one provided [here](https://github.com/ai/rake-completion).
+
+## Licence
+
+This project is released under the terms of the [MIT](LICENCE) licence. 
+
+[![Licence](http://upload.wikimedia.org/wikipedia/commons/thumb/0/0b/License_icon-mit-2.svg/200px-License_icon-mit-2.svg.png)](http://opensource.org/licenses/MIT)
+
+## Contributing
+
+That's quite simple:
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) it
+2. Create your own feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new [Pull Request](https://help.github.com/articles/using-pull-requests/)

data/templates/gems/Rakefile

@@ -0,0 +1,39 @@
+##############################################################################
+# Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
+# Time-stamp: <Mon 2016-06-27 09:43 svarrette>
+#
+# Copyright (c) 2016  <>
+#                       ____       _         __ _ _
+#                      |  _ \ __ _| | _____ / _(_) | ___
+#                      | |_) / _` | |/ / _ \ |_| | |/ _ \
+#                      |  _ < (_| |   <  __/  _| | |  __/
+#                      |_| \_\__,_|_|\_\___|_| |_|_|\___|
+#
+# Use 'rake -T' to list the available actions
+#
+# Resources:
+# * http://www.stuartellis.eu/articles/rake/
+##############################################################################
+require 'falkorlib'
+
+## placeholder for custom configuration of FalkorLib.config.*
+## See https://github.com/Falkor/falkorlib
+
+# Adapt the versioning aspects
+FalkorLib.config.versioning do |c|
+  c[:type] = 'gem'
+  c[:source]['gem'] = {
+    :filename  => 'lib/sysadmin-warrior/version.rb',
+    :getmethod => 'SysAdminWarrior::Version.to_s',
+  }
+end
+
+# Git flow customization
+FalkorLib.config.gitflow do |c|
+    c[:branches] = {
+        :master  => 'production',
+        :develop => 'devel'
+    }
+end
+
+require 'falkorlib/tasks/git'

data/templates/gems/lib/sysadmin-warrior/loader.rb

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Mon 2016-06-27 10:43 svarrette>
+################################################################################
+# Place the component you wish to see loaded

data/templates/gems/lib/sysadmin-warrior/version.rb

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Mon 2016-06-27 10:41 svarrette>
+################################################################################
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+#
+# SysAdmin Warrior (SAW) Version management
+#
+
+module SysAdminWarrior #:nodoc:
+
+  # Management of the current version of the library
+  module Version
+
+    # Change the MAJOR, MINOR and PATCH constants below
+    # to adjust the version of the FalkorLib gem
+    #
+    # MAJOR: Defines the major version
+    # MINOR: Defines the minor version
+    # PATCH: Defines the patch version
+    MAJOR, MINOR, PATCH = 0, 0, 1
+
+    module_function
+
+    ## Returns the major version ( big release based off of multiple minor releases )
+    def major
+      MAJOR
+    end
+
+    ## Returns the minor version ( small release based off of multiple patches )
+    def minor
+      MINOR
+    end
+
+    ## Returns the patch version ( updates, features and (crucial) bug fixes )
+    def patch
+      PATCH
+    end
+
+    ## @return the full version string
+    def to_s
+      [ MAJOR, MINOR, PATCH ].join('.')
+    end
+
+  end
+
+  # Shorter version of the Gem's VERSION
+  VERSION = Version.to_s
+end

data/templates/gems/lib/sysadmin-warrior.rb

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+###########################################################################################
+# Time-stamp: <Mon 2016-06-27 10:37 svarrette>
+###########################################################################################
+#  ____               _       _           _        __        __              _
+# / ___| _   _ ___   / \   __| |_ __ ___ (_)_ __   \ \      / /_ _ _ __ _ __(_) ___  _ __
+# \___ \| | | / __| / _ \ / _` | '_ ` _ \| | '_ \   \ \ /\ / / _` | '__| '__| |/ _ \| '__|
+#  ___) | |_| \__ \/ ___ \ (_| | | | | | | | | | |   \ V  V / (_| | |  | |  | | (_) | |
+# |____/ \__, |___/_/   \_\__,_|_| |_| |_|_|_| |_|    \_/\_/ \__,_|_|  |_|  |_|\___/|_|
+#        |___/
+##########################################################################################
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+#
+# * [Source code](https://github.com/Falkor/sysadmin-warrior)
+# * [Official Gem](https://rubygems.org/gems/sysadmin-warrior)
+##########################################################################################
+require "falkorlib"
+
+# Sebastien Varrette aka Falkor's Common library to share Ruby code
+# and `{rake,cap}` tasks
+module SysAdminWarrior
+
+  # Return the root directory of the gem
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
+
+  def self.lib
+    File.join root, 'lib'
+  end
+
+  def self.templates
+    File.join root, 'templates'
+  end
+
+end # module SysAdminWarrior
+
+
+require "sysadmin-warrior/version"
+require "sysadmin-warrior/loader"

data/templates/gems/sysadmin-warrior.gemspec

@@ -0,0 +1,200 @@
+# -*- coding: utf-8 -*-
+# We require your library, mainly to have access to the VERSION number.
+# Feel free to set $version manually.
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require "sysadmin-warrior/version"
+$version = SysAdminWarrior::Version.to_s
+
+#
+# This is your Gem specification. Default values are provided so that your library
+# should be correctly packaged given what you have described in the .noespec file.
+#
+Gem::Specification.new do |s|
+
+  ################################################################### ABOUT YOUR GEM
+
+  # Gem name (required)
+  s.name = "sysadmin-warrior"
+
+  # Gem version (required)
+  s.version = $version
+
+  # A short summary of this gem
+  #
+  # This is displayed in `gem list -d`.
+  s.summary = "SysAdmin Warrior (SAW) is a tool designed to make the life of system administrator easier from the command-line. It offers a flexible interface to register and manage IT systems and operations."
+
+  # A long description of this gem (required)
+  #
+  # The description should be more detailed than the summary.  For example,
+  # you might wish to copy the entire README into the description.
+  s.description = "SysAdmin Warrior (SAW) is a Free and Open Source Software designed to make the life of system administrator easier from the command-line. It offers a flexible interface to register and manage IT systems and operations."
+
+  # The URL of this gem home page (optional)
+  s.homepage = "https://github.com/Falkor/sysadmin-warrior"
+
+  # Gem publication date (required but auto)
+  #
+  # Today is automatically used by default, uncomment only if
+  # you know what you do!
+  #
+  # s.date = Time.now.strftime('%Y-%m-%d')
+
+  # The license(s) for the library.  Each license must be a short name, no
+  # more than 64 characters.
+  #
+  s.licenses    = ['MIT']
+
+  # The rubyforge project this gem lives under (optional)
+  #
+  # s.rubyforge_project = nil
+
+  ################################################################### ABOUT THE AUTHORS
+
+  # The list of author names who wrote this gem.
+  #
+  # If you are providing multiple authors and multiple emails they should be
+  # in the same order.
+  #
+  s.authors = ["Sebastien Varrette"]
+
+  # Contact emails for this gem
+  #
+  # If you are providing multiple authors and multiple emails they should be
+  # in the same order.
+  #
+  # NOTE: Somewhat strangly this attribute is always singular!
+  #       Don't replace by s.emails = ...
+  s.email  = ["Sebastien.Varrette@uni.lu"]
+
+  ################################################################### PATHS, FILES, BINARIES
+
+  # Paths in the gem to add to $LOAD_PATH when this gem is
+  # activated (required).
+  #
+  # The default 'lib' is typically sufficient.
+  s.require_paths = ["lib"]
+
+  # Files included in this gem.
+  #
+  # By default, we take all files included in the .Manifest.txt file on root
+  # of the project. Entries of the manifest are interpreted as Dir[...]
+  # patterns so that lazy people may use wilcards like lib/**/*
+  #
+  # here = File.expand_path(File.dirname(__FILE__))
+  # s.files = File.readlines(File.join(here, '.Manifest.txt')).
+  #     inject([]){|files, pattern| files + Dir[File.join(here, pattern.strip)]}.
+  #     collect{|x| x[(1+here.size)..-1]}
+
+  # Test files included in this gem.
+  #
+  s.test_files = Dir["test/**/*"] + Dir["spec/**/*"]
+
+  # Alternative:
+  s.files         = `git ls-files`.split("\n")
+  #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  #s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  # The path in the gem for executable scripts (optional)
+  #
+  #s.bindir = "bin"
+
+  # Executables included in the gem.
+  #
+  s.executables = (Dir["bin/*"]).collect{|f| File.basename(f)}
+
+  ################################################################### REQUIREMENTS & INSTALL
+  # Remember the gem version requirements operators and schemes:
+  #   =  Equals version
+  #   != Not equal to version
+  #   >  Greater than version
+  #   <  Less than version
+  #   >= Greater than or equal to
+  #   <= Less than or equal to
+  #   ~> Approximately greater than
+  #
+  # Don't forget to have a look at http://lmgtfy.com/?q=Ruby+Versioning+Policies
+  # for setting your gem version.
+  #
+  # For your requirements to other gems, remember that
+  #   ">= 2.2.0"              (optimistic:  specify minimal version)
+  #   ">= 2.2.0", "< 3.0"     (pessimistic: not greater than the next major)
+  #   "~> 2.2"                (shortcut for ">= 2.2.0", "< 3.0")
+  #   "~> 2.2.0"              (shortcut for ">= 2.2.0", "< 2.3.0")
+  #
+  #s.add_dependency("rake", ">= 10.1.0")
+
+  s.add_runtime_dependency('rake', '~> 10.2')
+  s.add_runtime_dependency("thor", '~> 0.19')
+  s.add_runtime_dependency("falkorlib", '~> 0.6.11')
+  #s.add_runtime_dependency("mercenary", '>= 0.3.5')
+
+  #
+  #
+  # One call to add_dependency('gem_name', 'gem version requirement') for each
+  # runtime dependency. These gems will be installed with your gem.
+  # One call to add_development_dependency('gem_name', 'gem version requirement')
+  # for each development dependency. These gems are required for developers
+  #
+  s.add_development_dependency("bundler", '~> 1.12', '>= 1.12.5')
+  s.add_development_dependency('rspec', '~> 3.4')
+  s.add_development_dependency("pry",   '~> 0.10.3')
+  s.add_development_dependency("yard",  '~> 0.8.7.6', "~> 0.8")
+
+  # The version of ruby required by this gem
+  #
+  # Uncomment and set this if your gem requires specific ruby versions.
+  #
+  # s.required_ruby_version = ">= 0"
+
+  # The RubyGems version required by this gem
+  #
+  # s.required_rubygems_version = ">= 0"
+
+  # The platform this gem runs on.  See Gem::Platform for details.
+  #
+  # s.platform = nil
+
+  # Extensions to build when installing the gem.
+  #
+  # Valid types of extensions are extconf.rb files, configure scripts
+  # and rakefiles or mkrf_conf files.
+  #
+  s.extensions = []
+
+  # External (to RubyGems) requirements that must be met for this gem to work.
+  # It’s simply information for the user.
+  #
+  s.requirements = nil
+
+  # A message that gets displayed after the gem is installed
+  #
+  # Uncomment and set this if you want to say something to the user
+  # after gem installation
+  #
+  s.post_install_message = "Thanks for installing SysAdmin Warrior.\n"
+
+  ################################################################### SECURITY
+
+  # The key used to sign this gem.  See Gem::Security for details.
+  #
+  #s.signing_key = "0xDD01D5C0"
+
+  # The certificate chain used to sign this gem.  See Gem::Security for
+  # details.
+  #
+  # s.cert_chain = []
+
+  ################################################################### RDOC
+
+  # An ARGV style array of options to RDoc
+  #
+  # See 'rdoc --help' about this
+  #
+  s.rdoc_options = []
+
+  # Extra files to add to RDoc such as README
+  #
+  s.extra_rdoc_files = Dir["README.md"] + Dir["LICENCE.md"]
+
+end

data/templates/latex/.gitignore

@@ -0,0 +1 @@
+.texinfo

data/templates/latex/letter/_content.md.erb

@@ -1,4 +1,7 @@
-This letter is to motivate my request to apply for ...
+
+\noindent
+
+The University of Luxembourg (UL) is at a key turning point of its development ...
 
 Feel free to use the Markdown format to feed this letter
 
@@ -20,7 +23,7 @@ This is from [*Mitch Resnick*](https://en.wikipedia.org/wiki/Mitchel_Resnick).
 
 [^ted]: \tiny<http://www.ted.com/talks/mitch_resnick_let_s_teach_kids_to_code.html>
 
-etc. 
+etc.
 
 * item 1
 * item 2
@@ -35,4 +38,4 @@ The main interest of using markdown is to simplify \LaTeX tables
 | item 2 |    1 |    1 |
 |        |      |      |
 
-
+Enjoy your letter

data/templates/latex/letter/main.tex.erb

@@ -1,10 +1,10 @@
 % =============================================================================
-% File:  <%= config[:name] %>.tex -- 
+% File:  <%= config[:name] %>.tex --
 % Author(s): <%= config[:author] %> (<%= config[:mail] %>)
-% Time-stamp: <Fri 2015-10-09 20:05 svarrette>
-% 
+% Time-stamp: <Sat 2016-10-15 23:57 svarrette>
+%
 % Copyright (c) <%= Time.now.year %> <%= config[:author] %><Sebastien.Varrette@uni.lu>
-% 
+%
 % For more information:
 % - LaTeX: http://www.latex-project.org/
 % - LaTeX symbol list:
@@ -15,6 +15,9 @@
 
 \usepackage{_style}
 \usepackage{microtype} % Improves typography
+\usepackage{longtable}
+\usepackage{booktabs}
+\usepackage{fontawesome}
 
 \graphicspath{{images/}} % Add this directory to the searched paths for graphics
 
@@ -46,9 +49,14 @@
 \def\Where{<%= config[:department] %> (<%= config[:department_acro] %>)} % Your department/institution
 \def\Address{<%= config[:address] %>} % Your address
 \def\CityZip{<%= config[:zipcode] %>, <%= config[:location] %>} % Your city, zip code, country, etc
-\def\Email{E-mail: \href{mailto:<%= config[:mail] %>}{<%= config[:mail] %>}} % Your email address
-\def\TEL{Phone: <%= config[:phone] %>} % Your phone number
-\def\URL{} %URL: http://csc.uni.lu/sebastien.varrette} % Your URL
+\def\Email{\faEnvelopeO\ \texttt{\href{mailto:<%= config[:mail] %>}{<%= config[:mail] %>}}} % Your email address
+\def\TEL{\faPhone\ <%= config[:phone] %>} % Your phone number
+\def\URL{\faGlobe\ <%= config[:url] %>} % Your url
+
+\def\LinkedIN{\href{https://www.linkedin.com/in/<%= config[:linkedin] %>}{\faLinkedin}}
+\def\Twitter{\href{https://twitter.com/<%= config[:twitter] %>}{\faTwitter}}
+\def\GoogleScholar{\href{https://scholar.google.com/citations?user=<%= config[:scholar] %>&hl=en}{\faGraduationCap}}
+\def\Skype{\href{skype:<%= config[:skype] %>?chat}{\faSkype}}
 
 % ----------------------------------------------------------------------------------------
 %   HEADER AND FROM ADDRESS STRUCTURE
@@ -60,22 +68,22 @@
   \vskip -1.07in~\\ % Position of the text in relation to the institution logo, increase to move down, decrease to move up
   \Large\hspace{1.5in}\hfill ~\\[0.05in] % First line of institution name, adjust hspace if your logo is wide
   \hspace{1.5in}\hfill \normalsize % Second line of institution name, adjust hspace if your logo is wide
-  \makebox[0ex][r]{\bf \Who \What }\hspace{0.08in} % Print your name and title with a little whitespace to the right
+  \makebox[0ex][r]{\bf \Who, \What }\hspace{0.08in} % Print your name and title with a little whitespace to the right
   ~\\[-0.11in] % Reduce the whitespace above the horizontal rule
   \hspace{1.5in}\vhrulefill{1pt} \\ % Horizontal rule, adjust hspace if your logo is wide and \vhrulefill for the thickness of the rule
-  \hspace{\fill}\parbox[t]{3.85in}{ % Create a box for your details underneath the horizontal rule on the right
+  \hspace{\fill}\parbox[t]{4.35in}{ % Create a box for your details underneath the horizontal rule on the right
     \footnotesize % Use a smaller font size for the details
     %\Who \\ \em % Your name, all text after this will be italicized
     \Where\\ % Your department
     \Address\\ % Your address
     \CityZip\\ % Your city and zip code
-    \TEL\\ % Your phone number
-    \Email\\[2em] % Your email address
-    %\URL % Your URL
+    \TEL\hspace{8em}\LinkedIN\ \ \Twitter\ \ \Skype\ \ \GoogleScholar \\ % Your phone number
+    \Email\\% Your email address
+    \URL\\[2em] % Your URL
     \Location, \today
   }
   \hspace{-1.4in} % Horizontal position of this block, increase to move left, decrease to move right
-  \vspace{-1in} % Move the letter content up for a more compact look
+  \vspace{-0.5in} % Move the letter content up for a more compact look
 }
 
 % ----------------------------------------------------------------------------------------
@@ -101,7 +109,7 @@
 %   SIGNATURE STRUCTURE
 % ----------------------------------------------------------------------------------------
 
-\signature{\Who \What} % The signature is a combination of your name and title
+\signature{\Who, \What} % The signature is a combination of your name and title
 
 \long\def\closing#1{
   \vspace{0.1in} % Some whitespace after the letter content and before the signature
@@ -145,7 +153,7 @@
 
 % ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 % eof
-% 
+%
 % Local Variables:
 % mode: latex
 % mode: flyspell