Patch version bump

2.1.13

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
 MANIFEST
 build
+cheat.egg-info
 dist

bin/cheat

@@ -38,7 +38,7 @@ from docopt import docopt
 
 if __name__ == '__main__':
     # parse the command-line options
-    options = docopt(__doc__, version='cheat 2.1.3')
+    options = docopt(__doc__, version='cheat 2.1.14')
 
     # list directories
     if options['--directories']:

cheat/cheatsheets/awk

@@ -1,2 +1,8 @@
 # sum integers from a file or stdin, one integer per line:
 printf '1\n2\n3\n' | awk '{ sum += $1} END {print sum}'
+
+# using specific character as separator to sum integers from a file or stdin
+printf '1:2:3' | awk -F ":" '{print $1+$2+$3}'
+
+# print a multiplication table
+seq 9 | sed 'H;g' | awk -v RS='' '{for(i=1;i<=NF;i++)printf("%dx%d=%d%s", i, NR, i*NR, i==NR?"\n":"\t")}'

cheat/cheatsheets/csplit

@@ -0,0 +1,5 @@
+# Split a file based on pattern
+csplit input.file '/PATTERN/'
+
+# Use prefix/suffix to improve resulting file names
+csplit -f 'prefix-' -b '%d.extension' input.file '/PATTERN/' '{*}'

cheat/cheatsheets/date

@@ -1,2 +1,5 @@
-# Printout date in format suitable for affixing to file names
+# Print date in format suitable for affixing to file names
 date +"%Y%m%d_%H%M%S"
+
+# Convert Unix timestamp to Date
+date -d @1440359821

cheat/cheatsheets/dnf

@@ -0,0 +1,16 @@
+# To install the latest version of a package:
+dnf install <package name>
+
+# To search package details for the given string
+dnf search <string>
+
+# To find which package provides a binary
+dnf provides <path to binary>
+
+# The following are available after installing "dnf-plugins-core"
+
+# Download a package
+dnf download <package name>
+
+# install the build dependencies for a SRPM or from a .spec file
+dnf builddep <srpm/.spec file>

cheat/cheatsheets/docker

@@ -4,6 +4,9 @@ docker -d
 # start a container with an interactive shell
 docker run -ti <image_name> /bin/bash
 
+# "shell" into a running container (docker-1.3+)
+docker exec -ti <container_name> bash
+
 # inspect a running container
 docker inspect <container_name> (or <container_id>)
 

cheat/cheatsheets/dpkg

@@ -0,0 +1,11 @@
+# Install the package or upgrade it
+dpkg -i test.deb
+
+# Remove a package including configuration files
+dpkg -P test.deb
+
+# List all installed packages with versions and details
+dpkg -I
+
+# Find out if a Debian package is installed or not
+dpkg -s test.deb | grep Status

cheat/cheatsheets/du

@@ -1,2 +1,5 @@
 # To sort directories/files by size
 du -sk *| sort -rn
+
+# To show cumulative humanreadable size
+du -sh

cheat/cheatsheets/ffmpeg

@@ -0,0 +1,12 @@
+# Print file metadata etc.
+ffmpeg -i path/to/file.ext
+
+# Convert all m4a files to mp3
+for f in *.m4a; do ffmpeg -i "$f" -acodec libmp3lame -ab 320k "${f%.m4a}.mp3"; done
+
+# Listen to 10 seconds of audio from a video file
+#
+# -ss : start time
+# -t  : seconds to cut
+# -autoexit : closes ffplay as soon as the audio finishes
+ffmpeg -ss 00:34:24.85 -t 10 -i path/to/file.mp4 -f mp3 pipe:play | ffplay -i pipe:play -autoexit

cheat/cheatsheets/git

@@ -1,4 +1,4 @@
-# To set your identify:
+# To set your identity:
 git config --global user.name "John Doe"
 git config --global user.email johndoe@example.com
 
@@ -17,9 +17,25 @@ git commit -m "Your commit message"
 # To edit previous commit message
 git commit --amend
 
+# Git commit in the past
+git commit --date="`date --date='2 day ago'`"
+git commit --date="Jun 13 18:30:25 IST 2015"
+# more recent versions of Git also support --date="2 days ago" directly
+
+# To change the date of an existing commit
+git filter-branch --env-filter \
+    'if [ $GIT_COMMIT = 119f9ecf58069b265ab22f1f97d2b648faf932e0 ]
+     then
+         export GIT_AUTHOR_DATE="Fri Jan 2 21:38:53 2009 -0800"
+         export GIT_COMMITTER_DATE="Sat May 19 01:01:01 2007 -0700"
+     fi'
+
 # To removed staged and working directory changes
 git reset --hard
 
+# To go 2 commits back
+git reset --hard HEAD~2
+
 # To remove untracked files
 git clean -f -d
 
@@ -35,6 +51,9 @@ git push git@github.com:username/project.git
 # To delete the branch "branch_name"
 git branch -D branch_name
 
+# To make an exisiting branch track a remote branch
+git branch -u upstream/foo
+
 # To see who commited which line in a file
 git blame filename
 
@@ -51,3 +70,37 @@ git show 83fb499:path/fo/file.ext                       # Shows the file as it a
 git diff branch_1 branch_2                              # Check difference between branches
 git log                                                 # Show all the commits
 git status                                              # Show the changes from last commit
+
+# Commit history of a set of files
+git log --pretty=email --patch-with-stat --reverse --full-index -- Admin\*.py > Sripts.patch
+
+# Import commits from another repo
+git --git-dir=../some_other_repo/.git format-patch -k -1 --stdout <commit SHA> | git am -3 -k
+
+# View commits that will be pushed
+git log @{u}..
+
+# View changes that are new on a feature branch
+git log -p feature --not master
+git diff master...feature
+
+# Interactive rebase for the last 7 commits
+git rebase -i @~7
+
+# Diff files WITHOUT considering them a part of git
+# This can be used to diff files that are not in a git repo!
+git diff --no-index path/to/file/A path/to/file/B
+
+# To pull changes while overwriting any local commits
+git fetch --all
+git reset --hard origin/master
+
+# Update all your submodules
+git submodule update --init --recursive
+
+# Perform a shallow clone to only get latest commits
+# (helps save data when cloning large repos)
+git clone --depth 1 <remote-url>
+
+# To unshallow a clone
+git pull --unshallow

cheat/cheatsheets/grep

@@ -1,13 +1,13 @@
-# Basic:
+# Search a file for a pattern
 grep pattern file
 
-# case nonsensitive research:
+# Case insensitive search (with line numbers)
-grep -i pattern file
+grep -in pattern file
 
 # Recursively grep for string <pattern> in folder:
 grep -R pattern folder
 
-# Getting pattern from file (one by line):
+# Read search patterns from a file (one per line)
 grep -f pattern_file file
 
 # Find lines NOT containing pattern
@@ -17,7 +17,7 @@ grep -v pattern file
 grep "^00" file  #Match lines starting with 00
 grep -E "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" file  #Find IP add
 
-# Find all files who contain {pattern} in the directory {directory}.
+# Find all files which match {pattern} in {directory}
 # This will show: "file:line my research"
 grep -rnw 'directory' -e "pattern"
 

cheat/cheatsheets/ip

@@ -19,8 +19,8 @@ ip route
 # Display all routes for IPv6
 ip -6 route
 
-# Add route via gateway IP
+# Add default route via gateway IP
-ip route add 192.168.0.0/24 via 192.168.1.1
+ip route add default via 192.168.1.1
 
 # Add route via interface
 ip route add 192.168.0.0/24 dev eth0

cheat/cheatsheets/journalctl

@@ -19,3 +19,14 @@ journalctl /usr/bin/dbus-daemon
 # Filter by PID
 journalctl _PID=123
 
+# Filter by Command, e.g., sshd
+journalctl _COMM=sshd
+
+# Filter by Command and time period
+journalctl _COMM=crond --since '10:00' --until '11:00'
+
+# List all available boots 
+journalctl --list-boots
+
+# Filter by specific User ID e.g., user id 1000 
+journalctl _UID=1000

cheat/cheatsheets/jq

@@ -0,0 +1,13 @@
+# Pretty print the json
+jq "." < filename.json
+
+# Access the value at key "foo"
+jq '.foo'
+
+# Access first list item
+jq '.[0]'
+
+# Slice & Dice
+jq '.[2:4]'
+jq '.[:3]'
+jq '.[-2:]'

