et 0.5.5 → 0.5.6.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 878c7e0d9b0502f6a7d4e1b74eac6f3b74fd37d8
-  data.tar.gz: 9de9207f81b70fc88e79b3789535c65852fa7946
+  metadata.gz: b2782275fe3bc5bae13bec94ba826d026cb9e7c0
+  data.tar.gz: 0e65bdf3385e33a0073aac29dbd10607227455e6
 SHA512:
-  metadata.gz: 855269fa8bf46ca3e373da7364b35872a73356cd973098eaceabb535be52f7381cfc11347403d45f403a5887b6f41f912536cc442d70fcb2a4e5502e9c617cb3
-  data.tar.gz: af29f4894062f35784fceb19e0316f7134208b53c3048591090a48ceff3eabf715d63b7f816cb1c4c7129af73335e5debf944b59cae35f92d0e221098e2e159f
+  metadata.gz: b7e91173a2eb580bd11ddfc80da3f05d7c78ce533c176722fcf5d16cd0f6dfffde7da84f1f05f96c08261bb29cc81f071fbbae54e10b036f7dd0bcbeb0e45fef
+  data.tar.gz: a9f8c1d3ca5ad1f8c4130f1670d5b07b84e5896b249804c9e5375af7da3966febb74a2c7717d9ad7b0971546ec2acfd896aee1d4268c7b7ab5657b4e39b93f73

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.3

data/bin/et

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require "et"
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'et'))
 
 runner = ET::Runner.new
 exit runner.go(ARGV)

data/lib/et.rb

@@ -1,9 +1,11 @@
 require "tmpdir"
-require "et/version"
-require "et/runner"
-require "et/api"
-require "et/config"
-require "et/formatter"
-require "et/lesson"
-require "et/challenge"
-require "et/exercise"
+require_relative "et/version"
+require_relative "et/runner"
+require_relative "et/operating_system"
+require_relative "et/api"
+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/api.rb

@@ -2,6 +2,7 @@ require "net/http/post/multipart"
 require "securerandom"
 require "base64"
 require "json"
+require "openssl"
 
 module ET
   class API
@@ -17,12 +18,7 @@ module ET
       request = Net::HTTP::Get.new(lessons_url)
       request["Authorization"] = auth_header
 
-      response = nil
-      Net::HTTP.start(lessons_url.host, lessons_url.port,
-        use_ssl: lessons_url.scheme == "https") do |http|
-
-        response = http.request(request)
-      end
+      response = issue_request(request)
       JSON.parse(response.body, symbolize_names: true)[:lessons]
     end
 
@@ -30,12 +26,8 @@ module ET
       request = Net::HTTP::Get.new(lesson_url(slug))
       request["Authorization"] = auth_header
 
-      response = nil
-      Net::HTTP.start(lessons_url.host, lessons_url.port,
-        use_ssl: lessons_url.scheme == "https") do |http|
+      response = issue_request(request)
 
-        response = http.request(request)
-      end
       body = JSON.parse(response.body, symbolize_names: true)
       body[:lesson]
     end
@@ -44,17 +36,16 @@ module ET
       uri = URI(url)
       dest = random_filename
 
-      Net::HTTP.start(uri.host, uri.port,
-        use_ssl: uri.scheme == "https") do |http|
-
-        resp = http.get(uri.path)
-
+      request = Net::HTTP::Get.new(uri.path)
+      response = issue_request(request, url)
+      if response.code == "200"
         open(dest, 'wb') do |file|
-          file.write(resp.body)
+          file.write(response.body)
         end
+        dest
+      else
+        nil
       end
-
-      dest
     end
 
     def submit_lesson(lesson)
@@ -66,16 +57,33 @@ module ET
           "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|
+        issue_request(request)
+      end
+    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
 
-    private
-
     def lesson_url(slug)
       URI.join(host, "lessons/#{slug}.json?submittable=1")
     end
@@ -99,5 +107,9 @@ module ET
     def auth_header
       "Basic #{credentials}"
     end
+
+    def operating_system
+      @os ||= ET::OperatingSystem.new
+    end
   end
 end

data/lib/et/archive_manager.rb

