et 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62871439d06d15d1b7b78b7493a5165f316d28d3
-  data.tar.gz: 8a415980a7d4c513faec60ebf3b1f80b370d6592
+  metadata.gz: 6e414688a6eb0fc5a464071284eaad87cf914f16
+  data.tar.gz: 647e0fbd0c9fadbe733f480e4d29db3d06e6a18a
 SHA512:
-  metadata.gz: 09f4f85e6be87779eb493370b0befc626507a581508e3558703ae5ff70f2470d77e3951fe816b565a2ac97dd2d69f8c3ac2841593062039dcab1f06c8e55bbb6
-  data.tar.gz: c9d81101825e76f1a805845a2549b8baf46c9f8a8f55c2a6bf7be0cf6c27a695c6a27d9a659869b1a2d08303c80665080c923d06f81dc29d2c0d8ab2b2662f62
+  metadata.gz: f8b87ae613c19d680bc2219b596e980351f04ddf9baee09efc1ce1624f9885e150db28312b8430c983ceccb90e78a701128afb8868607274dd6bcbdcf5515ec0
+  data.tar.gz: 7cdb0f85e3fecc7aa82431e8d3e1cda5d745b65582ccfbefe8539868ab29e19e5ea161796e7d54c12d2ab6c7d019185d0f380e78e31208add0ec1a747e5d74b2

data/Gemfile.lock

@@ -1,9 +1,12 @@
 PATH
   remote: .
   specs:
-    et (0.5.9)
+    et (0.6.0)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
       gli (= 2.11.0)
       multipart-post (~> 2.0)
+      rake (~> 10)
       rspec (~> 3.0)
       rspec-mocks (~> 3.0)
 
