et 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c8827508f274f3055a4d79b2d65bbb3d530ab7e47b66a5f9bdf2ebc9eded23
-  data.tar.gz: e26d93b96439f78c4c721a4a6a2193763575a71b6b2e28b4c412463760ae0461
+  metadata.gz: 331e5a91f8e482aa1fc11fdc252bb0fdb56e9f30a5e7540ab835eff988fe09fb
+  data.tar.gz: baae2e27d8c5535f80ce4ec00a4e8068ee94ddb35cda65351838871f32ff7335
 SHA512:
-  metadata.gz: acebf4e72972c2ddf75bd184c152a86ad28caa8a8c4c91eeb27f08f1c3eb6227c87ef9c19f21f1505247d4843ceec7791485f11604205c55009afe128c8025ee
-  data.tar.gz: 22da208518289aa04817da787607d32f80926859c7d8d8656f76013f9aa1b968194ad62180b474e3ea0e7e43010fd64233b8a6b8a0d12ea726cce166032a1269
+  metadata.gz: ecde7b950b03188702855221929ed4ff23e2e47578504123b9521ece21721e3d2d991942090544aac5b92d139b0a7563b351b9d5f2bd34cd938af9c82fb242a4
+  data.tar.gz: 67136c5f8a5a3ad58fce15cb0b23f3bf25c40b4e02e2df8e4c3a59a4b0dd0f4861242b0fe7dd501a78541f4e2903e955c5c9ee4c0be173868e7b79d9f7231b94

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et (0.6.2)
+    et (0.7.2)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       gli (= 2.11.0)

data/lib/et.rb

@@ -7,6 +7,4 @@ require_relative "et/submission_file_list"
 require_relative "et/config"
 require_relative "et/formatter"
 require_relative "et/lesson"
-require_relative "et/challenge"
-require_relative "et/exercise"
 require_relative "et/archive_manager"

data/lib/et/lesson.rb

@@ -53,18 +53,14 @@ module ET
 
     protected
 
-    def config
-      @config ||= YAML.load_file(File.join(dir, ".lesson.yml"))
-    end
-
     def random_archive_path
       File.join(Dir.mktmpdir, "#{SecureRandom.hex}.tar.gz")
     end
 
     def find_lesson_dir(current_dir)
-      path = File.join(current_dir, ".lesson.yml")
+      parent_directory = File.dirname(current_dir)
 
-      if File.exists?(path)
+      if Config.new(parent_directory).exists?
         current_dir
       elsif current_dir == "." || Pathname.new(current_dir).root?
         nil

data/lib/et/runner.rb

@@ -1,5 +1,4 @@
 require "gli"
-require "yaml"
 
 module ET
   class Runner
@@ -77,19 +76,6 @@ module ET
         end
       end
 
-      desc "Run an exercise test suite."
-      command :test do |c|
-        c.action do |_global_options, _options, _cmdargs|
-          exercise = Exercise.new(cwd)
-
-          if exercise.exists?
-            exercise.run_tests
-          else
-            raise StandardError.new("Not in an exercise directory.")
-          end
-        end
-      end
-
       run(args)
     end
 

data/lib/et/submission_file_list.rb

@@ -4,8 +4,9 @@ module ET
   class SubmissionFileList
     include Enumerable
     DEFAULT_IGNORE_GLOBS = [
-      '.lesson.yml',
-      'node_modules/'
+      '.etignore',
+      'node_modules/',
+      'coverage/'
     ]
 
     def initialize(path)

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/data/.et

@@ -0,0 +1 @@
+#required for et to do its thing

data/spec/lib/lesson_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe ET::Lesson do
   context "archive! method" do
     it "creates a tar.gz file" do
-      path = '/tmp/et'
+      path = Dir.mktmpdir
       filename = 'fab'
 
       FileUtils.rm_rf(File.join(path, filename))

data/spec/lib/submission_file_list_spec.rb

@@ -9,8 +9,8 @@ describe ET::SubmissionFileList do
     expect(file_list).to include('problem.rb')
   end
 
