exercism 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ1Mjc5YTZmYzg2OGYyOTAzNGM5NzY2Y2YwMzNhMzAzYjZiYTExNw==
+    M2U0NDc4ZmQ5NmI4NjJjNGQzYjY3YjUyMWQxZGM5ZDE4NWUxOGJiMw==
   data.tar.gz: !binary |-
-    ZmI1MjI3MzU5NjQ4N2YzZWYwNjVjYmEwYjU4NWIyNWZiOGYzM2YzNw==
+    ZDYwYTkxYzkyNGRlN2I0YjVmYzIwYmNlMGQwZTgzYTY2MDY5OWJlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTk0NWFjOTkxOWY0ZTE0YmQ5ODliYTQ2NDhjMjZjNDk5ZGQ0YzNkNGU1Nzc5
-    MjE2OTk0OTZjYmMzMWIxYTBjZGUxYTRmNGM0MTlmNmY5MzZlYThmN2JkZDdm
-    YTViZDUzOThjZjE2MzllMWQ0YTIxODdjZWZlN2MyOWQzMjkxNGI=
+    M2UwY2VmMjNiZDI4N2Y2MjM0YTE1Y2U3YjNlOWMwZThkYTViMzZiMTkyZTZl
+    NGViZWVkMDk2ZjY5NDg1NjE3MGIzZTU2NjYxYzc4ODQzZTMyNDllNzc0MGUw
+    OWY3ODgyN2ZkNTU3YmNkY2FhYjk1NmVkZjczMTJlYWEwZGQzZDQ=
   data.tar.gz: !binary |-
-    OTFiZjNlMmE5OWM5Yzg1OTdiNGU0NjU5ODNkN2I1MzNhZGQ5NGYxMGE0MDAy
-    NDBlOWVlMjljNmFhNDAxYzUyZmFlNzVhNWYyYTI2ZDIyMDc2NGJmYzliYWJk
-    MzE5ZTdhMGE5ZWRlMDg0OGQwMGIyYWYwZTc1ODBlMmE4ZTVhOTc=
+    Njg5NjM1Y2FkMGJkYjA1ZGM4ZWYwY2ZhNjhkNDdlOTQyYmZiOTVlZTJjZGU2
+    ZWUwZGM0MmQ2ZTViZWU2M2Y3OTZlMmJiYjBiODI3YWIwMjdkMjIxMTExN2Qw
+    NjU2YmI4OTFjOTNjNWY4YzkwOTQxZWQ0NTljZDRmYWY2MTYyNjQ=

data/lib/cli.rb

@@ -7,14 +7,21 @@ class Exercism
     def fetch
       require 'exercism'
 
-      Exercism::Api.fetch_for(Exercism.user)
+      assignments = Exercism::Api.fetch_for(Exercism.user, Exercism.project_dir)
+      if assignments.empty?
+        puts "No assignments fetched."
+      else
+        assignments.each do |assignment|
+          puts "Fetched #{File.join(assignment.assignment_dir)}"
+        end
+      end
     end
 
     desc "submit FILE", "Submit code to exercism.io on your current assignment"
     def submit(file)
       require 'exercism'
 
-      Exercism::Api.submit(file, {for: Exercism.user})
+      Exercism::Api.submit(File.join(FileUtils.pwd, file), {for: Exercism.user})
     end
 
     desc "login", "Save exercism.io api credentials"
@@ -23,7 +30,12 @@ class Exercism
 
       username = ask("Your GitHub username:")
       key = ask("Your exercism.io API key:")
-      Exercism.login(username, key)
+      default_path = FileUtils.pwd
+      path = ask("What is your exercism exercises project path? (#{default_path})")
+      if path.empty?
+        path = default_path
+      end
+      Exercism.login(username, key, path)
 
       say("Your credentials have been written to #{Exercism.config.file}")
     end

data/lib/exercism.rb

@@ -23,8 +23,12 @@ class Exercism
     Dir.home(Etc.getlogin)
   end
 
-  def self.login(github_username, key)
-    data = {'github_username' => github_username, 'key' => key}
+  def self.login(github_username, key, dir)
+    data = {
+      'github_username' => github_username,
+      'key' => key,
+      'project_dir' => dir
+    }
     Config.write(home, data)
     User.new(github_username, key)
   end
@@ -38,4 +42,8 @@ class Exercism
     User.new(c.github_username, c.key)
   end
 
+  def self.project_dir
+    config.project_dir
+  end
+
 end

data/lib/exercism/api.rb

@@ -6,18 +6,18 @@ class Exercism
       end
     end
 
-    def self.fetch_for(user)
+    def self.fetch_for(user, path)
       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))
+      Assignment.save(JSON.parse(response.body), path)
     end
 
     def self.submit(filename, options)
       user = options[:for]
-      path = File.join(FileUtils.pwd, filename)
+      path = File.join(filename)
       contents = File.read path
       response = conn.post do |req|
         req.url '/api/v1/user/assignments'

data/lib/exercism/assignment.rb

@@ -1,13 +1,15 @@
 class Exercism
   class Assignment
 
-    def self.save(data)
+    def self.save(data, path)
+      assignments = []
       data['assignments'].each do |attributes|
-        Assignment.new(attributes).save
+        assignments << Assignment.new(attributes.merge('project_dir' => path)).save
       end
+      assignments
     end
 
-    attr_reader :track, :slug, :readme, :test_file, :tests
+    attr_reader :track, :slug, :readme, :test_file, :tests, :project_dir
 
     def initialize(attributes)
       @track = attributes['track']
@@ -15,6 +17,7 @@ class Exercism
       @readme = attributes['readme']
       @test_file = attributes['test_file']
       @tests = attributes['tests']
+      @project_dir = attributes['project_dir']
     end
 
     def save
@@ -23,6 +26,11 @@ class Exercism
         f.write readme
       end
       File.write tests_path, tests
+      self
+    end
+
+    def assignment_dir
+      @assignment_dir ||= File.join(project_dir, track, slug)
     end
 
     private
@@ -34,19 +42,6 @@ class Exercism
     def tests_path
       File.join(assignment_dir, test_file)
     end
-
-    def assignment_dir
-      File.join(project_dir, track, slug)
-    end
-
-    def project_dir
-      dir = FileUtils.pwd
-      if File.basename(dir) == track
-        dir.gsub(/#{track}\z/, '')
-      else
-        dir
-      end
-    end
   end
 end
 

data/lib/exercism/config.rb

@@ -9,11 +9,12 @@ class Exercism
       config = new(path)
       config.github_username = data['github_username']
       config.key = data['key']
+      config.project_dir = data['project_dir']
       config.save
     end
 
     attr_reader :file
-    attr_writer :github_username, :key
+    attr_writer :github_username, :key, :project_dir
 
     def initialize(path)
       @file = File.join(path, '.exercism')
@@ -27,9 +28,17 @@ class Exercism
       @key ||= from_yaml['key']
     end
 
+    def project_dir
+      @project_dir ||= from_yaml['project_dir']
+    end
+
     def save
       File.open file, 'w' do |f|
-        data = {'github_username' => github_username, 'key' => key}
+        data = {
+          'github_username' => github_username,
+          'key' => key,
+          'project_dir' => project_dir
+        }
         f.write data.to_yaml
       end
       self

data/lib/exercism/version.rb

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

data/test/exercism/api_test.rb

@@ -16,25 +16,27 @@ end
 
 class ApiTest < MiniTest::Unit::TestCase
 
-  def setup
-    @project_dir = FileUtils.pwd
+  def project_dir
+    '/tmp'
+  end
+
+  def home
+    'test/fixtures/home'
   end
 
   def teardown
-    FileUtils.cd @project_dir
-    FileUtils.rm_rf File.join(@project_dir, 'test/fixtures/home/ruby')
-    FileUtils.rm_rf File.join(@project_dir, 'test/fixtures/home/javascript')
+    FileUtils.rm_rf File.join(project_dir, 'ruby')
+    FileUtils.rm_rf File.join(project_dir, 'javascript')
   end
 
   def test_fetch_assignment_from_api
-    home = File.join(@project_dir, 'test/fixtures/home')
-    readme_path = File.join(home, 'ruby/bob/README.md')
-    tests_path = File.join(home, 'ruby/bob/test.rb')
+    assignment_dir = File.join(project_dir, 'ruby', 'bob')
+    readme_path = File.join(assignment_dir, 'README.md')
+    tests_path = File.join(assignment_dir, 'test.rb')
 
     Exercism.stub(:home, home) do
-      FileUtils.cd home
       VCR.use_cassette('alice-gets-bob') do
-        Exercism::Api.fetch_for(Exercism.user)
+        Exercism::Api.fetch_for(Exercism.user, project_dir)
 
         Approvals.verify(File.read(readme_path), name: 'alice_gets_bob_readme')
         Approvals.verify(File.read(tests_path), name: 'alice_gets_bob_tests')
@@ -43,18 +45,16 @@ class ApiTest < MiniTest::Unit::TestCase
   end
 
   def test_send_assignment_to_api
-    home = File.join(@project_dir, 'test/fixtures/home')
-    assignment_path = File.join(home, 'ruby/bob')
-    FileUtils.mkdir_p(assignment_path)
-    submission = File.join(assignment_path, 'bob.rb')
+    assignment_dir = File.join(project_dir, 'ruby', 'bob')
+    FileUtils.mkdir_p(assignment_dir)
+    submission = File.join(assignment_dir, 'bob.rb')
     File.open(submission, 'w') do |f|
       f.write "puts 'hello world'"
     end
 
     Exercism.stub(:home, home) do
-      FileUtils.cd assignment_path
       VCR.use_cassette('alice-submits-bob') do
-        response = Exercism::Api.submit('bob.rb', {for: Exercism.user})
+        response = Exercism::Api.submit(submission, {for: Exercism.user})
         assert_equal 201, response.status
       end
     end

data/test/exercism/assignment_test.rb

@@ -2,21 +2,20 @@ require './test/test_helper'
 
 class AssignmentTest < MiniTest::Unit::TestCase
 
-  def setup
-    @project_dir = FileUtils.pwd
+  def project_dir
+    '/tmp'
   end
 
   def teardown
-    FileUtils.cd @project_dir
-    FileUtils.rm_rf File.join(@project_dir, 'test/fixtures/ruby')
+    FileUtils.rm_rf File.join(project_dir, 'ruby')
   end
 
   def readme_path
-    File.join(@project_dir, 'test/fixtures/ruby/queens/README.md')
+    File.join(project_dir, 'ruby', 'queens', 'README.md')
   end
 
   def tests_path
-    File.join(@project_dir, 'test/fixtures/ruby/queens/test.rb')
+    File.join(project_dir, 'ruby', 'queens', 'test.rb')
   end
 
   def assignment_data
@@ -25,22 +24,12 @@ class AssignmentTest < MiniTest::Unit::TestCase
       'slug' => 'queens',
       'readme' => 'Do it',
       'test_file' => 'test.rb',
-      'tests' => 'assert true'
+      'tests' => 'assert true',
+      'project_dir' => project_dir
     }
   end
 
   def test_write_assignment_from_project_directory
