exercism 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2U0NDc4ZmQ5NmI4NjJjNGQzYjY3YjUyMWQxZGM5ZDE4NWUxOGJiMw==
+    NGM5OTNiOGM4OGEyOGUxMTRmYzhlODRkYjcxOWQ3YWM3M2U2YmFmMw==
   data.tar.gz: !binary |-
-    ZDYwYTkxYzkyNGRlN2I0YjVmYzIwYmNlMGQwZTgzYTY2MDY5OWJlNQ==
+    N2RhYzc3MzE2MTg1YjJlM2NlYzY3NzJkYTE1Y2E4Y2JkMDY3NTBjMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2UwY2VmMjNiZDI4N2Y2MjM0YTE1Y2U3YjNlOWMwZThkYTViMzZiMTkyZTZl
-    NGViZWVkMDk2ZjY5NDg1NjE3MGIzZTU2NjYxYzc4ODQzZTMyNDllNzc0MGUw
-    OWY3ODgyN2ZkNTU3YmNkY2FhYjk1NmVkZjczMTJlYWEwZGQzZDQ=
+    NmVjZTBjZjBlYjVhZGQ3ZTE4YjE1OGQwZDdkZTg4Y2E1MzkwMDE1Zjk0ZGQw
+    MWJjOTM0MDIzNWNiNzgzYTJkOWQzZmZkMDViODBkNmJiYjkwN2IxOGFiOTZk
+    ZDc0MWIxMTE0Yjk1MDc3ZWNhZjg2NThmMjRmYzk3NGI1MDEyNjM=
   data.tar.gz: !binary |-
-    Njg5NjM1Y2FkMGJkYjA1ZGM4ZWYwY2ZhNjhkNDdlOTQyYmZiOTVlZTJjZGU2
-    ZWUwZGM0MmQ2ZTViZWU2M2Y3OTZlMmJiYjBiODI3YWIwMjdkMjIxMTExN2Qw
-    NjU2YmI4OTFjOTNjNWY4YzkwOTQxZWQ0NTljZDRmYWY2MTYyNjQ=
+    ZDI2NWVjMGI1NjE2MGYxNjU5MTM5NDAzMjNmNjIyOGI5YTdmZTQ1Y2JhMzk2
+    YjEyMGJkNzAwNGVkYTcxZDkwMTE1MGJmNzAyMjRlNGEwZDkxZWY0MmNjZmQ0
+    MDAzN2NiMTk3MDYwZTc3ZDZmMDc5ZTc5MWRiMjk2OGU5YjVhYzI=

data/lib/cli.rb

@@ -4,10 +4,12 @@ class Exercism
   class CLI < Thor
 
     desc "fetch", "Fetch current assignment from exercism.io"
+    method_option :host, aliases: '-h', default: 'http://exercism.io', desc: 'the url of the exercism application'
     def fetch
       require 'exercism'
 
-      assignments = Exercism::Api.fetch_for(Exercism.user, Exercism.project_dir)
+      api = Exercism::Api.new(options[:host], Exercism.user, Exercism.project_dir)
+      assignments = api.fetch
       if assignments.empty?
         puts "No assignments fetched."
       else
@@ -18,10 +20,12 @@ class Exercism
     end
 
     desc "submit FILE", "Submit code to exercism.io on your current assignment"
+    method_option :host, aliases: '-h', default: 'http://exercism.io', desc: 'the url of the exercism application'
     def submit(file)
       require 'exercism'
 
-      Exercism::Api.submit(File.join(FileUtils.pwd, file), {for: Exercism.user})
+      path = File.join(FileUtils.pwd, file)
+      Exercism::Api.new(options[:host], Exercism.user).submit(file)
     end
 
     desc "login", "Save exercism.io api credentials"

data/lib/exercism.rb

@@ -11,14 +11,6 @@ require 'exercism/api'
 
 class Exercism
 
-  def self.url
-    if ENV['EXERCISM_ENV'] == 'test'
-      'http://localhost:4567'
-    else
-      'http://exercism.herokuapp.com'
-    end
-  end
-
   def self.home
     Dir.home(Etc.getlogin)
   end

data/lib/exercism/api.rb

@@ -1,22 +1,29 @@
 class Exercism
   class Api
-    def self.conn
-     conn = Faraday.new(:url => Exercism.url) do |c|
+
+    attr_reader :url, :user, :project_dir
+    def initialize(url, user, project_dir = nil)
+      @url = url
+      @user = user
+      @project_dir = project_dir
+    end
+
+    def conn
+     conn = Faraday.new(:url => url) do |c|
         c.use Faraday::Adapter::NetHttp
       end
     end
 
-    def self.fetch_for(user, path)
+    def fetch
       response = conn.get do |req|
         req.url '/api/v1/user/assignments/current'
         req.headers['User-Agent'] = "exercism-CLI v#{Exercism::VERSION}"
         req.params['key'] = user.key
       end
-      Assignment.save(JSON.parse(response.body), path)
+      Assignment.save(JSON.parse(response.body), project_dir)
     end
 
-    def self.submit(filename, options)
-      user = options[:for]
+    def submit(filename)
       path = File.join(filename)
       contents = File.read path
       response = conn.post do |req|

data/lib/exercism/version.rb

@@ -1,3 +1,3 @@
 class Exercism
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/exercism/api_test.rb

@@ -36,7 +36,7 @@ class ApiTest < MiniTest::Unit::TestCase
 
     Exercism.stub(:home, home) do
       VCR.use_cassette('alice-gets-bob') do
-        Exercism::Api.fetch_for(Exercism.user, project_dir)
+        Exercism::Api.new('http://localhost:4567', Exercism.user, project_dir).fetch
 
         Approvals.verify(File.read(readme_path), name: 'alice_gets_bob_readme')
         Approvals.verify(File.read(tests_path), name: 'alice_gets_bob_tests')
@@ -54,7 +54,7 @@ class ApiTest < MiniTest::Unit::TestCase
 
     Exercism.stub(:home, home) do
       VCR.use_cassette('alice-submits-bob') do
-        response = Exercism::Api.submit(submission, {for: Exercism.user})
+        response = Exercism::Api.new('http://localhost:4567', Exercism.user).submit(submission)
         assert_equal 201, response.status
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday