exercism 0.0.25 → 0.0.26

data/bin/exercism

@@ -6,7 +6,7 @@ require 'cli'
 
 begin
   Exercism::CLI.start
-rescue Exception => e
+rescue StandardError => e
   puts
   puts "ERROR: Something went wrong. Exiting."
   puts e.message

data/exercism.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "faraday", ">= 0.8.8"
   spec.add_dependency "thor"
+  spec.add_dependency "launchy", "~> 2.3.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest", '~> 5.0'
   spec.add_development_dependency "vcr", '~> 2.4'
-  spec.add_development_dependency "fakeweb"
+  spec.add_development_dependency "webmock"
   spec.add_development_dependency "rake"
 
 

data/lib/cli.rb

@@ -37,6 +37,13 @@ class Exercism
       report(assignments)
     end
 
+    desc "open", "Opens exercism.io in your default browser"
+    def open
+      require 'launchy'
+
+      Launchy.open("http://exercism.io")
+    end
+
     desc "peek", "Fetch upcoming assignment from exercism.io"
     method_option :host, :aliases => '-h', :default => 'http://exercism.io', :desc => 'the url of the exercism application'
     def peek
@@ -51,6 +58,7 @@ class Exercism
     method_option :ask, :aliases => '-a', :default => false, :type => :boolean, :desc => 'ask before submitting assignment'
     def submit(file)
       require 'exercism'
+      require 'cli/monitored_request'
 
       submission = Submission.new(file)
 
@@ -67,20 +75,23 @@ class Exercism
         end
       end
 
-      begin
-        response = Exercism::Api.new(options[:host], Exercism.user).submit(submission.path)
+      MonitoredRequest.new(api).request :submit, submission.path do |request, body|
+        say "Your assignment has been submitted."
+        url = "#{options[:host]}/#{Exercism.user.github_username}/#{body['language']}/#{body['exercise']}"
+        say "For feedback on your submission visit #{url}"
+      end
+    end
+
+    desc "unsubmit", "Delete the last submission"
+    method_option :host, :aliases => '-h', :default => 'http://exercism.io', :desc => 'the url of the exercism application'
+    def unsubmit
+      require 'exercism'
+      require 'cli/monitored_request'
 
-        body = JSON.parse(response.body)
-        if body["error"]
-          say body["error"]
-        else
-          say "Your assignment has been submitted."
-          url = "#{options[:host]}/#{Exercism.user.github_username}/#{body['language']}/#{body['exercise']}"
-          say "For feedback on your submission visit #{url}"
+      MonitoredRequest.new(api).request :unsubmit do |request, body|
+        if response.status == 204
+          say "The last submission was successfully deleted."
         end
-      rescue Exception => e
-        puts "There was an issue with your submission."
-        puts e.message
       end
     end
 
@@ -119,6 +130,7 @@ class Exercism
       ask("Your exercism.io API key:")
     end
 
+
     def project_dir
       default_dir = FileUtils.pwd
       say "What is your exercism exercises project path?"
@@ -142,6 +154,5 @@ class Exercism
         end
       end
     end
-
   end
 end

data/lib/cli/monitored_request.rb

@@ -0,0 +1,24 @@
+class Exercism
+  class CLI
+    class MonitoredRequest
+      attr_reader :api
+
+      def initialize(api)
+        @api = api
+      end
+
+      def request(action, *args)
+        begin
+          response = api.send(action, *args)
+          response_body = JSON.parse(response.body)
+
+          abort response_body["error"] if response_body["error"]
+
+          yield response, response_body
+        rescue Exception => e
+          abort "There was an issue with your request.\n#{e}"
+        end
+      end
+    end
+  end
+end

data/lib/exercism/api.rb

@@ -32,13 +32,18 @@ class Exercism
     def submit(filename)
       path = File.join(filename)
       contents = File.read path
