tilgovi

commit 318158cf7ee82797969e5ab2fa559ca6ab4dfa6a
Merge: 0610025 a17f146
Author: Randall Leeds <tilgovi@hypothes.is>
Date:   Mon Jul 28 22:29:32 2014 -0700

    WIP on master: 0610025 Bump annotator-store version for security fix

diff --cc h/static/scripts/app_directives.coffee
index 7bac3cc,7bac3cc..4e03cca
diff --cc h/static/scripts/controllers.coffee

tilgovi

Util = require('../src/util')
$ = Util.$

Adder = require('../src/plugin/adder')
Viewer = require('../src/plugin/viewer')
Editor = require('../src/plugin/editor')
TextSelector = require('../src/plugin/textselector')
Highlighter = require('../src/plugin/highlighter')

tilgovi

// This is our interaction point
position = null;

$(document.body).on('mouseup', function (event) {
});

var annotator = Annotator.create({
  onSelection: function (event) {
    // We have to trigger this event ourselves.
    // Could be as simple as:

tilgovi

selectorExtension = require('./selectorExtension')

CustomAnnotator = Annotator.extend(selectorExtension)

annotator = new CustomAnnotator(...)

tilgovi

(defun balance-margins ()
  "This function balances the margins of all windows on the selected
   frame such that the first column and the fill column are the same
   distance from the left and right edge, respectively."
  (walk-windows
   (lambda (window)
     (let* ((total-width (window-total-width window))
            (fringe-width (apply '+ (butlast (window-fringes window))))
            (scroll-bar-width (window-scroll-bar-width window))
            (divider-width (window-right-divider-width window))

tilgovi

Background

For Hypothes.is, I've been using git describes --always option for generating version numbers. However, Chrome apps can only have digits (and '.') in their version identifiers. For that reason, instead of ending up with 0.0.6-1371-g93b5d9d (which is what versioneer generates for me), I've been publishing extensions that strip off the git hash.

Problem

When something goes wrong in production, the clear question is "what git hash was this extension built from?"

Solution

Here's my bash script to recover a git hash from a version like "0.0.6-1371" (in our case this means 1371 commits since v0.0.6).

It's easy: use git rev-list to count the commits since the tag. Then, subtract from that the trailing count in our version number to get the difference. Finally, skip back that amount from HEAD (important: in topological order).

tilgovi

#!/bin/bash

while IFS=" " read -ra LINE; do
        REF=${LINE[2]}
        HEAD=`echo ${REF} | awk '{print $NF}' | awk -F/ '{print $NF}'`
        GIT_WORK_TREE=~/${HEAD} git checkout -f ${REF}
        source ~/${HEAD}/bin/activate
        pip install -r ~/${HEAD}/requirements.txt
        pip install ~/${HEAD}
        deactivate

tilgovi

# -*- coding: utf-8 -*-
# <nbformat>3.0</nbformat>

# <codecell>

import json
import jsonld
import pprint
import rdflib
import rdflib_jsonld

tilgovi

The above grid shows the effect of fisheye distortion. Move the mouse to change the focal point.

tilgovi

"""
If a virtual environment is active, make sure it's being used.
Globally-installed console scripts use an absolute shebang path which
prevents them from importing packages in the virtualenv.
"""

import os
import os.path

if 'VIRTUAL_ENV' in os.environ: