diff --git a/.gitignore b/.gitignore
index 7bbcc3a..d39fbd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
-bin/*
 /dist
+tmp
+*.pyc
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+*.zip
+*.egg-info
+/build
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..845da0d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'guard'
+gem 'guard-shell'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..040f6a1
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,38 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.0.9)
+    ffi (1.9.0)
+    formatador (0.2.4)
+    guard (1.8.3)
+      formatador (>= 0.2.4)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-shell (0.5.1)
+      guard (>= 1.1.0)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    slop (3.4.6)
+    thor (0.18.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard
+  guard-shell
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..d1ac45a
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,27 @@
+notification :tmux, :color_location => 'status-right-bg'
+
+def run(command)
+  if system(command)
+    n "OK", "Ble", :success
+  else
+    n "BAD", "Ble", :failed
+  end
+
+  nil
+end
+
+def run_test(file)
+  run("PYTHONPATH=tests nosetests #{file}")
+end
+
+guard 'shell' do
+  watch(%r{asciinema/(.+)\.py$}) do |m|
+    test_filename = "tests/#{m[1]}_test.py"
+
+    if File.exists?(test_filename)
+      run_test(test_filename)
+    end
+  end
+
+  watch(%r{tests/.+\.py$}) { |m| run_test(m[0]) }
+end
diff --git a/Makefile b/Makefile
index 6c2828d..78bffcf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,17 @@
 NAME=asciinema
-VERSION=$(shell grep 'const Version' main.go | awk -F '"' '{print $$2}')
+VERSION=`python -c "import asciinema; print(asciinema.__version__)"`
 
-DIRS=bin
-INSTALL_DIRS=`find $(DIRS) -type d 2>/dev/null`
-INSTALL_FILES=`find $(DIRS) -type f 2>/dev/null`
-DOC_FILES=*.md LICENSE
+test: test-unit test-integration
 
-PREFIX?=/usr/local
-DOC_DIR=$(PREFIX)/share/doc/$(NAME)
+test-unit:
+	nosetests
 
-.PHONY: all build test fmt fmtdiff travis gox tag push release install uninstall binary-tarballs os-arch-tgz
+test-integration:
+	tests/integration.sh
 
-all: build
+release: test tag push
 
-build: test
-	go build -o bin/asciinema
-
-test:
-	go test ./...
-
-fmt:
-	go fmt ./...
-
-fmtdiff:
-	find . -type f -name "*.go" | xargs gofmt -d
-
-travis: build fmtdiff
-
-gox:
-	gox -os="darwin freebsd linux" -arch="386 amd64" -output="bin/asciinema_{{.OS}}_{{.Arch}}"
+release-test: test push-test
 
 tag:
 	git tag | grep "v$(VERSION)" && echo "Tag v$(VERSION) exists" && exit 1 || true
@@ -36,34 +19,11 @@ tag:
 	git push --tags
 
 push:
-	echo "TODO: uploading binaries to github release"
+	python setup.py sdist upload -r pypi
+
+push-test:
+	python setup.py sdist upload -r test
 
 release: test tag push
 
-install:
-	for dir in $(INSTALL_DIRS); do mkdir -p $(DESTDIR)$(PREFIX)/$$dir; done
-	for file in $(INSTALL_FILES); do cp $$file $(DESTDIR)$(PREFIX)/$$file; done
-	mkdir -p $(DESTDIR)$(DOC_DIR)
-	cp -r $(DOC_FILES) $(DESTDIR)$(DOC_DIR)/
-
-uninstall:
-	for file in $(INSTALL_FILES); do rm -f $(DESTDIR)$(PREFIX)/$$file; done
-	rm -rf $(DESTDIR)$(DOC_DIR)
-
-binary-tarballs:
-	GOOS=darwin GOARCH=386 $(MAKE) os-arch-tgz
-	GOOS=darwin GOARCH=amd64 $(MAKE) os-arch-tgz
-	GOOS=freebsd GOARCH=386 $(MAKE) os-arch-tgz
-	GOOS=freebsd GOARCH=amd64 $(MAKE) os-arch-tgz
-	GOOS=linux GOARCH=386 $(MAKE) os-arch-tgz
-	GOOS=linux GOARCH=amd64 $(MAKE) os-arch-tgz
-	GOOS=linux GOARCH=arm $(MAKE) os-arch-tgz
-	cd dist/$(VERSION) && sha1sum *.tar.gz >sha1sum.txt
-
-RELEASE=asciinema-$(VERSION)-$(GOOS)-$(GOARCH)
-
-os-arch-tgz:
-	mkdir -p dist/$(VERSION)/$(RELEASE)
-	go build -o dist/$(VERSION)/$(RELEASE)/asciinema
-	cp README.md CHANGELOG.md LICENSE dist/$(VERSION)/$(RELEASE)
-	cd dist/$(VERSION) && tar czf $(RELEASE).tar.gz $(RELEASE)
+.PHONY: test test-unit test-integration release release-test tag push push-test
diff --git a/asciinema/__init__.py b/asciinema/__init__.py
new file mode 100644
index 0000000..6b1e604
--- /dev/null
+++ b/asciinema/__init__.py
@@ -0,0 +1,2 @@
+__author__ = 'Marcin Kulik'
+__version__ = '0.9.8'
diff --git a/asciinema/__main__.py b/asciinema/__main__.py
new file mode 100644
index 0000000..b7dbc93
--- /dev/null
+++ b/asciinema/__main__.py
@@ -0,0 +1,10 @@
+import sys
+
+from .config import Config
+from .commands.builder import get_command
+
+def main():
+    get_command(sys.argv[1:], Config()).execute()
+
+if __name__ == '__main__':
+    main()
diff --git a/asciinema/asciicast.py b/asciinema/asciicast.py
new file mode 100644
index 0000000..fb71551
--- /dev/null
+++ b/asciinema/asciicast.py
@@ -0,0 +1,36 @@
+import os
+import subprocess
+import time
+
+
+class Asciicast(object):
+
+    def __init__(self, env=os.environ):
+        self.command = None
+        self.title = None
+        self.shell = env.get('SHELL', '/bin/sh')
+        self.term = env.get('TERM')
+        self.username = env.get('USER')
+
+    @property
+    def meta_data(self):
+        lines = int(get_command_output(['tput', 'lines']))
+        columns = int(get_command_output(['tput', 'cols']))
+
+        return {
+            'username'   : self.username,
+            'duration'   : self.duration,
+            'title'      : self.title,
+            'command'    : self.command,
+            'shell'      : self.shell,
+            'term'       : {
+                'type'   : self.term,
+                'lines'  : lines,
+                'columns': columns
+            }
+        }
+
+
+def get_command_output(args):
+    process = subprocess.Popen(args, stdout=subprocess.PIPE)
+    return process.communicate()[0].strip()
diff --git a/asciinema/commands/__init__.py b/asciinema/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/asciinema/commands/auth.py b/asciinema/commands/auth.py
new file mode 100644
index 0000000..be28013
--- /dev/null
+++ b/asciinema/commands/auth.py
@@ -0,0 +1,11 @@
+class AuthCommand(object):
+
+    def __init__(self, api_url, api_token):
+        self.api_url = api_url
+        self.api_token = api_token
+
+    def execute(self):
+        url = '%s/connect/%s' % (self.api_url, self.api_token)
+        print('Open the following URL in your browser to register your API ' \
+                'token and assign any recorded asciicasts to your profile:\n' \
+                '%s' % url)
diff --git a/asciinema/commands/builder.py b/asciinema/commands/builder.py
new file mode 100644
index 0000000..806a9db
--- /dev/null
+++ b/asciinema/commands/builder.py
@@ -0,0 +1,46 @@
+import getopt
+
+from .error import ErrorCommand
+from .record import RecordCommand
+from .auth import AuthCommand
+from .help import HelpCommand
+from .version import VersionCommand
+
+
+def get_command(argv, config):
+    try:
+        opts, commands = getopt.getopt(argv, 'c:t:ihvy', ['help', 'version'])
+    except getopt.error as msg:
+        return ErrorCommand(msg)
+
+    if len(commands) > 1:
+        return ErrorCommand('Too many arguments')
+
+    if len(commands) == 0:
+        command = 'rec'
+    elif len(commands) == 1:
+        command = commands[0]
+
+    cmd = None
+    title = None
+    skip_confirmation = False
+
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            return HelpCommand()
+        elif opt in('-v', '--version'):
+            return VersionCommand()
+        elif opt == '-c':
+            cmd = arg
+        elif opt == '-t':
+            title = arg
+        elif opt == '-y':
+            skip_confirmation = True
+
+    if command == 'rec':
+        return RecordCommand(config.api_url, config.api_token, cmd, title,
+                             skip_confirmation)
+    elif command == 'auth':
+        return AuthCommand(config.api_url, config.api_token)
+
+    return ErrorCommand("'%s' is not an asciinema command" % command)
diff --git a/asciinema/commands/error.py b/asciinema/commands/error.py
new file mode 100644
index 0000000..25663f1
--- /dev/null
+++ b/asciinema/commands/error.py
@@ -0,0 +1,11 @@
+import sys
+
+
+class ErrorCommand(object):
+
+    def __init__(self, message):
+        self.message = message
+
+    def execute(self):
+        print("asciinema: %s. See 'asciinema --help'." % self.message)
+        sys.exit(1)
diff --git a/asciinema/commands/help.py b/asciinema/commands/help.py
new file mode 100644
index 0000000..7010993
--- /dev/null
+++ b/asciinema/commands/help.py
@@ -0,0 +1,20 @@
+class HelpCommand(object):
+
+    def execute(self):
+        print(HELP_TEXT)
+
+
+HELP_TEXT = '''usage: asciinema [-h] [-y] [-c <command>] [-t <title>] [action]
+
+Asciicast recorder+uploader.
+
+Actions:
+ rec              record asciicast (this is the default when no action given)
+ auth             authenticate and/or claim recorded asciicasts
+
+Optional arguments:
+ -c command       run specified command instead of shell ($SHELL)
+ -t title         specify title of recorded asciicast
+ -y               don't prompt for confirmation
+ -h, --help       show this help message and exit
+ -v, --version    show version information'''
diff --git a/asciinema/commands/record.py b/asciinema/commands/record.py
new file mode 100644
index 0000000..759fc70
--- /dev/null
+++ b/asciinema/commands/record.py
@@ -0,0 +1,63 @@
+import sys
+import subprocess
+
+from asciinema.recorder import Recorder
+from asciinema.uploader import Uploader, ServerMaintenanceError, ResourceNotFoundError
+from asciinema.confirmator import Confirmator
+
+
+class RecordCommand(object):
+
+    def __init__(self, api_url, api_token, cmd, title, skip_confirmation,
+                 recorder=None, uploader=None, confirmator=None):
+        self.api_url = api_url
+        self.api_token = api_token
+        self.cmd = cmd
+        self.title = title
+        self.skip_confirmation = skip_confirmation
+        self.recorder = recorder if recorder is not None else Recorder()
+        self.uploader = uploader if uploader is not None else Uploader()
+        self.confirmator = confirmator if confirmator is not None else Confirmator()
+
+    def execute(self):
+        asciicast = self._record_asciicast()
+        self._upload_asciicast(asciicast)
+
+    def _record_asciicast(self):
+        self._reset_terminal()
+        print('~ Asciicast recording started.')
+
+        if not self.cmd:
+            print('~ Hit ctrl+d or type "exit" to finish.')
+
+        print('')
+
+        asciicast = self.recorder.record(self.cmd, self.title)
+
+        self._reset_terminal()
+        print('~ Asciicast recording finished.')
+
+        return asciicast
+
+    def _upload_asciicast(self, asciicast):
+        if self._upload_confirmed():
+            print('~ Uploading...')
+            try:
+                url = self.uploader.upload(self.api_url, self.api_token, asciicast)
+                print(url)
+            except ServerMaintenanceError:
+                print('~ Upload failed: The server is down for maintenance. Try again in a minute.')
+                sys.exit(1)
+            except ResourceNotFoundError:
+                print('~ Upload failed: Your client version is no longer supported. Please upgrade to the latest version.')
+                sys.exit(1)
+
+    def _upload_confirmed(self):
+        if self.skip_confirmation:
+            return True
+
+        return self.confirmator.confirm("~ Do you want to upload it? [Y/n] ")
+
+    def _reset_terminal(self):
+        subprocess.call(["reset"])
+        pass
diff --git a/asciinema/commands/version.py b/asciinema/commands/version.py
new file mode 100644
index 0000000..26c8691
--- /dev/null
+++ b/asciinema/commands/version.py
@@ -0,0 +1,7 @@
+from asciinema import __version__
+
+
+class VersionCommand(object):
+
+    def execute(self):
+        print('asciinema %s' % __version__)
diff --git a/asciinema/config.py b/asciinema/config.py
new file mode 100644
index 0000000..4656f1f
--- /dev/null
+++ b/asciinema/config.py
@@ -0,0 +1,77 @@
+import os
+import sys
+
+try:
+    from ConfigParser import RawConfigParser, ParsingError, NoOptionError
+except ImportError:
+    from configparser import RawConfigParser, ParsingError, NoOptionError
+
+import uuid
+
+
+DEFAULT_CONFIG_FILE_PATH = "~/.asciinema/config"
+DEFAULT_API_URL = 'https://asciinema.org'
+
+class Config:
+
+    def __init__(self, path=DEFAULT_CONFIG_FILE_PATH, overrides=None):
+        self.path = os.path.expanduser(path)
+        self.overrides = overrides if overrides is not None else os.environ
+
+        self._parse_config_file()
+
+    def _parse_config_file(self):
+        config = RawConfigParser()
+        config.add_section('user')
+        config.add_section('api')
+
+        try:
+            config.read(self.path)
+        except ParsingError:
+            print('Config file %s contains syntax errors' % self.path)
+            sys.exit(2)
+
+        self.config = config
+
+    @property
+    def api_url(self):
+        try:
+            api_url = self.config.get('api', 'url')
+        except NoOptionError:
+            api_url = DEFAULT_API_URL
+
+        api_url = self.overrides.get('ASCIINEMA_API_URL', api_url)
+
+        return api_url
+
+    @property
+    def api_token(self):
+        try:
+            return self._get_api_token()
+        except NoOptionError:
+            try:
+                return self._get_user_token()
+            except NoOptionError:
+                return self._create_api_token()
+
+    def _ensure_base_dir(self):
+        dir = os.path.dirname(self.path)
+
+        if not os.path.isdir(dir):
+            os.mkdir(dir)
+
+    def _get_api_token(self):
+        return self.config.get('api', 'token')
+
+    def _get_user_token(self):
+        return self.config.get('user', 'token')
+
+    def _create_api_token(self):
+        api_token = str(uuid.uuid1())
+        self.config.set('api', 'token', api_token)
+
+        self._ensure_base_dir()
+        with open(self.path, 'w') as f:
+            self.config.write(f)
+
+        return api_token
diff --git a/asciinema/confirmator.py b/asciinema/confirmator.py
new file mode 100644
index 0000000..1c20f46
--- /dev/null
+++ b/asciinema/confirmator.py
@@ -0,0 +1,11 @@
+from __future__ import print_function
+import sys
+
+
+class Confirmator(object):
+
+    def confirm(self, text):
+        print(text, end='')
+        sys.stdout.flush()
+        answer = sys.stdin.readline().strip()
+        return answer == 'y' or answer == 'Y' or answer == ''
diff --git a/asciinema/pty_recorder.py b/asciinema/pty_recorder.py
new file mode 100644
index 0000000..8e09d6c
--- /dev/null
+++ b/asciinema/pty_recorder.py
@@ -0,0 +1,118 @@
+import errno
+import os
+import pty
+import signal
+import tty
+import array
+import fcntl
+import termios
+import select
+import io
+import shlex
+
+from .stdout import Stdout
+
+
+class PtyRecorder(object):
+
+    def record_command(self, command, output=None):
+        command = shlex.split(command)
+        output = output if output is not None else Stdout()
+        master_fd = None
+
+        def _set_pty_size():
+            '''
+            Sets the window size of the child pty based on the window size
+            of our own controlling terminal.
+            '''
+
+            # Get the terminal size of the real terminal, set it on the pseudoterminal.
+            if os.isatty(pty.STDOUT_FILENO):
+                buf = array.array('h', [0, 0, 0, 0])
+                fcntl.ioctl(pty.STDOUT_FILENO, termios.TIOCGWINSZ, buf, True)
+                fcntl.ioctl(master_fd, termios.TIOCSWINSZ, buf)
+            else:
+                buf = array.array('h', [24, 80, 0, 0])
+                fcntl.ioctl(master_fd, termios.TIOCSWINSZ, buf)
+
+        def _signal_winch(signal, frame):
+            '''Signal handler for SIGWINCH - window size has changed.'''
+
+            _set_pty_size()
+
+        def _write_stdout(data):
+            '''Writes to stdout as if the child process had written the data.'''
+
+            os.write(pty.STDOUT_FILENO, data)
+
+        def _handle_master_read(data):
+            '''Handles new data on child process stdout.'''
+
+            _write_stdout(data)
+            output.write(data)
+
+        def _write_master(data):
+            '''Writes to the child process from its controlling terminal.'''
+
+            while data:
+                n = os.write(master_fd, data)
+                data = data[n:]
+
+        def _handle_stdin_read(data):
+            '''Handles new data on child process stdin.'''
+
+            _write_master(data)
+
+        def _copy():
+            '''Main select loop.
+
+            Passes control to _master_read() or _stdin_read()
+            when new data arrives.
+            '''
+
+            while 1:
+                try:
+                    rfds, wfds, xfds = select.select([master_fd, pty.STDIN_FILENO], [], [])
+                except select.error as e:
+                    if e[0] == errno.EINTR:   # Interrupted system call.
+                        continue
+
+                if master_fd in rfds:
+                    data = os.read(master_fd, 1024)
+
+                    if len(data) == 0:
+                        break
+
+                    _handle_master_read(data)
+
+                if pty.STDIN_FILENO in rfds:
+                    data = os.read(pty.STDIN_FILENO, 1024)
+                    _handle_stdin_read(data)
+
+
+        pid, master_fd = pty.fork()
+
+        if pid == pty.CHILD:
+            os.execlp(command[0], *command)
+
+        old_handler = signal.signal(signal.SIGWINCH, _signal_winch)
+
+        try:
+            mode = tty.tcgetattr(pty.STDIN_FILENO)
+            tty.setraw(pty.STDIN_FILENO)
+            restore = 1
+        except tty.error: # This is the same as termios.error
+            restore = 0
+
+        _set_pty_size()
+
+        try:
+            _copy()
+        except (IOError, OSError):
+            if restore:
+                tty.tcsetattr(pty.STDIN_FILENO, tty.TCSAFLUSH, mode)
+
+        os.close(master_fd)
+        signal.signal(signal.SIGWINCH, old_handler)
+
+        return output
diff --git a/asciinema/recorder.py b/asciinema/recorder.py
new file mode 100644
index 0000000..56bf86a
--- /dev/null
+++ b/asciinema/recorder.py
@@ -0,0 +1,24 @@
+import os
+from . import timer
+
+from .asciicast import Asciicast
+from .pty_recorder import PtyRecorder
+
+
+class Recorder(object):
+
+    def __init__(self, pty_recorder=None, env=None):
+        self.pty_recorder = pty_recorder if pty_recorder is not None else PtyRecorder()
+        self.env = env if env is not None else os.environ
+
+    def record(self, cmd, title):
+        duration, stdout = timer.timeit(self.pty_recorder.record_command,
+                                        cmd or self.env.get('SHELL', '/bin/sh'))
+
+        asciicast = Asciicast()
+        asciicast.title = title
+        asciicast.command = cmd
+        asciicast.stdout = stdout
+        asciicast.duration = duration
+
+        return asciicast
diff --git a/asciinema/requests_http_adapter.py b/asciinema/requests_http_adapter.py
new file mode 100644
index 0000000..e03f705
--- /dev/null
+++ b/asciinema/requests_http_adapter.py
@@ -0,0 +1,13 @@
+import requests
+
+
+class RequestsHttpAdapter(object):
+
+    def post(self, url, fields={}, files={}, headers={}):
+        response = requests.post(url, data=fields, files=files, headers=headers)
+
+        status  = response.status_code
+        headers = response.headers
+        body    = response.text
+
+        return (status, headers, body)
diff --git a/asciinema/stdout.py b/asciinema/stdout.py
new file mode 100644
index 0000000..771b4c6
--- /dev/null
+++ b/asciinema/stdout.py
@@ -0,0 +1,46 @@
+import time
+import io
+
+
+class StdoutTiming(object):
+
+    def __init__(self):
+        self._items = []
+
+    def append(self, item):
+        self._items.append(item)
+
+    def __str__(self):
+        lines = ["%f %d" % (item[0], item[1]) for item in self._items]
+        return "\n".join(lines)
+
+
+class Stdout(object):
+
+    def __init__(self, timing=None):
+        self._data = io.BytesIO()
+        self._timing = timing if timing is not None else StdoutTiming()
+
+        self._start_timing()
+
+    @property
+    def data(self):
+        return self._data.getvalue()
+
+    @property
+    def timing(self):
+        return str(self._timing).encode()
+
+    def write(self, data):
+        now = time.time()
+        delta = now - self._prev_time
+        self._prev_time = now
+
+        self._data.write(data)
+        self._timing.append([delta, len(data)])
+
+    def close(self):
+        self._data.close()
+
+    def _start_timing(self):
+        self._prev_time = time.time()
diff --git a/asciinema/timer.py b/asciinema/timer.py
new file mode 100644
index 0000000..256a2ef
--- /dev/null
+++ b/asciinema/timer.py
@@ -0,0 +1,10 @@
+import time
+
+
+def timeit(callable, *args):
+    start_time = time.time()
+    ret = callable(*args)
+    end_time = time.time()
+    duration = end_time - start_time
+
+    return (duration, ret)
diff --git a/asciinema/uploader.py b/asciinema/uploader.py
new file mode 100644
index 0000000..8e58718
--- /dev/null
+++ b/asciinema/uploader.py
@@ -0,0 +1,69 @@
+import json
+import bz2
+import platform
+import re
+
+from asciinema import __version__
+from .requests_http_adapter import RequestsHttpAdapter
+
+
+class ResourceNotFoundError(Exception):
+    pass
+
+
+class ServerMaintenanceError(Exception):
+    pass
+
+
+class Uploader(object):
+
+    def __init__(self, http_adapter=None):
+        self.http_adapter = http_adapter if http_adapter is not None else RequestsHttpAdapter()
+
+    def upload(self, api_url, api_token, asciicast):
+        url = '%s/api/asciicasts' % api_url
+        files = self._asciicast_files(asciicast, api_token)
+        headers = self._headers()
+
+        status, headers, body = self.http_adapter.post(url, files=files,
+                                                            headers=headers)
+
+        if status == 503:
+            raise ServerMaintenanceError()
+
+        if status == 404:
+            raise ResourceNotFoundError()
+
+        return body
+
+    def _asciicast_files(self, asciicast, api_token):
+        return {
+            'asciicast[stdout]': self._stdout_data_file(asciicast.stdout),
+            'asciicast[stdout_timing]': self._stdout_timing_file(asciicast.stdout),
+            'asciicast[meta]': self._meta_file(asciicast, api_token)
+        }
+
+    def _headers(self):
+        return { 'User-Agent': self._user_agent() }
+
+    def _stdout_data_file(self, stdout):
+        return ('stdout', bz2.compress(stdout.data))
+
+    def _stdout_timing_file(self, stdout):
+        return ('stdout.time', bz2.compress(stdout.timing))
+
+    def _meta_file(self, asciicast, api_token):
+        return ('meta.json', self._meta_json(asciicast, api_token))
+
+    def _meta_json(self, asciicast, api_token):
+        meta_data = asciicast.meta_data
+        auth_data = { 'user_token': api_token }
+        data = dict(list(meta_data.items()) + list(auth_data.items()))
+
+        return json.dumps(data)
+
+    def _user_agent(self):
+        os = re.sub('([^-]+)-(.*)', '\\1/\\2', platform.platform())
+
+        return 'asciinema/%s %s/%s %s' % (__version__,
+            platform.python_implementation(), platform.python_version(), os)
diff --git a/config.example b/config.example
new file mode 100644
index 0000000..7b2b410
--- /dev/null
+++ b/config.example
@@ -0,0 +1,2 @@
+[api]
+url = http://localhost:3000
diff --git a/packaging/aur/.gitignore b/packaging/aur/.gitignore
new file mode 100644
index 0000000..7984527
--- /dev/null
+++ b/packaging/aur/.gitignore
@@ -0,0 +1,2 @@
+/pkg
+/src
diff --git a/packaging/aur/PKGBUILD b/packaging/aur/PKGBUILD
new file mode 100644
index 0000000..265cd38
--- /dev/null
+++ b/packaging/aur/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Marcin Kulik <m@ku1ik.com>
+pkgname=asciinema
+pkgver=0.9.8
+pkgrel=2
+pkgdesc="Command line recorder for asciinema.org service"
+arch=(any)
+url="https://github.com/sickill/asciinema"
+license=('MIT')
+depends=('python-requests>=1.1.0', 'python-setuptools')
+makedepends=('python-distribute')
+source=(https://pypi.python.org/packages/source/a/asciinema/asciinema-${pkgver}.tar.gz)
+md5sums=('ae8662d033af0e973d5864a247117e7f')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/packaging/homebrew/asciinema.rb b/packaging/homebrew/asciinema.rb
new file mode 100644
index 0000000..5726447
--- /dev/null
+++ b/packaging/homebrew/asciinema.rb
@@ -0,0 +1,13 @@
+require 'formula'
+
+class Asciinema < Formula
+  homepage 'http://asciinema.org'
+  url 'https://github.com/sickill/asciinema/archive/v0.9.5.tar.gz'
+  sha1 '902893a524eaab7794eb04b5092b4b78c3c4c622'
+
+  depends_on :python => "2.7"
+
+  def install
+    system 'make', 'install', "PREFIX=#{prefix}"
+  end
+end
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..0505b80
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,46 @@
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+import asciinema
+
+
+url_template = 'https://github.com/sickill/asciinema/archive/v%s.tar.gz'
+
+requirements = [
+    'requests>=1.1.0'
+]
+
+setup(
+    name='asciinema',
+    version=asciinema.__version__,
+    packages=['asciinema', 'asciinema.commands'],
+    license='MIT',
+    description='Command line recorder for asciinema.org service',
+    author=asciinema.__author__,
+    author_email='m@ku1ik.com',
+    url='https://asciinema.org',
+    download_url=(url_template % asciinema.__version__),
+    entry_points={
+        'console_scripts': [
+            'asciinema = asciinema.__main__:main',
+        ],
+    },
+    install_requires=requirements,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Topic :: System :: Shells',
+        'Topic :: Terminals',
+        'Topic :: Utilities'
+    ],
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auth_command_test.py b/tests/auth_command_test.py
new file mode 100644
index 0000000..3552556
--- /dev/null
+++ b/tests/auth_command_test.py
@@ -0,0 +1,14 @@
+import re
+
+from asciinema.commands.auth import AuthCommand
+from .test_helper import assert_printed, Test
+
+
+class TestAuthCommand(Test):
+
+    def test_execute(self):
+        command = AuthCommand('http://the/url', 'a1b2c3')
+
+        command.execute()
+
+        assert_printed('http://the/url/connect/a1b2c3')
diff --git a/tests/builder_test.py b/tests/builder_test.py
new file mode 100644
index 0000000..c5a46a4
--- /dev/null
+++ b/tests/builder_test.py
@@ -0,0 +1,88 @@
+from nose.tools import assert_equal
+
+from asciinema.commands.builder import get_command
+from asciinema.commands.error import ErrorCommand
+from asciinema.commands.record import RecordCommand
+from asciinema.commands.auth import AuthCommand
+from asciinema.commands.help import HelpCommand
+from asciinema.commands.version import VersionCommand
+
+
+class Config(object):
+
+    def api_url(self):
+        return 'http://api/url'
+
+    def api_token(self):
+        return 'a-toh-can'
+
+
+class TestGetCommand(object):
+
+    def setUp(self):
+        self.config = Config()
+
+    def test_get_command_when_cmd_is_absent(self):
+        command = get_command([], self.config)
+
+        assert_equal(RecordCommand, type(command))
+
+    def test_get_command_when_cmd_is_rec(self):
+        command = get_command(['rec'], self.config)
+
+        assert_equal(RecordCommand, type(command))
+        assert_equal(self.config.api_url, command.api_url)
+        assert_equal(self.config.api_token, command.api_token)
+        assert_equal(None, command.cmd)
+        assert_equal(None, command.title)
+        assert_equal(False, command.skip_confirmation)
+
+    def test_get_command_when_cmd_is_rec_and_options_given(self):
+        argv = ['-c', '/bin/bash -l', '-t', "O'HAI LOL", '-y', 'rec']
+        command = get_command(argv, self.config)
+
+        assert_equal(RecordCommand, type(command))
+        assert_equal(self.config.api_url, command.api_url)
+        assert_equal(self.config.api_token, command.api_token)
+        assert_equal('/bin/bash -l', command.cmd)
+        assert_equal("O'HAI LOL", command.title)
+        assert_equal(True, command.skip_confirmation)
+
+    def test_get_command_when_cmd_is_auth(self):
+        command = get_command(['auth'], self.config)
+
+        assert_equal(AuthCommand, type(command))
+        assert_equal(self.config.api_url, command.api_url)
+        assert_equal(self.config.api_token, command.api_token)
+
+    def test_get_command_when_options_include_h(self):
+        command = get_command(['-h'], self.config)
+
+        assert_equal(HelpCommand, type(command))
+
+    def test_get_command_when_options_include_help(self):
+        command = get_command(['--help'], self.config)
+
+        assert_equal(HelpCommand, type(command))
+
+    def test_get_command_when_options_include_v(self):
+        command = get_command(['-v'], self.config)
+
+        assert_equal(VersionCommand, type(command))
+
+    def test_get_command_when_options_include_version(self):
+        command = get_command(['--version'], self.config)
+
+        assert_equal(VersionCommand, type(command))
+
+    def test_get_command_when_cmd_is_unknown(self):
+        command = get_command(['foobar'], self.config)
+
+        assert_equal(ErrorCommand, type(command))
+        assert_equal("'foobar' is not an asciinema command", command.message)
+
+    def test_get_command_when_too_many_cmds(self):
+        command = get_command(['foo', 'bar'], self.config)
+
+        assert_equal(ErrorCommand, type(command))
+        assert_equal("Too many arguments", command.message)
diff --git a/tests/config_test.py b/tests/config_test.py
new file mode 100644
index 0000000..80326bb
--- /dev/null
+++ b/tests/config_test.py
@@ -0,0 +1,73 @@
+from nose.tools import assert_equal
+
+import os
+import tempfile
+import re
+
+from asciinema.config import Config
+
+
+def create_config(content=None, overrides={}):
+    dir = tempfile.mkdtemp()
+    path = dir + '/config'
+
+    if content:
+        with open(path, 'w') as f:
+            f.write(content)
+
+    return Config(path, overrides)
+
+
+class TestConfig(object):
+
+    def test_api_url_when_no_file_and_no_override_set(self):
+        config = create_config()
+        assert_equal('https://asciinema.org', config.api_url)
+
+    def test_api_url_when_no_url_set_and_no_override_set(self):
+        config = create_config('')
+        assert_equal('https://asciinema.org', config.api_url)
+
+    def test_api_url_when_url_set_and_no_override_set(self):
+        config = create_config("[api]\nurl = http://the/url")
+        assert_equal('http://the/url', config.api_url)
+
+    def test_api_url_when_url_set_and_override_set(self):
+        config = create_config("[api]\nurl = http://the/url", {
+            'ASCIINEMA_API_URL': 'http://the/url2' })
+        assert_equal('http://the/url2', config.api_url)
+
+    def test_api_token_when_no_file(self):
+        config = create_config()
+
+        assert re.match('^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}', config.api_token)
+        assert os.path.isfile(config.path)
+
+    def test_api_token_when_no_dir(self):
+        config = create_config()
+        dir = os.path.dirname(config.path)
+        os.rmdir(dir)
+
+        assert re.match('^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}', config.api_token)
+        assert os.path.isfile(config.path)
+
+    def test_api_token_when_no_api_token_set(self):
+        config = create_config('')
+        assert re.match('^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}', config.api_token)
+
+    def test_api_token_when_api_token_set(self):
+        token = 'foo-bar-baz'
+        config = create_config("[api]\ntoken = %s" % token)
+        assert re.match(token, config.api_token)
+
+    def test_api_token_when_api_token_set_as_user_token(self):
+        token = 'foo-bar-baz'
+        config = create_config("[user]\ntoken = %s" % token)
+        assert re.match(token, config.api_token)
+
+    def test_api_token_when_api_token_set_and_user_token_set(self):
+        user_token = 'foo'
+        api_token = 'bar'
+        config = create_config("[user]\ntoken = %s\n[api]\ntoken = %s" %
+                               (user_token, api_token))
+        assert re.match(api_token, config.api_token)
diff --git a/tests/confirmator_test.py b/tests/confirmator_test.py
new file mode 100644
index 0000000..67ad6cc
--- /dev/null
+++ b/tests/confirmator_test.py
@@ -0,0 +1,67 @@
+import sys
+
+from asciinema.confirmator import Confirmator
+from .test_helper import assert_printed, assert_not_printed, Test
+
+
+class FakeStdin(object):
+
+    def set_line(self, line):
+        self.line = line
+
+    def readline(self):
+        return self.line
+
+
+class TestConfirmator(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self.real_stdin = sys.stdin
+        sys.stdin = self.stdin = FakeStdin()
+
+    def tearDown(self):
+        Test.tearDown(self)
+        sys.stdin = self.real_stdin
+
+    def test_confirm_when_y_entered(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("y\n")
+
+        assert confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
+
+    def test_confirm_when_Y_entered(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("Y\n")
+
+        assert confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
+
+    def test_confirm_when_enter_hit(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("\n")
+
+        assert confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
+
+    def test_confirm_when_spaces_entered(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("  \n")
+
+        assert confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
+
+    def test_confirm_when_n_entered(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("n\n")
+
+        assert not confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
+
+    def test_confirm_when_foo_entered(self):
+        confirmator = Confirmator()
+        self.stdin.set_line("foo\n")
+
+        assert not confirmator.confirm('Wanna?')
+        assert_printed('Wanna?')
diff --git a/tests/error_command_test.py b/tests/error_command_test.py
new file mode 100644
index 0000000..69b2b4c
--- /dev/null
+++ b/tests/error_command_test.py
@@ -0,0 +1,13 @@
+from nose.tools import assert_raises
+
+from asciinema.commands.error import ErrorCommand
+from .test_helper import assert_printed, Test
+
+
+class TestErrorCommand(Test):
+
+    def test_execute(self):
+        command = ErrorCommand('foo')
+
+        assert_raises(SystemExit, command.execute)
+        assert_printed('foo')
diff --git a/tests/help_command_test.py b/tests/help_command_test.py
new file mode 100644
index 0000000..9e7e3bb
--- /dev/null
+++ b/tests/help_command_test.py
@@ -0,0 +1,15 @@
+from asciinema.commands.help import HelpCommand
+from .test_helper import assert_printed, Test
+
+
+class TestHelpCommand(Test):
+
+    def test_execute(self):
+        command = HelpCommand()
+
+        command.execute()
+
+        assert_printed('asciinema')
+        assert_printed('usage')
+        assert_printed('rec')
+        assert_printed('auth')
diff --git a/tests/integration.sh b/tests/integration.sh
new file mode 100755
index 0000000..47d2571
--- /dev/null
+++ b/tests/integration.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+test() {
+  echo "Test: $1"
+  eval "PYTHONPATH=. python -m asciinema.__main__ $2 >/dev/null || (echo 'failed' && exit 1)"
+}
+
+test "help" "-h"
+test "version" "-v"
+test "auth" "auth"
diff --git a/tests/pty_recorder_test.py b/tests/pty_recorder_test.py
new file mode 100644
index 0000000..0ef8c78
--- /dev/null
+++ b/tests/pty_recorder_test.py
@@ -0,0 +1,49 @@
+import os
+import pty
+
+from nose.tools import assert_equal
+from .test_helper import Test
+
+from asciinema.stdout import Stdout
+from asciinema.pty_recorder import PtyRecorder
+
+
+class FakeStdout(object):
+
+    def __init__(self):
+        self.data = []
+        self.closed = False
+
+    def write(self, data):
+        self.data.append(data)
+
+
+class TestPtyRecorder(Test):
+
+    def setUp(self):
+        self.real_os_write = os.write
+        os.write = self.os_write
+
+    def tearDown(self):
+        os.write = self.real_os_write
+
+    def os_write(self, fd, data):
+        if fd != pty.STDOUT_FILENO:
+            self.real_os_write(fd, data)
+
+    def test_record_command_returns_stdout_instance(self):
+        pty_recorder = PtyRecorder()
+
+        output = pty_recorder.record_command('ls -l')
+
+        assert_equal(Stdout, type(output))
+
+    def test_record_command_writes_to_stdout(self):
+        pty_recorder = PtyRecorder()
+        output = FakeStdout()
+
+        command = 'python -c "import sys, time; sys.stdout.write(\'foo\'); ' \
+                  'sys.stdout.flush(); time.sleep(0.01); sys.stdout.write(\'bar\')"'
+        pty_recorder.record_command(command, output)
+
+        assert_equal([b'foo', b'bar'], output.data)
diff --git a/tests/record_command_test.py b/tests/record_command_test.py
new file mode 100644
index 0000000..0e99868
--- /dev/null
+++ b/tests/record_command_test.py
@@ -0,0 +1,117 @@
+import sys
+import subprocess
+
+from nose.tools import assert_equal, assert_raises
+from asciinema.commands.record import RecordCommand
+from asciinema.uploader import ServerMaintenanceError, ResourceNotFoundError
+from .test_helper import assert_printed, assert_not_printed, Test, FakeAsciicast
+
+
+class FakeRecorder(object):
+
+    def __init__(self):
+        self.asciicast = None
+
+    def record(self, cmd, title):
+        self.asciicast = FakeAsciicast(cmd, title)
+        return self.asciicast
+
+
+class FakeUploader(object):
+
+    def __init__(self, error_to_raise=None):
+        self.uploaded = None
+        self.error_to_raise = error_to_raise
+
+    def upload(self, api_url, api_token, asciicast):
+        if self.error_to_raise:
+            raise self.error_to_raise
+
+        self.uploaded = [api_url, api_token, asciicast]
+        return 'http://asciicast/url'
+
+
+class FakeConfirmator(object):
+
+    def __init__(self):
+        self.text = ''
+        self.success = True
+
+    def confirm(self, text):
+        self.text = text
+        return self.success
+
+
+class TestRecordCommand(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self.recorder = FakeRecorder()
+        self.uploader = FakeUploader()
+        self.confirmator = FakeConfirmator()
+        self.real_subprocess_call = subprocess.call
+        subprocess.call = lambda *args: None
+
+    def tearDown(self):
+        subprocess.call = self.real_subprocess_call
+
+    def create_command(self, skip_confirmation):
+        return RecordCommand('http://the/url', 'a1b2c3', 'ls -l', 'the title',
+                             skip_confirmation, self.recorder, self.uploader,
+                             self.confirmator)
+
+    def test_execute_when_upload_confirmation_skipped(self):
+        command = self.create_command(True)
+        self.confirmator.success = False
+
+        command.execute()
+
+        assert 'Do you want to upload' not in self.confirmator.text
+        self.assert_recorded_and_uploaded()
+
+    def test_execute_when_upload_confirmed(self):
+        command = self.create_command(False)
+        self.confirmator.success = True
+
+        command.execute()
+
+        assert 'Do you want to upload' in self.confirmator.text
+        self.assert_recorded_and_uploaded()
+
+    def test_execute_when_upload_rejected(self):
+        command = self.create_command(False)
+        self.confirmator.success = False
+
+        command.execute()
+
+        assert 'Do you want to upload' in self.confirmator.text
+        self.assert_recorded_but_not_uploaded()
+
+    def test_execute_when_uploader_raises_not_found_error(self):
+        self.uploader = FakeUploader(ResourceNotFoundError())
+        command = self.create_command(True)
+
+        assert_raises(SystemExit, command.execute)
+        assert_printed('upgrade')
+
+    def test_execute_when_uploader_raises_maintenance_error(self):
+        self.uploader = FakeUploader(ServerMaintenanceError())
+        command = self.create_command(True)
+
+        assert_raises(SystemExit, command.execute)
+        assert_printed('maintenance')
+
+    def assert_recorded_but_not_uploaded(self):
+        asciicast = self.recorder.asciicast
+        assert asciicast, 'asciicast not recorded'
+        assert_not_printed('Uploading...')
+        assert_equal(None, self.uploader.uploaded)
+
+    def assert_recorded_and_uploaded(self):
+        asciicast = self.recorder.asciicast
+        assert asciicast, 'asciicast not recorded'
+        assert_equal('ls -l', asciicast.cmd)
+        assert_equal('the title', asciicast.title)
+        assert_printed('Uploading...')
+        assert_equal(['http://the/url', 'a1b2c3', asciicast], self.uploader.uploaded)
+        assert_printed('http://asciicast/url')
diff --git a/tests/recorder_test.py b/tests/recorder_test.py
new file mode 100644
index 0000000..c619ef3
--- /dev/null
+++ b/tests/recorder_test.py
@@ -0,0 +1,58 @@
+from nose.tools import assert_equal
+
+from .test_helper import Test
+from asciinema.recorder import Recorder
+import asciinema.timer
+
+
+class FakePtyRecorder(object):
+
+    class Stdout(object):
+        pass
+
+    def __init__(self):
+        self.stdout = self.Stdout()
+        self.command = None
+
+    def record_command(self, *args):
+        self.call_args = args
+
+        return self.stdout
+
+    def record_call_args(self):
+        return self.call_args
+
+
+class TestRecorder(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self.pty_recorder = FakePtyRecorder()
+        self.real_timeit = asciinema.timer.timeit
+        asciinema.timer.timeit = lambda c, *args: (123.45, c(*args))
+
+    def tearDown(self):
+        asciinema.timer.timeit = self.real_timeit
+
+    def test_record_when_title_and_command_given(self):
+        recorder = Recorder(self.pty_recorder)
+
+        asciicast = recorder.record('ls -l', 'the title')
+
+        assert_equal('the title', asciicast.title)
+        assert_equal('ls -l', asciicast.command)
+        assert_equal(('ls -l',), self.pty_recorder.record_call_args())
+        assert_equal(123.45, asciicast.duration)
+        assert_equal(self.pty_recorder.stdout, asciicast.stdout)
+
+    def test_record_when_no_title_nor_command_given(self):
+        env = { 'SHELL': '/bin/blush' }
+        recorder = Recorder(self.pty_recorder, env)
+
+        asciicast = recorder.record(None, None)
+
+        assert_equal(None, asciicast.title)
+        assert_equal(None, asciicast.command)
+        assert_equal(('/bin/blush',), self.pty_recorder.record_call_args())
+        assert_equal(123.45, asciicast.duration)
+        assert_equal(self.pty_recorder.stdout, asciicast.stdout)
diff --git a/tests/requests_http_adapter_test.py b/tests/requests_http_adapter_test.py
new file mode 100644
index 0000000..c9d25de
--- /dev/null
+++ b/tests/requests_http_adapter_test.py
@@ -0,0 +1,49 @@
+import requests
+from nose.tools import assert_equal
+from .test_helper import Test
+from asciinema.requests_http_adapter import RequestsHttpAdapter
+
+
+class FakeResponse(object):
+
+    def __init__(self, status=200, headers={}, body=''):
+        self.status_code = status
+        self.headers = headers
+        self.text = body
+
+
+class TestRequestsHttpAdapter(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self._real_requests_post = requests.post
+        requests.post = self._fake_post
+
+    def tearDown(self):
+        Test.tearDown(self)
+        requests.post = self._real_requests_post
+
+    def test_post(self):
+        adapter = RequestsHttpAdapter()
+
+        status, headers, body = adapter.post(
+            'http://the/url',
+            { 'field': 'value' },
+            { 'file': ('name.txt', b'contents') },
+            { 'foo': 'bar' }
+        )
+
+        assert_equal('http://the/url', self._post_args['url'])
+        assert_equal({ 'field': 'value' }, self._post_args['data'])
+        assert_equal({ 'file': ('name.txt', b'contents') }, self._post_args['files'])
+        assert_equal({ 'foo': 'bar' }, self._post_args['headers'])
+
+        assert_equal(200, status)
+        assert_equal({ 'Content-type': 'text/plain' }, headers)
+        assert_equal('body', body)
+
+    def _fake_post(self, url, data={}, files={}, headers={}):
+        self._post_args = { 'url': url, 'data': data, 'files': files,
+                            'headers': headers }
+
+        return FakeResponse(200, { 'Content-type': 'text/plain' }, 'body' )
diff --git a/tests/stdout_test.py b/tests/stdout_test.py
new file mode 100644
index 0000000..a5eb7a5
--- /dev/null
+++ b/tests/stdout_test.py
@@ -0,0 +1,44 @@
+import time
+
+from nose.tools import assert_equal, assert_raises
+from .test_helper import Test, FakeClock
+from asciinema.stdout import Stdout, StdoutTiming
+
+
+class TestStdoutTiming(Test):
+
+    def test_append(self):
+        timing = StdoutTiming()
+
+        timing.append([0.123, 100])
+        timing.append([1234.56, 33])
+
+        assert_equal('0.123000 100\n1234.560000 33', str(timing))
+
+
+class TestStdout(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self.real_time = time.time
+        time.time = FakeClock([1, 3, 10]).time
+
+    def tearDown(self):
+        time.time = self.real_time
+
+    def test_write(self):
+        timing = []
+        stdout = Stdout(timing)
+
+        stdout.write(b'foo')
+        stdout.write(b'barbaz')
+
+        assert_equal(b'foobarbaz', stdout.data)
+        assert_equal([[2, 3], [7, 6]], timing)
+
+    def test_close(self):
+        stdout = Stdout()
+
+        stdout.close()
+
+        assert_raises(ValueError, stdout.write, 'qux')
diff --git a/tests/test_helper.py b/tests/test_helper.py
new file mode 100644
index 0000000..fe18d46
--- /dev/null
+++ b/tests/test_helper.py
@@ -0,0 +1,51 @@
+import sys
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+
+stdout = None
+
+
+def assert_printed(expected):
+    success = expected in stdout.getvalue()
+    assert success, 'expected text "%s" not printed' % expected
+
+
+def assert_not_printed(expected):
+    success = expected not in stdout.getvalue()
+    assert success, 'not expected text "%s" printed' % expected
+
+
+class Test(object):
+
+    def setUp(self):
+        global stdout
+        self.real_stdout = sys.stdout
+        sys.stdout = stdout = StringIO()
+
+    def tearDown(self):
+        sys.stdout = self.real_stdout
+
+
+class FakeClock(object):
+
+    def __init__(self, values):
+        self.values = values
+        self.n = 0
+
+    def time(self):
+        value = self.values[self.n]
+        self.n += 1
+
+        return value
+
+
+class FakeAsciicast(object):
+
+    def __init__(self, cmd=None, title=None, stdout=None, meta_data=None):
+        self.cmd = cmd
+        self.title = title
+        self.stdout = stdout
+        self.meta_data = meta_data or {}
diff --git a/tests/timer_test.py b/tests/timer_test.py
new file mode 100644
index 0000000..eabda66
--- /dev/null
+++ b/tests/timer_test.py
@@ -0,0 +1,21 @@
+import time
+
+from nose.tools import assert_equal
+from .test_helper import Test, FakeClock
+from asciinema.timer import timeit
+
+
+class TestTimer(Test):
+
+    def setUp(self):
+        self.real_time = time.time
+        time.time = FakeClock([10.0, 24.57]).time
+
+    def tearDown(self):
+        time.time = self.real_time
+
+    def test_timeit(self):
+        duration, return_value = timeit(lambda *args: args, 1, 'two', True)
+
+        assert_equal(14.57, duration)
+        assert_equal((1, 'two', True), return_value)
diff --git a/tests/uploader_test.py b/tests/uploader_test.py
new file mode 100644
index 0000000..0345a16
--- /dev/null
+++ b/tests/uploader_test.py
@@ -0,0 +1,86 @@
+import json
+import bz2
+import platform
+from nose.tools import assert_equal, assert_raises
+from .test_helper import Test, FakeAsciicast
+from asciinema import __version__
+from asciinema.uploader import Uploader, ServerMaintenanceError, ResourceNotFoundError
+
+
+class FakeHttpAdapter(object):
+
+    def __init__(self, status):
+        self.status = status
+        self.url = None
+        self.files = None
+        self.headers = None
+
+    def post(self, url, files, headers):
+        self.url = url
+        self.files = files
+        self.headers = headers
+
+        return (self.status, { 'Content-type': 'text/plain' }, b'success!')
+
+
+class FakeStdout(object):
+
+    def __init__(self, data=None, timing=None):
+        self.data = data or b''
+        self.timing = timing or b''
+
+
+class TestUploader(Test):
+
+    def setUp(self):
+        Test.setUp(self)
+        self.stdout = FakeStdout(b'data123', b'timing456')
+        self.asciicast = FakeAsciicast(cmd='ls -l', title='tit',
+                stdout=self.stdout, meta_data={ 'shell': '/bin/sh' })
+        self.real_platform = platform.platform
+        platform.platform = lambda: 'foo-bar-baz-qux-quux'
+
+    def tearDown(self):
+        Test.tearDown(self)
+        platform.platform = self.real_platform
+
+    def test_upload_when_status_201_returned(self):
+        http_adapter = FakeHttpAdapter(201)
+        uploader = Uploader(http_adapter)
+
+        response_body = uploader.upload('http://api/url', 'a1b2c3', self.asciicast)
+
+        assert_equal(b'success!', response_body)
+        assert_equal('http://api/url/api/asciicasts', http_adapter.url)
+        assert_equal(self._expected_files(), http_adapter.files)
+        assert_equal(self._expected_headers(), http_adapter.headers)
+
+    def test_upload_when_status_503_returned(self):
+        http_adapter = FakeHttpAdapter(503)
+        uploader = Uploader(http_adapter)
+
+        assert_raises(ServerMaintenanceError, uploader.upload,
+                      'http://api/url', 'a1b2c3', self.asciicast)
+
+    def test_upload_when_status_404_returned(self):
+        http_adapter = FakeHttpAdapter(404)
+        uploader = Uploader(http_adapter)
+
+        assert_raises(ResourceNotFoundError, uploader.upload,
+                      'http://api/url', 'a1b2c3', self.asciicast)
+
+    def _expected_files(self):
+        return {
+            'asciicast[meta]':
+                ('meta.json', json.dumps({ 'shell': '/bin/sh',
+                                           'user_token': 'a1b2c3' })),
+            'asciicast[stdout]':
+                ('stdout', bz2.compress(b'data123')),
+            'asciicast[stdout_timing]':
+                ('stdout.time', bz2.compress(b'timing456'))
+        }
+
+    def _expected_headers(self):
+        return { 'User-Agent': 'asciinema/%s %s/%s %s' %
+               (__version__, platform.python_implementation(),
+                   platform.python_version(), 'foo/bar-baz-qux-quux') }
diff --git a/tests/version_command_test.py b/tests/version_command_test.py
new file mode 100644
index 0000000..24bad96
--- /dev/null
+++ b/tests/version_command_test.py
@@ -0,0 +1,13 @@
+from asciinema.commands.version import VersionCommand
+from asciinema import __version__
+from .test_helper import assert_printed, Test
+
+
+class TestVersionCommand(Test):
+
+    def test_execute(self):
+        command = VersionCommand()
+
+        command.execute()
+
+        assert_printed('asciinema %s' % __version__)