@@ -0,0 +1,49 @@
+require "rubygems/package"
+require "pry"
+
+class ET::ArchiveManager
+  attr_reader :archive, :destination, :unpacked_files
+
+  def initialize(archive, destination)
+    @archive = archive
+    @destination = destination
+  end
+
+  def delete_archive
+    File.delete(archive)
+  end
+
+  def unpack
+    @unpacked_files = []
+    File.open(archive, "rb") do |tar_gz|
+      uncompress(tar_gz)
+    end
+    @unpacked_files
+  end
+
+  private
+
+  def uncompress(file)
+    Zlib::GzipReader.open(file) do |tar|
+      process_tar(tar)
+    end
+  end
+
+  def process_tar(tar)
+    Gem::Package::TarReader.new(tar) do |entries|
+      entries.each { |entry| create_file(entry) }
+    end
+  end
+
+  def create_file(entry)
+    if entry.file?
+      filename = File.join(destination, entry.full_name)
+      FileUtils.mkdir_p(File.dirname(filename))
+      File.open(filename, "wb") do |f|
+        f.write(entry.read)
+      end
+      File.chmod(entry.header.mode, filename)
+      @unpacked_files << filename
+    end
+  end
+end

data/lib/et/lesson.rb

@@ -1,5 +1,6 @@
 require "pathname"
 require "securerandom"
+require "rubygems/package"
 
 module ET
   class Lesson
@@ -13,19 +14,26 @@ module ET
       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
+        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.length) do |io|
+                      io.write(file_contents)
+                    end
+                  end
+                end
+              end
+            end
+          end
         end
+        filepath
       else
         nil
       end

data/lib/et/operating_system.rb

@@ -0,0 +1,37 @@
+require 'rbconfig'
+
+module ET
+  class OperatingSystem
+    attr_reader :raw_name, :version
+
+    def initialize(os = nil, version = nil)
+      @raw_name, @version = os, version
+      if @raw_name.nil?
+        derive_raw_name
+      end
+    end
+
+    #cribbed from Selenium
+    def name
+      case @raw_name
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        :windows
+      when /darwin|mac os/
+        :mac
+      when /linux/
+        :linux
+      when /solaris|bsd/
+        :unix
+      end
+    end
+
+    def platform_family?(platform)
+      name == platform.to_sym
+    end
+
+    protected
+    def derive_raw_name
+      @raw_name = RbConfig::CONFIG['host_os']
+    end
+  end
+end

data/lib/et/runner.rb

@@ -50,13 +50,14 @@ module ET
           cmdargs.each do |slug|
             lesson = api.get_lesson(slug)
             archive = api.download_file(lesson[:archive_url])
+            archive_manager = ET::ArchiveManager.new(archive, cwd)
+            archive_manager.unpack
 
-            if system("tar zxf #{archive} -C #{cwd}")
-              system("rm #{archive}")
-              challenge_dir = File.join(cwd, slug)
-              puts "Extracted challenge to #{challenge_dir}"
+            if !archive_manager.unpacked_files.empty?
+              archive_manager.delete_archive
+              puts "'#{slug}' extracted to '#{archive_manager.destination}'"
             else
-              raise StandardError.new("Failed to extract the challenge archive.")
+              raise StandardError.new("Failed to extract the archive.")
             end
           end
         end

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.5.5"
+  VERSION = "0.5.6.beta"
 end

data/spec/lib/api_spec.rb

@@ -1,16 +1,18 @@
 describe ET::API do
   let(:api) { ET::API.new(host: "http://localhost:3000") }
+  let(:lessons_uri) do
+    URI("http://localhost:3000/lessons.json?submittable=1")
+  end
 
-  describe "lessons" do
-    let(:lessons_response) do
-      File.read("spec/data/lessons.json")
-    end
+  let(:lessons_response) do
+    File.read("spec/data/lessons.json")
+  end
 
+  describe "lessons" do
     it "queries for a list of lessons" do
       request = {}
       response = double
       http = double
-      lessons_uri = URI("http://localhost:3000/lessons.json?submittable=1")
       expect(Net::HTTP::Get).to receive(:new).
         with(lessons_uri).
         and_return(request)
@@ -38,6 +40,7 @@ describe ET::API 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).
@@ -56,4 +59,79 @@ describe ET::API do
       expect(result[:archive_url]).to eq("http://example.com/rock-paper-scissors.tar.gz")
     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)
+
+      expect(Net::HTTP).to receive(:start).and_raise(OpenSSL::SSL::SSLError)
+      expect{ api.list_lessons }.to raise_error(OpenSSL::SSL::SSLError)
+    end
+
+    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
+    end
+  end
+
+  context 'downloading files' do
+    it 'returns nil when a 404 is encountered' do
+
+      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)
+
+      expect(api.download_file("http://example.com/somefile.tar.gz")).to be_nil
+    end
+    it 'returns a local file when a challenge is successfully downloaded' do
+      path = '/tmp/et'
+      filename = 'fab'
+
+      FileUtils.rm_rf(File.join(path, filename))
+      FileUtils.mkdir_p(path)
+
+      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'
+
+      expect(api.download_file(url)).to eql(File.join(path, filename))
+    end
+  end
 end

data/spec/lib/archive_manager_spec.rb

@@ -0,0 +1,27 @@
+describe ET::ArchiveManager do
+  let!(:archive) { File.join(File.dirname(__FILE__), "..", "data", "some-challenge.tar.gz") }
+  let!(:destination) { Dir.mktmpdir }
+  let!(:lesson_extractor) { ET::ArchiveManager.new(archive, destination) }
+
+  describe "#new" do
+    it "takes an archive and destination" do
+      expect(lesson_extractor).to be_a(ET::ArchiveManager)
+    end
+  end
+
+  describe "#unpack" do
+    it "extracts files from the archive" do
+      lesson_extractor.unpack
+      extracted_files =  Dir.entries(File.join(destination, "some-challenge"))
+      expect(extracted_files).to include("README.md")
+      expect(extracted_files).to include("sample.rb")
+    end
+
+    it "returns an array of extracted filenames" do
+      result = lesson_extractor.unpack
+      expect(result).to be_an(Array)
+      expect(result.size).to eq(2)
+      expect(result.first).to match /sample.rb/
+    end
+  end
+end

data/spec/lib/lesson_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe ET::Lesson do
+  context "archive! method" do
+    it "creates a tar.gz file" do
+      path = '/tmp/et'
+      filename = 'fab'
+
+      FileUtils.rm_rf(File.join(path, filename))
+      FileUtils.mkdir_p(path)
+
+      allow(Dir).to receive(:mktmpdir).and_return(path)
+      allow(SecureRandom).to receive(:hex).and_return(filename)
+
+      exercise_path = File.expand_path(
+        File.join(File.dirname(__FILE__), '../data/sample-exercise'))
+      lesson = ET::Lesson.new(exercise_path)
+      resulting_file = lesson.archive!
+
+      expect(resulting_file).to_not be_nil
+      expect(FileTest).to exist(resulting_file)
+    end
+  end
+end

data/spec/lib/operating_system_spec.rb

@@ -0,0 +1,20 @@
+describe ET::OperatingSystem do
+  context '10.10' do
+    let(:minor) { '10.10' }
+    let(:os) { ET::OperatingSystem.new('darwin', minor) }
+
+    it 'has a name' do
+      expect(os.name).to eq(:mac)
+    end
+
+  end
+
+  context '10.9' do
+    let(:minor) { '10.9' }
+    let(:os) { ET::OperatingSystem.new('darwin', minor + '.4') }
+
+    it 'has a minor version' do
+      expect(os.name).to eq(:mac)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6.beta
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,11 +116,13 @@ files:
 - et.gemspec
 - 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/formatter.rb
 - lib/et/lesson.rb
+- lib/et/operating_system.rb
 - lib/et/runner.rb
 - lib/et/version.rb
 - spec/cli/get_lesson_spec.rb
@@ -139,9 +141,12 @@ files:
 - 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/lesson_spec.rb
+- spec/lib/operating_system_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/archive_helper.rb
 - spec/support/helpers/output_catcher.rb
@@ -163,12 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface for the event horizon.