initial
This commit is contained in:
3
game/basic/README.md
Executable file
3
game/basic/README.md
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
# Game-Show/Game/Basic
|
||||||
|
|
||||||
|
Server to prompt basic HTTP forms for sharing questions and gathering answers
|
||||||
1
game/basic/git/COMMIT_EDITMSG
Executable file
1
game/basic/git/COMMIT_EDITMSG
Executable file
@@ -0,0 +1 @@
|
|||||||
|
Initial Commit
|
||||||
1
game/basic/git/HEAD
Executable file
1
game/basic/git/HEAD
Executable file
@@ -0,0 +1 @@
|
|||||||
|
ref: refs/heads/master
|
||||||
7
game/basic/git/config
Executable file
7
game/basic/git/config
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
[core]
|
||||||
|
repositoryformatversion = 0
|
||||||
|
filemode = true
|
||||||
|
bare = false
|
||||||
|
logallrefupdates = true
|
||||||
|
ignorecase = true
|
||||||
|
precomposeunicode = true
|
||||||
1
game/basic/git/description
Executable file
1
game/basic/git/description
Executable file
@@ -0,0 +1 @@
|
|||||||
|
Unnamed repository; edit this file 'description' to name the repository.
|
||||||
15
game/basic/git/hooks/applypatch-msg.sample
Executable file
15
game/basic/git/hooks/applypatch-msg.sample
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to check the commit log message taken by
|
||||||
|
# applypatch from an e-mail message.
|
||||||
|
#
|
||||||
|
# The hook should exit with non-zero status after issuing an
|
||||||
|
# appropriate message if it wants to stop the commit. The hook is
|
||||||
|
# allowed to edit the commit message file.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "applypatch-msg".
|
||||||
|
|
||||||
|
. git-sh-setup
|
||||||
|
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
||||||
|
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
|
||||||
|
:
|
||||||
24
game/basic/git/hooks/commit-msg.sample
Executable file
24
game/basic/git/hooks/commit-msg.sample
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to check the commit log message.
|
||||||
|
# Called by "git commit" with one argument, the name of the file
|
||||||
|
# that has the commit message. The hook should exit with non-zero
|
||||||
|
# status after issuing an appropriate message if it wants to stop the
|
||||||
|
# commit. The hook is allowed to edit the commit message file.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "commit-msg".
|
||||||
|
|
||||||
|
# Uncomment the below to add a Signed-off-by line to the message.
|
||||||
|
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
||||||
|
# hook is more suited to it.
|
||||||
|
#
|
||||||
|
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||||
|
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
||||||
|
|
||||||
|
# This example catches duplicate Signed-off-by lines.
|
||||||
|
|
||||||
|
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
||||||
|
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
||||||
|
echo >&2 Duplicate Signed-off-by lines.
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
114
game/basic/git/hooks/fsmonitor-watchman.sample
Executable file
114
game/basic/git/hooks/fsmonitor-watchman.sample
Executable file
@@ -0,0 +1,114 @@
|
|||||||
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use IPC::Open2;
|
||||||
|
|
||||||
|
# An example hook script to integrate Watchman
|
||||||
|
# (https://facebook.github.io/watchman/) with git to speed up detecting
|
||||||
|
# new and modified files.
|
||||||
|
#
|
||||||
|
# The hook is passed a version (currently 1) and a time in nanoseconds
|
||||||
|
# formatted as a string and outputs to stdout all files that have been
|
||||||
|
# modified since the given time. Paths must be relative to the root of
|
||||||
|
# the working tree and separated by a single NUL.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "query-watchman" and set
|
||||||
|
# 'git config core.fsmonitor .git/hooks/query-watchman'
|
||||||
|
#
|
||||||
|
my ($version, $time) = @ARGV;
|
||||||
|
|
||||||
|
# Check the hook interface version
|
||||||
|
|
||||||
|
if ($version == 1) {
|
||||||
|
# convert nanoseconds to seconds
|
||||||
|
$time = int $time / 1000000000;
|
||||||
|
} else {
|
||||||
|
die "Unsupported query-fsmonitor hook version '$version'.\n" .
|
||||||
|
"Falling back to scanning...\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
my $git_work_tree;
|
||||||
|
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
|
||||||
|
$git_work_tree = Win32::GetCwd();
|
||||||
|
$git_work_tree =~ tr/\\/\//;
|
||||||
|
} else {
|
||||||
|
require Cwd;
|
||||||
|
$git_work_tree = Cwd::cwd();
|
||||||
|
}
|
||||||
|
|
||||||
|
my $retry = 1;
|
||||||
|
|
||||||
|
launch_watchman();
|
||||||
|
|
||||||
|
sub launch_watchman {
|
||||||
|
|
||||||
|
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
|
||||||
|
or die "open2() failed: $!\n" .
|
||||||
|
"Falling back to scanning...\n";
|
||||||
|
|
||||||
|
# In the query expression below we're asking for names of files that
|
||||||
|
# changed since $time but were not transient (ie created after
|
||||||
|
# $time but no longer exist).
|
||||||
|
#
|
||||||
|
# To accomplish this, we're using the "since" generator to use the
|
||||||
|
# recency index to select candidate nodes and "fields" to limit the
|
||||||
|
# output to file names only. Then we're using the "expression" term to
|
||||||
|
# further constrain the results.
|
||||||
|
#
|
||||||
|
# The category of transient files that we want to ignore will have a
|
||||||
|
# creation clock (cclock) newer than $time_t value and will also not
|
||||||
|
# currently exist.
|
||||||
|
|
||||||
|
my $query = <<" END";
|
||||||
|
["query", "$git_work_tree", {
|
||||||
|
"since": $time,
|
||||||
|
"fields": ["name"],
|
||||||
|
"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
|
||||||
|
}]
|
||||||
|
END
|
||||||
|
|
||||||
|
print CHLD_IN $query;
|
||||||
|
close CHLD_IN;
|
||||||
|
my $response = do {local $/; <CHLD_OUT>};
|
||||||
|
|
||||||
|
die "Watchman: command returned no output.\n" .
|
||||||
|
"Falling back to scanning...\n" if $response eq "";
|
||||||
|
die "Watchman: command returned invalid output: $response\n" .
|
||||||
|
"Falling back to scanning...\n" unless $response =~ /^\{/;
|
||||||
|
|
||||||
|
my $json_pkg;
|
||||||
|
eval {
|
||||||
|
require JSON::XS;
|
||||||
|
$json_pkg = "JSON::XS";
|
||||||
|
1;
|
||||||
|
} or do {
|
||||||
|
require JSON::PP;
|
||||||
|
$json_pkg = "JSON::PP";
|
||||||
|
};
|
||||||
|
|
||||||
|
my $o = $json_pkg->new->utf8->decode($response);
|
||||||
|
|
||||||
|
if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
|
||||||
|
print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
|
||||||
|
$retry--;
|
||||||
|
qx/watchman watch "$git_work_tree"/;
|
||||||
|
die "Failed to make watchman watch '$git_work_tree'.\n" .
|
||||||
|
"Falling back to scanning...\n" if $? != 0;
|
||||||
|
|
||||||
|
# Watchman will always return all files on the first query so
|
||||||
|
# return the fast "everything is dirty" flag to git and do the
|
||||||
|
# Watchman query just to get it over with now so we won't pay
|
||||||
|
# the cost in git to look up each individual file.
|
||||||
|
print "/\0";
|
||||||
|
eval { launch_watchman() };
|
||||||
|
exit 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
die "Watchman: $o->{error}.\n" .
|
||||||
|
"Falling back to scanning...\n" if $o->{error};
|
||||||
|
|
||||||
|
binmode STDOUT, ":utf8";
|
||||||
|
local $, = "\0";
|
||||||
|
print @{$o->{files}};
|
||||||
|
}
|
||||||
8
game/basic/git/hooks/post-update.sample
Executable file
8
game/basic/git/hooks/post-update.sample
Executable file
@@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to prepare a packed repository for use over
|
||||||
|
# dumb transports.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "post-update".
|
||||||
|
|
||||||
|
exec git update-server-info
|
||||||
14
game/basic/git/hooks/pre-applypatch.sample
Executable file
14
game/basic/git/hooks/pre-applypatch.sample
Executable file
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to verify what is about to be committed
|
||||||
|
# by applypatch from an e-mail message.
|
||||||
|
#
|
||||||
|
# The hook should exit with non-zero status after issuing an
|
||||||
|
# appropriate message if it wants to stop the commit.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-applypatch".
|
||||||
|
|
||||||
|
. git-sh-setup
|
||||||
|
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
||||||
|
test -x "$precommit" && exec "$precommit" ${1+"$@"}
|
||||||
|
:
|
||||||
49
game/basic/git/hooks/pre-commit.sample
Executable file
49
game/basic/git/hooks/pre-commit.sample
Executable file
@@ -0,0 +1,49 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to verify what is about to be committed.
|
||||||
|
# Called by "git commit" with no arguments. The hook should
|
||||||
|
# exit with non-zero status after issuing an appropriate message if
|
||||||
|
# it wants to stop the commit.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-commit".
|
||||||
|
|
||||||
|
if git rev-parse --verify HEAD >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
against=HEAD
|
||||||
|
else
|
||||||
|
# Initial commit: diff against an empty tree object
|
||||||
|
against=$(git hash-object -t tree /dev/null)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If you want to allow non-ASCII filenames set this variable to true.
|
||||||
|
allownonascii=$(git config --bool hooks.allownonascii)
|
||||||
|
|
||||||
|
# Redirect output to stderr.
|
||||||
|
exec 1>&2
|
||||||
|
|
||||||
|
# Cross platform projects tend to avoid non-ASCII filenames; prevent
|
||||||
|
# them from being added to the repository. We exploit the fact that the
|
||||||
|
# printable range starts at the space character and ends with tilde.
|
||||||
|
if [ "$allownonascii" != "true" ] &&
|
||||||
|
# Note that the use of brackets around a tr range is ok here, (it's
|
||||||
|
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
||||||
|
# the square bracket bytes happen to fall in the designated range.
|
||||||
|
test $(git diff --cached --name-only --diff-filter=A -z $against |
|
||||||
|
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
||||||
|
then
|
||||||
|
cat <<\EOF
|
||||||
|
Error: Attempt to add a non-ASCII file name.
|
||||||
|
|
||||||
|
This can cause problems if you want to work with people on other platforms.
|
||||||
|
|
||||||
|
To be portable it is advisable to rename the file.
|
||||||
|
|
||||||
|
If you know what you are doing you can disable this check using:
|
||||||
|
|
||||||
|
git config hooks.allownonascii true
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If there are whitespace errors, print the offending file names and fail.
|
||||||
|
exec git diff-index --check --cached $against --
|
||||||
53
game/basic/git/hooks/pre-push.sample
Executable file
53
game/basic/git/hooks/pre-push.sample
Executable file
@@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# An example hook script to verify what is about to be pushed. Called by "git
|
||||||
|
# push" after it has checked the remote status, but before anything has been
|
||||||
|
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
||||||
|
#
|
||||||
|
# This hook is called with the following parameters:
|
||||||
|
#
|
||||||
|
# $1 -- Name of the remote to which the push is being done
|
||||||
|
# $2 -- URL to which the push is being done
|
||||||
|
#
|
||||||
|
# If pushing without using a named remote those arguments will be equal.
|
||||||
|
#
|
||||||
|
# Information about the commits which are being pushed is supplied as lines to
|
||||||
|
# the standard input in the form:
|
||||||
|
#
|
||||||
|
# <local ref> <local sha1> <remote ref> <remote sha1>
|
||||||
|
#
|
||||||
|
# This sample shows how to prevent push of commits where the log message starts
|
||||||
|
# with "WIP" (work in progress).
|
||||||
|
|
||||||
|
remote="$1"
|
||||||
|
url="$2"
|
||||||
|
|
||||||
|
z40=0000000000000000000000000000000000000000
|
||||||
|
|
||||||
|
while read local_ref local_sha remote_ref remote_sha
|
||||||
|
do
|
||||||
|
if [ "$local_sha" = $z40 ]
|
||||||
|
then
|
||||||
|
# Handle delete
|
||||||
|
:
|
||||||
|
else
|
||||||
|
if [ "$remote_sha" = $z40 ]
|
||||||
|
then
|
||||||
|
# New branch, examine all commits
|
||||||
|
range="$local_sha"
|
||||||
|
else
|
||||||
|
# Update to existing branch, examine new commits
|
||||||
|
range="$remote_sha..$local_sha"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for WIP commit
|
||||||
|
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
|
||||||
|
if [ -n "$commit" ]
|
||||||
|
then
|
||||||
|
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exit 0
|
||||||
169
game/basic/git/hooks/pre-rebase.sample
Executable file
169
game/basic/git/hooks/pre-rebase.sample
Executable file
@@ -0,0 +1,169 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006, 2008 Junio C Hamano
|
||||||
|
#
|
||||||
|
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
||||||
|
# its job, and can prevent the command from running by exiting with
|
||||||
|
# non-zero status.
|
||||||
|
#
|
||||||
|
# The hook is called with the following parameters:
|
||||||
|
#
|
||||||
|
# $1 -- the upstream the series was forked from.
|
||||||
|
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
||||||
|
#
|
||||||
|
# This sample shows how to prevent topic branches that are already
|
||||||
|
# merged to 'next' branch from getting rebased, because allowing it
|
||||||
|
# would result in rebasing already published history.
|
||||||
|
|
||||||
|
publish=next
|
||||||
|
basebranch="$1"
|
||||||
|
if test "$#" = 2
|
||||||
|
then
|
||||||
|
topic="refs/heads/$2"
|
||||||
|
else
|
||||||
|
topic=`git symbolic-ref HEAD` ||
|
||||||
|
exit 0 ;# we do not interrupt rebasing detached HEAD
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$topic" in
|
||||||
|
refs/heads/??/*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0 ;# we do not interrupt others.
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Now we are dealing with a topic branch being rebased
|
||||||
|
# on top of master. Is it OK to rebase it?
|
||||||
|
|
||||||
|
# Does the topic really exist?
|
||||||
|
git show-ref -q "$topic" || {
|
||||||
|
echo >&2 "No such branch $topic"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Is topic fully merged to master?
|
||||||
|
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
||||||
|
if test -z "$not_in_master"
|
||||||
|
then
|
||||||
|
echo >&2 "$topic is fully merged to master; better remove it."
|
||||||
|
exit 1 ;# we could allow it, but there is no point.
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Is topic ever merged to next? If so you should not be rebasing it.
|
||||||
|
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
||||||
|
only_next_2=`git rev-list ^master ${publish} | sort`
|
||||||
|
if test "$only_next_1" = "$only_next_2"
|
||||||
|
then
|
||||||
|
not_in_topic=`git rev-list "^$topic" master`
|
||||||
|
if test -z "$not_in_topic"
|
||||||
|
then
|
||||||
|
echo >&2 "$topic is already up to date with master"
|
||||||
|
exit 1 ;# we could allow it, but there is no point.
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
||||||
|
/usr/bin/perl -e '
|
||||||
|
my $topic = $ARGV[0];
|
||||||
|
my $msg = "* $topic has commits already merged to public branch:\n";
|
||||||
|
my (%not_in_next) = map {
|
||||||
|
/^([0-9a-f]+) /;
|
||||||
|
($1 => 1);
|
||||||
|
} split(/\n/, $ARGV[1]);
|
||||||
|
for my $elem (map {
|
||||||
|
/^([0-9a-f]+) (.*)$/;
|
||||||
|
[$1 => $2];
|
||||||
|
} split(/\n/, $ARGV[2])) {
|
||||||
|
if (!exists $not_in_next{$elem->[0]}) {
|
||||||
|
if ($msg) {
|
||||||
|
print STDERR $msg;
|
||||||
|
undef $msg;
|
||||||
|
}
|
||||||
|
print STDERR " $elem->[1]\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
' "$topic" "$not_in_next" "$not_in_master"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
<<\DOC_END
|
||||||
|
|
||||||
|
This sample hook safeguards topic branches that have been
|
||||||
|
published from being rewound.
|
||||||
|
|
||||||
|
The workflow assumed here is:
|
||||||
|
|
||||||
|
* Once a topic branch forks from "master", "master" is never
|
||||||
|
merged into it again (either directly or indirectly).
|
||||||
|
|
||||||
|
* Once a topic branch is fully cooked and merged into "master",
|
||||||
|
it is deleted. If you need to build on top of it to correct
|
||||||
|
earlier mistakes, a new topic branch is created by forking at
|
||||||
|
the tip of the "master". This is not strictly necessary, but
|
||||||
|
it makes it easier to keep your history simple.
|
||||||
|
|
||||||
|
* Whenever you need to test or publish your changes to topic
|
||||||
|
branches, merge them into "next" branch.
|
||||||
|
|
||||||
|
The script, being an example, hardcodes the publish branch name
|
||||||
|
to be "next", but it is trivial to make it configurable via
|
||||||
|
$GIT_DIR/config mechanism.
|
||||||
|
|
||||||
|
With this workflow, you would want to know:
|
||||||
|
|
||||||
|
(1) ... if a topic branch has ever been merged to "next". Young
|
||||||
|
topic branches can have stupid mistakes you would rather
|
||||||
|
clean up before publishing, and things that have not been
|
||||||
|
merged into other branches can be easily rebased without
|
||||||
|
affecting other people. But once it is published, you would
|
||||||
|
not want to rewind it.
|
||||||
|
|
||||||
|
(2) ... if a topic branch has been fully merged to "master".
|
||||||
|
Then you can delete it. More importantly, you should not
|
||||||
|
build on top of it -- other people may already want to
|
||||||
|
change things related to the topic as patches against your
|
||||||
|
"master", so if you need further changes, it is better to
|
||||||
|
fork the topic (perhaps with the same name) afresh from the
|
||||||
|
tip of "master".
|
||||||
|
|
||||||
|
Let's look at this example:
|
||||||
|
|
||||||
|
o---o---o---o---o---o---o---o---o---o "next"
|
||||||
|
/ / / /
|
||||||
|
/ a---a---b A / /
|
||||||
|
/ / / /
|
||||||
|
/ / c---c---c---c B /
|
||||||
|
/ / / \ /
|
||||||
|
/ / / b---b C \ /
|
||||||
|
/ / / / \ /
|
||||||
|
---o---o---o---o---o---o---o---o---o---o---o "master"
|
||||||
|
|
||||||
|
|
||||||
|
A, B and C are topic branches.
|
||||||
|
|
||||||
|
* A has one fix since it was merged up to "next".
|
||||||
|
|
||||||
|
* B has finished. It has been fully merged up to "master" and "next",
|
||||||
|
and is ready to be deleted.
|
||||||
|
|
||||||
|
* C has not merged to "next" at all.
|
||||||
|
|
||||||
|
We would want to allow C to be rebased, refuse A, and encourage
|
||||||
|
B to be deleted.
|
||||||
|
|
||||||
|
To compute (1):
|
||||||
|
|
||||||
|
git rev-list ^master ^topic next
|
||||||
|
git rev-list ^master next
|
||||||
|
|
||||||
|
if these match, topic has not merged in next at all.
|
||||||
|
|
||||||
|
To compute (2):
|
||||||
|
|
||||||
|
git rev-list master..topic
|
||||||
|
|
||||||
|
if this is empty, it is fully merged to "master".
|
||||||
|
|
||||||
|
DOC_END
|
||||||
24
game/basic/git/hooks/pre-receive.sample
Executable file
24
game/basic/git/hooks/pre-receive.sample
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to make use of push options.
|
||||||
|
# The example simply echoes all push options that start with 'echoback='
|
||||||
|
# and rejects all pushes when the "reject" push option is used.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-receive".
|
||||||
|
|
||||||
|
if test -n "$GIT_PUSH_OPTION_COUNT"
|
||||||
|
then
|
||||||
|
i=0
|
||||||
|
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
||||||
|
do
|
||||||
|
eval "value=\$GIT_PUSH_OPTION_$i"
|
||||||
|
case "$value" in
|
||||||
|
echoback=*)
|
||||||
|
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
||||||
|
;;
|
||||||
|
reject)
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
i=$((i + 1))
|
||||||
|
done
|
||||||
|
fi
|
||||||
42
game/basic/git/hooks/prepare-commit-msg.sample
Executable file
42
game/basic/git/hooks/prepare-commit-msg.sample
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to prepare the commit log message.
|
||||||
|
# Called by "git commit" with the name of the file that has the
|
||||||
|
# commit message, followed by the description of the commit
|
||||||
|
# message's source. The hook's purpose is to edit the commit
|
||||||
|
# message file. If the hook fails with a non-zero status,
|
||||||
|
# the commit is aborted.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "prepare-commit-msg".
|
||||||
|
|
||||||
|
# This hook includes three examples. The first one removes the
|
||||||
|
# "# Please enter the commit message..." help message.
|
||||||
|
#
|
||||||
|
# The second includes the output of "git diff --name-status -r"
|
||||||
|
# into the message, just before the "git status" output. It is
|
||||||
|
# commented because it doesn't cope with --amend or with squashed
|
||||||
|
# commits.
|
||||||
|
#
|
||||||
|
# The third example adds a Signed-off-by line to the message, that can
|
||||||
|
# still be edited. This is rarely a good idea.
|
||||||
|
|
||||||
|
COMMIT_MSG_FILE=$1
|
||||||
|
COMMIT_SOURCE=$2
|
||||||
|
SHA1=$3
|
||||||
|
|
||||||
|
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
||||||
|
|
||||||
|
# case "$COMMIT_SOURCE,$SHA1" in
|
||||||
|
# ,|template,)
|
||||||
|
# /usr/bin/perl -i.bak -pe '
|
||||||
|
# print "\n" . `git diff --cached --name-status -r`
|
||||||
|
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
||||||
|
# *) ;;
|
||||||
|
# esac
|
||||||
|
|
||||||
|
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||||
|
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
||||||
|
# if test -z "$COMMIT_SOURCE"
|
||||||
|
# then
|
||||||
|
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
||||||
|
# fi
|
||||||
128
game/basic/git/hooks/update.sample
Executable file
128
game/basic/git/hooks/update.sample
Executable file
@@ -0,0 +1,128 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to block unannotated tags from entering.
|
||||||
|
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "update".
|
||||||
|
#
|
||||||
|
# Config
|
||||||
|
# ------
|
||||||
|
# hooks.allowunannotated
|
||||||
|
# This boolean sets whether unannotated tags will be allowed into the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.allowdeletetag
|
||||||
|
# This boolean sets whether deleting tags will be allowed in the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.allowmodifytag
|
||||||
|
# This boolean sets whether a tag may be modified after creation. By default
|
||||||
|
# it won't be.
|
||||||
|
# hooks.allowdeletebranch
|
||||||
|
# This boolean sets whether deleting branches will be allowed in the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.denycreatebranch
|
||||||
|
# This boolean sets whether remotely creating branches will be denied
|
||||||
|
# in the repository. By default this is allowed.
|
||||||
|
#
|
||||||
|
|
||||||
|
# --- Command line
|
||||||
|
refname="$1"
|
||||||
|
oldrev="$2"
|
||||||
|
newrev="$3"
|
||||||
|
|
||||||
|
# --- Safety check
|
||||||
|
if [ -z "$GIT_DIR" ]; then
|
||||||
|
echo "Don't run this script from the command line." >&2
|
||||||
|
echo " (if you want, you could supply GIT_DIR then run" >&2
|
||||||
|
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
||||||
|
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- Config
|
||||||
|
allowunannotated=$(git config --bool hooks.allowunannotated)
|
||||||
|
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
||||||
|
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
||||||
|
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
||||||
|
allowmodifytag=$(git config --bool hooks.allowmodifytag)
|
||||||
|
|
||||||
|
# check for no description
|
||||||
|
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
||||||
|
case "$projectdesc" in
|
||||||
|
"Unnamed repository"* | "")
|
||||||
|
echo "*** Project description file hasn't been set" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# --- Check types
|
||||||
|
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
||||||
|
zero="0000000000000000000000000000000000000000"
|
||||||
|
if [ "$newrev" = "$zero" ]; then
|
||||||
|
newrev_type=delete
|
||||||
|
else
|
||||||
|
newrev_type=$(git cat-file -t $newrev)
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$refname","$newrev_type" in
|
||||||
|
refs/tags/*,commit)
|
||||||
|
# un-annotated tag
|
||||||
|
short_refname=${refname##refs/tags/}
|
||||||
|
if [ "$allowunannotated" != "true" ]; then
|
||||||
|
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
||||||
|
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/tags/*,delete)
|
||||||
|
# delete tag
|
||||||
|
if [ "$allowdeletetag" != "true" ]; then
|
||||||
|
echo "*** Deleting a tag is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/tags/*,tag)
|
||||||
|
# annotated tag
|
||||||
|
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
||||||
|
then
|
||||||
|
echo "*** Tag '$refname' already exists." >&2
|
||||||
|
echo "*** Modifying a tag is not allowed in this repository." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/heads/*,commit)
|
||||||
|
# branch
|
||||||
|
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
||||||
|
echo "*** Creating a branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/heads/*,delete)
|
||||||
|
# delete branch
|
||||||
|
if [ "$allowdeletebranch" != "true" ]; then
|
||||||
|
echo "*** Deleting a branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/remotes/*,commit)
|
||||||
|
# tracking branch
|
||||||
|
;;
|
||||||
|
refs/remotes/*,delete)
|
||||||
|
# delete tracking branch
|
||||||
|
if [ "$allowdeletebranch" != "true" ]; then
|
||||||
|
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# Anything else (is there anything else?)
|
||||||
|
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# --- Finished
|
||||||
|
exit 0
|
||||||
BIN
game/basic/git/index
Executable file
BIN
game/basic/git/index
Executable file
Binary file not shown.
6
game/basic/git/info/exclude
Executable file
6
game/basic/git/info/exclude
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
# git ls-files --others --exclude-from=.git/info/exclude
|
||||||
|
# Lines that start with '#' are comments.
|
||||||
|
# For a project mostly in C, the following would be a good set of
|
||||||
|
# exclude patterns (uncomment them if you want to use them):
|
||||||
|
# *.[oa]
|
||||||
|
# *~
|
||||||
1
game/basic/git/logs/HEAD
Executable file
1
game/basic/git/logs/HEAD
Executable file
@@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 8263c8b6f1825595b0d22f83fdc0e4274eae1d51 Bel LaPointe <breel@qualtrics.com> 1582562913 -0700 commit (initial): Initial Commit
|
||||||
1
game/basic/git/logs/refs/heads/master
Executable file
1
game/basic/git/logs/refs/heads/master
Executable file
@@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 8263c8b6f1825595b0d22f83fdc0e4274eae1d51 Bel LaPointe <breel@qualtrics.com> 1582562913 -0700 commit (initial): Initial Commit
|
||||||
BIN
game/basic/git/objects/00/76607907d4e64dd8177a00a6b2852116c513d0
Executable file
BIN
game/basic/git/objects/00/76607907d4e64dd8177a00a6b2852116c513d0
Executable file
Binary file not shown.
BIN
game/basic/git/objects/82/63c8b6f1825595b0d22f83fdc0e4274eae1d51
Executable file
BIN
game/basic/git/objects/82/63c8b6f1825595b0d22f83fdc0e4274eae1d51
Executable file
Binary file not shown.
2
game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22
Executable file
2
game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
xИ1В0Faжњв—<D0B2>QЎGи#Rr‡љ&‰‹ќ¶ЧGayzъвG"nЧсtЖќ
|
||||||
|
_|’cи7LdщењgЭYС«JYbw<Bxв-Z¬–Hs]рЭШZ–j :cЎ–шпTн`5ч&€
|
||||||
1
game/basic/git/refs/heads/master
Executable file
1
game/basic/git/refs/heads/master
Executable file
@@ -0,0 +1 @@
|
|||||||
|
8263c8b6f1825595b0d22f83fdc0e4274eae1d51
|
||||||
3
questions/.gitignore
vendored
Executable file
3
questions/.gitignore
vendored
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
**/*.sw*
|
||||||
|
questions
|
||||||
|
exec-questions
|
||||||
3
questions/README.md
Executable file
3
questions/README.md
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
# Game-Show/Questions
|
||||||
|
|
||||||
|
JSON API for getting, validating, and creating questions and answer choices
|
||||||
51
questions/config/config.go
Executable file
51
questions/config/config.go
Executable file
@@ -0,0 +1,51 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"local/args"
|
||||||
|
"local/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
Addr string
|
||||||
|
DB storage.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
var config Config
|
||||||
|
|
||||||
|
func New() error {
|
||||||
|
as := args.NewArgSet()
|
||||||
|
as.Append(args.INT, "p", "port to listen on", 39981)
|
||||||
|
as.Append(args.STRING, "db", "db type to use", "map")
|
||||||
|
as.Append(args.STRING, "dbns", "db namespace", "")
|
||||||
|
as.Append(args.STRING, "dbaddr", "db's address or path", "")
|
||||||
|
as.Append(args.STRING, "dbuser", "db's username", "")
|
||||||
|
as.Append(args.STRING, "dbpass", "db's password", "")
|
||||||
|
err := as.Parse()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
db, err := storage.New(
|
||||||
|
storage.TypeFromString(as.Get("db").GetString()),
|
||||||
|
as.Get("dbaddr").GetString(),
|
||||||
|
as.Get("dbuser").GetString(),
|
||||||
|
as.Get("dbpass").GetString(),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
was := config.DB
|
||||||
|
config = Config{
|
||||||
|
Addr: fmt.Sprintf(":%d", as.Get("p").GetInt()),
|
||||||
|
DB: db,
|
||||||
|
}
|
||||||
|
if was != nil {
|
||||||
|
was.Close()
|
||||||
|
}
|
||||||
|
storage.DefaultNamespace = as.Get("dbns").GetString()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func Get() Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
1
questions/git/COMMIT_EDITMSG
Executable file
1
questions/git/COMMIT_EDITMSG
Executable file
@@ -0,0 +1 @@
|
|||||||
|
Create, cat, delete, and check individual questions
|
||||||
1
questions/git/HEAD
Executable file
1
questions/git/HEAD
Executable file
@@ -0,0 +1 @@
|
|||||||
|
ref: refs/heads/master
|
||||||
7
questions/git/config
Executable file
7
questions/git/config
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
[core]
|
||||||
|
repositoryformatversion = 0
|
||||||
|
filemode = true
|
||||||
|
bare = false
|
||||||
|
logallrefupdates = true
|
||||||
|
ignorecase = true
|
||||||
|
precomposeunicode = true
|
||||||
1
questions/git/description
Executable file
1
questions/git/description
Executable file
@@ -0,0 +1 @@
|
|||||||
|
Unnamed repository; edit this file 'description' to name the repository.
|
||||||
15
questions/git/hooks/applypatch-msg.sample
Executable file
15
questions/git/hooks/applypatch-msg.sample
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to check the commit log message taken by
|
||||||
|
# applypatch from an e-mail message.
|
||||||
|
#
|
||||||
|
# The hook should exit with non-zero status after issuing an
|
||||||
|
# appropriate message if it wants to stop the commit. The hook is
|
||||||
|
# allowed to edit the commit message file.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "applypatch-msg".
|
||||||
|
|
||||||
|
. git-sh-setup
|
||||||
|
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
||||||
|
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
|
||||||
|
:
|
||||||
24
questions/git/hooks/commit-msg.sample
Executable file
24
questions/git/hooks/commit-msg.sample
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to check the commit log message.
|
||||||
|
# Called by "git commit" with one argument, the name of the file
|
||||||
|
# that has the commit message. The hook should exit with non-zero
|
||||||
|
# status after issuing an appropriate message if it wants to stop the
|
||||||
|
# commit. The hook is allowed to edit the commit message file.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "commit-msg".
|
||||||
|
|
||||||
|
# Uncomment the below to add a Signed-off-by line to the message.
|
||||||
|
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
||||||
|
# hook is more suited to it.
|
||||||
|
#
|
||||||
|
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||||
|
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
||||||
|
|
||||||
|
# This example catches duplicate Signed-off-by lines.
|
||||||
|
|
||||||
|
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
||||||
|
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
||||||
|
echo >&2 Duplicate Signed-off-by lines.
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
114
questions/git/hooks/fsmonitor-watchman.sample
Executable file
114
questions/git/hooks/fsmonitor-watchman.sample
Executable file
@@ -0,0 +1,114 @@
|
|||||||
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use IPC::Open2;
|
||||||
|
|
||||||
|
# An example hook script to integrate Watchman
|
||||||
|
# (https://facebook.github.io/watchman/) with git to speed up detecting
|
||||||
|
# new and modified files.
|
||||||
|
#
|
||||||
|
# The hook is passed a version (currently 1) and a time in nanoseconds
|
||||||
|
# formatted as a string and outputs to stdout all files that have been
|
||||||
|
# modified since the given time. Paths must be relative to the root of
|
||||||
|
# the working tree and separated by a single NUL.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "query-watchman" and set
|
||||||
|
# 'git config core.fsmonitor .git/hooks/query-watchman'
|
||||||
|
#
|
||||||
|
my ($version, $time) = @ARGV;
|
||||||
|
|
||||||
|
# Check the hook interface version
|
||||||
|
|
||||||
|
if ($version == 1) {
|
||||||
|
# convert nanoseconds to seconds
|
||||||
|
$time = int $time / 1000000000;
|
||||||
|
} else {
|
||||||
|
die "Unsupported query-fsmonitor hook version '$version'.\n" .
|
||||||
|
"Falling back to scanning...\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
my $git_work_tree;
|
||||||
|
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
|
||||||
|
$git_work_tree = Win32::GetCwd();
|
||||||
|
$git_work_tree =~ tr/\\/\//;
|
||||||
|
} else {
|
||||||
|
require Cwd;
|
||||||
|
$git_work_tree = Cwd::cwd();
|
||||||
|
}
|
||||||
|
|
||||||
|
my $retry = 1;
|
||||||
|
|
||||||
|
launch_watchman();
|
||||||
|
|
||||||
|
sub launch_watchman {
|
||||||
|
|
||||||
|
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
|
||||||
|
or die "open2() failed: $!\n" .
|
||||||
|
"Falling back to scanning...\n";
|
||||||
|
|
||||||
|
# In the query expression below we're asking for names of files that
|
||||||
|
# changed since $time but were not transient (ie created after
|
||||||
|
# $time but no longer exist).
|
||||||
|
#
|
||||||
|
# To accomplish this, we're using the "since" generator to use the
|
||||||
|
# recency index to select candidate nodes and "fields" to limit the
|
||||||
|
# output to file names only. Then we're using the "expression" term to
|
||||||
|
# further constrain the results.
|
||||||
|
#
|
||||||
|
# The category of transient files that we want to ignore will have a
|
||||||
|
# creation clock (cclock) newer than $time_t value and will also not
|
||||||
|
# currently exist.
|
||||||
|
|
||||||
|
my $query = <<" END";
|
||||||
|
["query", "$git_work_tree", {
|
||||||
|
"since": $time,
|
||||||
|
"fields": ["name"],
|
||||||
|
"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
|
||||||
|
}]
|
||||||
|
END
|
||||||
|
|
||||||
|
print CHLD_IN $query;
|
||||||
|
close CHLD_IN;
|
||||||
|
my $response = do {local $/; <CHLD_OUT>};
|
||||||
|
|
||||||
|
die "Watchman: command returned no output.\n" .
|
||||||
|
"Falling back to scanning...\n" if $response eq "";
|
||||||
|
die "Watchman: command returned invalid output: $response\n" .
|
||||||
|
"Falling back to scanning...\n" unless $response =~ /^\{/;
|
||||||
|
|
||||||
|
my $json_pkg;
|
||||||
|
eval {
|
||||||
|
require JSON::XS;
|
||||||
|
$json_pkg = "JSON::XS";
|
||||||
|
1;
|
||||||
|
} or do {
|
||||||
|
require JSON::PP;
|
||||||
|
$json_pkg = "JSON::PP";
|
||||||
|
};
|
||||||
|
|
||||||
|
my $o = $json_pkg->new->utf8->decode($response);
|
||||||
|
|
||||||
|
if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
|
||||||
|
print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
|
||||||
|
$retry--;
|
||||||
|
qx/watchman watch "$git_work_tree"/;
|
||||||
|
die "Failed to make watchman watch '$git_work_tree'.\n" .
|
||||||
|
"Falling back to scanning...\n" if $? != 0;
|
||||||
|
|
||||||
|
# Watchman will always return all files on the first query so
|
||||||
|
# return the fast "everything is dirty" flag to git and do the
|
||||||
|
# Watchman query just to get it over with now so we won't pay
|
||||||
|
# the cost in git to look up each individual file.
|
||||||
|
print "/\0";
|
||||||
|
eval { launch_watchman() };
|
||||||
|
exit 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
die "Watchman: $o->{error}.\n" .
|
||||||
|
"Falling back to scanning...\n" if $o->{error};
|
||||||
|
|
||||||
|
binmode STDOUT, ":utf8";
|
||||||
|
local $, = "\0";
|
||||||
|
print @{$o->{files}};
|
||||||
|
}
|
||||||
8
questions/git/hooks/post-update.sample
Executable file
8
questions/git/hooks/post-update.sample
Executable file
@@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to prepare a packed repository for use over
|
||||||
|
# dumb transports.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "post-update".
|
||||||
|
|
||||||
|
exec git update-server-info
|
||||||
14
questions/git/hooks/pre-applypatch.sample
Executable file
14
questions/git/hooks/pre-applypatch.sample
Executable file
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to verify what is about to be committed
|
||||||
|
# by applypatch from an e-mail message.
|
||||||
|
#
|
||||||
|
# The hook should exit with non-zero status after issuing an
|
||||||
|
# appropriate message if it wants to stop the commit.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-applypatch".
|
||||||
|
|
||||||
|
. git-sh-setup
|
||||||
|
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
||||||
|
test -x "$precommit" && exec "$precommit" ${1+"$@"}
|
||||||
|
:
|
||||||
49
questions/git/hooks/pre-commit.sample
Executable file
49
questions/git/hooks/pre-commit.sample
Executable file
@@ -0,0 +1,49 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to verify what is about to be committed.
|
||||||
|
# Called by "git commit" with no arguments. The hook should
|
||||||
|
# exit with non-zero status after issuing an appropriate message if
|
||||||
|
# it wants to stop the commit.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-commit".
|
||||||
|
|
||||||
|
if git rev-parse --verify HEAD >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
against=HEAD
|
||||||
|
else
|
||||||
|
# Initial commit: diff against an empty tree object
|
||||||
|
against=$(git hash-object -t tree /dev/null)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If you want to allow non-ASCII filenames set this variable to true.
|
||||||
|
allownonascii=$(git config --bool hooks.allownonascii)
|
||||||
|
|
||||||
|
# Redirect output to stderr.
|
||||||
|
exec 1>&2
|
||||||
|
|
||||||
|
# Cross platform projects tend to avoid non-ASCII filenames; prevent
|
||||||
|
# them from being added to the repository. We exploit the fact that the
|
||||||
|
# printable range starts at the space character and ends with tilde.
|
||||||
|
if [ "$allownonascii" != "true" ] &&
|
||||||
|
# Note that the use of brackets around a tr range is ok here, (it's
|
||||||
|
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
||||||
|
# the square bracket bytes happen to fall in the designated range.
|
||||||
|
test $(git diff --cached --name-only --diff-filter=A -z $against |
|
||||||
|
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
||||||
|
then
|
||||||
|
cat <<\EOF
|
||||||
|
Error: Attempt to add a non-ASCII file name.
|
||||||
|
|
||||||
|
This can cause problems if you want to work with people on other platforms.
|
||||||
|
|
||||||
|
To be portable it is advisable to rename the file.
|
||||||
|
|
||||||
|
If you know what you are doing you can disable this check using:
|
||||||
|
|
||||||
|
git config hooks.allownonascii true
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If there are whitespace errors, print the offending file names and fail.
|
||||||
|
exec git diff-index --check --cached $against --
|
||||||
53
questions/git/hooks/pre-push.sample
Executable file
53
questions/git/hooks/pre-push.sample
Executable file
@@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# An example hook script to verify what is about to be pushed. Called by "git
|
||||||
|
# push" after it has checked the remote status, but before anything has been
|
||||||
|
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
||||||
|
#
|
||||||
|
# This hook is called with the following parameters:
|
||||||
|
#
|
||||||
|
# $1 -- Name of the remote to which the push is being done
|
||||||
|
# $2 -- URL to which the push is being done
|
||||||
|
#
|
||||||
|
# If pushing without using a named remote those arguments will be equal.
|
||||||
|
#
|
||||||
|
# Information about the commits which are being pushed is supplied as lines to
|
||||||
|
# the standard input in the form:
|
||||||
|
#
|
||||||
|
# <local ref> <local sha1> <remote ref> <remote sha1>
|
||||||
|
#
|
||||||
|
# This sample shows how to prevent push of commits where the log message starts
|
||||||
|
# with "WIP" (work in progress).
|
||||||
|
|
||||||
|
remote="$1"
|
||||||
|
url="$2"
|
||||||
|
|
||||||
|
z40=0000000000000000000000000000000000000000
|
||||||
|
|
||||||
|
while read local_ref local_sha remote_ref remote_sha
|
||||||
|
do
|
||||||
|
if [ "$local_sha" = $z40 ]
|
||||||
|
then
|
||||||
|
# Handle delete
|
||||||
|
:
|
||||||
|
else
|
||||||
|
if [ "$remote_sha" = $z40 ]
|
||||||
|
then
|
||||||
|
# New branch, examine all commits
|
||||||
|
range="$local_sha"
|
||||||
|
else
|
||||||
|
# Update to existing branch, examine new commits
|
||||||
|
range="$remote_sha..$local_sha"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for WIP commit
|
||||||
|
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
|
||||||
|
if [ -n "$commit" ]
|
||||||
|
then
|
||||||
|
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exit 0
|
||||||
169
questions/git/hooks/pre-rebase.sample
Executable file
169
questions/git/hooks/pre-rebase.sample
Executable file
@@ -0,0 +1,169 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006, 2008 Junio C Hamano
|
||||||
|
#
|
||||||
|
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
||||||
|
# its job, and can prevent the command from running by exiting with
|
||||||
|
# non-zero status.
|
||||||
|
#
|
||||||
|
# The hook is called with the following parameters:
|
||||||
|
#
|
||||||
|
# $1 -- the upstream the series was forked from.
|
||||||
|
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
||||||
|
#
|
||||||
|
# This sample shows how to prevent topic branches that are already
|
||||||
|
# merged to 'next' branch from getting rebased, because allowing it
|
||||||
|
# would result in rebasing already published history.
|
||||||
|
|
||||||
|
publish=next
|
||||||
|
basebranch="$1"
|
||||||
|
if test "$#" = 2
|
||||||
|
then
|
||||||
|
topic="refs/heads/$2"
|
||||||
|
else
|
||||||
|
topic=`git symbolic-ref HEAD` ||
|
||||||
|
exit 0 ;# we do not interrupt rebasing detached HEAD
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$topic" in
|
||||||
|
refs/heads/??/*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0 ;# we do not interrupt others.
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Now we are dealing with a topic branch being rebased
|
||||||
|
# on top of master. Is it OK to rebase it?
|
||||||
|
|
||||||
|
# Does the topic really exist?
|
||||||
|
git show-ref -q "$topic" || {
|
||||||
|
echo >&2 "No such branch $topic"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Is topic fully merged to master?
|
||||||
|
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
||||||
|
if test -z "$not_in_master"
|
||||||
|
then
|
||||||
|
echo >&2 "$topic is fully merged to master; better remove it."
|
||||||
|
exit 1 ;# we could allow it, but there is no point.
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Is topic ever merged to next? If so you should not be rebasing it.
|
||||||
|
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
||||||
|
only_next_2=`git rev-list ^master ${publish} | sort`
|
||||||
|
if test "$only_next_1" = "$only_next_2"
|
||||||
|
then
|
||||||
|
not_in_topic=`git rev-list "^$topic" master`
|
||||||
|
if test -z "$not_in_topic"
|
||||||
|
then
|
||||||
|
echo >&2 "$topic is already up to date with master"
|
||||||
|
exit 1 ;# we could allow it, but there is no point.
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
||||||
|
/usr/bin/perl -e '
|
||||||
|
my $topic = $ARGV[0];
|
||||||
|
my $msg = "* $topic has commits already merged to public branch:\n";
|
||||||
|
my (%not_in_next) = map {
|
||||||
|
/^([0-9a-f]+) /;
|
||||||
|
($1 => 1);
|
||||||
|
} split(/\n/, $ARGV[1]);
|
||||||
|
for my $elem (map {
|
||||||
|
/^([0-9a-f]+) (.*)$/;
|
||||||
|
[$1 => $2];
|
||||||
|
} split(/\n/, $ARGV[2])) {
|
||||||
|
if (!exists $not_in_next{$elem->[0]}) {
|
||||||
|
if ($msg) {
|
||||||
|
print STDERR $msg;
|
||||||
|
undef $msg;
|
||||||
|
}
|
||||||
|
print STDERR " $elem->[1]\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
' "$topic" "$not_in_next" "$not_in_master"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
<<\DOC_END
|
||||||
|
|
||||||
|
This sample hook safeguards topic branches that have been
|
||||||
|
published from being rewound.
|
||||||
|
|
||||||
|
The workflow assumed here is:
|
||||||
|
|
||||||
|
* Once a topic branch forks from "master", "master" is never
|
||||||
|
merged into it again (either directly or indirectly).
|
||||||
|
|
||||||
|
* Once a topic branch is fully cooked and merged into "master",
|
||||||
|
it is deleted. If you need to build on top of it to correct
|
||||||
|
earlier mistakes, a new topic branch is created by forking at
|
||||||
|
the tip of the "master". This is not strictly necessary, but
|
||||||
|
it makes it easier to keep your history simple.
|
||||||
|
|
||||||
|
* Whenever you need to test or publish your changes to topic
|
||||||
|
branches, merge them into "next" branch.
|
||||||
|
|
||||||
|
The script, being an example, hardcodes the publish branch name
|
||||||
|
to be "next", but it is trivial to make it configurable via
|
||||||
|
$GIT_DIR/config mechanism.
|
||||||
|
|
||||||
|
With this workflow, you would want to know:
|
||||||
|
|
||||||
|
(1) ... if a topic branch has ever been merged to "next". Young
|
||||||
|
topic branches can have stupid mistakes you would rather
|
||||||
|
clean up before publishing, and things that have not been
|
||||||
|
merged into other branches can be easily rebased without
|
||||||
|
affecting other people. But once it is published, you would
|
||||||
|
not want to rewind it.
|
||||||
|
|
||||||
|
(2) ... if a topic branch has been fully merged to "master".
|
||||||
|
Then you can delete it. More importantly, you should not
|
||||||
|
build on top of it -- other people may already want to
|
||||||
|
change things related to the topic as patches against your
|
||||||
|
"master", so if you need further changes, it is better to
|
||||||
|
fork the topic (perhaps with the same name) afresh from the
|
||||||
|
tip of "master".
|
||||||
|
|
||||||
|
Let's look at this example:
|
||||||
|
|
||||||
|
o---o---o---o---o---o---o---o---o---o "next"
|
||||||
|
/ / / /
|
||||||
|
/ a---a---b A / /
|
||||||
|
/ / / /
|
||||||
|
/ / c---c---c---c B /
|
||||||
|
/ / / \ /
|
||||||
|
/ / / b---b C \ /
|
||||||
|
/ / / / \ /
|
||||||
|
---o---o---o---o---o---o---o---o---o---o---o "master"
|
||||||
|
|
||||||
|
|
||||||
|
A, B and C are topic branches.
|
||||||
|
|
||||||
|
* A has one fix since it was merged up to "next".
|
||||||
|
|
||||||
|
* B has finished. It has been fully merged up to "master" and "next",
|
||||||
|
and is ready to be deleted.
|
||||||
|
|
||||||
|
* C has not merged to "next" at all.
|
||||||
|
|
||||||
|
We would want to allow C to be rebased, refuse A, and encourage
|
||||||
|
B to be deleted.
|
||||||
|
|
||||||
|
To compute (1):
|
||||||
|
|
||||||
|
git rev-list ^master ^topic next
|
||||||
|
git rev-list ^master next
|
||||||
|
|
||||||
|
if these match, topic has not merged in next at all.
|
||||||
|
|
||||||
|
To compute (2):
|
||||||
|
|
||||||
|
git rev-list master..topic
|
||||||
|
|
||||||
|
if this is empty, it is fully merged to "master".
|
||||||
|
|
||||||
|
DOC_END
|
||||||
24
questions/git/hooks/pre-receive.sample
Executable file
24
questions/git/hooks/pre-receive.sample
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to make use of push options.
|
||||||
|
# The example simply echoes all push options that start with 'echoback='
|
||||||
|
# and rejects all pushes when the "reject" push option is used.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "pre-receive".
|
||||||
|
|
||||||
|
if test -n "$GIT_PUSH_OPTION_COUNT"
|
||||||
|
then
|
||||||
|
i=0
|
||||||
|
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
||||||
|
do
|
||||||
|
eval "value=\$GIT_PUSH_OPTION_$i"
|
||||||
|
case "$value" in
|
||||||
|
echoback=*)
|
||||||
|
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
||||||
|
;;
|
||||||
|
reject)
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
i=$((i + 1))
|
||||||
|
done
|
||||||
|
fi
|
||||||
42
questions/git/hooks/prepare-commit-msg.sample
Executable file
42
questions/git/hooks/prepare-commit-msg.sample
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to prepare the commit log message.
|
||||||
|
# Called by "git commit" with the name of the file that has the
|
||||||
|
# commit message, followed by the description of the commit
|
||||||
|
# message's source. The hook's purpose is to edit the commit
|
||||||
|
# message file. If the hook fails with a non-zero status,
|
||||||
|
# the commit is aborted.
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "prepare-commit-msg".
|
||||||
|
|
||||||
|
# This hook includes three examples. The first one removes the
|
||||||
|
# "# Please enter the commit message..." help message.
|
||||||
|
#
|
||||||
|
# The second includes the output of "git diff --name-status -r"
|
||||||
|
# into the message, just before the "git status" output. It is
|
||||||
|
# commented because it doesn't cope with --amend or with squashed
|
||||||
|
# commits.
|
||||||
|
#
|
||||||
|
# The third example adds a Signed-off-by line to the message, that can
|
||||||
|
# still be edited. This is rarely a good idea.
|
||||||
|
|
||||||
|
COMMIT_MSG_FILE=$1
|
||||||
|
COMMIT_SOURCE=$2
|
||||||
|
SHA1=$3
|
||||||
|
|
||||||
|
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
||||||
|
|
||||||
|
# case "$COMMIT_SOURCE,$SHA1" in
|
||||||
|
# ,|template,)
|
||||||
|
# /usr/bin/perl -i.bak -pe '
|
||||||
|
# print "\n" . `git diff --cached --name-status -r`
|
||||||
|
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
||||||
|
# *) ;;
|
||||||
|
# esac
|
||||||
|
|
||||||
|
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||||
|
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
||||||
|
# if test -z "$COMMIT_SOURCE"
|
||||||
|
# then
|
||||||
|
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
||||||
|
# fi
|
||||||
128
questions/git/hooks/update.sample
Executable file
128
questions/git/hooks/update.sample
Executable file
@@ -0,0 +1,128 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# An example hook script to block unannotated tags from entering.
|
||||||
|
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
||||||
|
#
|
||||||
|
# To enable this hook, rename this file to "update".
|
||||||
|
#
|
||||||
|
# Config
|
||||||
|
# ------
|
||||||
|
# hooks.allowunannotated
|
||||||
|
# This boolean sets whether unannotated tags will be allowed into the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.allowdeletetag
|
||||||
|
# This boolean sets whether deleting tags will be allowed in the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.allowmodifytag
|
||||||
|
# This boolean sets whether a tag may be modified after creation. By default
|
||||||
|
# it won't be.
|
||||||
|
# hooks.allowdeletebranch
|
||||||
|
# This boolean sets whether deleting branches will be allowed in the
|
||||||
|
# repository. By default they won't be.
|
||||||
|
# hooks.denycreatebranch
|
||||||
|
# This boolean sets whether remotely creating branches will be denied
|
||||||
|
# in the repository. By default this is allowed.
|
||||||
|
#
|
||||||
|
|
||||||
|
# --- Command line
|
||||||
|
refname="$1"
|
||||||
|
oldrev="$2"
|
||||||
|
newrev="$3"
|
||||||
|
|
||||||
|
# --- Safety check
|
||||||
|
if [ -z "$GIT_DIR" ]; then
|
||||||
|
echo "Don't run this script from the command line." >&2
|
||||||
|
echo " (if you want, you could supply GIT_DIR then run" >&2
|
||||||
|
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
||||||
|
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- Config
|
||||||
|
allowunannotated=$(git config --bool hooks.allowunannotated)
|
||||||
|
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
||||||
|
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
||||||
|
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
||||||
|
allowmodifytag=$(git config --bool hooks.allowmodifytag)
|
||||||
|
|
||||||
|
# check for no description
|
||||||
|
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
||||||
|
case "$projectdesc" in
|
||||||
|
"Unnamed repository"* | "")
|
||||||
|
echo "*** Project description file hasn't been set" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# --- Check types
|
||||||
|
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
||||||
|
zero="0000000000000000000000000000000000000000"
|
||||||
|
if [ "$newrev" = "$zero" ]; then
|
||||||
|
newrev_type=delete
|
||||||
|
else
|
||||||
|
newrev_type=$(git cat-file -t $newrev)
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$refname","$newrev_type" in
|
||||||
|
refs/tags/*,commit)
|
||||||
|
# un-annotated tag
|
||||||
|
short_refname=${refname##refs/tags/}
|
||||||
|
if [ "$allowunannotated" != "true" ]; then
|
||||||
|
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
||||||
|
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/tags/*,delete)
|
||||||
|
# delete tag
|
||||||
|
if [ "$allowdeletetag" != "true" ]; then
|
||||||
|
echo "*** Deleting a tag is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/tags/*,tag)
|
||||||
|
# annotated tag
|
||||||
|
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
||||||
|
then
|
||||||
|
echo "*** Tag '$refname' already exists." >&2
|
||||||
|
echo "*** Modifying a tag is not allowed in this repository." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/heads/*,commit)
|
||||||
|
# branch
|
||||||
|
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
||||||
|
echo "*** Creating a branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/heads/*,delete)
|
||||||
|
# delete branch
|
||||||
|
if [ "$allowdeletebranch" != "true" ]; then
|
||||||
|
echo "*** Deleting a branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
refs/remotes/*,commit)
|
||||||
|
# tracking branch
|
||||||
|
;;
|
||||||
|
refs/remotes/*,delete)
|
||||||
|
# delete tracking branch
|
||||||
|
if [ "$allowdeletebranch" != "true" ]; then
|
||||||
|
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# Anything else (is there anything else?)
|
||||||
|
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# --- Finished
|
||||||
|
exit 0
|
||||||
BIN
questions/git/index
Executable file
BIN
questions/git/index
Executable file
Binary file not shown.
6
questions/git/info/exclude
Executable file
6
questions/git/info/exclude
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
# git ls-files --others --exclude-from=.git/info/exclude
|
||||||
|
# Lines that start with '#' are comments.
|
||||||
|
# For a project mostly in C, the following would be a good set of
|
||||||
|
# exclude patterns (uncomment them if you want to use them):
|
||||||
|
# *.[oa]
|
||||||
|
# *~
|
||||||
1
questions/git/logs/HEAD
Executable file
1
questions/git/logs/HEAD
Executable file
@@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 6c9aa16c804365d5d374cce094d85be92485cb6c Bel LaPointe <breel@qualtrics.com> 1582582655 -0700 commit (initial): Create, cat, delete, and check individual questions
|
||||||
1
questions/git/logs/refs/heads/master
Executable file
1
questions/git/logs/refs/heads/master
Executable file
@@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 6c9aa16c804365d5d374cce094d85be92485cb6c Bel LaPointe <breel@qualtrics.com> 1582582655 -0700 commit (initial): Create, cat, delete, and check individual questions
|
||||||
BIN
questions/git/objects/1c/be5b4f9b31517dbc55b22fd3bd319511ce566e
Executable file
BIN
questions/git/objects/1c/be5b4f9b31517dbc55b22fd3bd319511ce566e
Executable file
Binary file not shown.
BIN
questions/git/objects/29/ec01372414bf7b295510bf570f60519fd683db
Executable file
BIN
questions/git/objects/29/ec01372414bf7b295510bf570f60519fd683db
Executable file
Binary file not shown.
BIN
questions/git/objects/36/9254316a3454531018c6d7d8573dad0066f914
Executable file
BIN
questions/git/objects/36/9254316a3454531018c6d7d8573dad0066f914
Executable file
Binary file not shown.
BIN
questions/git/objects/3a/5a9a45ebec9154067bac9521d0d2177a6e94cf
Executable file
BIN
questions/git/objects/3a/5a9a45ebec9154067bac9521d0d2177a6e94cf
Executable file
Binary file not shown.
BIN
questions/git/objects/42/60ceab1cbd51f21609a096266e0331eaa1aaee
Executable file
BIN
questions/git/objects/42/60ceab1cbd51f21609a096266e0331eaa1aaee
Executable file
Binary file not shown.
1
questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe
Executable file
1
questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe
Executable file
@@ -0,0 +1 @@
|
|||||||
|
xKÊÉOR06aÐÒÒ×Ò+.×â*,M-.ÉÌÏ+æJHMÖEpË
|
||||||
BIN
questions/git/objects/4c/d85bb1b02ee495c738981b4db6103091428017
Executable file
BIN
questions/git/objects/4c/d85bb1b02ee495c738981b4db6103091428017
Executable file
Binary file not shown.
BIN
questions/git/objects/4d/1849b1a5885820a92dff9d16a3cf0eee9d4d33
Executable file
BIN
questions/git/objects/4d/1849b1a5885820a92dff9d16a3cf0eee9d4d33
Executable file
Binary file not shown.
2
questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43
Executable file
2
questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
x+)JMU060f040031QHĚ+.O-ŇKĎg¸!ő-eűVysŁ<73>Ńť•ˇë—LYúEQ|Ijq HĺŽV>1îĂWßUóńžZ˝ŁůëÓuˇ*3S@
|
||||||
|
|%<7.í<>PX©ű®Řâó|ďćúCä祂TTʇéď1ť™u=ćo!Ďí˛éÓó3*ŕ6e_ügaz˝ľ"SČi’ĎᏚMźŻ€*+HĚ;ŰlR<6C>a–IH°€Ä±ë7Âm×2¤ý<14>*),:83?dá<11>VŐ–]ëB˙~î_ő"ńŻU<C5BB>-š2¸>7˘7nĐ{2ő¸ĹißmťÄŮIzA
|
||||||
BIN
questions/git/objects/4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138
Executable file
BIN
questions/git/objects/4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138
Executable file
Binary file not shown.
BIN
questions/git/objects/6b/d1fe3835d77f78691242924cc3f129f135e7a8
Executable file
BIN
questions/git/objects/6b/d1fe3835d77f78691242924cc3f129f135e7a8
Executable file
Binary file not shown.
BIN
questions/git/objects/6c/9aa16c804365d5d374cce094d85be92485cb6c
Executable file
BIN
questions/git/objects/6c/9aa16c804365d5d374cce094d85be92485cb6c
Executable file
Binary file not shown.
BIN
questions/git/objects/79/1f56c48f8c35996ad75cfd710cdb7697976f69
Executable file
BIN
questions/git/objects/79/1f56c48f8c35996ad75cfd710cdb7697976f69
Executable file
Binary file not shown.
BIN
questions/git/objects/b1/735867269049f230b87aba98edf9b63008312f
Executable file
BIN
questions/git/objects/b1/735867269049f230b87aba98edf9b63008312f
Executable file
Binary file not shown.
BIN
questions/git/objects/be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0
Executable file
BIN
questions/git/objects/be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0
Executable file
Binary file not shown.
BIN
questions/git/objects/c4/3080052584baae55fdf38faae861e80d3a563d
Executable file
BIN
questions/git/objects/c4/3080052584baae55fdf38faae861e80d3a563d
Executable file
Binary file not shown.
BIN
questions/git/objects/d8/1af664b7b51f103732c15b897955afa494a5fa
Executable file
BIN
questions/git/objects/d8/1af664b7b51f103732c15b897955afa494a5fa
Executable file
Binary file not shown.
BIN
questions/git/objects/ea/b6ff32f6690dae6f6208db0a7fa1cc71d8a3cd
Executable file
BIN
questions/git/objects/ea/b6ff32f6690dae6f6208db0a7fa1cc71d8a3cd
Executable file
Binary file not shown.
BIN
questions/git/objects/f0/08850e160bc3d5ee7b0e0dcaabb883f5e5aef1
Executable file
BIN
questions/git/objects/f0/08850e160bc3d5ee7b0e0dcaabb883f5e5aef1
Executable file
Binary file not shown.
1
questions/git/refs/heads/master
Executable file
1
questions/git/refs/heads/master
Executable file
@@ -0,0 +1 @@
|
|||||||
|
6c9aa16c804365d5d374cce094d85be92485cb6c
|
||||||
26
questions/main.go
Executable file
26
questions/main.go
Executable file
@@ -0,0 +1,26 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"local/game-show/questions/config"
|
||||||
|
"local/game-show/questions/server"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
err := config.New()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
server, err := server.New()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
if err := server.Routes(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
log.Printf("Listening on %s", config.Get().Addr)
|
||||||
|
if err := http.ListenAndServe(config.Get().Addr, server); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
167
questions/server/routes.go
Executable file
167
questions/server/routes.go
Executable file
@@ -0,0 +1,167 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"local/game-show/questions/config"
|
||||||
|
"local/game-show/questions/storage"
|
||||||
|
"local/gziphttp"
|
||||||
|
"local/router"
|
||||||
|
dbstorage "local/storage"
|
||||||
|
"net/http"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (s *Server) Routes() error {
|
||||||
|
routes := []struct {
|
||||||
|
path string
|
||||||
|
method http.HandlerFunc
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
path: fmt.Sprintf("create"),
|
||||||
|
method: gzip(s.create),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: fmt.Sprintf("delete/%s", router.Wildcard),
|
||||||
|
method: gzip(s.delete),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: fmt.Sprintf("list"),
|
||||||
|
method: gzip(s.list),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: fmt.Sprintf("cat/%s", router.Wildcard),
|
||||||
|
method: gzip(s.cat),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: fmt.Sprintf("check/%s", router.Wildcard),
|
||||||
|
method: gzip(s.check),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, route := range routes {
|
||||||
|
err := s.Add(route.path, route.method)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func gzip(foo http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if gziphttp.Can(r) {
|
||||||
|
gz := gziphttp.New(w)
|
||||||
|
defer gz.Close()
|
||||||
|
w = gz
|
||||||
|
}
|
||||||
|
if filepath.Ext(r.URL.Path) == ".css" {
|
||||||
|
w.Header().Set("Content-Type", "text/css; charset=utf-8")
|
||||||
|
}
|
||||||
|
foo(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) create(w http.ResponseWriter, r *http.Request) {
|
||||||
|
one, err := readOne(r)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
one.FillIDs()
|
||||||
|
if !one.HasSolution() {
|
||||||
|
http.Error(w, "must have a solution", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if b, err := json.Marshal(one); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
} else if err := config.Get().DB.Set(one.ID, b); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintf(w, `{"ok":%q}\n`, one.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) delete(w http.ResponseWriter, r *http.Request) {
|
||||||
|
key := key(r)
|
||||||
|
err := config.Get().DB.Set(key, nil)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintln(w, "{}")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) list(w http.ResponseWriter, r *http.Request) {
|
||||||
|
keys, err := config.Get().DB.List(nil)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := json.NewEncoder(w).Encode(keys); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) cat(w http.ResponseWriter, r *http.Request) {
|
||||||
|
key := key(r)
|
||||||
|
one, err := loadOne(key)
|
||||||
|
if err == dbstorage.ErrNotFound {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
} else if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
json.NewEncoder(w).Encode(one)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) check(w http.ResponseWriter, r *http.Request) {
|
||||||
|
got, err := readOne(r)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
want, err := loadOne(got.ID)
|
||||||
|
if err == dbstorage.ErrNotFound {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
} else if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ok := want.Check(got)
|
||||||
|
fmt.Fprintf(w, `{"ok":%v}`, ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readOne(r *http.Request) (storage.One, error) {
|
||||||
|
key := key(r)
|
||||||
|
|
||||||
|
var submit storage.One
|
||||||
|
err := json.NewDecoder(r.Body).Decode(&submit)
|
||||||
|
if key != "" {
|
||||||
|
submit.ID = key
|
||||||
|
}
|
||||||
|
|
||||||
|
return submit, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOne(id string) (storage.One, error) {
|
||||||
|
b, err := config.Get().DB.Get(id)
|
||||||
|
if err != nil {
|
||||||
|
return storage.One{}, err
|
||||||
|
}
|
||||||
|
var one storage.One
|
||||||
|
err = json.Unmarshal(b, &one)
|
||||||
|
return one, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func key(r *http.Request) string {
|
||||||
|
index := strings.Index(r.URL.Path[1:], "/")
|
||||||
|
if index < 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return r.URL.Path[index+2:]
|
||||||
|
}
|
||||||
13
questions/server/server.go
Executable file
13
questions/server/server.go
Executable file
@@ -0,0 +1,13 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"local/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Server struct {
|
||||||
|
*router.Router
|
||||||
|
}
|
||||||
|
|
||||||
|
func New() (*Server, error) {
|
||||||
|
return &Server{Router: router.New()}, nil
|
||||||
|
}
|
||||||
35
questions/storage/answer.go
Executable file
35
questions/storage/answer.go
Executable file
@@ -0,0 +1,35 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/buger/jsonparser"
|
||||||
|
)
|
||||||
|
|
||||||
|
const prefix_answer = "answer_"
|
||||||
|
|
||||||
|
type Answer struct {
|
||||||
|
Pair
|
||||||
|
Right bool `json:"right"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewAnswer(text string) Answer {
|
||||||
|
return Answer{Pair: New(prefix_answer+NewID(), text)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func IsAnswer(ID string) bool {
|
||||||
|
return strings.HasPrefix(ID, prefix_answer)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Answer) UnmarshalJSON(b []byte) error {
|
||||||
|
if err := json.Unmarshal(b, &a.Pair); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if right, err := jsonparser.GetBoolean(b, "right"); err != nil && err != jsonparser.KeyPathNotFoundError {
|
||||||
|
return err
|
||||||
|
} else {
|
||||||
|
a.Right = right
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
34
questions/storage/answer_test.go
Executable file
34
questions/storage/answer_test.go
Executable file
@@ -0,0 +1,34 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestUnmarshalAnswerObject(t *testing.T) {
|
||||||
|
raw := `{"text":"text here", "id":"id here"}`
|
||||||
|
var a Answer
|
||||||
|
if err := json.Unmarshal([]byte(raw), &a); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if a.Text != "text here" {
|
||||||
|
t.Fatal(a.Text)
|
||||||
|
}
|
||||||
|
if a.ID != "id here" {
|
||||||
|
t.Fatal(a.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUnmarshalAnswerString(t *testing.T) {
|
||||||
|
raw := `"text here"`
|
||||||
|
var a Answer
|
||||||
|
if err := json.Unmarshal([]byte(raw), &a); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if a.ID != "text here" {
|
||||||
|
t.Fatal(a.ID)
|
||||||
|
}
|
||||||
|
if a.Text != "" {
|
||||||
|
t.Fatal(a.Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
7
questions/storage/id.go
Executable file
7
questions/storage/id.go
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import "github.com/google/uuid"
|
||||||
|
|
||||||
|
func NewID() string {
|
||||||
|
return uuid.New().String()
|
||||||
|
}
|
||||||
115
questions/storage/one.go
Executable file
115
questions/storage/one.go
Executable file
@@ -0,0 +1,115 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/buger/jsonparser"
|
||||||
|
)
|
||||||
|
|
||||||
|
type One struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Question Question `json:"q"`
|
||||||
|
Answers []Answer `json:"a"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one *One) UnmarshalJSON(b []byte) error {
|
||||||
|
if b, _, _, err := jsonparser.Get(b, "q"); err == jsonparser.KeyPathNotFoundError {
|
||||||
|
} else if err != nil {
|
||||||
|
return fmt.Errorf("failed to find question: %v: %q", err, b)
|
||||||
|
} else if err := json.Unmarshal(b, &one.Question); err != nil {
|
||||||
|
if err := json.Unmarshal([]byte(fmt.Sprintf("%q", b)), &one.Question); err != nil {
|
||||||
|
return fmt.Errorf("failed to parse question from obj: %v: %q", err, b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if b, _, _, err := jsonparser.Get(b, "a"); err == jsonparser.KeyPathNotFoundError {
|
||||||
|
} else if err != nil {
|
||||||
|
return fmt.Errorf("failed to find answers: %v: %q", err, b)
|
||||||
|
} else if err := json.Unmarshal(b, &one.Answers); err != nil {
|
||||||
|
return fmt.Errorf("failed to parse answers: %v: %q", err, b)
|
||||||
|
}
|
||||||
|
|
||||||
|
if id, err := jsonparser.GetString(b, "id"); err != nil && err != jsonparser.KeyPathNotFoundError {
|
||||||
|
return fmt.Errorf("failed to parse id: %v: %q", err, b)
|
||||||
|
} else {
|
||||||
|
one.ID = id
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one *One) FillIDs() {
|
||||||
|
if one.ID == "" {
|
||||||
|
one.ID = NewID()
|
||||||
|
}
|
||||||
|
if one.Question.ID == "" {
|
||||||
|
one.Question.ID = NewID()
|
||||||
|
}
|
||||||
|
for i := range one.Answers {
|
||||||
|
if one.Answers[i].ID == "" {
|
||||||
|
one.Answers[i].ID = NewID()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one One) Check(two One) bool {
|
||||||
|
if !one.CheckQuestion(two) {
|
||||||
|
log.Println("question mismatch")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if !one.CheckAnswers(two) {
|
||||||
|
log.Println("answer mismatch")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one One) CheckQuestion(two One) bool {
|
||||||
|
log.Println(one.Question)
|
||||||
|
log.Println(two.Question)
|
||||||
|
log.Println(one.Question == (Question{}))
|
||||||
|
log.Println(two.Question == (Question{}))
|
||||||
|
log.Println(one.Question.Equals(two.Question.Pair))
|
||||||
|
return one.Question == (Question{}) || two.Question == (Question{}) || one.Question.Equals(two.Question.Pair)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one One) CheckAnswers(two One) bool {
|
||||||
|
log.Println(len(one.Answers), one.Answers)
|
||||||
|
log.Println(len(two.Answers), two.Answers)
|
||||||
|
if len(two.Answers) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, answer := range two.Answers {
|
||||||
|
log.Printf("%+v %s %v", answer, "with id", answer.ID)
|
||||||
|
oanswer := one.GetAnswer(answer.ID)
|
||||||
|
log.Println(" ", oanswer)
|
||||||
|
if oanswer == (Answer{}) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if !oanswer.Right {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one One) GetAnswer(id string) Answer {
|
||||||
|
for _, answer := range one.Answers {
|
||||||
|
log.Println(" ", answer, "==", id)
|
||||||
|
if answer.ID == id {
|
||||||
|
return answer
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Answer{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (one One) HasSolution() bool {
|
||||||
|
for i := range one.Answers {
|
||||||
|
if one.Answers[i].Right {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
83
questions/storage/one_test.go
Executable file
83
questions/storage/one_test.go
Executable file
@@ -0,0 +1,83 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestOneStrings(t *testing.T) {
|
||||||
|
raw := `{
|
||||||
|
"id":"my id",
|
||||||
|
"q":"my question",
|
||||||
|
"a":[
|
||||||
|
"my answer 0",
|
||||||
|
"my answer 1"
|
||||||
|
]
|
||||||
|
}`
|
||||||
|
var one One
|
||||||
|
if err := json.Unmarshal([]byte(raw), &one); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if one.ID != "my id" {
|
||||||
|
t.Fatal(one.ID)
|
||||||
|
}
|
||||||
|
if one.Question.ID != "my question" {
|
||||||
|
t.Fatal(one.ID)
|
||||||
|
}
|
||||||
|
if len(one.Answers) != 2 {
|
||||||
|
t.Fatal(one.Answers)
|
||||||
|
}
|
||||||
|
if one.Answers[0].ID != "my answer 0" {
|
||||||
|
t.Fatal(one.Answers[0])
|
||||||
|
}
|
||||||
|
if one.Answers[1].ID != "my answer 1" {
|
||||||
|
t.Fatal(one.Answers[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestOneObj(t *testing.T) {
|
||||||
|
raw := `{
|
||||||
|
"id":"my id",
|
||||||
|
"q":{
|
||||||
|
"text": "my question"
|
||||||
|
},
|
||||||
|
"a":[
|
||||||
|
{"text": "my answer 0"},
|
||||||
|
{"text": "my answer 1"}
|
||||||
|
]
|
||||||
|
}`
|
||||||
|
var one One
|
||||||
|
if err := json.Unmarshal([]byte(raw), &one); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if one.ID != "my id" {
|
||||||
|
t.Fatal(one.ID)
|
||||||
|
}
|
||||||
|
if one.Question.Text != "my question" {
|
||||||
|
t.Fatal(one.Question)
|
||||||
|
}
|
||||||
|
if len(one.Answers) != 2 {
|
||||||
|
t.Fatal(one.Answers)
|
||||||
|
}
|
||||||
|
if one.Answers[0].Text != "my answer 0" {
|
||||||
|
t.Fatal(one.Answers[0])
|
||||||
|
}
|
||||||
|
if one.Answers[1].Text != "my answer 1" {
|
||||||
|
t.Fatal(one.Answers[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestOneNonObj(t *testing.T) {
|
||||||
|
raw := `{
|
||||||
|
"id":"my id",
|
||||||
|
"q": [],
|
||||||
|
"a":[
|
||||||
|
[],
|
||||||
|
{}
|
||||||
|
]
|
||||||
|
}`
|
||||||
|
var one One
|
||||||
|
if err := json.Unmarshal([]byte(raw), &one); err == nil {
|
||||||
|
t.Fatal(err, one)
|
||||||
|
}
|
||||||
|
}
|
||||||
36
questions/storage/pair.go
Executable file
36
questions/storage/pair.go
Executable file
@@ -0,0 +1,36 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/buger/jsonparser"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Pair struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(id, text string) Pair {
|
||||||
|
return Pair{
|
||||||
|
Text: text,
|
||||||
|
ID: id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Pair) UnmarshalJSON(b []byte) error {
|
||||||
|
var err error
|
||||||
|
if s, err := jsonparser.GetString(b); err == nil {
|
||||||
|
p.ID = s
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if p.Text, err = jsonparser.GetString(b, "text"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if p.ID, err = jsonparser.GetString(b, "id"); err != nil && err != jsonparser.KeyPathNotFoundError {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p Pair) Equals(o Pair) bool {
|
||||||
|
return p == o
|
||||||
|
}
|
||||||
19
questions/storage/question.go
Executable file
19
questions/storage/question.go
Executable file
@@ -0,0 +1,19 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const prefix_question = "question_"
|
||||||
|
|
||||||
|
type Question struct {
|
||||||
|
Pair
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewQuestion(text string) Question {
|
||||||
|
return Question{New(prefix_question+NewID(), text)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func IsQuestion(ID string) bool {
|
||||||
|
return strings.HasPrefix(ID, prefix_question)
|
||||||
|
}
|
||||||
34
questions/storage/question_test.go
Executable file
34
questions/storage/question_test.go
Executable file
@@ -0,0 +1,34 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestUnmarshalQuestionObject(t *testing.T) {
|
||||||
|
raw := `{"text":"text here", "id":"id here"}`
|
||||||
|
var a Question
|
||||||
|
if err := json.Unmarshal([]byte(raw), &a); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if a.Text != "text here" {
|
||||||
|
t.Fatal(a.Text)
|
||||||
|
}
|
||||||
|
if a.ID != "id here" {
|
||||||
|
t.Fatal(a.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUnmarshalQuestionString(t *testing.T) {
|
||||||
|
raw := `"text here"`
|
||||||
|
var a Question
|
||||||
|
if err := json.Unmarshal([]byte(raw), &a); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if a.ID != "text here" {
|
||||||
|
t.Fatal(a.ID)
|
||||||
|
}
|
||||||
|
if a.Text != "" {
|
||||||
|
t.Fatal(a.Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user