confinicky 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27b81f5cb5ca48290be52cfbd42ed4715192c500
-  data.tar.gz: 986f3624753e71cf6a1ee988c670ac53b6e4ede2
+  metadata.gz: 53f1baf258a65df2bcf011c06047e10b3cbbab80
+  data.tar.gz: 55b8320db2def454e6fd80bc9432e26bcef04788
 SHA512:
-  metadata.gz: 3e446c0d547bc3b0702806416903071ae776070a5ec31746b3a0b7df9ec71a229bf15ec27e8014733d3e59114808c7914de2635234c99be9f5264a6fff6ed33c
-  data.tar.gz: e5d121c74747d5fbdff3151881cfd50de5c64cbe65f84414db028912749d4622dbcd600ac09343d1e7356a02311a07acf366e8d9357be33d734bef4bd948d3aa
+  metadata.gz: bbeccd3fda8048b6e9d2797e7fbefccc4e6f817c6c6748d6e85034f5628fd51339e53dd189ca8a4c41aa77530e8e0086d85015dc9a245cbf7c1be1ca55e9bfb6
+  data.tar.gz: 0c07f1a3af6b25078b7e705d0f297af9147afc1f70dc604ee52c47554f67b60e2784da4695224278a20bebac7793d115b8f996bd9a66913007b7695bc8f659f7

data/Rakefile

@@ -2,6 +2,8 @@
 
 require 'rubygems'
 require 'bundler'
+require './lib/confinicky/version.rb'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -18,10 +20,11 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/jimjeffers/confinicky"
   gem.license = "MIT"
   gem.summary = "A simple CLI to manage environment variables on your local machine."
-  gem.description = "A CLI that allows you to perform basic CRUD for your environment variables."
+  gem.description = "A simple CLI to manage environment variables on your local machine. Perform basic CRUD for your environment variables all in the command line."
   gem.email = "jim@sumocreations.com"
   gem.authors = ["Jim Jeffers"]
-  gem.executables = ['confinicky', 'cfy']
+  gem.executables = ['cfy']
+  gem.version = Confinicky::Version::STRING
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -43,7 +46,7 @@ task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = Confinicky::Version::STRING
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "confinicky #{version}"

data/bin/cfy

@@ -2,4 +2,21 @@
 
 $:.push File.expand_path("../../lib", __FILE__)
 
-require 'confinicky/boot'
+require 'commander/import'
+require 'terminal-table'
+require 'confinicky'
+
+HighLine.track_eof = false # Fix for built-in Ruby
+Signal.trap("INT") {} # Suppress backtrace when exiting command
+
+program :name, "Confinicky"
+program :version, Confinicky::Version::STRING
+program :description, 'A command-line interface for managing your shell environment variables.'
+
+program :help, 'Author', 'Jim Jeffers <jim@sumocreations.com>'
+program :help, 'Website', 'https://github.com/jimjeffers'
+program :help_formatter, :compact
+
+default_command :help
+
+require 'confinicky/commands'

data/confinicky.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: confinicky 0.1.4 ruby lib
+# stub: confinicky 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "confinicky"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jim Jeffers"]
   s.date = "2014-08-11"
-  s.description = "A CLI that allows you to perform basic CRUD for your environment variables."
+  s.description = "A simple CLI to manage environment variables on your local machine. Perform basic CRUD for your environment variables all in the command line."
   s.email = "jim@sumocreations.com"
-  s.executables = ["confinicky", "cfy"]
+  s.executables = ["cfy"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,12 +26,9 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
-    "VERSION",
     "bin/cfy",
-    "bin/confinicky",
     "confinicky.gemspec",
     "lib/confinicky.rb",
-    "lib/confinicky/boot.rb",
     "lib/confinicky/commands.rb",
     "lib/confinicky/commands/clean.rb",
     "lib/confinicky/commands/duplicates.rb",
@@ -41,8 +38,11 @@ Gem::Specification.new do |s|
     "lib/confinicky/commands/use.rb",
     "lib/confinicky/config.rb",
     "lib/confinicky/shell_file.rb",
+    "lib/confinicky/version.rb",
     "test/helper.rb",
-    "test/test_confinicky.rb"
+    "test/sample_bash_file.sh",
+    "test/test_confinicky.rb",
+    "test/test_file_writing.rb"
   ]
   s.homepage = "http://github.com/jimjeffers/confinicky"
   s.licenses = ["MIT"]

data/lib/confinicky/shell_file.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 module Confinicky
   class ShellFile
 
+    attr_reader :lines
+    attr_reader :exports
     ##
     # References the actual file path from the shell configuration.
     def self.file_path
@@ -31,16 +33,21 @@ module Confinicky
 
     ##
     # Parses the configuration file if it exists.
-    def initialize
-      raise "Config file not found. Please set" if !Confinicky::ShellFile.exists?
+    def initialize(file_path: Confinicky::ShellFile.file_path)
+      raise "Config file not found. Please set" if !File.exists?(@file_path = file_path)
       @exports = []
       @lines = []
-      file = File.new(Confinicky::ShellFile.file_path, "r")
+
+      file = File.new(@file_path, "r")
 
       while (line = file.gets)
         if line =~ /\Aexport /
           export = line.gsub(/\Aexport /,"").split("=")
-          @exports << [export[0], export[1].gsub(/\n/, "")]
+          if export[1].nil?
+            @lines << line
+          else
+            @exports << [export[0], export[1].gsub(/\n/, "")]
+          end
         else
           @lines << line
         end
@@ -83,6 +90,7 @@ module Confinicky
       assignment = assignment.split("=")
       return false if assignment.length < 2
       remove! assignment[0]
+      assignment[1] = "\'#{assignment[1]}\'" if assignment[1] =~ /\s/
       @exports << assignment
     end
 
@@ -95,7 +103,7 @@ module Confinicky
     ##
     # Writes a new version of the configuration file.
     def write!
-      File.open(Confinicky::ShellFile.file_path, "w") do |f|
+      File.open(@file_path, "w") do |f|
         for line in @lines
           f.write line
         end
@@ -103,5 +111,11 @@ module Confinicky
       end
     end
 
+    ##
+    # Returns the file path for the current instance of the shell file class.
+    def file_path
+      @file_path
+    end
+
   end
 end

data/lib/confinicky/version.rb

@@ -0,0 +1,10 @@
+module Confinicky
+  module Version
+    MAJOR = 0
+    MINOR = 1
+    PATCH = 5
+    BUILD = ''
+
+    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
+  end
+end

data/test/helper.rb

@@ -24,14 +24,13 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-gem "minitest"
 require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'confinicky'
 
-class MiniTest::Unit::Test
+class MiniTest::Test
 end
 
 MiniTest.autorun

data/test/sample_bash_file.sh

