et 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39aed635bf95f14c089d17488dcde13d1a85ea2
-  data.tar.gz: 680174f609918e638266301b381d5ac5d74d8f84
+  metadata.gz: 44921ec7a8dc12f41fa49bac47557a76f75de660
+  data.tar.gz: 074a87d6f612a8ac878f8608222f2a69b0eb6b34
 SHA512:
-  metadata.gz: efca6c830ff04b4be2414c83c062462a9d0d532c1b0621693d6f97f52f7d156b681421a3bf25ed0760a4548c0fa40ef36d0c21e6c151e8fb2f8026f6237bf72b
-  data.tar.gz: 5a52aa3f094bc58460a9834c7a2f09a004e834a53f0e580f344d71ddb538f7b168f029732921a2013fba2fa5235b76c29d71ea206c9c0993a240a161026fcd7e
+  metadata.gz: d5a6d4ac016be8a94adb73d46880ff5da19266734d6d41b814312d638d5a84ce3d832d3f114da3212b7e509bfbc181d7ec123edb7c5da7936addfc0257bf4ce4
+  data.tar.gz: 13b8218ceccd48c032c2ab8b158fa597b4505de41309c87b28796a0faafc6b80733cec84aad3d08467b6adacaedd5222f5860e6b9a3f8fec2dfa27b27a1aebda

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.3

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et (0.3.0)
+    et (0.5.0)
       gli (= 2.11.0)
       rest-client (~> 1.7)
 
@@ -10,8 +10,8 @@ GEM
   specs:
     diff-lcs (1.2.5)
     gli (2.11.0)
-    mime-types (2.3)
-    netrc (0.7.7)
+    mime-types (2.4.3)
+    netrc (0.8.0)
     rake (10.3.2)
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)

data/lib/et.rb

@@ -3,4 +3,6 @@ require "et/runner"
 require "et/api"
 require "et/config"
 require "et/formatter"
+require "et/lesson"
 require "et/challenge"
+require "et/exercise"

data/lib/et/api.rb

@@ -13,13 +13,13 @@ module ET
       @token = options[:token]
     end
 
-    def list_challenges
-      response = RestClient.get(challenges_url)
+    def list_lessons
+      response = RestClient.get(lessons_url)
       JSON.parse(response, symbolize_names: true)[:lessons]
     end
 
-    def get_challenge(slug)
-      response = RestClient.get(challenge_url(slug))
+    def get_lesson(slug)
+      response = RestClient.get(lesson_url(slug))
       body = JSON.parse(response, symbolize_names: true)
       body[:lesson]
     end
@@ -41,21 +41,21 @@ module ET
       dest
     end
 