-    FileUtils.cd 'test/fixtures'
-    assignment = Exercism::Assignment.new(assignment_data)
-    assignment.save
-
-    assert_equal "Do it", File.read(readme_path)
-    assert_equal "assert true", File.read(tests_path)
-  end
-
-  def test_write_assignment_from_language_directory
-    FileUtils.mkdir File.join(@project_dir, 'test/fixtures/ruby')
-    FileUtils.cd 'test/fixtures/ruby'
     assignment = Exercism::Assignment.new(assignment_data)
     assignment.save
 

data/test/exercism/config_test.rb

@@ -14,21 +14,31 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Exercism::Config.read(path)
     assert_equal 'alice', config.github_username
     assert_equal key, config.key
+    assert_equal '/tmp', config.project_dir
   end
 
   def test_write_config_file
     path = './test/fixtures'
     key = '7a7096c'
-    data = {'github_username' => 'bob', 'key' => key}
+    data = {
+      'github_username' => 'bob',
+      'key' => key,
+      'project_dir' => '/dev/null'
+    }
     config = Exercism::Config.write(path, data)
     assert_equal 'bob', config.github_username
     assert_equal key, config.key
+    assert_equal '/dev/null', config.project_dir
   end
 
   def test_delete_config_file
     path = './test/fixtures'
     key = '7a7096c'
-    data = {'github_username' => 'bob', 'key' => key}
+    data = {
+      'github_username' => 'bob',
+      'key' => key,
+      'project_dir' => '/tmp'
+    }
     config = Exercism::Config.write(path, data)
     filename = config.file
     config.delete

data/test/exercism_test.rb

@@ -20,7 +20,7 @@ class ExercismTest < MiniTest::Unit::TestCase
   def test_login_gives_you_a_user
     Exercism.stub(:home, './test/fixtures') do
       key = '97e9975'
-      user = Exercism.login('bob', key)
+      user = Exercism.login('bob', key, '/dev/null')
       assert_equal 'bob', user.github_username
       assert_equal key, user.key
     end
@@ -29,7 +29,7 @@ class ExercismTest < MiniTest::Unit::TestCase
   def test_login_writes_the_config_file
     Exercism.stub(:home, './test/fixtures') do
       key = '97e9975'
-      Exercism.login('bob', key)
+      Exercism.login('bob', key, '/tmp')
       user = Exercism.user
       assert_equal 'bob', user.github_username
       assert_equal key, user.key

data/test/fixtures/home/.exercism

@@ -1,3 +1,4 @@
 ---
 github_username: alice
 key: 634abfb095ed621e1c793c9875fcd9fda455ea90
+project_dir: /tmp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Katrina Owen