learn-test 3.2.4 → 3.3.0.pre.5

data/spec/lib/learn_test/strategies/none_spec.rb

@@ -34,7 +34,6 @@ describe LearnTest::Strategies::None do
       expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token)
         .and_return(oauth_token)
 
-
       expect(strategy.results).to eq(
         username: username,
         github_user_id: user_id,

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
+require 'aruba/rspec'
+require 'digest'
+require 'simplecov'
+
+SimpleCov.start
+
 require_relative '../lib/learn_test'
+
+support_dir = File.join('./', 'spec', 'support', '**', '*.rb')
+Dir.glob(support_dir).each { |f| require f }
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

data/spec/support/git.rb

@@ -0,0 +1,17 @@
+def git_set_user
+ run_command_and_stop 'git config user.email "info@flatironschool.com"'
+ run_command_and_stop 'git config user.name "Flatiron School"'
+end
+
+def git_init
+  run_command_and_stop 'git init'
+  git_set_user
+end
+
+def git_add(files = '.')
+  run_command_and_stop "git add #{files}"
+end
+
+def git_commit(msg)
+  run_command_and_stop "git commit -m \"#{msg}\""
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.0.pre.5
 platform: ruby
 authors:
 - Flatiron School
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,24 +136,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description:
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+description: 
 email:
 - learn@flatironschool.com
 executables:
 - learn-test
-- learn-test-wip
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/learn-test
-- bin/learn-test-wip
 - learn-test.gemspec
 - lib/learn_test.rb
 - lib/learn_test/client.rb
@@ -168,7 +181,11 @@ files:
 - lib/learn_test/dependencies/selenium_server.rb
 - lib/learn_test/dependency.rb
 - lib/learn_test/file_finder.rb
-- lib/learn_test/git_wip.rb
+- lib/learn_test/git.rb
+- lib/learn_test/git/wip/base.rb
+- lib/learn_test/git/wip/branch.rb
+- lib/learn_test/git/wip/error.rb
+- lib/learn_test/git/wip/reference.rb
 - lib/learn_test/github_interactor.rb
 - lib/learn_test/js_strategy.rb
 - lib/learn_test/learn_oauth_token_parser.rb
@@ -197,10 +214,14 @@ files:
 - node_modules/karma-json-reporter/package.json
 - spec/features/rspec_unit_spec.rb
 - spec/fixtures/.netrc
+- spec/fixtures/rspec-unit-spec/.results.json
 - spec/fixtures/rspec-unit-spec/.rspec
 - spec/fixtures/rspec-unit-spec/lib/dog.rb
 - spec/fixtures/rspec-unit-spec/spec/dog_spec.rb
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
+- spec/learn_test/git/wip/base_spec.rb
+- spec/learn_test/git/wip/branch_spec.rb
+- spec/learn_test/git/wip/error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
@@ -208,11 +229,12 @@ files:
 - spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/git.rb
 homepage: https://github.com/learn-co/learn-test
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -224,22 +246,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Runs RSpec, Karma, Mocha, and Python Pytest Test builds and pushes JSON output
   to Learn.
 test_files:
 - spec/features/rspec_unit_spec.rb
 - spec/fixtures/.netrc
+- spec/fixtures/rspec-unit-spec/.results.json
 - spec/fixtures/rspec-unit-spec/.rspec
 - spec/fixtures/rspec-unit-spec/lib/dog.rb
 - spec/fixtures/rspec-unit-spec/spec/dog_spec.rb
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
+- spec/learn_test/git/wip/base_spec.rb
+- spec/learn_test/git/wip/branch_spec.rb
+- spec/learn_test/git/wip/error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
@@ -247,3 +273,4 @@ test_files:
 - spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/git.rb

data/bin/learn-test-wip

@@ -1,249 +0,0 @@
-#!/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='[ save <message> [ --editor | --untracked | --no-gpg-sign ] | 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
-
-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'
-"
-
-. "$(git --exec-path)/git-sh-setup"
-
-require_work_tree
-
-TMP=$(mktemp -d -t .git-wip)
-
-cleanup () {
-	rm -f "$TMP-*"
-}
-
-trap cleanup 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 "$@"
-}
-
-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
-}
-
-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"
-}
-
-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
-	;;
---*)
-	;;
-*)
-	[ -f "$1" ] || die "Unknown command '$1'."
-	;;
-esac
-
-case $WIP_COMMAND in
-save)
-	do_save "$WIP_MESSAGE" $@
-	;;
-*)
-	usage
-	exit 1
-	;;
-esac
-
-# vim: set noet sw=8

data/lib/learn_test/git_wip.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'git'
-require 'logger'
-
-module LearnTest
-  module GitWip
-    class << self
-      def run!(log: false)
-        git = Git.open('./', log: log)
-        working_branch = git.current_branch
-
-        commands = [
-          'learn-test-wip save "Automatic test submission" --editor',
-          "git push origin wip/#{working_branch}:refs/heads/wip"
-        ].join(';')
-
-        Open3.popen3(commands) do |_stdin, _stdout, _stderr, wait_thr|
-          # while out = stdout.gets do; puts out; end
-          # while err = stderr.gets do; puts err; end
-  
-          if wait_thr.value.exitstatus.zero?
-            git.config['remote.origin.url'].gsub('.git', '/tree/wip')
-          else
-            #  puts 'There was an error running learn-test-wip'
-            false
-          end
-        end
-      rescue StandardError => e
-        false
-      end
-    end
-  end
-end