-    def submit_challenge(challenge)
-      submission_file = challenge.archive!
-      RestClient.post(submission_url(challenge.slug),
+    def submit_lesson(lesson)
+      submission_file = lesson.archive!
+      RestClient.post(submission_url(lesson.slug),
         { submission: { archive: File.new(submission_file) }},
         { "Authorization" => auth_header })
     end
 
     private
 
-    def challenge_url(slug)
+    def lesson_url(slug)
       URI.join(host, "lessons/#{slug}.json").to_s
     end
 
-    def challenges_url
-      URI.join(host, "lessons.json?type=challenge").to_s
+    def lessons_url
+      URI.join(host, "lessons.json?submittable=1").to_s
     end
 
     def submission_url(slug)

data/lib/et/challenge.rb

@@ -1,72 +1,7 @@
-require "pathname"
-require "securerandom"
-
 module ET
-  class Challenge
-    attr_reader :cwd
-
-    def initialize(cwd)
-      @cwd = cwd
-    end
-
-    def archive!
-      if exists?
-        filepath = random_archive_path
-
-        cmd = "tar zcf #{filepath} -C #{dir}"
-
-        ignored_files.each do |file|
-          cmd += " --exclude='#{file}'"
-        end
-
-        cmd += " ."
-
-        if system(cmd)
-          filepath
-        else
-          nil
-        end
-      else
-        nil
-      end
-    end
-
-    def dir
-      @dir ||= find_challenge_dir(cwd)
-    end
-
-    def slug
-      File.basename(dir)
-    end
-
+  class Challenge < Lesson
     def exists?
-      !dir.nil?
-    end
-
-    def ignored_files
-      (config["ignore"] || []) + [".lesson.yml"]
-    end
-
-    private
-
-    def config
-      @config ||= YAML.load(File.read(File.join(dir, ".lesson.yml")))
-    end
-
-    def random_archive_path
-      File.join(Dir.mktmpdir, "#{SecureRandom.hex}.tar.gz")
-    end
-
-    def find_challenge_dir(current_dir)
-      path = File.join(current_dir, ".lesson.yml")
-
-      if File.exists?(path)
-        current_dir
-      elsif current_dir == "." || Pathname.new(current_dir).root?
-        nil
-      else
-        find_challenge_dir(File.dirname(current_dir))
-      end
+      !dir.nil? && config["type"] == "challenge"
     end
   end
 end

data/lib/et/config.rb

@@ -1,3 +1,4 @@
+require "yaml"
 require "pathname"
 
 module ET
@@ -36,9 +37,12 @@ module ET
       options[key]
     end
 
-    def update(options)
-      @options = options
-      File.write(path, options.to_yaml)
+    def save!(options)
+      if exists?
+        File.write(path, options.to_yaml)
+      else
+        File.write(File.join(current_dir, ".et"), options.to_yaml)
+      end
     end
 
     private

data/lib/et/exercise.rb

@@ -0,0 +1,15 @@
+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/lib/et/lesson.rb

@@ -0,0 +1,72 @@
+require "pathname"
+require "securerandom"
+
+module ET
+  class Lesson
+    attr_reader :cwd
+
+    def initialize(cwd)
+      @cwd = cwd
+    end
+
+    def archive!
+      if exists?
+        filepath = random_archive_path
+
+        cmd = "tar zcf #{filepath} -C #{dir}"
+
+        ignored_files.each do |file|
+          cmd += " --exclude='#{file}'"
+        end
+
+        cmd += " ."
+
+        if system(cmd)
+          filepath
+        else
+          nil
+        end
+      else
+        nil
+      end
+    end
+
+    def dir
+      @dir ||= find_lesson_dir(cwd)
+    end
+
+    def slug
+      File.basename(dir)
+    end
+
+    def exists?
+      !dir.nil?
+    end
+
+    def ignored_files
+      (config["ignore"] || []) + [".lesson.yml"]
+    end
+
+    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")
+
+      if File.exists?(path)
+        current_dir
+      elsif current_dir == "." || Pathname.new(current_dir).root?
+        nil
+      else
+        find_lesson_dir(File.dirname(current_dir))
+      end
+    end
+  end
+end

data/lib/et/runner.rb

@@ -16,12 +16,12 @@ module ET
 
       pre { |_, _, _, _| check_config! }
 
-      desc "Initialize current directory as challenge work area."
+      desc "Initialize current directory as a work area."
       skips_pre
       command :init do |c|
         c.flag [:u, :user], desc: "Username"
         c.flag [:t, :token], desc: "Login token"
-        c.flag [:h, :host], desc: "Server hosting the challenges"
+        c.flag [:h, :host], desc: "Server hosting the lessons"
 
         c.action do |_global_options, options, _cmdargs|
           settings = {
@@ -31,25 +31,25 @@ module ET
           }
 
           settings = prompt_for_missing(settings)
-          save_config(settings)
+          config.save!(settings)
 
           puts "Saved configuration to #{config.path}"
         end
       end
 
-      desc "List available challenges."
+      desc "List available lessons."
       command :list do |c|
         c.action do |_global_options, _options, _cmdargs|
-          Formatter.print_table(api.list_challenges, :slug, :title)
+          Formatter.print_table(api.list_lessons, :slug, :title, :type)
         end
       end
 
-      desc "Download challenge to your working area."
+      desc "Download lesson to your working area."
       command :get do |c|
         c.action do |_global_options, _options, cmdargs|
           cmdargs.each do |slug|
-            challenge = api.get_challenge(slug)
-            archive = api.download_file(challenge[:archive_url])
+            lesson = api.get_lesson(slug)
+            archive = api.download_file(lesson[:archive_url])
 
             if system("tar zxf #{archive} -C #{cwd}")
               system("rm #{archive}")
@@ -62,16 +62,29 @@ module ET
         end
       end
 
-      desc "Submit the challenge in this directory."
+      desc "Submit the lesson in this directory."
       command :submit do |c|
         c.action do |_global_options, _options, _cmdargs|
-          challenge = Challenge.new(cwd)
+          lesson = Lesson.new(cwd)
 
-          if challenge.exists?
-            api.submit_challenge(challenge)
-            puts "Challenge submitted"
+          if lesson.exists?
+            api.submit_lesson(lesson)
+            puts "Lesson submitted"
           else
-            raise StandardError.new("Not in a challenge directory.")
+            raise StandardError.new("Not in a lesson directory.")
+          end
+        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
@@ -137,13 +150,5 @@ module ET
           "Run `et init` to create one.")
       end
     end
