exercism 0.0.19 → 0.0.20

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .approvals
+tags

data/README.md

@@ -29,6 +29,8 @@ This submits `example.rb` on your current assignment.
 
 Reveals stack traces on errors.
 
+By default, Exercism will create a config file in the base of your home directory, i.e. `~/.exercism`. This file can be moved to `~/.config/exercism` if desired.
+
 ## Contributing
 
 1. Fork it

data/lib/cli.rb

@@ -77,26 +77,7 @@ class Exercism
     def login
       require 'exercism'
 
-      username = ask("Your GitHub username:")
-      key = ask("Your exercism.io API key:")
-      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
+      Exercism.login username, key, project_dir
 
       say("Your credentials have been written to #{Exercism.config.file}")
     end
@@ -119,6 +100,22 @@ class Exercism
 
     private
 
+    def username
+      ask("Your GitHub username:")
+    end
+
+    def key
+      ask("Your exercism.io API key:")
+    end
+
+    def project_dir
+      default_dir = FileUtils.pwd
+      say "What is your exercism exercises project path?"
+      say "Press Enter to select the default (#{default_dir}):\n"
+      dir = ask ">", :default => default_dir
+      File.expand_path(dir)
+    end
+
     def api(host = options[:host])
       Exercism::Api.new(host, Exercism.user, Exercism.project_dir)
     end

data/lib/exercism.rb

@@ -25,13 +25,13 @@ class Exercism
     @home ||= Env.home
   end
 
-  def self.login(github_username, key, dir, config_path)
+  def self.login(github_username, key, dir)
     data = {
       'github_username' => github_username,
       'key' => key,
       'project_dir' => dir
     }
-    Config.write(config_path, data)
+    Config.write home, data
   end
 
   def self.user

data/lib/exercism/api.rb

@@ -56,7 +56,7 @@ class Exercism
     def endpoint(action = nil)
       "/api/v1/#{action}".chomp('/')
     end
-   
+
     def save(body)
       Assignment.save(JSON.parse(body), project_dir)
     end

data/lib/exercism/config.rb

@@ -7,9 +7,7 @@ class Exercism
 
     def self.read(path)
       config = new(path)
-      return config if config.exists?
-
-      new(alternate_path) unless config.exists?
+      config.exists? ? config : new(alternate_path)
     end
 
     def self.write(path, data)

data/lib/exercism/version.rb

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

data/test/exercism_test.rb

@@ -21,7 +21,7 @@ class ExercismTest < Minitest::Test
     home = './test/fixtures'
     Exercism.stub(:home, home) do
       key = '97e9975'
-      Exercism.login('bob', key, '/tmp', home)
+      Exercism.login('bob', key, '/tmp')
       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.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json