learn-test 3.1.1 → 3.2.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab317e2c505ba8c96f7bd145925b6cef33769bb2bf13314d5a4f26e96128162
-  data.tar.gz: ef2d53632b5accf208bcad802c3e4bc0890b8cd6403e01779a1c93e634dcca82
+  metadata.gz: 85948be08314d36e3b4597876f067163c9025b10f942206017ff52ea41bc523e
+  data.tar.gz: 865fceee285410a3379ccae13fd4de8ca88500987b696235217d91d0148ae560
 SHA512:
-  metadata.gz: 44955ca26a374b05ad501e60393e8b6c03fd6544ef6d058390107aa854fa42a41fc7342864f922ac5eb0caa674e9834312db31dc4e6a56f391741d432ab396c5
-  data.tar.gz: c751e75c60f932fe2593ff16add92cc50876bc8e942d3eaa20239f7c84d24602d3f969734d8840a5ab73709b5cc2079271c4a3801a22eaceb4aaeba463eaccef
+  metadata.gz: '09a99a7add2f3e8e801d56bd5b6c000dd55bed72bcfd69c31d5579c8cfb2d45f07b381d29433cf0a2d994f08ffc77c5321a2702daf910b00da50f5753eed9667'
+  data.tar.gz: f20bcc537d9c2809681821a8a938bb8dae4913e07148927410802be2aaf7153628e6e3f58da8fa01ebcc61abb139795f3439e8a642fae4015aa01fa2149b4e76

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--order rand
 --require spec_helper

data/Gemfile

@@ -1,16 +1,6 @@
-source 'https://rubygems.org'
-
-gem 'rspec', '~> 3.7'
-gem 'netrc', '~> 0.11.0'
-gem 'git', '~> 1.7'
-gem 'oj', '~> 3.10'
-gem 'faraday', '~> 1.0'
-gem 'crack', '~> 0.4.3'
-gem 'colorize', '~> 0.8.1'
+# frozen_string_literal: true
 
-group :development do
-  gem 'rake', '~> 13.0.1'
-end
+source 'https://rubygems.org'
 
 group :test do
   gem 'rspec_junit_formatter', '~> 0.4.1'

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'

data/bin/learn-test

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require_relative '../lib/learn_test'
@@ -6,45 +7,45 @@ require_relative '../lib/learn_test'
 options = {}
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: learn [options]"
+  opts.banner = 'Usage: learn [options]'
 
-  opts.on("--sync", "Report test results synchronously") do |s|
+  opts.on('--sync', 'Report test results synchronously') do |s|
     options[:sync] = s
   end
 
-  opts.on("-d", "--debug", "Output errors during results synchronization") do |d|
+  opts.on('-d', '--debug', 'Output errors during results synchronization') do |d|
     options[:debug] = d
   end
 
-  opts.on("-n", "--[no-]color", "Turn off color output") do |c|
+  opts.on('-n', '--[no-]color', 'Turn off color output') do |c|
     options[:color] = c
   end
 
-  opts.on("-f", "--format") do |f|
+  opts.on('-f', '--format') do |f|
     options[:format] = f
   end
 
-  opts.on("-l", "--local", "Don't push results to Learn") do |l|
+  opts.on('-l', '--local', "Don't push results to Learn") do |l|
     options[:local] = l
   end
 
-  opts.on("-b", "--browser", "Run tests in browser") do |b|
+  opts.on('-b', '--browser', 'Run tests in browser') do |b|
     options[:browser] = b
   end
 
-  opts.on("-o", "--out FILE") do |o|
+  opts.on('-o', '--out FILE') do |o|
     options[:out] = o
   end
 
-  opts.on("-s", "--skip") do |s|
+  opts.on('-s', '--skip') do |s|
     options[:skip] = s
   end
 
-  opts.on("-t", "--test") do |t|
+  opts.on('-t', '--test') do |t|
     options[:test] = t
   end
 
-  opts.on("-v", "--version") do |v|
+  opts.on('-v', '--version') do |v|
     puts LearnTest::VERSION
     exit
   end
@@ -57,16 +58,16 @@ OptionParser.new do |opts|
     options[:fail_fast] = f
   end
 
-  opts.on("-e", "--example STRING", "Run examples whose full nested names include STRING (may be used more than once)") do |s|
+  opts.on('-e', '--example STRING', 'Run examples whose full nested names include STRING (may be used more than once)') do |s|
     (options[:example] ||= []) << s
   end
 
-  if ARGV.any? { |arg| arg == "init" }
+  if ARGV.any? { |arg| arg == 'init' }
     options[:init] = true
   end
 
   options[:argv] = ARGV
 end.parse!
 
-repo = options[:test] ? "git@github.com:flatiron-school/a-sample-repo.git" : LearnTest::RepoParser.get_repo
+repo = options[:test] ? 'git@github.com:flatiron-school/a-sample-repo.git' : LearnTest::RepoParser.get_repo
 LearnTest::Runner.new(repo, options).run

data/bin/learn-test-wip

@@ -0,0 +1,356 @@
+#!/bin/bash
+#
+# Copyright Bart Trojanowski <bart@jukie.net>
+# 
+# git-wip is a script that will manage Work In Progress (or WIP) branches.
+# WIP branches are mostly throw away but identify points of development
+# between commits.  The intent is to tie this script into your editor so
+# that each time you save your file, the git-wip script captures that
+# state in git.  git-wip also helps you return back to a previous state of
+# development.
+#
+# See also http://github.com/bartman/git-wip
+#
+# The code is licensed as GPL v2 or, at your option, any later version.
+# Please see http://www.gnu.org/licenses/gpl-2.0.txt
+#
+
+USAGE='[ info | save <message> [ --editor | --untracked | --no-gpg-sign ] | log [ --pretty ] | delete ] [ [--] <file>... ]'
+LONG_USAGE="Manage Work In Progress branches
+
+Commands:
+        git wip                   - create a new WIP commit
+        git wip save <message>    - create a new WIP commit with custom message
+        git wip info [<branch>]   - brief WIP info
+        git wip log [<branch>]    - show changes on the WIP branch
+        git wip delete [<branch>] - delete a WIP branch
+
+Options for save:
+        -e --editor               - be less verbose, assume called from an editor
+        -u --untracked            - capture also untracked files
+        -i --ignored              - capture also ignored files
+        --no-gpg-sign             - do not sign commit; that is, countermand
+                                    'commit.gpgSign = true'
+
+Options for log:
+  -p --pretty               - show a pretty graph
+	-r --reflog               - show changes in reflog
+	-s --stat                 - show diffstat
+"
+
+. "$(git --exec-path)/git-sh-setup"
+
+require_work_tree
+
+TMP="$GIT_DIR/.git-wip.$$"
+trap 'rm -f "$TMP-*"' 0
+
+WIP_INDEX="$TMP-INDEX"
+
+WIP_PREFIX=refs/wip/
+WIP_COMMAND=
+WIP_MESSAGE=WIP
+EDITOR_MODE=false
+
+dbg() {
+	if test -n "$WIP_DEBUG"
+	then
+		printf '# %s\n' "$*"
+	fi
+}
+
+# some errors are not worth reporting in --editor mode
+report_soft_error () {
+	$EDITOR_MODE && exit 0
+	die "$@"
+}
+
+cleanup () {
+	rm -f "$TMP-*"
+}
+
+get_work_branch () {
+	ref=$(git symbolic-ref -q HEAD) \
+	|| report_soft_error "git-wip requires a branch"
+
+
+	branch=${ref#refs/heads/}
+	if [ $branch = $ref ] ; then
+		die "git-wip requires a local branch"
+	fi
+
+	echo $branch
+}
+
+get_wip_branch () {
+	return 0
+}
+
+check_files () {
+	local -a files="$@"
+
+	for f in "${files[@]}"
+	do
+		[ -f "$f" -o -d "$f" ] || die "$f: No such file or directory."
+	done
+}
+
+build_new_tree () {
+	local untracked=$1 ; shift
+	local ignored=$1 ; shift
+	local files="$@"
+
+	(
+	set -e
+	rm -f "$WIP_INDEX"
+	cp -p "$GIT_DIR/index" "$WIP_INDEX"
+	export GIT_INDEX_FILE="$WIP_INDEX"
+	git read-tree $wip_parent
+	if [ -n "$files" ]
+	then
+		git add -f "${files[@]}"
+	else
+		git add --update .
+	fi
+	[ -n "$untracked" ] && git add .
+	[ -n "$ignored" ] && git add -f -A .
+	git write-tree
+	rm -f "$WIP_INDEX"
+	)
+}
+
+do_save () {
+	local msg="$1" ; shift
+	local add_untracked=
+	local add_ignored=
+	local no_sign=
+
+	while test $# != 0
+	do
+		case "$1" in
+		-e|--editor)
+			EDITOR_MODE=true
+			;;
+		-u|--untracked)
+			add_untracked=t
+			;;
+		-i|--ignored)
+			add_ignored=t
+			;;
+		--no-gpg-sign)
+			no_sign=--no-gpg-sign
+			;;
+		--)
+			shift
+			break
+			;;
+		*)
+			[ -f "$1" ] && break
+			die "Unknown option '$1'."
+			;;
+		esac
+		shift
+	done
+	local files="$@"
+	local "add_untracked=$add_untracked"
+	local "add_ignored=$add_ignored"
+
+	if test ${#files} -gt 0
+	then
+		check_files "${files[@]}"
+	fi
+
+	dbg "msg=$msg"
+	dbg "files=$files"
+
+	local work_branch=$(get_work_branch)
+	local wip_branch="$WIP_PREFIX$work_branch"
+
+	dbg "work_branch=$work_branch"
+	dbg "wip_branch=$wip_branch"
+
+	# enable reflog
+	local wip_branch_file="$GIT_DIR/logs/$wip_branch"
+	dbg "wip_branch_file=$wip_branch_file"
+	mkdir -p "$(dirname "$wip_branch_file")"
+	: >>"$wip_branch_file"
+
+	if ! work_last=$(git rev-parse --verify $work_branch)
+	then
+		report_soft_error "'$work_branch' branch has no commits."
+	fi
+
+	dbg "work_last=$work_last"
+
+	if wip_last=$(git rev-parse --quiet --verify $wip_branch)
+	then
+		local base=$(git merge-base $wip_last $work_last) \
+		|| die "'work_branch' and '$wip_branch' are unrelated."
+
+		if [ $base = $work_last ] ; then
+			wip_parent=$wip_last
+		else
+			wip_parent=$work_last
+		fi
+	else
+		wip_parent=$work_last
+	fi
+
+	dbg "wip_parent=$wip_parent"
+
+	new_tree=$( build_new_tree "$add_untracked" "$add_ignored" "${files[@]}" ) \
+	|| die "Cannot save the current worktree state."
+
+	dbg "new_tree=$new_tree"
+
+	if git diff-tree --exit-code --quiet $new_tree $wip_parent ; then
+		report_soft_error "no changes"
+	fi
+
+	dbg "... has changes"
+
+	new_wip=$(printf '%s\n' "$msg" | git commit-tree $no_sign $new_tree -p $wip_parent 2>/dev/null) \
+	|| die "Cannot record working tree state"
+
+	dbg "new_wip=$new_wip"
+
+	msg1=$(printf '%s\n' "$msg" | sed -e 1q)
+	git update-ref -m "git-wip: $msg1" $wip_branch $new_wip $wip_last
+
+	dbg "SUCCESS"
+}
+
+do_info () {
+	local branch=$1
+
+	die "info not implemented"
+}
+
+do_log () {
+	local work_branch=$1
+	[ -z $branch ] && work_branch=$(get_work_branch)
+	local wip_branch="$WIP_PREFIX$work_branch"
+
+	local log_cmd="log"
+	local graph=""
+	local pretty=""
+	local stat=""
+	while [ -n "$1" ]
+	do
+		case "$1" in
+			-p|--pretty)
+				graph="--graph"
+				pretty="--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+				;;
+			-s|--stat)
+				stat="--stat"
+				;;
+			-r|--reflog)
+				log_cmd="reflog"
+				;;
+			*)
+				break
+				;;
+		esac
+		shift
+	done
+
+	if [ $log_cmd = reflog ]
+	then
+		echo git reflog $stat $pretty $wip_branch | sh
+		return $?
+	fi
+
+	if ! work_last=$(git rev-parse --verify $work_branch)
+	then
+		die "'$work_branch' branch has no commits."
+	fi
+
+	dbg work_last=$work_last
+
+	if ! wip_last=$(git rev-parse --quiet --verify $wip_branch)
+	then
+		die "'$work_branch' branch has no commits."
+	fi
+
+	dbg wip_last=$wip_last
+
+	local base=$(git merge-base $wip_last $work_last)
+
+	dbg base=$base
+
+	echo git log $graph $stat $pretty $@ $wip_last $work_last "^$base~1" | sh
+}
+
+do_delete () {
+	local branch=$1
+
+	die "delete not implemented"
+}
+
+do_help () {
+	local rc=$1
+
+	cat <<END
+Usage: git wip $USAGE
+
+$LONG_USAGE
+END
+	exit $rc
+}
+
+
+if test $# -eq 0
+then
+	dbg "no arguments"
+
+	do_save "WIP"
+	exit $?
+fi
+
+dbg "args: $@"
+
+case "$1" in
+save)
+	WIP_COMMAND=$1
+	shift
+	if [ -n "$1" ]
+	then
+		WIP_MESSAGE="$1"
+		shift
+	fi
+	;;
+info|log|delete)
+	WIP_COMMAND=$1
+	shift
+	;;
+help)
+	do_help 0
+	;;
+--*)
+	;;
+*)
+	[ -f "$1" ] || die "Unknown command '$1'."
+	;;
+esac
+
+case $WIP_COMMAND in
+save)
+	do_save "$WIP_MESSAGE" $@
+	;;
+info)
+	do_info $@
+	;;
+log)
+	do_log $@
+	;;
+delete)
+	do_delete $@
+	;;
+*)
+	usage
+	exit 1
+	;;
+esac
+
+# vim: set noet sw=8