et 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659755ddf3d5c95f243c0f589a186e7e5182dfcb
-  data.tar.gz: a0e8250a68aed83fd6ba768afbf318be17c6a8ce
+  metadata.gz: b6265a35fbd53ec50dbd1f0c661a3f55863eaeb8
+  data.tar.gz: 71a553c9f295034abb2878b146d1c715c87a61d5
 SHA512:
-  metadata.gz: 5595fd4b14e94e2f1651f837802f8abaad0114fbb00008909caf93154e87f418ee8ac8a6ca8d61cdd574821bfb56b7ec96861652cba46522041119e82cd420bb
-  data.tar.gz: 55aa57f61366edb9a281119bea0778e7c36eadcddec5958c081103cc0ffc6b0b4cb48f8b1f02ac361e5058dea98617de1323c1a7790b1738e1ec6a7084ebe51d
+  metadata.gz: 2a0dd2902e3c5ef89eadd8e4b07544f32756579e714b0acadf9b34d1b3d60951258ed3ce81a73c85c336119c7721c7f81154cc776a998e74618126f486c600a9
+  data.tar.gz: 81cd40a31acbfb853fc8d676bcae5ee8e923d43f79fdb084a89a8e44cc39752f4c70f66a422331b211e272daa6cc8132765b6d6a3ccd47741a6eccc5039d96d8

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.2.0

data/.travis.yml

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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    et (0.5.1)
+    et (0.5.2)
       gli (= 2.11.0)
-      rest-client (~> 1.7)
+      multipart-post (~> 2.0)
       rspec (~> 3.0)
       rspec-mocks (~> 3.0)
 
@@ -12,24 +12,21 @@ GEM
   specs:
     diff-lcs (1.2.5)
     gli (2.11.0)
-    mime-types (2.4.3)
-    netrc (0.10.2)
+    multipart-post (2.0.0)
     rake (10.3.2)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,3 +1,30 @@
 # ET
 
 A command-line utility for downloading and submitting code challenges.
+
+When running locally, use the following command to avoid using the installed gem version:
+
+```no-highlight
+$ bundle exec bin/et help
+
+NAME
+    et -
+
+SYNOPSIS
+    et [global options] command [command options] [arguments...]
+
+VERSION
+    0.5.1
+
+GLOBAL OPTIONS
+    --help    - Show this message
+    --version - Display the program version
+
+COMMANDS
+    get    - Download lesson to your working area.
+    help   - Shows a list of commands or help for one command
+    init   - Initialize current directory as a work area.
+    list   - List available lessons.
+    submit - Submit the lesson in this directory.
+    test   - Run an exercise test suite.
+```

data/et.gemspec

@@ -22,6 +22,6 @@ DESC
   s.add_development_dependency("rake", "~> 10")
   s.add_runtime_dependency("rspec", "~> 3.0")
   s.add_runtime_dependency("rspec-mocks", "~> 3.0")
-  s.add_runtime_dependency("rest-client", "~> 1.7")
+  s.add_runtime_dependency("multipart-post", "~> 2.0")
   s.add_runtime_dependency("gli", "2.11.0")
 end

data/lib/et.rb

@@ -1,3 +1,4 @@
+require "tmpdir"
 require "et/version"
 require "et/runner"
 require "et/api"

data/lib/et/api.rb

@@ -1,4 +1,4 @@
-require "rest-client"
+require "net/http/post/multipart"
 require "securerandom"
 require "base64"
 require "json"
@@ -14,12 +14,12 @@ module ET
     end
 
     def list_lessons
-      response = RestClient.get(lessons_url)
+      response = Net::HTTP.get(lessons_url)
       JSON.parse(response, symbolize_names: true)[:lessons]
     end
 
     def get_lesson(slug)
-      response = RestClient.get(lesson_url(slug))
+      response = Net::HTTP.get(lesson_url(slug))
       body = JSON.parse(response, symbolize_names: true)
       body[:lesson]
     end
@@ -43,23 +43,33 @@ module ET
 
     def submit_lesson(lesson)
       submission_file = lesson.archive!
-      RestClient.post(submission_url(lesson.slug),
-        { submission: { archive: File.new(submission_file) }},
-        { "Authorization" => auth_header })
+      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
+
+        Net::HTTP.start(url.host, url.port,
+          use_ssl: url.scheme == "https") do |http|
+
+          http.request(request)
+        end
+      end
     end
 
     private
 
     def lesson_url(slug)
-      URI.join(host, "lessons/#{slug}.json").to_s
+      URI.join(host, "lessons/#{slug}.json")
     end
 
     def lessons_url
-      URI.join(host, "lessons.json?submittable=1").to_s
+      URI.join(host, "lessons.json?submittable=1")
     end
 
     def submission_url(slug)
-      URI.join(host, "lessons/#{slug}/submissions.json").to_s
+      URI.join(host, "lessons/#{slug}/submissions.json")
     end
 
     def random_filename

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/lib/api_spec.rb

@@ -7,8 +7,8 @@ describe ET::API do
     end
 
     it "queries for a list of lessons" do
-      expect(RestClient).to receive(:get).
-        with("http://localhost:3000/lessons.json?submittable=1").
+      expect(Net::HTTP).to receive(:get).
+        with(URI("http://localhost:3000/lessons.json?submittable=1")).
         and_return(lessons_response)
 
       results = api.list_lessons
@@ -24,8 +24,8 @@ describe ET::API do
     end
 
     it "queries for a single lesson" do
-      expect(RestClient).to receive(:get).
-        with("http://localhost:3000/lessons/rock-paper-scissors.json").
+      expect(Net::HTTP).to receive(:get).
+        with(URI("http://localhost:3000/lessons/rock-paper-scissors.json")).
         and_return(lesson_response)
 
       result = api.get_lesson("rock-paper-scissors")

data/spec/spec_helper.rb

@@ -51,7 +51,7 @@ RSpec.configure do |config|
   config.include ArchiveHelper
 
   config.before :each do
-    allow(RestClient).to receive(:get)
-    allow(RestClient).to receive(:post)
+    allow(Net::HTTP).to receive(:start)
+    allow(Net::HTTP).to receive(:get)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Command-line interface for the event horizon.