exercism 0.0.18 → 0.0.19

data/exercism.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "json"
   spec.add_dependency "faraday"
   spec.add_dependency "thor"
   spec.add_development_dependency "bundler", "~> 1.3"
@@ -28,7 +29,6 @@ Gem::Specification.new do |spec|
 
 
   if RUBY_VERSION <= "1.8.7"
-    spec.add_dependency "json"
     spec.add_development_dependency "nokogiri", "~>1.5.0"
   else
     spec.add_development_dependency "nokogiri", "~>1.6.0"

data/lib/cli.rb

@@ -1,3 +1,4 @@
+require 'rubygems' if RUBY_VERSION == '1.8.7'
 require 'thor'
 
 class Exercism
@@ -50,12 +51,22 @@ class Exercism
     def submit(file)
       require 'exercism'
 
-      path = File.join(FileUtils.pwd, file)
+      submission = Submission.new(file)
+
+      if submission.test?
+        say "It looks like this is a test, you probably don't want to do that."
+        if no?("Do you want to submit it anyway? [y/n]")
+          return
+        end
+      end
+
       begin
-        response = Exercism::Api.new(options[:host], Exercism.user).submit(file)
-        puts "Your assignment has been submitted."
-        url = submission_url(response.body, options[:host])
-        puts "For feedback on your submission visit #{url}"
+        response = Exercism::Api.new(options[:host], Exercism.user).submit(submission.file)
+        say "Your assignment has been submitted."
+
+        body = JSON.parse(response.body)
+        url = "#{options[:host]}/#{Exercism.user.github_username}/#{body['language']}/#{body['exercise']}"
+        say "For feedback on your submission visit #{url}"
       rescue Exception => e
         puts "There was an issue with your submission."
         puts e.message
@@ -68,13 +79,24 @@ class Exercism
 
       username = ask("Your GitHub username:")
       key = ask("Your exercism.io API key:")
-      default_path = FileUtils.pwd
-      path = ask("What is your exercism exercises project path? (#{default_path})")
-      if path.empty?
-        path = default_path
+      default_dir = FileUtils.pwd
+      say "What is your exercism exercises project path?"
+      say "Press Enter to select the default (#{default_dir}):\n"
+      dir = ask ">"
+      if dir.empty?
+        dir = default_dir
+      end
+      project_dir = File.expand_path(dir)
+
+      say "Where do you want your configuration stored? (type a number)"
+      say "1. #{File.join(Exercism.home, '.exercism')}"
+      say "2. #{File.join(Exercism.home, '.config', 'exercism')}"
+
+      if ask(">").to_i == 2
+        Exercism.login username, key, project_dir, File.join(Exercism.home, '.config')
+      else
+        Exercism.login username, key, project_dir, Exercism.home
       end
-      path = File.expand_path(path)
-      Exercism.login(username, key, path)
 
       say("Your credentials have been written to #{Exercism.config.file}")
     end
@@ -95,22 +117,20 @@ class Exercism
       puts "You are not logged in."
     end
 
-private
+    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."
+        say "No assignments fetched."
       else
         assignments.each do |assignment|
-          puts "Fetched #{File.join(assignment.assignment_dir)}"
+          say "\nFetched #{assignment.exercise}"
+          say File.join(assignment.exercise, 'README.md')
+          say File.join(assignment.exercise, assignment.test_file)
         end
       end
     end

data/lib/exercism.rb

@@ -3,36 +3,35 @@ require 'etc'
 require 'json'
 require 'yaml'
 require 'fileutils'
-require 'faraday'
+
+old_warn, $-w = $-w, nil
+begin
+  require 'faraday'
+ensure
+  $-w = old_warn
+end
+
 require 'exercism/version'
+require 'exercism/env'
 require 'exercism/config'
 require 'exercism/user'
 require 'exercism/assignment'
+require 'exercism/submission'
 require 'exercism/api'
 
 class Exercism
 
   def self.home
-    if ENV["OS"] == 'Windows_NT' then
-      ENV["HOMEDRIVE"]+ENV["HOMEPATH"]
-    else
-      return File.expand_path('~') if RUBY_VERSION <= "1.8.7"
-      Dir.home(Etc.getlogin)
-    end
+    @home ||= Env.home
   end
 
-  def self.login(github_username, key, dir)
+  def self.login(github_username, key, dir, config_path)
     data = {
       'github_username' => github_username,
       'key' => key,
       'project_dir' => dir
     }