@@ -0,0 +1,652 @@
+# =============================================================== #
+#
+# PERSONAL $HOME/.bashrc FILE for bash-3.0 (or later)
+# By Emmanuel Rouat [no-email]
+#
+# Last modified: Tue Nov 20 22:04:47 CET 2012
+
+#  This file is normally read by interactive shells only.
+#+ Here is the place to define your aliases, functions and
+#+ other interactive features like your prompt.
+#
+#  The majority of the code here assumes you are on a GNU
+#+ system (most likely a Linux box) and is often based on code
+#+ found on Usenet or Internet.
+#
+#  See for instance:
+#  http://tldp.org/LDP/abs/html/index.html
+#  http://www.caliban.org/bash
+#  http://www.shelldorado.com/scripts/categories.html
+#  http://www.dotfiles.org
+#
+#  The choice of colors was done for a shell with a dark background
+#+ (white on black), and this is usually also suited for pure text-mode
+#+ consoles (no X server available). If you use a white background,
+#+ you'll have to do some other choices for readability.
+#
+#  This bashrc file is a bit overcrowded.
+#  Remember, it is just just an example.
+#  Tailor it to your needs.
+#
+# =============================================================== #
+
+# --> Comments added by HOWTO author.
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+
+#-------------------------------------------------------------
+# Source global definitions (if any)
+#-------------------------------------------------------------
+
+
+if [ -f /etc/bashrc ]; then
+      . /etc/bashrc   # --> Read /etc/bashrc, if present.
+fi
+
+
+#--------------------------------------------------------------
+#  Automatic setting of $DISPLAY (if not set already).
+#  This works for me - your mileage may vary. . . .
+#  The problem is that different types of terminals give
+#+ different answers to 'who am i' (rxvt in particular can be
+#+ troublesome) - however this code seems to work in a majority
+#+ of cases.
+#--------------------------------------------------------------
+
+function get_xserver ()
+{
+    case $TERM in
+        xterm )
+            XSERVER=$(who am i | awk '{print $NF}' | tr -d ')''(' )
+            # Ane-Pieter Wieringa suggests the following alternative:
+            #  I_AM=$(who am i)
+            #  SERVER=${I_AM#*(}
+            #  SERVER=${SERVER%*)}
+            XSERVER=${XSERVER%%:*}
+            ;;
+            aterm | rxvt)
+            # Find some code that works here. ...
+            ;;
+    esac
+}
+
+if [ -z ${DISPLAY:=""} ]; then
+    get_xserver
+    if [[ -z ${XSERVER}  || ${XSERVER} == $(hostname) ||
+       ${XSERVER} == "unix" ]]; then
+          DISPLAY=":0.0"          # Display on local host.
+    else
+       DISPLAY=${XSERVER}:0.0     # Display on remote host.
+    fi
+fi
+
+export DISPLAY
+
+#-------------------------------------------------------------
+# Some settings
+#-------------------------------------------------------------
+
+#set -o nounset     # These  two options are useful for debugging.
+#set -o xtrace
+alias debug="set -o nounset; set -o xtrace"
+
+ulimit -S -c 0      # Don't want coredumps.
+set -o notify
+set -o noclobber
+set -o ignoreeof
+
+
+# Enable options:
+shopt -s cdspell
+shopt -s cdable_vars
+shopt -s checkhash
+shopt -s checkwinsize
+shopt -s sourcepath
+shopt -s no_empty_cmd_completion
+shopt -s cmdhist
+shopt -s histappend histreedit histverify
+shopt -s extglob       # Necessary for programmable completion.
+
+# Disable options:
+shopt -u mailwarn
+unset MAILCHECK        # Don't want my shell to warn me of incoming mail.
+
+
+#-------------------------------------------------------------
+# Greeting, motd etc. ...
+#-------------------------------------------------------------
+
+# Color definitions (taken from Color Bash Prompt HowTo).
+# Some colors might look different of some terminals.
+# For example, I see 'Bold Red' as 'orange' on my screen,
+# hence the 'Green' 'BRed' 'Red' sequence I often use in my prompt.
+
+
+# Normal Colors
+Black='\e[0;30m'        # Black
+Red='\e[0;31m'          # Red
+Green='\e[0;32m'        # Green
+Yellow='\e[0;33m'       # Yellow
+Blue='\e[0;34m'         # Blue
+Purple='\e[0;35m'       # Purple
+Cyan='\e[0;36m'         # Cyan
+White='\e[0;37m'        # White
+
+# Bold
+BBlack='\e[1;30m'       # Black
+BRed='\e[1;31m'         # Red
+BGreen='\e[1;32m'       # Green
+BYellow='\e[1;33m'      # Yellow
+BBlue='\e[1;34m'        # Blue
+BPurple='\e[1;35m'      # Purple
+BCyan='\e[1;36m'        # Cyan
+BWhite='\e[1;37m'       # White
+
+# Background
+On_Black='\e[40m'       # Black
+On_Red='\e[41m'         # Red
+On_Green='\e[42m'       # Green
+On_Yellow='\e[43m'      # Yellow
+On_Blue='\e[44m'        # Blue
+On_Purple='\e[45m'      # Purple
+On_Cyan='\e[46m'        # Cyan
+On_White='\e[47m'       # White
+
+NC="\e[m"               # Color Reset
+
+
+ALERT=${BWhite}${On_Red} # Bold White on red background
+
+
+
+echo -e "${BCyan}This is BASH ${BRed}${BASH_VERSION%.*}${BCyan}\
+- DISPLAY on ${BRed}$DISPLAY${NC}\n"
+date
+if [ -x /usr/games/fortune ]; then
+    /usr/games/fortune -s     # Makes our day a bit more fun.... :-)
+fi
+
+function _exit()              # Function to run upon exit of shell.
+{
+    echo -e "${BRed}Hasta la vista, baby${NC}"
+}
+trap _exit EXIT
+
+#-------------------------------------------------------------
+# Shell Prompt - for many examples, see:
+#       http://www.debian-administration.org/articles/205
+#       http://www.askapache.com/linux/bash-power-prompt.html
+#       http://tldp.org/HOWTO/Bash-Prompt-HOWTO
+#       https://github.com/nojhan/liquidprompt
+#-------------------------------------------------------------
+# Current Format: [TIME USER@HOST PWD] >
+# TIME:
+#    Green     == machine load is low
+#    Orange    == machine load is medium
+#    Red       == machine load is high
+#    ALERT     == machine load is very high
+# USER:
+#    Cyan      == normal user
+#    Orange    == SU to user
+#    Red       == root
+# HOST:
+#    Cyan      == local session
+#    Green     == secured remote connection (via ssh)
+#    Red       == unsecured remote connection
+# PWD:
+#    Green     == more than 10% free disk space
+#    Orange    == less than 10% free disk space
+#    ALERT     == less than 5% free disk space
+#    Red       == current user does not have write privileges
+#    Cyan      == current filesystem is size zero (like /proc)
+# >:
+#    White     == no background or suspended jobs in this shell
+#    Cyan      == at least one background job in this shell
+#    Orange    == at least one suspended job in this shell
+#
+#    Command is added to the history file each time you hit enter,
+#    so it's available to all shells (using 'history -a').
+
+
+# Test connection type:
+if [ -n "${SSH_CONNECTION}" ]; then
+    CNX=${Green}        # Connected on remote machine, via ssh (good).
+elif [[ "${DISPLAY%%:0*}" != "" ]]; then
+    CNX=${ALERT}        # Connected on remote machine, not via ssh (bad).
+else
+    CNX=${BCyan}        # Connected on local machine.
+fi
+
+# Test user type:
+if [[ ${USER} == "root" ]]; then
+    SU=${Red}           # User is root.
+elif [[ ${USER} != $(logname) ]]; then
+    SU=${BRed}          # User is not login user.
+else
+    SU=${BCyan}         # User is normal (well ... most of us are).
+fi
+
+
+
+NCPU=$(grep -c 'processor' /proc/cpuinfo)    # Number of CPUs
+SLOAD=$(( 100*${NCPU} ))        # Small load
+MLOAD=$(( 200*${NCPU} ))        # Medium load
+XLOAD=$(( 400*${NCPU} ))        # Xlarge load
+
+# Returns system load as percentage, i.e., '40' rather than '0.40)'.
+function load()
+{
+    local SYSLOAD=$(cut -d " " -f1 /proc/loadavg | tr -d '.')
+    # System load of the current host.
+    echo $((10#$SYSLOAD))       # Convert to decimal.
+}
+
+# Returns a color indicating system load.
+function load_color()
+{
+    local SYSLOAD=$(load)
+    if [ ${SYSLOAD} -gt ${XLOAD} ]; then
+        echo -en ${ALERT}
+    elif [ ${SYSLOAD} -gt ${MLOAD} ]; then
+        echo -en ${Red}
+    elif [ ${SYSLOAD} -gt ${SLOAD} ]; then
+        echo -en ${BRed}
+    else
+        echo -en ${Green}
+    fi
+}
+
+# Returns a color according to free disk space in $PWD.
+function disk_color()
+{
+    if [ ! -w "${PWD}" ] ; then
+        echo -en ${Red}
+        # No 'write' privilege in the current directory.
+    elif [ -s "${PWD}" ] ; then
+        local used=$(command df -P "$PWD" |
+                   awk 'END {print $5} {sub(/%/,"")}')
+        if [ ${used} -gt 95 ]; then
+            echo -en ${ALERT}           # Disk almost full (>95%).
+        elif [ ${used} -gt 90 ]; then
+            echo -en ${BRed}            # Free disk space almost gone.
+        else
+            echo -en ${Green}           # Free disk space is ok.
+        fi
+    else
+        echo -en ${Cyan}
+        # Current directory is size '0' (like /proc, /sys etc).
+    fi
+}
+
+# Returns a color according to running/suspended jobs.
+function job_color()
+{
+    if [ $(jobs -s | wc -l) -gt "0" ]; then
+        echo -en ${BRed}
+    elif [ $(jobs -r | wc -l) -gt "0" ] ; then
+        echo -en ${BCyan}
+    fi
+}
+
+# Adds some text in the terminal frame (if applicable).
+
+
+# Now we construct the prompt.
+PROMPT_COMMAND="history -a"
+case ${TERM} in
+  *term | rxvt | linux)
+        PS1="\[\$(load_color)\][\A\[${NC}\] "
+        # Time of day (with load info):
+        PS1="\[\$(load_color)\][\A\[${NC}\] "
+        # User@Host (with connection type info):
+        PS1=${PS1}"\[${SU}\]\u\[${NC}\]@\[${CNX}\]\h\[${NC}\] "
+        # PWD (with 'disk space' info):
+        PS1=${PS1}"\[\$(disk_color)\]\W]\[${NC}\] "
+        # Prompt (with 'job' info):
+        PS1=${PS1}"\[\$(job_color)\]>\[${NC}\] "
+        # Set title of current xterm:
+        PS1=${PS1}"\[\e]0;[\u@\h] \w\a\]"
+        ;;
+    *)
+        PS1="(\A \u@\h \W) > " # --> PS1="(\A \u@\h \w) > "
+                               # --> Shows full pathname of current dir.
+        ;;
+esac
+
+
+
+export TIMEFORMAT=$'\nreal %3R\tuser %3U\tsys %3S\tpcpu %P\n'
+export HISTIGNORE="&:bg:fg:ll:h"
+export HISTTIMEFORMAT="$(echo -e ${BCyan})[%d/%m %H:%M:%S]$(echo -e ${NC}) "
+export HISTCONTROL=ignoredups
+export HOSTFILE=$HOME/.hosts    # Put a list of remote hosts in ~/.hosts
+
+
+#============================================================
+#
+#  ALIASES AND FUNCTIONS
+#
+#  Arguably, some functions defined here are quite big.
+#  If you want to make this file smaller, these functions can
+#+ be converted into scripts and removed from here.
+#
+#============================================================
+
+#-------------------
+# Personnal Aliases
+#-------------------
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+# -> Prevents accidentally clobbering files.
+alias mkdir='mkdir -p'
+
+alias h='history'
+alias j='jobs -l'
+alias which='type -a'
+alias ..='cd ..'
+
+# Pretty-print of some PATH variables:
+alias path='echo -e ${PATH//:/\\n}'
+alias libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
+
+
+alias du='du -kh'    # Makes a more readable output.
+alias df='df -kTh'
+
+#-------------------------------------------------------------
+# The 'ls' family (this assumes you use a recent GNU ls).
+#-------------------------------------------------------------
+# Add colors for filetype and  human-readable sizes by default on 'ls':
+alias ls='ls -h --color'
+alias lx='ls -lXB'         #  Sort by extension.
+alias lk='ls -lSr'         #  Sort by size, biggest last.
+alias lt='ls -ltr'         #  Sort by date, most recent last.
+alias lc='ls -ltcr'        #  Sort by/show change time,most recent last.
+alias lu='ls -ltur'        #  Sort by/show access time,most recent last.
+
+# The ubiquitous 'll': directories first, with alphanumeric sorting:
+alias ll="ls -lv --group-directories-first"
+alias lm='ll |more'        #  Pipe through 'more'
+alias lr='ll -R'           #  Recursive ls.
+alias la='ll -A'           #  Show hidden files.
+alias tree='tree -Csuh'    #  Nice alternative to 'recursive ls' ...
+
+
+#-------------------------------------------------------------
+# Tailoring 'less'
+#-------------------------------------------------------------
+
+alias more='less'
+export PAGER=less
+export LESSCHARSET='latin1'
+export LESSOPEN='|/usr/bin/lesspipe.sh %s 2>&-'
+                # Use this if lesspipe.sh exists.
+export LESS='-i -N -w  -z-4 -g -e -M -X -F -R -P%t?f%f \
+:stdin .?pb%pb\%:?lbLine %lb:?bbByte %bb:-...'
+
+# LESS man page colors (makes Man pages more readable).
+export LESS_TERMCAP_mb=$'\E[01;31m'
+export LESS_TERMCAP_md=$'\E[01;31m'
+export LESS_TERMCAP_me=$'\E[0m'
+export LESS_TERMCAP_se=$'\E[0m'
+export LESS_TERMCAP_so=$'\E[01;44;33m'
+export LESS_TERMCAP_ue=$'\E[0m'
+export LESS_TERMCAP_us=$'\E[01;32m'
+
+
+#-------------------------------------------------------------
+# Spelling typos - highly personnal and keyboard-dependent :-)
+#-------------------------------------------------------------
+
+alias xs='cd'
+alias vf='cd'
+alias moer='more'
+alias moew='more'
+alias kk='ll'
+
+
+#-------------------------------------------------------------
+# A few fun ones
+#-------------------------------------------------------------
+
+# Adds some text in the terminal frame (if applicable).
+
+function xtitle()
+{
+    case "$TERM" in
+    *term* | rxvt)
+        echo -en  "\e]0;$*\a" ;;
+    *)  ;;
+    esac
+}
+
+
+# Aliases that use xtitle
+alias top='xtitle Processes on $HOST && top'
+alias make='xtitle Making $(basename $PWD) ; make'
+
+# .. and functions
+function man()
+{
+    for i ; do
+        xtitle The $(basename $1|tr -d .[:digit:]) manual
+        command man -a "$i"
+    done
+}
+
+
+#-------------------------------------------------------------
+# Make the following commands run in background automatically:
+#-------------------------------------------------------------
+
+function te()  # wrapper around xemacs/gnuserv
+{
+    if [ "$(gnuclient -batch -eval t 2>&-)" == "t" ]; then
+       gnuclient -q "$@";
+    else
+       ( xemacs "$@" &);
+    fi
+}
+
+function soffice() { command soffice "$@" & }
+function firefox() { command firefox "$@" & }
+function xpdf() { command xpdf "$@" & }
+
+
+#-------------------------------------------------------------
+# File & strings related functions:
+#-------------------------------------------------------------
+
+
+# Find a file with a pattern in name:
+function ff() { find . -type f -iname '*'"$*"'*' -ls ; }
+
+# Find a file with pattern $1 in name and Execute $2 on it:
+function fe() { find . -type f -iname '*'"${1:-}"'*' \
+-exec ${2:-file} {} \;  ; }
+
+#  Find a pattern in a set of files and highlight them:
+#+ (needs a recent version of egrep).
+function fstr()
+{
+    OPTIND=1
+    local mycase=""
+    local usage="fstr: find string in files.
+Usage: fstr [-i] \"pattern\" [\"filename pattern\"] "
+    while getopts :it opt
+    do
+        case "$opt" in
+           i) mycase="-i " ;;
+           *) echo "$usage"; return ;;
+        esac
+    done
+    shift $(( $OPTIND - 1 ))
+    if [ "$#" -lt 1 ]; then
+        echo "$usage"
+        return;
+    fi
+    find . -type f -name "${2:-*}" -print0 | \
+xargs -0 egrep --color=always -sn ${case} "$1" 2>&- | more
+
+}
+
+
+function swap()
+{ # Swap 2 filenames around, if they exist (from Uzi's bashrc).
+    local TMPFILE=tmp.$$
+
+    [ $# -ne 2 ] && echo "swap: 2 arguments needed" && return 1
+    [ ! -e $1 ] && echo "swap: $1 does not exist" && return 1
+    [ ! -e $2 ] && echo "swap: $2 does not exist" && return 1
+
+    mv "$1" $TMPFILE
+    mv "$2" "$1"
+    mv $TMPFILE "$2"
+}
+
+function extract()      # Handy Extract Program
+{
+    if [ -f $1 ] ; then
+        case $1 in
+            *.tar.bz2)   tar xvjf $1     ;;
+            *.tar.gz)    tar xvzf $1     ;;
+            *.bz2)       bunzip2 $1      ;;
+            *.rar)       unrar x $1      ;;
+            *.gz)        gunzip $1       ;;
+            *.tar)       tar xvf $1      ;;
+            *.tbz2)      tar xvjf $1     ;;
+            *.tgz)       tar xvzf $1     ;;
+            *.zip)       unzip $1        ;;
+            *.Z)         uncompress $1   ;;
+            *.7z)        7z x $1         ;;
+            *)           echo "'$1' cannot be extracted via >extract<" ;;
+        esac
+    else
+        echo "'$1' is not a valid file!"
+    fi
+}
+
+
+# Creates an archive (*.tar.gz) from given directory.
+function maketar() { tar cvzf "${1%%/}.tar.gz"  "${1%%/}/"; }
+
+# Create a ZIP archive of a file or folder.
+function makezip() { zip -r "${1%%/}.zip" "$1" ; }
+
+# Make your directories and files access rights sane.
+function sanitize() { chmod -R u=rwX,g=rX,o= "$@" ;}
+
+#-------------------------------------------------------------
+# Process/system related functions:
+#-------------------------------------------------------------
+
+
+function my_ps() { ps $@ -u $USER -o pid,%cpu,%mem,bsdtime,command ; }
+function pp() { my_ps f | awk '!/awk/ && $0~var' var=${1:-".*"} ; }
+
+
+function killps()   # kill by process name
+{
+    local pid pname sig="-TERM"   # default signal
+    if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
+        echo "Usage: killps [-SIGNAL] pattern"
+        return;
+    fi
+    if [ $# = 2 ]; then sig=$1 ; fi
+    for pid in $(my_ps| awk '!/awk/ && $0~pat { print $1 }' pat=${!#} )
+    do
+        pname=$(my_ps | awk '$1~var { print $5 }' var=$pid )
+        if ask "Kill process $pid <$pname> with signal $sig?"
+            then kill $sig $pid
+        fi
+    done
+}
+
+function mydf()         # Pretty-print of 'df' output.
+{                       # Inspired by 'dfc' utility.
+    for fs ; do
+
+        if [ ! -d $fs ]
+        then
+          echo -e $fs" :No such file or directory" ; continue
+        fi
+
+        local info=( $(command df -P $fs | awk 'END{ print $2,$3,$5 }') )
+        local free=( $(command df -Pkh $fs | awk 'END{ print $4 }') )
+        local nbstars=$(( 20 * ${info[1]} / ${info[0]} ))
+        local out="["
+        for ((j=0;j<20;j++)); do
+            if [ ${j} -lt ${nbstars} ]; then
+               out=$out"*"
+            else
+               out=$out"-"
+            fi
+        done
+        out=${info[2]}" "$out"] ("$free" free on "$fs")"
+        echo -e $out
+    done
+}
+
+
+function my_ip() # Get IP adress on ethernet.
+{
+    MY_IP=$(/sbin/ifconfig eth0 | awk '/inet/ { print $2 } ' |
+      sed -e s/addr://)
+    echo ${MY_IP:-"Not connected"}
+}
+
+function ii()   # Get current host related info.
+{
+    echo -e "\nYou are logged on ${BRed}$HOST"
+    echo -e "\n${BRed}Additionnal information:$NC " ; uname -a
+    echo -e "\n${BRed}Users logged on:$NC " ; w -hs |
+             cut -d " " -f1 | sort | uniq
+    echo -e "\n${BRed}Current date :$NC " ; date
+    echo -e "\n${BRed}Machine stats :$NC " ; uptime
+    echo -e "\n${BRed}Memory stats :$NC " ; free
+    echo -e "\n${BRed}Diskspace :$NC " ; mydf / $HOME
+    echo -e "\n${BRed}Local IP Address :$NC" ; my_ip
+    echo -e "\n${BRed}Open connections :$NC "; netstat -pan --inet;
+    echo
+}
+
+#-------------------------------------------------------------
+# Misc utilities:
+#-------------------------------------------------------------
+
+function repeat()       # Repeat n times command.
+{
+    local i max
+    max=$1; shift;
+    for ((i=1; i <= max ; i++)); do  # --> C-like syntax
+        eval "$@";
+    done
+}
+
+
+function ask()          # See 'killps' for example of use.
+{
+    echo -n "$@" '[y/n] ' ; read ans
+    case "$ans" in
+        y*|Y*) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+function corename()   # Get name of app that created a corefile.
+{
+    for file ; do
+        echo -n $file : ; gdb --core=$file --batch | head -1
+    done
+}
+
+#-------------------------------------------------------------
+# Export Environment Variables
+#-------------------------------------------------------------
+
+export PATH=$PATH:"/test"
+export PATH=$PATH:"/duplicate"

data/test/test_confinicky.rb

@@ -1,9 +1,21 @@
 require 'helper'
 
-class TestConfinicky < MiniTest::Unit::Test
+class TestConfinicky < MiniTest::Test
 
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  def setup
+    @shell_file = Confinicky::ShellFile.new(file_path: 'test/sample_bash_file.sh')
+  end
+
+  def test_shell_file_duplicates
+    assert_equal 1, @shell_file.find_duplicates.length
+  end
+
+  def test_exports_without_assignments
+    assert_includes @shell_file.lines, "export DISPLAY\n"
+  end
+
+  def test_detects_exports_with_assignment
+    assert_equal 18, @shell_file.exports.length
   end
 
 end

data/test/test_file_writing.rb

@@ -0,0 +1,41 @@
+require 'fileutils'
+require 'helper'
+
+class TestFileWriting < MiniTest::Test
+
+  def setup
+    FileUtils.cp 'test/sample_bash_file.sh', 'test/sample_bash_file.sh.tmp'
+    @shell_file = Confinicky::ShellFile.new(file_path: 'test/sample_bash_file.sh.tmp')
+  end
+
+  def test_clean_file
+    @shell_file.clean!
+    assert_equal 17, @shell_file.exports.length
+  end
+
+  def test_add_var
+    @shell_file.set!("NEW_VAR=12345")
+    assert_equal 19, @shell_file.exports.length
+  end
+
+  def test_remove_var
+    @shell_file.remove!("PATH")
+    assert_equal 16, @shell_file.exports.length
+  end
+
+  def test_add_var_should_not_duplicate
+    @shell_file.set!("NEW_VAR=12345")
+    @shell_file.set!("NEW_VAR=123456")
+    assert_equal 19, @shell_file.exports.length
+  end
+
+  def test_whitespace
+    @shell_file.set!("NEW_STRING=A String")
+    assert_equal 1, @shell_file.exports.delete_if{|i| i[1] != "\'A String\'"}.length
+  end
+
+  def teardown
+    FileUtils.rm 'test/sample_bash_file.sh.tmp'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confinicky
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jim Jeffers
@@ -108,10 +108,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: A CLI that allows you to perform basic CRUD for your environment variables.
+description: A simple CLI to manage environment variables on your local machine. Perform
+  basic CRUD for your environment variables all in the command line.
 email: jim@sumocreations.com
 executables:
-- confinicky
 - cfy
 extensions: []
 extra_rdoc_files:
@@ -124,12 +124,9 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/cfy
-- bin/confinicky
 - confinicky.gemspec
 - lib/confinicky.rb
-- lib/confinicky/boot.rb
 - lib/confinicky/commands.rb
 - lib/confinicky/commands/clean.rb
 - lib/confinicky/commands/duplicates.rb
@@ -139,8 +136,11 @@ files:
 - lib/confinicky/commands/use.rb
 - lib/confinicky/config.rb
 - lib/confinicky/shell_file.rb
+- lib/confinicky/version.rb
 - test/helper.rb
+- test/sample_bash_file.sh
 - test/test_confinicky.rb
+- test/test_file_writing.rb
 homepage: http://github.com/jimjeffers/confinicky
 licenses:
 - MIT

data/VERSION

@@ -1 +0,0 @@
-0.1.4

data/bin/confinicky

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.push File.expand_path("../../lib", __FILE__)
-
-require 'confinicky/boot'

data/lib/confinicky/boot.rb

@@ -1,17 +0,0 @@
-require 'commander/import'
-require 'terminal-table'
-require 'confinicky'
-
-HighLine.track_eof = false # Fix for built-in Ruby
-Signal.trap("INT") {} # Suppress backtrace when exiting command
-
-program :version, "0.1.3"
-program :description, 'A command-line interface for managing your shell environment variables.'
-
-program :help, 'Author', 'Jim Jeffers <jim@sumocreations.com>'
-program :help, 'Website', 'https://github.com/jimjeffers'
-program :help_formatter, :compact
-
-default_command :help
-
-require 'confinicky/commands'