-
-    def save_config(settings)
-      if config.exists?
-        config.update(settings)
-      else
-        File.write(File.join(cwd, ".et"), settings.to_yaml)
-      end
-    end
   end
 end

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/cli/{get_challenge_spec.rb → get_lesson_spec.rb}

@@ -1,5 +1,5 @@
-describe "get challenge" do
-  let(:challenge_info) do
+describe "get lesson" do
+  let(:lesson_info) do
     {
       title: "Some Challenge",
       slug: "some-challenge",
@@ -12,13 +12,13 @@ describe "get challenge" do
   end
 
   context "when in a working area" do
-    it "downloads and extracts the challenge" do
+    it "downloads and extracts the lesson" do
       tmp_archive_path = File.join(Dir.tmpdir, "some-challenge.tar.gz")
-      system("cp #{sample_archive_path} #{tmp_archive_path}")
+      system("cp", sample_archive_path.to_s, tmp_archive_path)
 
-      expect_any_instance_of(ET::API).to receive(:get_challenge).
+      expect_any_instance_of(ET::API).to receive(:get_lesson).
         with("some-challenge").
-        and_return(challenge_info)
+        and_return(lesson_info)
 
       expect_any_instance_of(ET::API).to receive(:download_file).
         with("http://localhost:3000/some-challenge.tar.gz").

data/spec/cli/list_lessons_spec.rb

@@ -0,0 +1,29 @@
+describe "list lessons" do
+  let(:sample_lessons_file) { project_root.join("spec/data/lessons.json") }
+
+  let(:sample_lessons) do
+    JSON.parse(File.read(sample_lessons_file), symbolize_names: true)[:lessons]
+  end
+
+  it "prints the titles and slug" do
+    expect_any_instance_of(ET::API).to receive(:list_lessons).
+      and_return(sample_lessons)
+
+    Dir.mktmpdir("test") do |tmpdir|
+      write_sample_config_to(tmpdir)
+
+      runner = ET::Runner.new(tmpdir)
+      stdout, _ = capture_output do
+        expect(runner.go(["list"])).to eq(0)
+      end
+
+      expect(stdout).to include("Max Number")
+      expect(stdout).to include("max-number")
+      expect(stdout).to include("exercise")
+
+      expect(stdout).to include("Optimal Guesser")
+      expect(stdout).to include("optimal-guesser")
+      expect(stdout).to include("challenge")
+    end
+  end
+end

data/spec/cli/run_exercise_test_suite_spec.rb

@@ -0,0 +1,31 @@
+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/cli/submit_lesson_spec.rb

@@ -0,0 +1,37 @@
+describe "submit lesson" do
+  let(:sample_archive_path) do
+    project_root.join("spec/data/archive.tar.gz")
+  end
+
+  context "when in a working area" do
+    it "packages and uploads a challenge directory" do
+      Dir.mktmpdir("test") do |tmpdir|
+        write_sample_config_to(tmpdir)
+        challenge_dir = add_sample_challenge(tmpdir)
+
+        expect_any_instance_of(ET::API).to receive(:submit_lesson).
+          and_return(true)
+
+        runner = ET::Runner.new(challenge_dir)
+         _, _ = capture_output do
+          expect(runner.go(["submit"])).to eq(0)
+        end
+      end
+    end
+
+    it "packages and uploads an exercise directory" do
+      Dir.mktmpdir("test") do |tmpdir|
+        write_sample_config_to(tmpdir)
+        exercise_dir = add_sample_exercise(tmpdir)
+
+        expect_any_instance_of(ET::API).to receive(:submit_lesson).
+          and_return(true)
+
+        runner = ET::Runner.new(exercise_dir)
+         _, _ = capture_output do
+          expect(runner.go(["submit"])).to eq(0)
+        end
+      end
+    end
+  end
+end

data/spec/data/challenge.json

@@ -1 +1,8 @@
-{"lesson":{"slug":"rock-paper-scissors","title":"Rock, Paper, Scissors","body":"body goes here...","archive_url":"http://example.com/rock-paper-scissors.tar.gz"}}
+{
+    "lesson": {
+        "archive_url": "http://example.com/rock-paper-scissors.tar.gz",
+        "body": "body goes here...",
+        "slug": "rock-paper-scissors",
+        "title": "Rock, Paper, Scissors"
+    }
+}

data/spec/data/lessons.json

@@ -0,0 +1,19 @@
+{
+    "lessons": [
+        {
+            "slug": "max-number",
+            "title": "Max Number",
+            "type": "exercise"
+        },
+        {
+            "slug": "guess-the-number",
+            "title": "Guess the Number",
+            "type": "challenge"
+        },
+        {
+            "slug": "optimal-guesser",
+            "title": "Optimal Guesser",
+            "type": "challenge"
+        }
+    ]
+}

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

@@ -0,0 +1,6 @@
+---
+title: "Sample Challenge"
+type: "challenge"
+description: "Some description."
+ignore:
+- "sample-challenge.md"

data/spec/data/sample-challenge/problem.rb

@@ -0,0 +1 @@
+# YOUR CODE GOES HERE

data/spec/data/sample-challenge/sample-challenge.md

@@ -0,0 +1,3 @@
+### Instructions
+
+Do something.

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

@@ -0,0 +1,6 @@
+---
+title: "Sample Exercise"
+type: "exercise"
+description: "Some description here."
+ignore:
+- "sample-exercise.md"

data/spec/data/sample-exercise/lib/sample_exercise.rb

@@ -0,0 +1 @@
+puts "hi"

data/spec/data/sample-exercise/sample-exercise.md

@@ -0,0 +1,3 @@
+### Instructions
+
+Do something.

data/spec/data/sample-exercise/test/sample_exercise_test.rb

@@ -0,0 +1,7 @@
+require_relative "../lib/sample_exercise"
+
+describe "something" do
+  it "works" do
+    expect(true).to eq(true)
+  end
+end

data/spec/lib/api_spec.rb

@@ -1,33 +1,34 @@
 describe ET::API do
   let(:api) { ET::API.new(host: "http://localhost:3000") }
 
-  describe "challenges" do
-    let(:challenges_response) do
-      File.read("spec/data/challenges.json")
+  describe "lessons" do
+    let(:lessons_response) do
+      File.read("spec/data/lessons.json")
     end
 
-    it "queries for a list of challenges" do
+    it "queries for a list of lessons" do
       expect(RestClient).to receive(:get).
-        with("http://localhost:3000/lessons.json?type=challenge").
-        and_return(challenges_response)
+        with("http://localhost:3000/lessons.json?submittable=1").
+        and_return(lessons_response)
 
-      results = api.list_challenges
+      results = api.list_lessons
 
-      expect(results.count).to eq(2)
-      expect(results[0][:title]).to eq("Auto-Guesser")
-      expect(results[0][:slug]).to eq("auto-guesser")
+      expect(results.count).to eq(3)
+      expect(results[0][:title]).to eq("Max Number")
+      expect(results[0][:slug]).to eq("max-number")
+      expect(results[0][:type]).to eq("exercise")
     end
 
-    let(:challenge_response) do
+    let(:lesson_response) do
       File.read("spec/data/challenge.json")
     end
 
-    it "queries for a single challenge" do
+    it "queries for a single lesson" do
       expect(RestClient).to receive(:get).
         with("http://localhost:3000/lessons/rock-paper-scissors.json").
-        and_return(challenge_response)
+        and_return(lesson_response)
 
-      result = api.get_challenge("rock-paper-scissors")
+      result = api.get_lesson("rock-paper-scissors")
 
       expect(result[:title]).to eq("Rock, Paper, Scissors")
       expect(result[:archive_url]).to eq("http://example.com/rock-paper-scissors.tar.gz")

data/spec/lib/challenge_spec.rb

@@ -1,18 +1,10 @@
 require "yaml"
 
 describe ET::Challenge do
-  let(:challenge_info) do
-    {
-      "title" => "Guess the Number",
-      "ignore" => ["README.md"]
-    }
-  end
-
   describe "#dir" do
     it "selects the directory containing the challenge file" do
-      Dir.mktmpdir do |challenge_dir|
-        challenge_path = File.join(challenge_dir, ".lesson.yml")
-        File.write(challenge_path, challenge_info.to_yaml)
+      Dir.mktmpdir do |tmpdir|
+        challenge_dir = add_sample_challenge(tmpdir)
 
         challenge = ET::Challenge.new(challenge_dir)
         expect(challenge.dir).to eq(challenge_dir)
@@ -20,20 +12,22 @@ describe ET::Challenge do
     end
 
     it "checks parent directories for the challenge file" do
-      Dir.mktmpdir do |parent_dir|
-        challenge_path = File.join(parent_dir, ".lesson.yml")
-        File.write(challenge_path, challenge_info.to_yaml)
+      Dir.mktmpdir do |tmpdir|
+        challenge_dir = add_sample_challenge(tmpdir)
 
-        child_dir = File.join(parent_dir, "foobar")
+        child_dir = File.join(challenge_dir, "child")
+        Dir.mkdir(child_dir)
 
         challenge = ET::Challenge.new(child_dir)
-        expect(challenge.dir).to eq(parent_dir)
+        expect(challenge.dir).to eq(challenge_dir)
       end
     end
 
     it "returns nil if no challenge file found" do
-      challenge = ET::Challenge.new(Dir.tmpdir)
-      expect(challenge.dir).to eq(nil)
+      Dir.mktmpdir do |tmpdir|
+        challenge = ET::Challenge.new(tmpdir)
+        expect(challenge.dir).to eq(nil)
+      end
     end
   end
 
@@ -42,18 +36,14 @@ describe ET::Challenge do
       archive_path = nil
 
       begin
-        Dir.mktmpdir do |challenge_dir|
-          challenge_path = File.join(challenge_dir, ".lesson.yml")
-          File.write(challenge_path, challenge_info.to_yaml)
-
-          file_path = File.join(challenge_dir, "file.rb")
-          File.write(file_path, "2 + 2 == 5")
+        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, "./file.rb")
-          expect(contents).to eq("2 + 2 == 5")
+          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)
@@ -66,18 +56,16 @@ describe ET::Challenge do
       archive_path = nil
 
       begin