-    Config.write(home, data)
-    User.new(github_username, key)
-  end
-
-  def self.config
-    Config.read(home)
+    Config.write(config_path, data)
   end
 
   def self.user
@@ -44,4 +43,11 @@ class Exercism
     config.project_dir
   end
 
+  def self.alternate_config_path
+    Config.alternate_path
+  end
+
+  def self.config
+    Config.read(home)
+  end
 end

data/lib/exercism/assignment.rb

@@ -3,7 +3,7 @@ class Exercism
 
     def self.save(data, path)
       data['assignments'].map do |attributes|
-        Assignment.new(attributes.merge('project_dir' => path)).save
+        new(attributes.merge('project_dir' => path)).save
       end
     end
 
@@ -18,6 +18,10 @@ class Exercism
       @project_dir = attributes['project_dir']
     end
 
+    def exercise
+      File.join(track, slug)
+    end
+
     def save
       FileUtils.mkdir_p assignment_dir
       save_readme

data/lib/exercism/config.rb

@@ -1,8 +1,15 @@
 class Exercism
   class Config
 
+    def self.alternate_path
+      File.join(Env.home, '.config')
+    end
+
     def self.read(path)
-      new(path)
+      config = new(path)
+      return config if config.exists?
+
+      new(alternate_path) unless config.exists?
     end
 
     def self.write(path, data)
@@ -13,11 +20,11 @@ class Exercism
       config.save
     end
 
-    attr_reader :file
+    attr_reader :path
     attr_writer :github_username, :key, :project_dir
 
     def initialize(path)
-      @file = File.join(path, '.exercism')
+      @path = path
     end
 
     def github_username
@@ -34,6 +41,8 @@ class Exercism
 
     def save
       FileUtils.mkdir_p(project_dir)
