Merge pull request #209 from chrisallenlane/edit-after-copy

Resolves #207

.gitignore

@@ -1,2 +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.0')
+    options = docopt(__doc__, version='cheat 2.1.5')
 
     # list directories
     if options['--directories']:

cheat/cheatsheets/bower

@@ -0,0 +1,26 @@
+# Install a package locally
+bower install <package-name>
+
+# Install a package locally directly from github
+bower install <user>/<repo>
+
+# Install a specific package locally
+bower install <package-name>#<version>
+
+# Install a package locally and save installed package into bower.json
+bower install <package-name> --save
+
+# Retrieve info of a particular package
+bower info <package-name>
+
+# List local packages
+bower list
+
+# Search for a package by name
+bower search <package-name>
+
+# Update a package to their newest version
+bower update <package-name>
+
+# Remove a local package
+bower uninstall <package-name>

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/gzip

@@ -0,0 +1,17 @@
+# To create a *.gz compressed file
+gzip test.txt
+
+# To create a *.gz compressed file to a specific location using -c option (standard out)
+gzip -c test.txt > test_custom.txt.gz
+
+# To uncompress a *.gz file
+gzip -d test.txt.gz
+
+# Display compression ratio of the compressed file using gzip -l
+gzip -l *.gz
+
+# Recursively compress all the files under a specified directory
+gzip -r documents_directory
+
+# To create a *.gz compressed file and keep the original
+gzip < test.txt > test.txt.gz

cheat/cheatsheets/ip

@@ -19,8 +19,8 @@ ip route
 # Display all routes for IPv6
 ip -6 route
 
-# Add route via gateway IP
-ip route add 192.168.0.0/24 via 192.168.1.1
+# Add default route via gateway IP
+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/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/ping6

@@ -0,0 +1,2 @@
+# get all ipv6 neighbors via broadcast ping
+ping6 -I eth0 ff02::1

cheat/cheatsheets/smbclient

@@ -0,0 +1,5 @@
+# To display public shares on the server:
+smbclient -L <hostname> -U%
+
+# To connect to a share:
+smbclient //<hostname>/<share> -U<username>%<password>

cheat/cheatsheets/ss

@@ -0,0 +1,18 @@
+ss
+Utility to investigate sockets
+
+Args
+-4/-6 list ipv4/ipv6 sockets
+-n numeric addresses instead of hostnames
+-l list listing sockets
+-u/-t/-x list udp/tcp/unix sockets
+-p Show process(es) that using socket
+
+# show all listing tcp sockets including the corresponding process
+ss -tlp
+
+# show all sockets connecting to 192.168.2.1 on port 80
+ss -t dst 192.168.2.1:80
+
+# show all ssh related connection
+ss -t state established '( dport = :ssh or sport = :ssh )'

cheat/cheatsheets/ssh

@@ -4,12 +4,19 @@ ssh -i /path/to/file.pem user@example.com
 # To connect on an non-standard port:
 ssh -p 2222 user@example.com
 
+# To connect and forward the authentication agent
+ssh -A user@example.com
+
 # To execute a command on a remote server:
 ssh -t user@example.com 'the-remote-command'
 
 # To tunnel an x session over SSH:
 ssh -X user@example.com
 
+# Redirect traffic with a tunnel between local host (port 8080) and a remote
+# host (remote.example.com:5000) through a proxy (personal.server.com):
+ssh -f -L 8080:remote.example.com:5000 user@personal.server.com -N
+
 # To launch a specific x application over SSH:
 ssh -X -t user@example.com 'chromium-browser'
 

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/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

@@ -32,21 +32,9 @@ def create_or_edit(sheet):
 
     # if the cheatsheet exists but is not writable...
     elif exists(sheet) and not is_writable(sheet):
-        # ... ask the user if we should copy the cheatsheet to her home directory for editing
-        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.')
+        # copy the cheatsheet to the home directory before editing
+        copy(path(sheet), os.path.join(sheets.default_path(), sheet))
+        edit(sheet)
 
 
 def create(sheet):

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 """
-
-    # if we've already reached out to the filesystem, just return the result
-    # from memory
-    if cheats:
-        return cheats
+    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.0',
+    version      = '2.1.5',
     author       = 'Chris Lane',
     author_email = 'chris@chris-allen-lane.com',
     license      = 'GPL3',