-        Dir.mktmpdir do |dir|
-          File.write(File.join(dir, ".lesson.yml"), challenge_info.to_yaml)
-          File.write(File.join(dir, "file.rb"), "2 + 2 == 5")
-          File.write(File.join(dir, "README.md"), "Ignore me!")
+        Dir.mktmpdir do |tmpdir|
+          challenge_dir = add_sample_challenge(tmpdir)
 
-          challenge = ET::Challenge.new(dir)
+          challenge = ET::Challenge.new(challenge_dir)
           archive_path = challenge.archive!
 
           files = list_files_in_gzipped_archive(archive_path)
 
-          expect(files).to include("./file.rb")
-          expect(files).to_not include("./README.md")
+          expect(files).to include("./problem.rb")
+          expect(files).to_not include("./sample-challenge.md")
           expect(files).to_not include("./.lesson.yml")
         end
       ensure

data/spec/lib/config_spec.rb

@@ -1,4 +1,51 @@
+require "yaml"
+
 describe ET::Config do
+  describe "#save" do
+    let(:options) do
+      {
+        "username" => "foobar",
+        "token" => "supersecret",
+        "host" => "http://example.com"
+      }
+    end
+
+    it "writes a new config file if doesn't exist" do
+      Dir.mktmpdir("test") do |tmpdir|
+        config = ET::Config.new(tmpdir)
+        config.save!(options)
+
+        config_file = File.join(tmpdir, ".et")
+        expect(File.exists?(config_file)).to eq(true)
+
+        saved_options = YAML.load_file(config_file)
+
+        options.each do |key, value|
+          expect(saved_options[key]).to eq(value)
+        end
+      end
+    end
+
+    it "updates an existing config file with new options" do
+      Dir.mktmpdir("test") do |parent_dir|
+        nested_dir = File.join(parent_dir, "nested")
+        Dir.mkdir(nested_dir)
+
+        write_sample_config_to(parent_dir)
+
+        config = ET::Config.new(nested_dir)
+        config.save!(options)
+
+        expect(File.exists?(File.join(nested_dir, ".et"))).to eq(false)
+
+        saved_options = YAML.load_file(File.join(parent_dir, ".et"))
+        options.each do |key, value|
+          expect(saved_options[key]).to eq(value)
+        end
+      end
+    end
+  end
+
   describe "#path" do
     it "finds the config file in the given directory" do
       Dir.mktmpdir("test") do |tmpdir|