cheat/cheatsheets/jrnl

@@ -0,0 +1,25 @@
+# Add entry to default jrnl (from your configured text editor)
+jrnl
+
+# Add entry to default jrnl
+jrnl Write entry here.
+
+# List of tags
+jrnl --tags
+
+# Entries per tag
+jrnl @tag
+
+# Export jrnl as json
+jrnl --export json
+
+# Entries in a timeframe
+jrnl -from 2009 -until may
+
+# Add Sublime text to .jrnl_config
+
+# Windows
+"editor": "F:\\Powerpack\\Sublime\\sublime_text.exe -w"
+
+# Linux
+"editor": "/usr/bin/sublime -w"

cheat/cheatsheets/ln

@@ -1,2 +1,5 @@
 # To create a symlink:
 ln -s path/to/the/target/directory name-of-symlink
+
+# Symlink, while overwriting existing destination files
+ln -sf /some/dir/exec /usr/bin/exec

cheat/cheatsheets/man

@@ -0,0 +1,5 @@
+# Convert a man page to pdf
+man -t bash | ps2pdf - bash.pdf
+
+# View the ascii chart
+man 7 ascii

cheat/cheatsheets/markdown

@@ -35,6 +35,9 @@ ___
 # links
 This is [an example](http://example.com "Title") inline link.
 
+# image
+![Alt Text](/path/to/file.png)
+
 # emphasis
 *em* _em_
 

cheat/cheatsheets/more

@@ -0,0 +1,3 @@
+# To show the file start at line number 5
+more +5 file
+

cheat/cheatsheets/mysqldump

@@ -1,16 +1,16 @@
- # To dump a database to a file (Note that your password will appear in your command history!):
+# To dump a database to a file (Note that your password will appear in your command history!):
 mysqldump -uusername -ppassword the-database > db.sql
 
 # To dump a database to a file:
 mysqldump -uusername -p the-database > db.sql
 
- # To dump a database to a .tgz file (Note that your password will appear in your command history!):
+# To dump a database to a .tgz file (Note that your password will appear in your command history!):
 mysqldump -uusername -ppassword the-database | gzip -9 > db.sql
 
 # To dump a database to a .tgz file:
 mysqldump -uusername -p the-database | gzip -9 > db.sql
 
- # To dump all databases to a file (Note that your password will appear in your command history!):
+# To dump all databases to a file (Note that your password will appear in your command history!):
 mysqldump -uusername -ppassword --all-databases > all-databases.sql
 
 # To dump all databases to a file:

cheat/cheatsheets/nova

@@ -0,0 +1,20 @@
+# To list VMs on current tenant:
+nova list
+
+# To list VMs of all tenants (admin user only):
+nova list --all-tenants
+
+# To boot a VM on a specific host:
+nova boot --nic net-id=<net_id> \
+          --image <image_id> \
+          --flavor <flavor> \
+          --availability-zone nova:<host_name> <vm_name>
+
+# To stop a server
+nova stop <server>
+
+# To start a server
+nova start <server>
+
+# To attach a network interface to a specific VM:
+nova interface-attach --net-id <net_id> <server>

cheat/cheatsheets/numfmt

@@ -0,0 +1,2 @@
+# Convert bytes to Human readable format
+numfmt --to=iec --suffix=B --padding=7 1048576

cheat/cheatsheets/p4

@@ -0,0 +1,5 @@
+# Print details related to Client and server configuration
+p4 info 
+
+# Open a file and add it to depot
+p4 add <filename>

cheat/cheatsheets/paste

@@ -0,0 +1,15 @@
+# Concat columns from files
+paste file1 file2 ...
+
+# List the files in the current directory in three columns:
+ls | paste - - -
+
+# Combine pairs of lines from a file into single lines:
+paste -s -d '\t\n' myfile
+
+# Number the lines in a file, similar to nl(1):
+sed = myfile | paste -s -d '\t\n' - -
+
+# Create a colon-separated list of directories named bin,
+# suitable for use in the PATH environment variable:
+find / -name bin -type d | paste -s -d : -

cheat/cheatsheets/pip

@@ -0,0 +1,21 @@
+# Search for packages
+pip search SomePackage
+
+# Install some packages
+pip install SomePackage
+
+# Output and install packages in a requirement file
+pip freeze > requirements.txt
+pip install -r requirements.txt
+
+# Show details of a package
+pip show SomePackage
+
+# List outdated packages
+pip list --outdated
+
+# Upgrade all outdated packages, thanks to http://stackoverflow.com/a/3452888
+pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U
+
+# Install specific version of a package
+pip install -I SomePackage1==1.1.0 'SomePackage2>=1.0.4'

cheat/cheatsheets/rpm

@@ -8,7 +8,12 @@ rpm -e <package>
 rpm -qf </path/to/file>
 
 # To find what files are installed by a package:
+rpm -ql <package>
 rpm -qpl <rpm>
 
+# To find what packages require a package or file:
+rpm -q --whatrequires <package>
+rpm -q --whatrequires <file>
+
 # To list all installed packages:
 rpm -qa

cheat/cheatsheets/ssh

@@ -28,3 +28,7 @@ ssh user@example.com -C -c blowfish -X
 
 # For more information, see:
 # http://unix.stackexchange.com/q/12755/44856
+
+# Copy files and folders through ssh from remote host to pwd with tar.gz compression
+# when there is no rsync command available
+ssh user@example.com "cd /var/www/Shared/; tar zcf - asset1 asset2" | tar zxf -

cheat/cheatsheets/udisksctl

@@ -0,0 +1,11 @@
+# Get info about block device
+udisksctl info -b <block_device>
+
+# Mounting device 
+udisksctl mount --block-device <block_device>
+
+# Unmounting device 
+udisksctl unmount --block-device <block_device>
+
+# Get help 
+udisksctl help 

cheat/cheatsheets/uniq

@@ -0,0 +1,18 @@
+# show all lines without duplication
+# `sort -u` and `uniq` is the same effect.
+sort file | uniq
+
+# show not duplicated lines
+sort file | uniq -u
+
+# show duplicated lines only
+sort file | uniq -d
+
+# count all lines
+sort file | uniq -c
+
+# count not duplicated lines
+sort file | uniq -uc
+
+# count only duplicated lines
+sort file | uniq -dc

cheat/cheatsheets/unzip

@@ -0,0 +1,8 @@
+# Extract archive
+unzip archive.zip
+
+# Test integrity of archive
+unzip -tq archive.zip
+
+# List files and directories in a file
+unzip -l archive.zip

cheat/cheatsheets/vagrant

@@ -0,0 +1,33 @@
+# Initate Vagrant
+mkdir vag-vm; cd vag-vm
+vagrant init
+
+# Add a box to vagrant repo
+vagrant box add hashicorp/precise32
+
+# Add a box  Vagrant file
+config.vm.box = "hashicorp/precise32"
+
+# Add vm to public network as host
+config.vm.network "public_network"
+
+# Add provision script to vagrant file
+config.vm.provision :shell, path: "provision.sh"
+
+# Start vm 
+vagrant up
+
+# Connect to started instance
+vagrant ssh
+
+# Shutdown vm
+vagrant halt
+
+# Hibernate vm
+vagrant suspend
+
+# Set vm to initial state by cleaning all data
+vagrant destroy
+
+# Restart vm with new provision script
+vagran reload --provision

cheat/cheatsheets/weechat

@@ -0,0 +1,16 @@
+# Set unread marker on all windows
+Ctrl-s Ctrl-u
+
+# Switch buffer left
+Ctrl-p, Alt-left
+# Switch buffer right
+Ctrl-n, Alt-right
+# Next buffer with activity
+Alt-a
+# Switch buffers
+Alt-0...9
+
+# Scroll buffer title
+F9/F10
+# Scroll nick list
+F11/F12

cheat/cheatsheets/wget

@@ -2,7 +2,7 @@
 wget http://path.to.the/file
 
 # To download a file and change its name
-wget http://path.to.the/file -o newname
+wget http://path.to.the/file -O newname
 
 # To download a file into a directory
 wget -P path/to/directory http://path.to.the/file

cheat/cheatsheets/yum

@@ -22,6 +22,9 @@ yum info <package name>
 # List currently enabled repositories:
 yum repolist
 
+# List packages containing a certain keyword:
+yum list <package_name_or_word_to_search>
+ 
 # To download the source RPM for a package:
 yumdownloader --source <package name>
 

cheat/cheatsheets/zip

@@ -0,0 +1,5 @@
+# Create zip file
+zip archive.zip file1 directory/
+
+# To list, test and extract zip archives, see unzip
+cheat unzip

cheat/cheatsheets/zoneadm

@@ -0,0 +1,21 @@
+# Halt zone
+zoneadm -z <zone_name> halt
+
+# Delete Zone 
+zoneadm -z <zone_name> halt
+zoneadm -z <zone_name> uninstall
+
+# Verify Zone
+zoneadm -z <zone_name> verify
+
+# Installing Zone 
+zoneadm -z <zone_name> install
+
+# Boot Zone
+zoneadm -z <zone_name> boot
+
+# Reboot Zone
+zoneadm -z <zone_name> reboot
+
+# List Zones
+zoneadm list -cv

cheat/sheet.py

@@ -25,28 +25,16 @@ def create_or_edit(sheet):
     # if the cheatsheet does not exist
     if not exists(sheet):
         create(sheet)
-    
+
-    # if the cheatsheet exists and is writeable...
+    # if the cheatsheet exists but not in the default_path, copy it to the
-    elif exists(sheet) and is_writable(sheet):
+    # default path before editing
+    elif exists(sheet) and not exists_in_default_path(sheet):
+        copy(path(sheet), os.path.join(sheets.default_path(), sheet))
         edit(sheet)
 
-    # if the cheatsheet exists but is not writable...
+    # if it exists and is in the default path, then just open it
-    elif exists(sheet) and not is_writable(sheet):
+    else:
-        # ... ask the user if we should copy the cheatsheet to her home directory for editing
+        edit(sheet)
-        yes = prompt_yes_or_no(
-          'The ' + sheet + ' sheet is not editable. Do you want to copy it to '
-          'your user cheatsheets directory before editing? Keep in mind that '
-          'your sheet will always be used before system-wide one.'
-        )
-
-        # if yes, copy the cheatsheet to the home directory before editing
-        if yes:
-            copy(path(sheet), os.path.join(sheets.default_path(), sheet))
-            edit(sheet)
-
-        # if no, just abort
-        else:
-            die('Aborting.')
 
 
 def create(sheet):
@@ -75,6 +63,12 @@ def exists(sheet):
     return sheet in sheets.get() and os.access(path(sheet), os.R_OK)
 
 
+def exists_in_default_path(sheet):
+    """ Predicate that returns true if the sheet exists in default_path"""
+    default_path_sheet = os.path.join(sheets.default_path(), sheet)
+    return sheet in sheets.get() and os.access(default_path_sheet, os.R_OK)
+
+
 def is_writable(sheet):
     """ Predicate that returns true if the sheet is writeable """
     return sheet in sheets.get() and os.access(path(sheet), os.W_OK)

cheat/sheets.py

@@ -2,13 +2,6 @@ from cheat import cheatsheets
 from cheat.utils import *
 import os
 
-# @kludge: it breaks the functional paradigm to a degree, but declaring this
-# var here (versus within get()) gives us a "poor man's" memoization on the
-# call to get(). This, in turn, spares us from having to call out to the
-# filesystem more than once.
-cheats = {}
-
-
 def default_path():
     """ Returns the default cheatsheet path """
 
@@ -37,11 +30,7 @@ def default_path():
 
 def get():
     """ Assembles a dictionary of cheatsheets as name => file-path """
-
+    cheats = {}
-    # if we've already reached out to the filesystem, just return the result
-    # from memory
-    if cheats:
-        return cheats
 
     # otherwise, scan the filesystem
     for cheat_dir in reversed(paths()):

setup.py

@@ -3,7 +3,7 @@ import os
 
 setup(
     name         = 'cheat',
-    version      = '2.1.3',
+    version      = '2.1.14',
     author       = 'Chris Lane',
     author_email = 'chris@chris-allen-lane.com',
     license      = 'GPL3',