-      response = conn.post do |req|
-        req.url endpoint('user/assignments')
-        req.headers['Accept'] = 'application/json'
-        req.headers['Content-Type'] = 'application/json'
-        req.body = {:code =>  contents, :key => user.key, :path => path}.to_json
-      end
-      response
+
+      json_request(:post, 'user/assignments', {
+        :key  => user.key,
+        :code => contents,
+        :path => path
+      })
+    end
+
+    def unsubmit
+      json_request(:delete, 'user/assignments', {
+        :key => user.key
+      })
     end
 
     private
@@ -51,6 +56,17 @@ class Exercism
       save response.body
     end
 
+    def json_request(verb, path, body)
+      response = conn.send(verb) do |request|
+        request.url endpoint(path)
+        request.headers['Accept'] = 'application/json'
+        request.headers['Content-Type'] = 'application/json'
+        request.body = body.to_json
+      end
+
+      response
+    end
+
     def user_agent
       "github.com/kytrinyx/exercism CLI v#{Exercism::VERSION}"
     end

data/lib/exercism/submission.rb

@@ -11,7 +11,7 @@ class Exercism
     end
 
     def path
-      File.absolute_path(file)
+      File.expand_path(file)
     end
 
     def test?

data/lib/exercism/version.rb

@@ -1,3 +1,3 @@
 class Exercism
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/test/cli/monitored_request_test.rb

@@ -0,0 +1,53 @@
+require './test/test_helper'
+require 'cli/monitored_request'
+
+Struct.new('Response', :body)
+
+class MonitoredRequestTest < MiniTest::Unit::TestCase
+  def setup
+    setup_api
+    @monitored_request = Exercism::CLI::MonitoredRequest.new(@api)
+  end
+
+  def test_yield
+    @monitored_request.request :success_action do |response, body|
+      assert_equal 'Hi.', body["message"]
+    end
+  end
+
+  def test_response_errors
+    out, err = capture_subprocess_io do
+      pid = fork { @monitored_request.request :failure_action }
+      Process.wait pid
+    end
+
+    assert_match 'Error.', err
+  end
+
+  def test_handle_request_exceptions
+    out, err = capture_subprocess_io do
+      pid = fork { @monitored_request.request :exception_action }
+      Process.wait pid
+    end
+
+    assert_match 'There was an issue with your request.', err
+  end
+
+  private
+
+  def setup_api
+    @api = Minitest::Mock.new
+
+    def @api.failure_action
+      Struct::Response.new('{"error":"Error."}')
+    end
+
+    def @api.success_action
+      Struct::Response.new('{"message":"Hi."}')
+    end
+
+    def @api.exception_action
+      raise Exception
+    end
+  end
+end

data/test/exercism/api_test.rb

@@ -6,7 +6,7 @@ test_dir = File.join(FileUtils.pwd, 'test/fixtures')
 
 VCR.configure do |c|
   c.cassette_library_dir = File.join(test_dir, 'vcr_cassettes')
-  c.hook_into :fakeweb
+  c.hook_into :webmock
 end
 
 require 'approvals'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,6 +204,7 @@ files:
 - bin/exercism
 - exercism.gemspec
 - lib/cli.rb
+- lib/cli/monitored_request.rb
 - lib/exercism.rb
 - lib/exercism/api.rb
 - lib/exercism/assignment.rb
@@ -196,6 +213,7 @@ files:
 - lib/exercism/submission.rb
 - lib/exercism/user.rb
 - lib/exercism/version.rb
+- test/cli/monitored_request_test.rb
 - test/exercism/api_test.rb
 - test/exercism/assignment_test.rb
 - test/exercism/config_test.rb
@@ -238,6 +256,7 @@ specification_version: 3
 summary: This gem provides a command line client to allow users of the exercism.io
   application to easily fetch and submit assignments.
 test_files:
+- test/cli/monitored_request_test.rb
 - test/exercism/api_test.rb
 - test/exercism/assignment_test.rb
 - test/exercism/config_test.rb