@@ -37,7 +84,7 @@ describe ET::Config do
       end
     end
 
-    it "preprends http if scheme not provided" do
+    it "prepends http if scheme not provided" do
       Dir.mktmpdir("test") do |tmpdir|
         write_sample_config_to(tmpdir, "host" => "example.com")
 

data/spec/lib/exercise_spec.rb

@@ -0,0 +1,28 @@
+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

data/spec/support/helpers/sample_files.rb

@@ -2,29 +2,27 @@ require "yaml"
 
 module SampleFiles
   def write_sample_config_to(dir, additional_settings = nil)
-    config = {
+    settings = {
       "username" => "bob",
       "token" => "1234",
       "host" => "http://localhost:3000"
     }
 
     if additional_settings
-      config = config.merge(additional_settings)
+      settings = settings.merge(additional_settings)
     end
 
-    path = File.join(dir, ".et")
-    File.write(path, config.to_yaml)
+    config = ET::Config.new(dir)
+    config.save!(settings)
   end
 
-  def write_sample_challenge_to(working_dir, slug)
-    options = { "title" => slug.capitalize, "slug" => slug }
-
-    dir = File.join(working_dir, slug)
-    system("mkdir #{dir}")
-
-    File.write(File.join(dir, "README.md"), "# README")
-    File.write(File.join(dir, ".lesson.yml"), options.to_yaml)
+  def add_sample_exercise(dir)
+    system("cp", "-r", project_root.join("spec/data/sample-exercise").to_s, dir)
+    File.join(dir, "sample-exercise")
+  end
 
-    dir
+  def add_sample_challenge(dir)
+    system("cp", "-r", project_root.join("spec/data/sample-challenge").to_s, dir)
+    File.join(dir, "sample-challenge")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,19 +104,30 @@ files:
 - lib/et/api.rb
 - lib/et/challenge.rb
 - lib/et/config.rb
+- lib/et/exercise.rb
 - lib/et/formatter.rb
+- lib/et/lesson.rb
 - lib/et/runner.rb
 - lib/et/version.rb
-- spec/cli/get_challenge_spec.rb
+- spec/cli/get_lesson_spec.rb
 - spec/cli/init_spec.rb
-- spec/cli/list_challenges_spec.rb
-- spec/cli/submit_challenge_spec.rb
+- spec/cli/list_lessons_spec.rb
+- spec/cli/run_exercise_test_suite_spec.rb
+- spec/cli/submit_lesson_spec.rb
 - spec/data/challenge.json
-- spec/data/challenges.json
+- spec/data/lessons.json
+- spec/data/sample-challenge/.lesson.yml
+- spec/data/sample-challenge/problem.rb
+- spec/data/sample-challenge/sample-challenge.md
+- 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/challenge_spec.rb
 - spec/lib/config_spec.rb
+- spec/lib/exercise_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/archive_helper.rb
 - spec/support/helpers/output_catcher.rb

data/spec/cli/list_challenges_spec.rb

@@ -1,25 +0,0 @@
-describe "list challenges" do
-  let(:sample_challenges) do
-    JSON.parse(File.read("spec/data/challenges.json"), symbolize_names: true)[:lessons]
-  end
-
-  it "prints the titles and slug" do
-    expect_any_instance_of(ET::API).to receive(:list_challenges).
-      and_return(sample_challenges)
-
-    Dir.mktmpdir("test") do |tmpdir|
-      write_sample_config_to(tmpdir)
-
-      runner = ET::Runner.new(tmpdir)
-      stdout, _ = capture_output do
-        expect(runner.go(["list"])).to eq(0)
-      end
-
-      expect(stdout).to include("Guess the Number")
-      expect(stdout).to include("guess-the-number")
-
-      expect(stdout).to include("Auto-Guesser")
-      expect(stdout).to include("auto-guesser")
-    end
-  end
-end

data/spec/cli/submit_challenge_spec.rb

@@ -1,22 +0,0 @@
-describe "submit challenge" do
-  let(:sample_archive_path) do
-    project_root.join("spec/data/archive.tar.gz")
-  end
-
-  context "when in a working area" do
-    it "packages and uploads directory" do
-      Dir.mktmpdir("test") do |tmpdir|
-        write_sample_config_to(tmpdir)
-        challenge_dir = write_sample_challenge_to(tmpdir, "some-challenge")
-
-        expect_any_instance_of(ET::API).to receive(:submit_challenge).
-          and_return(true)
-
-        runner = ET::Runner.new(challenge_dir)
-         _, _ = capture_output do
-          expect(runner.go(["submit"])).to eq(0)
-        end
-      end
-    end
-  end
-end

data/spec/data/challenges.json

@@ -1 +0,0 @@
-{"lessons":[{"title":"Auto-Guesser","slug":"auto-guesser"},{"title":"Guess the Number","slug":"guess-the-number"}]}