@@ -12,6 +15,10 @@ GEM
   specs:
     coderay (1.1.1)
     diff-lcs (1.2.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
     gli (2.11.0)
     method_source (0.8.2)
     multipart-post (2.0.0)
@@ -20,19 +27,19 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     slop (3.6.0)
 
 PLATFORMS
@@ -41,7 +48,6 @@ PLATFORMS
 DEPENDENCIES
   et!
   pry (~> 0)
-  rake (~> 10)
 
 BUNDLED WITH
-   1.12.5
+   1.13.5

data/README.md

@@ -28,3 +28,20 @@ COMMANDS
     submit - Submit the lesson in this directory.
     test   - Run an exercise test suite.
 ```
+
+### Releasing New Versions
+
+Bundler provided `gem_tasks` have been incorporated into this libraries
+`Rakefile`. Thankfully these tasks make releasing new gem versions a snap!
+
+To release a new version of this gem:
+
+1. Bump the version according to [semantic versioning](http://semver.org/)
+2. Perform a git commit
+3. Run `rake release` from the project root
+
+Bundler's provided rake task will appropriately push a tag to GitHub and the gem
+itself to [rubygems.org](https://rubygems.org)
+
+_Note:_ in order to release the gem you must be an authorized owner of it on
+[rubygems.org](https://rubygems.org)

data/et.gemspec

@@ -19,10 +19,12 @@ DESC
   s.bindir = "bin"
   s.executables << "et"
   s.license = "MIT"
-  s.add_development_dependency("rake", "~> 10")
   s.add_development_dependency("pry", '~> 0')
   s.add_runtime_dependency("rspec", "~> 3.0")
+  s.add_runtime_dependency("rake", "~> 10")
   s.add_runtime_dependency("rspec-mocks", "~> 3.0")
   s.add_runtime_dependency("multipart-post", "~> 2.0")
   s.add_runtime_dependency("gli", "2.11.0")
+  s.add_runtime_dependency("faraday", "~> 0.9")
+  s.add_runtime_dependency("faraday_middleware", "~> 0.10")
 end

data/lib/et.rb

@@ -3,6 +3,7 @@ require_relative "et/version"
 require_relative "et/runner"
 require_relative "et/operating_system"
 require_relative "et/api"
+require_relative "et/submission_file_list"
 require_relative "et/config"
 require_relative "et/formatter"
 require_relative "et/lesson"

data/lib/et/api.rb

@@ -1,9 +1,9 @@
-require "net/http/post/multipart"
 require "securerandom"
 require "base64"
 require "json"
 require "openssl"
 
+require_relative "fallback_connection"
 module ET
   class API
     attr_reader :host, :username, :token
@@ -15,30 +15,29 @@ module ET
     end
 
     def list_lessons
-      request = Net::HTTP::Get.new(lessons_url)
-      request["Authorization"] = auth_header
-
-      response = issue_request(request)
-      JSON.parse(response.body, symbolize_names: true)[:lessons]
+      resp = nil
+      api_client.with_ssl_fallback do |client|
+        resp = client.get('/lessons.json', :submittable => 1)
+      end
+      resp.body['lessons']
     end
 
     def get_lesson(slug)
-      request = Net::HTTP::Get.new(lesson_url(slug))
-      request["Authorization"] = auth_header
-
-      response = issue_request(request)
-
-      body = JSON.parse(response.body, symbolize_names: true)
-      body[:lesson]
+      resp = nil
+      api_client.with_ssl_fallback do |client|
+        resp = client.get(lesson_url(slug), :submittable => 1)
+      end
+      resp.body['lesson']
     end
 
     def download_file(url)
-      uri = URI(url)
+      response = nil
       dest = random_filename
 
-      request = Net::HTTP::Get.new(uri.path)
-      response = issue_request(request, url)
-      if response.code == "200"
+      download_client(url).with_ssl_fallback do |client|
+        response = client.get(URI(url).path)
+      end
+      if response.status == 200
         open(dest, 'wb') do |file|
           file.write(response.body)
         end
@@ -50,66 +49,47 @@ module ET
 
     def submit_lesson(lesson)
       submission_file = lesson.archive!
-      url = submission_url(lesson.slug)
-
-      File.open(submission_file) do |f|
-        request = Net::HTTP::Post::Multipart.new(url.path,
-          "submission[archive]" => UploadIO.new(f, "application/x-tar", "archive.tar.gz"))
-        request["Authorization"] = auth_header
-
-        issue_request(request)
+      io = Faraday::UploadIO.new(submission_file, "application/x-tar")
+      resp = nil
+      api_client.with_ssl_fallback do |client|
+        resp = client.post(submission_url(lesson.slug),
+          "submission" => { "archive" => io})
       end
+      resp
     end
 
     private
-    def issue_request(request, url = nil)
-      uri = URI.parse(url || @host)
-      begin
-        Net::HTTP.start(uri.host, uri.port,
-          use_ssl: uri.scheme == "https") do |http|
-
-          http.request(request)
-        end
-      rescue OpenSSL::SSL::SSLError => e
-        if operating_system.platform_family?(:windows)
-          https = Net::HTTP.new(uri.host, uri.port)
-          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          https.use_ssl = uri.scheme == 'https'
-          https.start do |http|
-            http.request(request)
-          end
-        else
-          raise e
-        end
-      end
-    end
-
     def lesson_url(slug)
-      URI.join(host, "lessons/#{slug}.json?submittable=1")
-    end
-
-    def lessons_url
-      URI.join(host, "lessons.json?submittable=1")
+      "/lessons/#{slug}.json"
     end
 
     def submission_url(slug)
-      URI.join(host, "lessons/#{slug}/submissions.json")
+      "/lessons/#{slug}/submissions.json"
     end
 
     def random_filename
       File.join(Dir.mktmpdir, SecureRandom.hex)
     end
 
-    def credentials
-      Base64.strict_encode64("#{username}:#{token}")
-    end
+    def api_client
+      @api_client ||= ET::FallbackConnection.new(:url => @host) do |client|
+        client.request :multipart
 
-    def auth_header
-      "Basic #{credentials}"
+        client.request :url_encoded
+        client.request :basic_auth, username, token
+
+        client.response :json, :content_type => /\bjson$/
+
+        client.adapter  Faraday.default_adapter
+      end
     end
 
-    def operating_system
-      @os ||= ET::OperatingSystem.new
+    def download_client(url)
+      uri = URI(url)
+      scheme_and_host = [uri.scheme, uri.host].join('://')
+      ET::FallbackConnection.new(:url => scheme_and_host) do |client|
+        client.adapter  Faraday.default_adapter
+      end
     end
   end
 end

data/lib/et/fallback_connection.rb

@@ -0,0 +1,29 @@
+require "faraday"
+require "faraday_middleware"
+
+module ET
+  class FallbackConnection
+    def initialize(opts = {}, &block)
+      @connection = Faraday.new(opts, &block)
+
+      @fallback_connection = Faraday.new(opts.merge(:ssl => {:verify => false}))
+    end
+
+    def with_ssl_fallback(&block)
+      begin
+        block.call(@connection)
+      rescue OpenSSL::SSL::SSLError => e
+        if operating_system.platform_family?(:windows)
+          block.call(@fallback_connection)
+        else
+          raise e
+        end
+      end
+    end
+
+    private
+    def operating_system
+      @os ||= ET::OperatingSystem.new
+    end
+  end
+end

data/lib/et/lesson.rb

@@ -17,16 +17,16 @@ module ET
         File.open(filepath, "wb") do |file|
           Zlib::GzipWriter.wrap(file) do |gz|
             Gem::Package::TarWriter.new(gz) do |tar|
-              Dir.glob(File.join(dir, "**/*")).each do |file|
-                relative_path = file.gsub(dir + "/", "")
-                if !ignored_files.include?(relative_path)
-                  if FileTest.directory?(file)
-                    tar.mkdir(relative_path, 0755)
-                  else
-                    file_contents = File.read(file)
-                    tar.add_file_simple("./" + relative_path, 0555, file_contents.bytesize) do |io|
-                      io.write(file_contents)
-                    end
+              ET::SubmissionFileList.new(dir).each do |file|
+                relative_path = file
+                absolute_path = File.join(dir, file)
+
+                if FileTest.directory?(absolute_path)
+                  tar.mkdir(relative_path, 0755)
+                else
+                  file_contents = File.read(absolute_path)
+                  tar.add_file_simple("./" + relative_path, 0555, file_contents.bytesize) do |io|
+                    io.write(file_contents)
                   end
                 end
               end
@@ -51,10 +51,6 @@ module ET
       !dir.nil?
     end
 
-    def ignored_files
-      (config["ignore"] || []) + [".lesson.yml"]
-    end
-
     protected
 
     def config

data/lib/et/runner.rb

@@ -40,7 +40,7 @@ module ET
       desc "List available lessons."
       command :list do |c|
         c.action do |_global_options, _options, _cmdargs|
-          Formatter.print_table(api.list_lessons, :slug, :title, :type)
+          Formatter.print_table(api.list_lessons, 'slug', 'title', 'type')
         end
       end
 
@@ -49,7 +49,7 @@ module ET
         c.action do |_global_options, _options, cmdargs|
           cmdargs.each do |slug|
             lesson = api.get_lesson(slug)
-            archive = api.download_file(lesson[:archive_url])
+            archive = api.download_file(lesson['archive_url'])
             archive_manager = ET::ArchiveManager.new(archive, cwd)
             archive_manager.unpack
 

data/lib/et/submission_file_list.rb

@@ -0,0 +1,50 @@
+require "rake/file_list"
+
+module ET
+  class SubmissionFileList
+    include Enumerable
+    DEFAULT_IGNORE_GLOBS = [
+      '.lesson.yml',
+      'node_modules/**/*'
+    ]
+
+    def initialize(path)
+      @path = path
+    end
+
+    def files
+      unless @files
+        @files = Rake::FileList[File.join(@path, "**/*")]
+        ignore_globs.each do |glob|
+          @files = @files.exclude(File.join(@path, glob))
+        end
+        @files = @files.sub(File.join(@path, "/"), "")
+      end
+
+      @files
+    end
+
+    def each(&block)
+      files.each do |file|
+        block.call(file)
+      end
+    end
+
+    protected
+    def ignore_globs
+      lesson_ignore_globs + [] + DEFAULT_IGNORE_GLOBS
+    end
+
+    def lesson_ignore_globs
+      unless @lesson_ignore_globs
+        lesson_yml = File.join(@path, '.lesson.yml')
+        if FileTest.exists?(lesson_yml)
+          @lesson_ignore_globs = YAML.load_file(lesson_yml)['ignore'] || []
+        else
+          @lesson_ignore_globs = []
+        end
+      end
+      @lesson_ignore_globs
+    end
+  end
+end

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/spec/cli/get_lesson_spec.rb

@@ -1,38 +1,38 @@
-describe "get lesson" do
+describe 'get lesson' do
   let(:lesson_info) do
     {
-      title: "Some Challenge",
-      slug: "some-challenge",
-      archive_url: "http://localhost:3000/some-challenge.tar.gz"
+      'title' => 'Some Challenge',
+      'slug'  => 'some-challenge',
+      'archive_url' => "http://localhost:3000/some-challenge.tar.gz"
     }
   end
 
   let(:sample_archive_path) do
-    project_root.join("spec/data/some-challenge.tar.gz")
+    project_root.join('spec/data/some-challenge.tar.gz')
   end
 
-  context "when in a working area" do
-    it "downloads and extracts the lesson" do
-      tmp_archive_path = File.join(Dir.tmpdir, "some-challenge.tar.gz")
-      system("cp", sample_archive_path.to_s, tmp_archive_path)
+  context 'when in a working area' do
+    it 'downloads and extracts the lesson' do
+      tmp_archive_path = File.join(Dir.tmpdir, 'some-challenge.tar.gz')
+      system('cp', sample_archive_path.to_s, tmp_archive_path)
 
       expect_any_instance_of(ET::API).to receive(:get_lesson).
-        with("some-challenge").
+        with('some-challenge').
         and_return(lesson_info)
 
       expect_any_instance_of(ET::API).to receive(:download_file).
-        with("http://localhost:3000/some-challenge.tar.gz").
+        with('http://localhost:3000/some-challenge.tar.gz').
         and_return(tmp_archive_path)
 
-      Dir.mktmpdir("test") do |tmpdir|
+      Dir.mktmpdir('test') do |tmpdir|
         write_sample_config_to(tmpdir)
 
         runner = ET::Runner.new(tmpdir)
          _, _ = capture_output do
-          expect(runner.go(["get", "some-challenge"])).to eq(0)
+          expect(runner.go(['get', 'some-challenge'])).to eq(0)
         end
 
-        ["some-challenge/README.md", "some-challenge/sample.rb"].each do |filename|
+        ['some-challenge/README.md', 'some-challenge/sample.rb'].each do |filename|
           path = File.join(tmpdir, filename)
           expect(File.exist?(path)).to eq(true)
         end

data/spec/cli/list_lessons_spec.rb

@@ -2,7 +2,7 @@ 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]
+    JSON.parse(File.read(sample_lessons_file))['lessons']
   end
 
   it "prints the titles and slug" do

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

@@ -0,0 +1,7 @@
+---
+title: "Bloated Challenge"
+type: "challenge"
+description: "Some description."
+ignore:
+- "bloated-challenge.md"
+- "rando_folder/**/*"

data/spec/data/bloated-challenge/bloated-challenge.md

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

data/spec/data/bloated-challenge/node_modules/boo/somefile.js

@@ -0,0 +1 @@
+alert('please do not include this file');

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

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

data/spec/data/bloated-challenge/rando_folder/rando_file.js

@@ -0,0 +1 @@
+console.log('I am random');

data/spec/lib/api_spec.rb

@@ -10,26 +10,24 @@ describe ET::API do
 
   describe "lessons" do
     it "queries for a list of lessons" do
-      request = {}
-      response = double
-      http = double
-      expect(Net::HTTP::Get).to receive(:new).
-        with(lessons_uri).
-        and_return(request)
-      expect(Net::HTTP).to receive(:start).with(
-        lessons_uri.host,
-        lessons_uri.port,
-        use_ssl: lessons_uri.scheme == "https").
-        and_yield(http)
-      expect(http).to receive(:request).and_return(response)
-      expect(response).to receive(:body).and_return(lessons_response)
+      client = Faraday.new do |builder|
+        builder.response :json
+
+        builder.adapter :test do |stubs|
+          stubs.get("/lessons.json") do
+            [200, {}, lessons_response]
+          end
+        end
+      end
+
+      allow_any_instance_of(ET::FallbackConnection).to receive(:with_ssl_fallback).and_yield(client)
 
       results = api.list_lessons
 
       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")
+      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(:lesson_response) do
@@ -37,99 +35,67 @@ describe ET::API do
     end
 
     it "queries for a single lesson" do
-      request = {}
-      response = double
-      http = double
-
-      lesson_uri = URI("http://localhost:3000/lessons/rock-paper-scissors.json?submittable=1")
-      expect(Net::HTTP::Get).to receive(:new).
-        with(lesson_uri).
-        and_return(request)
-      expect(Net::HTTP).to receive(:start).with(
-        lesson_uri.host,
-        lesson_uri.port,
-        use_ssl: lesson_uri.scheme == "https").
-        and_yield(http)
-      expect(http).to receive(:request).and_return(response)
-      expect(response).to receive(:body).and_return(lesson_response)
-
-      result = api.get_lesson("rock-paper-scissors")
+      client = Faraday.new do |builder|
+        builder.response :json
 
-      expect(result[:title]).to eq("Rock, Paper, Scissors")
-      expect(result[:archive_url]).to eq("http://example.com/rock-paper-scissors.tar.gz")
-    end
-  end
+        builder.adapter :test do |stubs|
+          stubs.get("/lessons/rock-paper-scissors.json") do
+            [200, {}, lesson_response]
+          end
+        end
+      end
 
-  context 'ssl verification' do
-    it 're-raises an exception for non Windows machines' do
-      dbl_os = double
-      allow(dbl_os).to receive(:platform_family?).with(:windows).and_return(false)
-      expect(ET::OperatingSystem).to receive(:new).and_return(dbl_os)
+      allow_any_instance_of(ET::FallbackConnection).
+        to receive(:with_ssl_fallback).and_yield(client)
 
-      expect(Net::HTTP).to receive(:start).and_raise(OpenSSL::SSL::SSLError)
-      expect{ api.list_lessons }.to raise_error(OpenSSL::SSL::SSLError)
-    end
+      result = api.get_lesson("rock-paper-scissors")
 
-    it 'swallows the exception for windows machines and reissues' do
-      http = double
-      allow(http).to receive(:start).and_yield(http)
-      allow(http).to receive(:verify_mode=)
-      allow(http).to receive(:use_ssl=)
-      response = double
-
-      allow(http).to receive(:request).and_return(response)
-      allow(response).to receive(:body).and_return(lessons_response)
-
-      allow(Net::HTTP).to receive(:start).
-        with(
-          lessons_uri.host,
-          lessons_uri.port,
-          use_ssl: lessons_uri.scheme == 'https').
-            and_raise(OpenSSL::SSL::SSLError)
-
-      expect(Net::HTTP).to receive(:new).with(
-          lessons_uri.host,
-          lessons_uri.port).
-          and_return(http)
-
-      dbl_os = double
-      allow(dbl_os).to receive(:platform_family?).and_return(:windows)
-      allow(ET::OperatingSystem).to receive(:new).and_return(dbl_os)
-
-      api.list_lessons
+      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  
 
   context 'downloading files' do
     it 'returns nil when a 404 is encountered' do
+      filename = 'somefile.tar.gz'
+      client = Faraday.new do |builder|
+        builder.response :json
 
-      http = double
-      response = double
-      allow(response).to receive(:code).and_return("404")
-      allow(http).to receive(:request).and_return(response)
-      allow(Net::HTTP).to receive(:start).and_yield(http)
+        builder.adapter :test do |stubs|
+          stubs.get("/#{filename}") do
+            [404, {}, '']
+          end
+        end
+      end
 
-      expect(api.download_file("http://example.com/somefile.tar.gz")).to be_nil
+      allow_any_instance_of(ET::FallbackConnection).
+        to receive(:with_ssl_fallback).and_yield(client)
+
+      expect(api.download_file("http://example.com/#{filename}")).to be_nil
     end
+
     it 'returns a local file when a challenge is successfully downloaded' do
       path = '/tmp/et'
-      filename = 'fab'
+      filename = 'some-challenge.tar.gz'
 
       FileUtils.rm_rf(File.join(path, filename))
       FileUtils.mkdir_p(path)
 
+      filename = 'somefile.tar.gz'
+      client = Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.get("/#{filename}") do
+            [200, {}, '']
+          end
+        end
+      end
+
+      allow_any_instance_of(ET::FallbackConnection).
+        to receive(:with_ssl_fallback).and_yield(client)
       allow(Dir).to receive(:mktmpdir).and_return(path)
       allow(SecureRandom).to receive(:hex).and_return(filename)
 
-      http = double
-      response = double
-      file_contents = File.read(File.join(File.dirname(__FILE__), "../data/some-challenge.tar.gz"))
-      allow(response).to receive(:body).and_return(file_contents)
-      allow(response).to receive(:code).and_return("200")
-      allow(http).to receive(:request).and_return(response)
-      allow(Net::HTTP).to receive(:start).and_yield(http)
-
-      url = 'http://example.com/some-challenge.tar.gz'
+      url = "http://example.com/#{filename}"
 
       expect(api.download_file(url)).to eql(File.join(path, filename))
     end

data/spec/lib/fallback_connection_spec.rb

@@ -0,0 +1,42 @@
+describe ET::FallbackConnection do
+  let(:cnn) do
+    ET::FallbackConnection.new(:url => 'http://localhost')
+  end
+
+  context 'ssl verification' do
+    it 're-raises an exception for non Windows machines' do
+      dbl_os = double
+      allow(dbl_os).to receive(:platform_family?).with(:windows).and_return(false)
+      expect(ET::OperatingSystem).to receive(:new).and_return(dbl_os)
+
+      allow_any_instance_of(Faraday::Connection).
+        to receive(:get).and_raise(OpenSSL::SSL::SSLError)
+        
+      expect{ cnn.with_ssl_fallback{|client| client.get('/') }}.
+        to raise_error(OpenSSL::SSL::SSLError)
+    end
+
+    it 'swallows the exception for windows machines and reissues' do
+      dbl_os = double
+      allow(dbl_os).to receive(:platform_family?).and_return(:windows)
+      allow(ET::OperatingSystem).to receive(:new).and_return(dbl_os)
+
+      called_twice = false
+      allow_any_instance_of(Faraday::Connection).to receive(:get) do |*args|
+        if args[0].ssl.verify != false
+          #simulate a windows SSL verification failed
+          raise OpenSSL::SSL::SSLError
+        elsif args[0].ssl.verify == false
+          #flip the switch that the request was reissued without SSL verification
+          called_twice = true
+          double(:body => '{}')
+        end
+      end
+
+      cnn.with_ssl_fallback do |client|
+        client.get('/')
+      end
+      expect(called_twice).to be(true)
+    end
+  end
+end

data/spec/lib/submission_file_list_spec.rb

@@ -0,0 +1,27 @@
+describe ET::SubmissionFileList do
+  let(:file_list) do
+    path = File.expand_path(File.join(
+      File.dirname(__FILE__), "../data/bloated-challenge"))
+    ET::SubmissionFileList.new(path)
+  end
+
+  it 'includes a relevant file' do
+    expect(file_list).to include('problem.rb')
+  end
+
+  it 'ignores a standard file' do
+    expect(file_list).to_not include('sample-challenge.md')
+  end
+
+  it 'ignores a file included in the default globs' do
+    expect(file_list).to_not include('node_modules/somefile.js')
+  end
+
+  it 'ignores a file included in a glob' do
+    expect(file_list).to_not include('node_modules/boo/somefile.js')
+  end
+
+  it 'ignores a file included in the lesson.yml ignore' do
+    expect(file_list).to_not include('rando_folder/rando_file.js')
+  end
+end

data/spec/spec_helper.rb

@@ -49,9 +49,4 @@ RSpec.configure do |config|
   config.include SampleFiles
   config.include PathHelper
   config.include ArchiveHelper
-
-  config.before :each do
-    allow(Net::HTTP).to receive(:start)
-    allow(Net::HTTP).to receive(:get)
-  end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: |
   Users can download challenges and submit their solutions via the command-line
   interface.
@@ -120,16 +148,23 @@ files:
 - 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
 - lib/et/operating_system.rb
 - lib/et/runner.rb
+- lib/et/submission_file_list.rb
 - lib/et/version.rb
 - 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/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
+- spec/data/bloated-challenge/rando_folder/rando_file.js
 - spec/data/challenge.json
 - spec/data/lessons.json
 - spec/data/sample-challenge/.lesson.yml
@@ -145,8 +180,10 @@ files:
 - 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
+- spec/lib/submission_file_list_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/archive_helper.rb
 - spec/support/helpers/output_catcher.rb
@@ -173,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface for the event horizon.