+      FileUtils.mkdir_p(path)
+
       File.open file, 'w' do |f|
         data = {
           'github_username' => github_username,
@@ -46,11 +55,27 @@ class Exercism
     end
 
     def delete
-      FileUtils.rm(file) if File.exists?(file)
+      FileUtils.rm(file) if exists?
+    end
+
+    def exists?
+      File.exists?(file)
+    end
+
+    def file
+      @file ||= File.join(path, filename)
     end
 
     private
 
+    def filename
+      default? ? ".exercism" : "exercism"
+    end
+
+    def default?
+      path !~ /\.config/
+    end
+
     def from_yaml
       unless @data
          @data = YAML.load(File.read(file))

data/lib/exercism/env.rb

@@ -0,0 +1,21 @@
+class Exercism
+  class Env
+    def self.home
+      if windows_nt?
+        ENV["HOMEDRIVE"] + ENV["HOMEPATH"]
+      elsif ruby18?
+        File.expand_path('~')
+      else
+        Dir.home(Etc.getlogin)
+      end
+    end
+
+    def self.windows_nt?
+      ENV["OS"] == 'Windows_NT'
+    end
+
+    def self.ruby18?
+      RUBY_VERSION == '1.8.7'
+    end
+  end
+end

data/lib/exercism/submission.rb

@@ -0,0 +1,28 @@
+class Exercism
+  class Submission
+
+    def self.test?(file)
+      new(file).test?
+    end
+
+    attr_reader :file
+    def initialize(file)
+      @file = file
+    end
+
+    def test?
+      test_identifiers.any? do |_, suffix|
+        file.end_with?(suffix)
+      end
+    end
+
+    def test_identifiers
+      {
+        :ruby => '_test.rb',
+        :js => '.spec.js',
+        :elixir => '_test.exs'
+      }
+    end
+
+  end
+end

data/lib/exercism/version.rb

@@ -1,3 +1,3 @@
 class Exercism
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/test/exercism/config_test.rb

@@ -6,8 +6,20 @@ class ConfigTest < Minitest::Test
     './test/fixtures'
   end
 
+  def data
+    {
+      'github_username' => 'bob',
+      'key' => '7a7096c',
+      'project_dir' => '/tmp'
+    }
+  end
+
   def key
-    '7a7096c'
+    data['key']
+  end
+
+  def write_config_file(path, info = {})
+    Exercism::Config.write(path, data.merge!(info))
   end
 
   def teardown
@@ -15,6 +27,10 @@ class ConfigTest < Minitest::Test
       FileUtils.rm('./test/fixtures/.exercism')
     end
 
+    if File.exists?('./test/fixtures/.config/exercism')
+      FileUtils.rm_r('./test/fixtures/.config')
+    end
+
     if File.exists?('./test/fixtures/some/project/dir')
       FileUtils.rm_r('./test/fixtures/some')
     end
@@ -27,39 +43,34 @@ class ConfigTest < Minitest::Test
     assert_equal '/tmp', config.project_dir
   end
 
+  def test_reads_from_alternate_path_config_file_when_default_is_missing
+    write_config_file('./test/fixtures/.config')
+    Exercism::Config.stub(:alternate_path, './test/fixtures/.config') do
+      config = Exercism::Config.read(path)
+      assert_equal 'bob', config.github_username
+      assert_equal key, config.key
+      assert_equal '/tmp', config.project_dir
+    end
+  end
+
   def test_write_config_file
-    data = {
-      'github_username' => 'bob',
-      'key' => key,
-      'project_dir' => '/tmp'
-    }
-    config = Exercism::Config.write(path, data)
+    config = write_config_file(path)
     assert_equal 'bob', config.github_username
     assert_equal key, config.key
     assert_equal '/tmp', config.project_dir
   end
 
   def test_delete_config_file
-    data = {
-      'github_username' => 'bob',
-      'key' => key,
-      'project_dir' => '/tmp'
-    }
-    config = Exercism::Config.write(path, data)
+    config = write_config_file(path)
     filename = config.file
     config.delete
     assert !File.exists?(filename)
   end
 
   def test_write_directory_if_missing
-    project_dir = './test/fixtures/some/project/dir'
-    data = {
-      'github_username' => 'bob',
-      'key' => key,
-      'project_dir' => project_dir
-    }
-    Exercism::Config.write(path, data)
-    assert File.exist? project_dir
+    data = {'project_dir' => './test/fixtures/some/project/dir'}
+    write_config_file(path, data)
+    assert File.exist?(data['project_dir'])
   end
 
 end

data/test/exercism/submission_test.rb

@@ -0,0 +1,28 @@
+require './test/test_helper'
+require 'exercism/submission'
+
+class SubmissionTest < Minitest::Test
+  def test_knows_ruby_code
+    refute Exercism::Submission.test?('queens.rb')
+  end
+
+  def test_identifies_ruby_tests
+    assert Exercism::Submission.test?('queens_test.rb')
+  end
+
+  def test_knows_elixir_code
+    refute Exercism::Submission.test?('queens.exs')
+  end
+
+  def test_identifies_elixir_tests
+    assert Exercism::Submission.test?('queens_test.exs')
+  end
+
+  def test_knows_javascript_code
+    refute Exercism::Submission.test?('queens.js')
+  end
+
+  def test_identifies_javascript_tests
+    assert Exercism::Submission.test?('queens.spec.js')
+  end
+end

data/test/exercism_test.rb

@@ -17,19 +17,11 @@ class ExercismTest < Minitest::Test
     end
   end
 
-  def test_login_gives_you_a_user
-    Exercism.stub(:home, './test/fixtures') do
-      key = '97e9975'
-      user = Exercism.login('bob', key, '/tmp')
-      assert_equal 'bob', user.github_username
-      assert_equal key, user.key
-    end
-  end
-
   def test_login_writes_the_config_file
-    Exercism.stub(:home, './test/fixtures') do
+    home = './test/fixtures'
+    Exercism.stub(:home, home) do
       key = '97e9975'
-      Exercism.login('bob', key, '/tmp')
+      Exercism.login('bob', key, '/tmp', home)
       user = Exercism.user
       assert_equal 'bob', user.github_username
       assert_equal key, user.key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -176,11 +192,14 @@ files:
 - lib/exercism/api.rb
 - lib/exercism/assignment.rb
 - lib/exercism/config.rb
+- lib/exercism/env.rb
+- lib/exercism/submission.rb
 - lib/exercism/user.rb
 - lib/exercism/version.rb
 - test/exercism/api_test.rb
 - test/exercism/assignment_test.rb
 - test/exercism/config_test.rb
+- test/exercism/submission_test.rb
 - test/exercism_test.rb
 - test/fixtures/approvals/alice_gets_bob_readme.approved.txt
 - test/fixtures/approvals/alice_gets_bob_tests.approved.txt
@@ -221,6 +240,7 @@ test_files:
 - test/exercism/api_test.rb
 - test/exercism/assignment_test.rb
 - test/exercism/config_test.rb
+- test/exercism/submission_test.rb
 - test/exercism_test.rb
 - test/fixtures/approvals/alice_gets_bob_readme.approved.txt
 - test/fixtures/approvals/alice_gets_bob_tests.approved.txt