exercism 0.0.13 → 0.0.14

data/README.md

@@ -4,6 +4,7 @@ Client gem for the warmup-exercise app exercism.io.
 
 [![Code Climate](https://codeclimate.com/github/kytrinyx/exercism.png)](https://codeclimate.com/github/kytrinyx/exercism)
 [![Build Status](https://travis-ci.org/kytrinyx/exercism.png?branch=master)](https://travis-ci.org/kytrinyx/exercism)
+[![Gem Version](https://badge.fury.io/rb/exercism.png)](https://rubygems.org/gems/exercism)
 
 ## Install
 

data/bin/exercism

@@ -7,6 +7,9 @@ require 'cli'
 begin
   Exercism::CLI.start
 rescue Exception => e
-  print "\nERROR: Something went wrong. Exiting.\n"
+  puts
+  puts "ERROR: Something went wrong. Exiting."
+  puts e.message
+  puts
   raise e if ENV['EXERCISM_ENV'] =~ /test|development/
 end

data/lib/cli.rb

@@ -17,15 +17,8 @@ class Exercism
     def fetch
       require 'exercism'
 
-      api = Exercism::Api.new(options[:host], Exercism.user, Exercism.project_dir)
       assignments = api.fetch
-      if assignments.empty?
-        puts "No assignments fetched."
-      else
-        assignments.each do |assignment|
-          puts "Fetched #{File.join(assignment.assignment_dir)}"
-        end
-      end
+      report(assignments)
     end
 
     desc "peek", "Fetch upcoming assignment from exercism.io"
@@ -33,15 +26,8 @@ class Exercism
     def peek
       require 'exercism'
 
-      api = Exercism::Api.new(options[:host], Exercism.user, Exercism.project_dir)
       assignments = api.peek
-      if assignments.empty?
-        puts "No assignments fetched."
-      else
-        assignments.each do |assignment|
-          puts "Fetched #{File.join(assignment.assignment_dir)}"
-        end
-      end
+      report(assignments)
     end
 
     desc "submit FILE", "Submit code to exercism.io on your current assignment"
@@ -51,9 +37,10 @@ class Exercism
 
       path = File.join(FileUtils.pwd, file)
       begin
-        Exercism::Api.new(options[:host], Exercism.user).submit(file)
+        response = Exercism::Api.new(options[:host], Exercism.user).submit(file)
         puts "Your assignment has been submitted."
-        puts "Check the website for feedback in a bit."
+        url = submission_url(response.body, options[:host])
+        puts "For feedback on your submission visit #{url}."
       rescue Exception => e
         puts "There was an issue with your submission."
         puts e.message
@@ -93,5 +80,25 @@ class Exercism
       puts "You are not logged in."
     end
 
+private
+    def api(host = options[:host])
+      Exercism::Api.new(host, Exercism.user, Exercism.project_dir)
+    end
+
+    def submission_url(response_body, host)
+      body = JSON.parse(response_body)
+      "#{host}/user/#{body['language']}/#{body['exercise']}" 
+    end
+
+    def report(assignments)
+      if assignments.empty?
+        puts "No assignments fetched."
+      else
+        assignments.each do |assignment|
+          puts "Fetched #{File.join(assignment.assignment_dir)}"
+        end
+      end
+    end
+
   end
 end

data/lib/exercism/api.rb

@@ -11,25 +11,16 @@ class Exercism
     def conn
      conn = Faraday.new(:url => url) do |c|
         c.use Faraday::Adapter::NetHttp
+        c.headers['User-Agent'] = user_agent
       end
     end
 
     def fetch
-      response = conn.get do |req|
-        req.url endpoint('current')
-        req.headers['User-Agent'] = user_agent
-        req.params['key'] = user.key
-      end
-      save response.body
+      get_and_save('current')
     end
 
     def peek
-      response = conn.get do |req|
-        req.url endpoint('next')
-        req.headers['User-Agent'] = user_agent
-        req.params['key'] = user.key
-      end
-      save response.body
+      get_and_save('next')
     end
 
     def submit(filename)
@@ -39,7 +30,6 @@ class Exercism
         req.url endpoint
         req.headers['Accept'] = 'application/json'
         req.headers['Content-Type'] = 'application/json'
-        req.headers['User-Agent'] = user_agent
         req.body = {code: contents, key: user.key, path: path}.to_json
       end
       response
@@ -47,8 +37,16 @@ class Exercism
 
     private
 
+    def get_and_save(action)
+      response = conn.get do |req|
+        req.url endpoint(action)
+        req.params['key'] = user.key
+      end
+      save response.body
+    end
+
     def user_agent
-      "exercism-CLI v#{Exercism::VERSION}"
+      "github.com/kytrinyx/exercism CLI v#{Exercism::VERSION}"
     end
 
     def endpoint(action = nil)

data/lib/exercism/version.rb

@@ -1,3 +1,3 @@
 class Exercism
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday