et 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00179bd64d106f8b6a721fbc5db5f5482c1eb6d8
-  data.tar.gz: fed344968bf74831c833c2d9b5728dcb42d394c7
+  metadata.gz: b39aed635bf95f14c089d17488dcde13d1a85ea2
+  data.tar.gz: 680174f609918e638266301b381d5ac5d74d8f84
 SHA512:
-  metadata.gz: 7d69b2af3044f4b6df40fe317d8d1488d9afc620a810a15ca0744f5980ee2fb34da7a7bd990e7cd67679a31c11769278d189d0fbeeef60d85f868367a2552b00
-  data.tar.gz: 3b08ea5c8308edfb2a5829e0878bbb24f3b9f4509a0db882ebb80ab5745bfab005304ef37482279d1172ec35271012c5d8e192a88db9b2e0a7a4feabdf868f80
+  metadata.gz: efca6c830ff04b4be2414c83c062462a9d0d532c1b0621693d6f97f52f7d156b681421a3bf25ed0760a4548c0fa40ef36d0c21e6c151e8fb2f8026f6237bf72b
+  data.tar.gz: 5a52aa3f094bc58460a9834c7a2f09a004e834a53f0e580f344d71ddb538f7b168f029732921a2013fba2fa5235b76c29d71ea206c9c0993a240a161026fcd7e

data/lib/et/api.rb

@@ -15,13 +15,13 @@ module ET
 
     def list_challenges
       response = RestClient.get(challenges_url)
-      JSON.parse(response, symbolize_names: true)
+      JSON.parse(response, symbolize_names: true)[:lessons]
     end
 
     def get_challenge(slug)
       response = RestClient.get(challenge_url(slug))
       body = JSON.parse(response, symbolize_names: true)
-      body[:challenge]
+      body[:lesson]
     end
 
     def download_file(url)
@@ -51,15 +51,15 @@ module ET
     private
 
     def challenge_url(slug)
-      URI.join(host, "challenges/#{slug}.json").to_s
+      URI.join(host, "lessons/#{slug}.json").to_s
     end
 
     def challenges_url
-      URI.join(host, "challenges.json").to_s
+      URI.join(host, "lessons.json?type=challenge").to_s
     end
 
     def submission_url(slug)
-      URI.join(host, "challenges/#{slug}/submissions.json").to_s
+      URI.join(host, "lessons/#{slug}/submissions.json").to_s
     end
 
     def random_filename

data/lib/et/challenge.rb

@@ -1,3 +1,4 @@
+require "pathname"
 require "securerandom"
 
 module ET
@@ -43,13 +44,13 @@ module ET
     end
 
     def ignored_files
-      (config["ignore"] || []) + [".challenge"]
+      (config["ignore"] || []) + [".lesson.yml"]
     end
 
     private
 
     def config
-      @config ||= YAML.load(File.read(File.join(dir, ".challenge")))
+      @config ||= YAML.load(File.read(File.join(dir, ".lesson.yml")))
     end
 
     def random_archive_path
@@ -57,11 +58,11 @@ module ET
     end
 
     def find_challenge_dir(current_dir)
-      path = File.join(current_dir, ".challenge")
+      path = File.join(current_dir, ".lesson.yml")
 
       if File.exists?(path)
         current_dir
-      elsif current_dir == "/" || current_dir == "."
+      elsif current_dir == "." || Pathname.new(current_dir).root?
         nil
       else
         find_challenge_dir(File.dirname(current_dir))

data/lib/et/config.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module ET
   class Config
     attr_reader :current_dir
@@ -50,7 +52,7 @@ module ET
 
       if File.exists?(config_path)
         config_path
-      elsif dir == "/" || dir == "."
+      elsif dir == "." || Pathname.new(dir).root?
         nil
       else
         find_config_file(File.dirname(dir))

data/lib/et/runner.rb

@@ -40,7 +40,7 @@ module ET
       desc "List available challenges."
       command :list do |c|
         c.action do |_global_options, _options, _cmdargs|
-          Formatter.print_table(api.list_challenges[:challenges], :slug, :title)
+          Formatter.print_table(api.list_challenges, :slug, :title)
         end
       end
 

data/lib/et/version.rb

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

data/spec/cli/list_challenges_spec.rb

@@ -1,11 +1,6 @@
 describe "list challenges" do
   let(:sample_challenges) do
-    {
-      challenges: [
-        { title: "Guess the Number", slug: "guess-the-number" },
-        { title: "Blackjack", slug: "blackjack" }
-      ]
-    }
+    JSON.parse(File.read("spec/data/challenges.json"), symbolize_names: true)[:lessons]
   end
 
   it "prints the titles and slug" do
@@ -23,8 +18,8 @@ describe "list challenges" do
       expect(stdout).to include("Guess the Number")
       expect(stdout).to include("guess-the-number")
 
-      expect(stdout).to include("Blackjack")
-      expect(stdout).to include("blackjack")
+      expect(stdout).to include("Auto-Guesser")
+      expect(stdout).to include("auto-guesser")
     end
   end
 end

data/spec/data/challenge.json

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

data/spec/data/challenges.json

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

data/spec/lib/api_spec.rb

@@ -8,14 +8,29 @@ describe ET::API do
 
     it "queries for a list of challenges" do
       expect(RestClient).to receive(:get).
-        with("http://localhost:3000/challenges.json").
+        with("http://localhost:3000/lessons.json?type=challenge").
         and_return(challenges_response)
 
       results = api.list_challenges
 
-      expect(results[:challenges].count).to eq(2)
-      expect(results[:challenges][0][:title]).to eq("Auto-Guesser")
-      expect(results[:challenges][0][:slug]).to eq("auto-guesser")
+      expect(results.count).to eq(2)
+      expect(results[0][:title]).to eq("Auto-Guesser")
+      expect(results[0][:slug]).to eq("auto-guesser")
+    end
+
+    let(:challenge_response) do
+      File.read("spec/data/challenge.json")
+    end
+
+    it "queries for a single challenge" do
+      expect(RestClient).to receive(:get).
+        with("http://localhost:3000/lessons/rock-paper-scissors.json").
+        and_return(challenge_response)
+
+      result = api.get_challenge("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")
     end
   end
 end

data/spec/lib/challenge_spec.rb

@@ -4,7 +4,6 @@ describe ET::Challenge do
   let(:challenge_info) do
     {
       "title" => "Guess the Number",
-      "slug" => "guess-the-number",
       "ignore" => ["README.md"]
     }
   end
@@ -12,7 +11,7 @@ describe ET::Challenge do
   describe "#dir" do
     it "selects the directory containing the challenge file" do
       Dir.mktmpdir do |challenge_dir|
-        challenge_path = File.join(challenge_dir, ".challenge")
+        challenge_path = File.join(challenge_dir, ".lesson.yml")
         File.write(challenge_path, challenge_info.to_yaml)
 
         challenge = ET::Challenge.new(challenge_dir)
@@ -22,7 +21,7 @@ describe ET::Challenge do
 
     it "checks parent directories for the challenge file" do
       Dir.mktmpdir do |parent_dir|
-        challenge_path = File.join(parent_dir, ".challenge")
+        challenge_path = File.join(parent_dir, ".lesson.yml")
         File.write(challenge_path, challenge_info.to_yaml)
 
         child_dir = File.join(parent_dir, "foobar")
@@ -44,7 +43,7 @@ describe ET::Challenge do
 
       begin
         Dir.mktmpdir do |challenge_dir|
-          challenge_path = File.join(challenge_dir, ".challenge")
+          challenge_path = File.join(challenge_dir, ".lesson.yml")
           File.write(challenge_path, challenge_info.to_yaml)
 
           file_path = File.join(challenge_dir, "file.rb")
@@ -68,7 +67,7 @@ describe ET::Challenge do
 
       begin
         Dir.mktmpdir do |dir|
-          File.write(File.join(dir, ".challenge"), challenge_info.to_yaml)
+          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!")
 
@@ -79,7 +78,7 @@ describe ET::Challenge do
 
           expect(files).to include("./file.rb")
           expect(files).to_not include("./README.md")
-          expect(files).to_not include("./.challenge")
+          expect(files).to_not include("./.lesson.yml")
         end
       ensure
         if archive_path && File.exist?(archive_path)

data/spec/support/helpers/sample_files.rb

@@ -23,7 +23,7 @@ module SampleFiles
     system("mkdir #{dir}")
 
     File.write(File.join(dir, "README.md"), "# README")
-    File.write(File.join(dir, ".challenge"), options.to_yaml)
+    File.write(File.join(dir, ".lesson.yml"), options.to_yaml)
 
     dir
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +111,7 @@ files:
 - spec/cli/init_spec.rb
 - spec/cli/list_challenges_spec.rb
 - spec/cli/submit_challenge_spec.rb
+- spec/data/challenge.json
 - spec/data/challenges.json
 - spec/data/some-challenge.tar.gz
 - spec/lib/api_spec.rb