-  it 'includes .etignore' do
-    expect(file_list).to include('.etignore')
+  it 'does not include .etignore' do
+    expect(file_list).to_not include('.etignore')
   end
 
   it 'ignores a standard file' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -131,6 +131,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -147,9 +148,7 @@ files:
 - lib/et.rb
 - lib/et/api.rb
 - lib/et/archive_manager.rb
-- lib/et/challenge.rb
 - lib/et/config.rb
-- lib/et/exercise.rb
 - lib/et/fallback_connection.rb
 - lib/et/formatter.rb
 - lib/et/lesson.rb
@@ -160,10 +159,9 @@ files:
 - spec/cli/get_lesson_spec.rb
 - spec/cli/init_spec.rb
 - spec/cli/list_lessons_spec.rb
-- spec/cli/run_exercise_test_suite_spec.rb
 - spec/cli/submit_lesson_spec.rb
+- spec/data/.et
 - spec/data/bloated-challenge/.etignore
-- spec/data/bloated-challenge/.lesson.yml
 - spec/data/bloated-challenge/bloated-challenge.md
 - spec/data/bloated-challenge/node_modules/boo/somefile.js
 - spec/data/bloated-challenge/problem.rb
@@ -171,20 +169,16 @@ files:
 - spec/data/challenge.json
 - spec/data/lessons.json
 - spec/data/sample-challenge/.etignore
-- spec/data/sample-challenge/.lesson.yml
 - spec/data/sample-challenge/problem.rb
 - spec/data/sample-challenge/sample-challenge.md
 - spec/data/sample-exercise/.etignore
-- spec/data/sample-exercise/.lesson.yml
 - spec/data/sample-exercise/lib/sample_exercise.rb
 - spec/data/sample-exercise/sample-exercise.md
 - spec/data/sample-exercise/test/sample_exercise_test.rb
 - spec/data/some-challenge.tar.gz
 - spec/lib/api_spec.rb
 - spec/lib/archive_manager_spec.rb
-- spec/lib/challenge_spec.rb
 - spec/lib/config_spec.rb
-- spec/lib/exercise_spec.rb
 - spec/lib/fallback_connection_spec.rb
 - spec/lib/lesson_spec.rb
 - spec/lib/operating_system_spec.rb

data/lib/et/challenge.rb

@@ -1,7 +0,0 @@
-module ET
-  class Challenge < Lesson
-    def exists?
-      !dir.nil? && config["type"] == "challenge"
-    end
-  end
-end

data/lib/et/exercise.rb

@@ -1,15 +0,0 @@
-module ET
-  class Exercise < Lesson
-    def run_tests
-      system("rspec", "--color", "--fail-fast", spec_file)
-    end
-
-    def exists?
-      !dir.nil? && config["type"] == "exercise"
-    end
-
-    def spec_file
-      File.join(dir, "test", "#{slug.gsub("-", "_")}_test.rb")
-    end
-  end
-end

data/spec/cli/run_exercise_test_suite_spec.rb

@@ -1,31 +0,0 @@
-describe "run exercise test suite" do
-  context "when in an exercise directory" do
-    it "runs the test suite" do
-      Dir.mktmpdir("test") do |tmpdir|
-        write_sample_config_to(tmpdir)
-        exercise_dir = add_sample_exercise(tmpdir)
-
-        expect_any_instance_of(ET::Exercise).to receive(:run_tests).and_return(true)
-
-        runner = ET::Runner.new(exercise_dir)
-        _, _ = capture_output do
-          expect(runner.go(["test"])).to eq(0)
-        end
-      end
-    end
-  end
-
-  context "when not in an exercise directory" do
-    it "fails to run the test suite" do
-      Dir.mktmpdir("test") do |tmpdir|
-        write_sample_config_to(tmpdir)
-        expect_any_instance_of(ET::Exercise).to_not receive(:run_tests)
-
-        runner = ET::Runner.new(tmpdir)
-        _, _ = capture_output do
-          expect(runner.go(["test"])).to eq(1)
-        end
-      end
-    end
-  end
-end

data/spec/data/bloated-challenge/.lesson.yml

@@ -1,3 +0,0 @@
-title: "Bloated Challenge"
-type: "challenge"
-description: "Some description."

data/spec/data/sample-challenge/.lesson.yml

@@ -1,4 +0,0 @@
----
-title: "Sample Challenge"
-type: "challenge"
-description: "Some description."

data/spec/data/sample-exercise/.lesson.yml

@@ -1,4 +0,0 @@
----
-title: "Sample Exercise"
-type: "exercise"
-description: "Some description here."

data/spec/lib/challenge_spec.rb

@@ -1,78 +0,0 @@
-require "yaml"
-
-describe ET::Challenge do
-  describe "#dir" do
-    it "selects the directory containing the challenge file" do
-      Dir.mktmpdir do |tmpdir|
-        challenge_dir = add_sample_challenge(tmpdir)
-
-        challenge = ET::Challenge.new(challenge_dir)
-        expect(challenge.dir).to eq(challenge_dir)
-      end
-    end
-
-    it "checks parent directories for the challenge file" do
-      Dir.mktmpdir do |tmpdir|
-        challenge_dir = add_sample_challenge(tmpdir)
-
-        child_dir = File.join(challenge_dir, "child")
-        Dir.mkdir(child_dir)
-
-        challenge = ET::Challenge.new(child_dir)
-        expect(challenge.dir).to eq(challenge_dir)
-      end
-    end
-
-    it "returns nil if no challenge file found" do
-      Dir.mktmpdir do |tmpdir|
-        challenge = ET::Challenge.new(tmpdir)
-        expect(challenge.dir).to eq(nil)
-      end
-    end
-  end
-
-  describe "#archive" do
-    it "packages up files in the given directory" do
-      archive_path = nil
-
-      begin
-        Dir.mktmpdir do |tmpdir|
-          challenge_dir = add_sample_challenge(tmpdir)
-
-          challenge = ET::Challenge.new(challenge_dir)
-          archive_path = challenge.archive!
-
-          contents = read_file_from_gzipped_archive(archive_path, "./problem.rb")
-          expect(contents).to eq("# YOUR CODE GOES HERE\n")
-        end
-      ensure
-        if archive_path && File.exist?(archive_path)
-          FileUtils.rm(archive_path)
-        end
-      end
-    end
-
-    it "excludes files in the ignore array" do
-      archive_path = nil
-
-      begin
-        Dir.mktmpdir do |tmpdir|
-          challenge_dir = add_sample_challenge(tmpdir)
-
-          challenge = ET::Challenge.new(challenge_dir)
-          archive_path = challenge.archive!
-
-          files = list_files_in_gzipped_archive(archive_path)
-
-          expect(files).to include("./problem.rb")
-          expect(files).to_not include("./sample-challenge.md")
-          expect(files).to_not include("./.lesson.yml")
-        end
-      ensure
-        if archive_path && File.exist?(archive_path)
-          FileUtils.rm(archive_path)
-        end
-      end
-    end
-  end
-end

data/spec/lib/exercise_spec.rb

@@ -1,28 +0,0 @@
-describe ET::Exercise do
-  describe "#exists?" do
-    it "is true if within an exercise directory" do
-      Dir.mktmpdir do |tmpdir|
-        exercise_dir = add_sample_exercise(tmpdir)
-        exercise = ET::Exercise.new(exercise_dir)
-
-        expect(exercise.exists?).to eq(true)
-      end
-    end
-
-    it "is false when in a challenge directory" do
-      Dir.mktmpdir do |tmpdir|
-        challenge_dir = add_sample_challenge(tmpdir)
-        exercise = ET::Exercise.new(challenge_dir)
-
-        expect(exercise.exists?).to eq(false)
-      end
-    end
-
-    it "is false when not in a lesson dir" do
-      Dir.mktmpdir do |tmpdir|
-        exercise = ET::Exercise.new(tmpdir)
-        expect(exercise.exists?).to eq(false)
-      end
-    end
-  end
-end