exercism 0.0.26 → 0.0.27

data/README.md

@@ -25,6 +25,14 @@ This retrieves the README and test suite for your current assignment.
 
 This submits `example.rb` on your current assignment.
 
+    $ exercism stash save example.rb
+
+This saves 'example.rb' to exercism.io as an unfinished "stash" file that can be retrieved later. Helpful for use on multiple computers: stash the file you're working on at computer 1, then retrieve it with the loot command on computer 2.
+
+    $ exercism stash apply example.rb
+
+This retrieves the most recent stash file, if one exists, and saves it to the current directory.
+
     $ export EXERCISM_ENV=development
 
 Reveals stack traces on errors.

data/lib/cli.rb

@@ -1,7 +1,9 @@
 require 'rubygems' if RUBY_VERSION == '1.8.7'
 require 'thor'
+require 'exercism/cli/stash.rb'
 
 class Exercism
+
   class CLI < Thor
 
     desc "version", "Output current version of gem"
@@ -120,6 +122,16 @@ class Exercism
       puts "You are not logged in."
     end
 
+    desc "stash [SUBCOMMAND]", "Stash or apply code that is in-progress"
+    subcommand "stash", Stash
+
+    desc "dir", "Display the project path"
+    def dir
+      require 'exercism'
+
+      puts Exercism.config.project_dir
+    end
+
     private
 
     def username
@@ -155,4 +167,6 @@ class Exercism
       end
     end
   end
+
+  
 end

data/lib/exercism.rb

@@ -18,6 +18,7 @@ require 'exercism/user'
 require 'exercism/assignment'
 require 'exercism/submission'
 require 'exercism/api'
+require 'exercism/stash'
 
 class Exercism
 

data/lib/exercism/api.rb

@@ -46,8 +46,41 @@ class Exercism
       })
     end
 
+    def save_stash(action, filename)
+      path = File.join(filename)
+      contents = File.read path
+      response = conn.post do |req|
+        req.url endpoint(action)
+        req.headers['Accept'] = 'application/json'
+        req.headers['Content-Type'] = 'application/json'
+        req.body = {:code => contents, :key => user.key, :filename => path}.to_json
+      end
+      response
+    end
+
+    def apply_stash(action, filename)
+      get_stash(action, filename)
+    end
+
+    def list_stash(action)
+      response = conn.get do |req|
+        req.url endpoint(action)
+        req.params['key'] = user.key
+      end
+      JSON.parse(response.body)
+    end
+
     private
 
+    def get_stash(action, filename)
+      response = conn.get do |req|
+        req.url endpoint(action)
+        req.params['key'] = user.key
+        req.params['filename'] = filename
+      end
+      Stash.new(JSON.parse(response.body))
+    end
+
     def get_and_save(action)
       response = conn.get do |req|
         req.url endpoint(action)

data/lib/exercism/cli/stash.rb

@@ -0,0 +1,53 @@
+class Stash < Thor
+
+  desc "save FILE", "Stash code from a file in-progress"
+  method_option :host, :aliases => '-h', :default => 'http://exercism.io', :desc => 'the url of the exercism application'
+  def save(file)
+    require 'exercism'
+
+    begin
+      puts file
+      puts File.read file
+      response = Exercism::Api.new(options[:host], Exercism.user).save_stash('user/assignments/stash', file)
+      say "Stash file has been saved"
+    rescue Exception => e
+      puts "Error submitting stash"
+      puts e.message
+    end
+  end
+
+  desc "apply FILE", "Retrieve stashed file from exercism.io"
+  method_option :host, :aliases => '-h', :default => 'http://exercism.io', :desc => 'the url of the exercism application'
+  def apply(file)
+    require 'exercism'
+
+    begin
+      stash = Exercism::Api.new(options[:host], Exercism.user).apply_stash('user/assignments/stash', file)
+      if File.exists?(stash.filename)
+        say "File: " + stash.filename + " already exists"
+        if no?("Overwrite it? [y/n]")
+          return
+        end
+      end
+      stash.save
+      puts "Stash file downloaded successfully: " + File.join(FileUtils.pwd, stash.filename)
+    rescue Exception => e
+      puts "Error: No stash file was found."
+    end
+  end
+
+  desc "list", "List stashed files"
+  method_option :host, :aliases => '-h', :default => 'http://exercism.io', :desc => 'the url of the exercism application'
+  def list
+    require 'exercism'
+    begin
+      stashed = Exercism::Api.new(options[:host], Exercism.user).list_stash('user/assignments/stash/list')
+      stashed.each do |name|
+        puts name
+      end
+    rescue Exception => e
+      puts "Error: unable to retrieve stashed file list"
+    end
+  end
+
+end

data/lib/exercism/stash.rb

@@ -0,0 +1,28 @@
+class Exercism
+  class Stash
+
+  	attr_reader :code, :filename
+
+  	def self.save(body)
+  	  new(body).save
+  	end
+
+  	def initialize(body)
+  	  @code = body['code']
+      @filename = body['filename']
+  	end
+
+  	def save
+  	  File.open path, 'w' do |f|
+  	  	f.write code
+  	  end
+  	  self
+  	end
+
+    private
+
+  	def path
+  	  File.join(FileUtils.pwd, filename)
+  	end
+  end
+end

data/lib/exercism/submission.rb

@@ -28,6 +28,7 @@ class Exercism
         :clojure => '_test.clj',
         :python => '_test.py',
         :go => '_test.go',
+        :haskell => '_test.hs',
       }
     end
 

data/lib/exercism/version.rb

@@ -1,3 +1,3 @@
 class Exercism
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/test/exercism/api_test.rb

@@ -75,4 +75,47 @@ class ApiTest < Minitest::Test
     end
   end
 
+  def test_save_stash_to_api
+    submission = File.join(FileUtils.pwd, 'bob.rb')
+    File.open(submission, 'w') do |f|
+      f.write "puts 'hello world'"
+    end
+
+    Exercism.stub(:home, home) do
+      VCR.use_cassette('alice-submits-stash') do
+        response = Exercism::Api.new('http://localhost:4567', Exercism.user).save_stash('user/assignments/stash', submission)
+        assert_equal 201, response.status
+      end
+    end
+  end
+
+  def test_apply_stash_from_api
+    submission = File.join(FileUtils.pwd, 'bob.rb')
+    File.open(submission, 'w') do |f|
+      f.write "puts 'hello world'"
+    end
+    Exercism.stub(:home, home) do
+      VCR.use_cassette('alice-gets-stash') do
+        Exercism::Api.new('http://localhost:4567', Exercism.user).save_stash('user/assignments/stash', submission)
+        response = Exercism::Api.new('http://localhost:4567', Exercism.user).apply_stash('user/assignments/stash', 'bob.rb')
+        assert response
+      end
+    end
+  end
+
+  def test_get_stash_list
+    submission = File.join(FileUtils.pwd, 'bob.rb')
+    File.open(submission, 'w') do |f|
+      f.write "puts 'hello world'"
+    end
+    Exercism.stub(:home, home) do
+      VCR.use_cassette('alice-gets-stash-list') do
+        Exercism::Api.new('http://localhost:4567', Exercism.user).save_stash('user/assignments/stash', submission)
+        response = Exercism::Api.new('http://localhost:4567', Exercism.user).list_stash('user/assignments/stash/list')
+        assert response
+      end
+    end
+  end
+
+
 end

data/test/fixtures/vcr_cassettes/alice-gets-stash-list.yml

@@ -0,0 +1,75 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4567/api/v1/user/assignments/stash
+    body:
+      encoding: UTF-8
+      string: ! '{"code":"puts ''hello world''","key":"634abfb095ed621e1c793c9875fcd9fda455ea90","filename":"/vagrant/exercism/old/bob.rb"}'
+    headers:
+      user-agent:
+      - github.com/kytrinyx/exercism CLI v0.0.21
+      accept:
+      - application/json
+      content-type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      content-type:
+      - application/json;charset=utf-8
+      content-length:
+      - '49'
+      x-content-type-options:
+      - nosniff
+      set-cookie:
+      - rack.session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRiJFMmQ4YjRlNmUxNmMxODkyMTQ0M2Y0%0AOTA3NTkwYWJkZGFkZWI0NGE0NzA1MDA0OWE2NmQ4ZTM5N2YzMmRmNzE1Ykki%0ACWNzcmYGOwBGIkVjMmM0M2ZlNTFjNjRiZTMxYmJjNGIyYzRhNmY4OWQ0OTEw%0AYmQzODJiN2FlNzJhOTUyODc0OGI4MGQ1ZTUzOWI4SSINdHJhY2tpbmcGOwBG%0AewhJIhRIVFRQX1VTRVJfQUdFTlQGOwBGIi1jODFhNWRiMmQwMDlhYmFlNTJk%0AMmRiM2Q3Y2ZlODQ1ZDg0NTY3YzZhSSIZSFRUUF9BQ0NFUFRfRU5DT0RJTkcG%0AOwBGIi1kYTM5YTNlZTVlNmI0YjBkMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0ASSIZSFRUUF9BQ0NFUFRfTEFOR1VBR0UGOwBGIi1kYTM5YTNlZTVlNmI0YjBk%0AMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0A--da7f28f9a4756d813c05aebea82e8ba690ac9c41;
+        path=/; HttpOnly
+      connection:
+      - close
+      server:
+      - thin 1.5.1 codename Straight Razor
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"puts ''hello world''","filename":"bob.rb"}'
+    http_version: '1.1'
+  recorded_at: Tue, 03 Sep 2013 19:48:18 GMT
+- request:
+    method: get
+    uri: http://localhost:4567/api/v1/user/assignments/stash/list?key=634abfb095ed621e1c793c9875fcd9fda455ea90
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      user-agent:
+      - github.com/kytrinyx/exercism CLI v0.0.21
+      accept-encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/json;charset=utf-8
+      content-length:
+      - '19'
+      x-content-type-options:
+      - nosniff
+      set-cookie:
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFMTY2YzVlNTE2NDgwNmFkYWFjNDlh%0ANzg5MTY1ZTA5Zjk4NDgyYjhiODc5Y2NjNmQzNWVkZGEwZThmOWRkMDZiY0ki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItYzgxYTVk%0AYjJkMDA5YWJhZTUyZDJkYjNkN2NmZTg0NWQ4NDU2N2M2YUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGRkMDk4OTE3NGYxOWE1YjE4NzkxMjEzY2M0%0AMGM1YTYwOWQyNTQ2Y0kiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--88e3a688ea8b8538dd22926f606ddfec4aa86ada;
+        path=/; HttpOnly
+      connection:
+      - close
+      server:
+      - thin 1.5.1 codename Straight Razor
+    body:
+      encoding: US-ASCII
+      string: ! '{"list":["bob.rb"]}'
+    http_version: '1.1'
+  recorded_at: Tue, 03 Sep 2013 19:48:18 GMT
+recorded_with: VCR 2.5.0

data/test/fixtures/vcr_cassettes/alice-gets-stash.yml

@@ -0,0 +1,75 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4567/api/v1/user/assignments/stash
+    body:
+      encoding: UTF-8
+      string: ! '{"code":"puts ''hello world''","key":"634abfb095ed621e1c793c9875fcd9fda455ea90","filename":"/vagrant/exercism/old/bob.rb"}'
+    headers:
+      User-Agent:
+      - github.com/kytrinyx/exercism CLI v0.0.26
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Content-Type:
+      - application/json;charset=utf-8
+      Content-Length:
+      - '49'
+      X-Content-Type-Options:
+      - nosniff
+      Set-Cookie:
+      - rack.session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRiJFYmE5NmY5Zjk0MTVhMWY4ODNmNDEw%0AYjA4NTllODRlZTBkYzhlNjAwOWZlZjg1NTcyMWViNmQ3ODQxNGRmY2MwNEki%0ACWNzcmYGOwBGIkVhMzhkZTdkNzRhOGUyZWVlOWRlYmEzODRhOWQ0ZDkyNjdm%0ANmMxZmRkMzA2NzZmODAxYzIxYTQzYjU5MGU1NzA5SSINdHJhY2tpbmcGOwBG%0AewhJIhRIVFRQX1VTRVJfQUdFTlQGOwBGIi1mNjFlZGRjODY2MWFmNTkzYmVj%0AM2VlNjQzMjJmODFlMGQ0MGYwN2UySSIZSFRUUF9BQ0NFUFRfRU5DT0RJTkcG%0AOwBGIi1kYTM5YTNlZTVlNmI0YjBkMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0ASSIZSFRUUF9BQ0NFUFRfTEFOR1VBR0UGOwBGIi1kYTM5YTNlZTVlNmI0YjBk%0AMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0A--f0aff46f488f06e9b29743514ec4bcd46c76baf2;
+        path=/; HttpOnly
+      Connection:
+      - keep-alive
+      Server:
+      - thin 1.5.1 codename Straight Razor
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"puts ''hello world''","filename":"bob.rb"}'
+    http_version: 
+  recorded_at: Tue, 03 Sep 2013 21:17:32 GMT
+- request:
+    method: get
+    uri: http://localhost:4567/api/v1/user/assignments/stash?filename=bob.rb&key=634abfb095ed621e1c793c9875fcd9fda455ea90
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - github.com/kytrinyx/exercism CLI v0.0.26
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json;charset=utf-8
+      Content-Length:
+      - '49'
+      X-Content-Type-Options:
+      - nosniff
+      Set-Cookie:
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFYjcyNGFhNjQ5MzFkOTM5YzlhY2Mx%0AYjk5YjZmY2MwZWFlMzFiMGIyYjA2YzMwNWRmZDUzN2UxYzU2MmYwMzVjNkki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZjYxZWRk%0AYzg2NjFhZjU5M2JlYzNlZTY0MzIyZjgxZTBkNDBmMDdlMkkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGRkMDk4OTE3NGYxOWE1YjE4NzkxMjEzY2M0%0AMGM1YTYwOWQyNTQ2Y0kiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--db35df569572aadc232dff027dc7d69836926953;
+        path=/; HttpOnly
+      Connection:
+      - keep-alive
+      Server:
+      - thin 1.5.1 codename Straight Razor
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"puts ''hello world''","filename":"bob.rb"}'
+    http_version: 
+  recorded_at: Tue, 03 Sep 2013 21:17:32 GMT
+recorded_with: VCR 2.5.0

data/test/fixtures/vcr_cassettes/alice-submits-stash.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4567/api/v1/user/assignments/stash
+    body:
+      encoding: UTF-8
+      string: ! '{"code":"puts ''hello world''","key":"634abfb095ed621e1c793c9875fcd9fda455ea90","filename":"/vagrant/exercism/old/bob.rb"}'
+    headers:
+      user-agent:
+      - github.com/kytrinyx/exercism CLI v0.0.21
+      accept:
+      - application/json
+      content-type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      content-type:
+      - application/json;charset=utf-8
+      content-length:
+      - '49'
+      x-content-type-options:
+      - nosniff
+      set-cookie:
+      - rack.session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRiJFMTBiNjFjNTgxZjQ5MTYzYzc5YTNh%0AOTljYzI4ZTVkNTAzODllMjhjNjI1NTlmNjcyYWUyNTdkZjA2OWIxZDNjZEki%0ACWNzcmYGOwBGIkViN2E1MjkzZjIyYTg0ZGFmZDU5NTE0YTA1MWIxZjQzZjA0%0AZTc3ZmNmNWEyMWRhMTg1YTZjMWU2ODgxNzg3Nzc0SSINdHJhY2tpbmcGOwBG%0AewhJIhRIVFRQX1VTRVJfQUdFTlQGOwBGIi1jODFhNWRiMmQwMDlhYmFlNTJk%0AMmRiM2Q3Y2ZlODQ1ZDg0NTY3YzZhSSIZSFRUUF9BQ0NFUFRfRU5DT0RJTkcG%0AOwBGIi1kYTM5YTNlZTVlNmI0YjBkMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0ASSIZSFRUUF9BQ0NFUFRfTEFOR1VBR0UGOwBGIi1kYTM5YTNlZTVlNmI0YjBk%0AMzI1NWJmZWY5NTYwMTg5MGFmZDgwNzA5%0A--55534de505b2b27c1026cea95de54209be91452a;
+        path=/; HttpOnly
+      connection:
+      - close
+      server:
+      - thin 1.5.1 codename Straight Razor
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"puts ''hello world''","filename":"bob.rb"}'
+    http_version: '1.1'
+  recorded_at: Tue, 03 Sep 2013 19:08:40 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -208,8 +208,10 @@ files:
 - lib/exercism.rb
 - lib/exercism/api.rb
 - lib/exercism/assignment.rb
+- lib/exercism/cli/stash.rb
 - lib/exercism/config.rb
 - lib/exercism/env.rb
+- lib/exercism/stash.rb
 - lib/exercism/submission.rb
 - lib/exercism/user.rb
 - lib/exercism/version.rb
@@ -226,8 +228,11 @@ files:
 - test/fixtures/home/.exercism
 - test/fixtures/ruby/bob/bob.rb
 - test/fixtures/vcr_cassettes/alice-gets-bob.yml
+- test/fixtures/vcr_cassettes/alice-gets-stash-list.yml
+- test/fixtures/vcr_cassettes/alice-gets-stash.yml
 - test/fixtures/vcr_cassettes/alice-gets-word-count.yml
 - test/fixtures/vcr_cassettes/alice-submits-bob.yml
+- test/fixtures/vcr_cassettes/alice-submits-stash.yml
 - test/test_helper.rb
 homepage: https://github.com/kytrinyx/exercism
 licenses:
@@ -269,6 +274,9 @@ test_files:
 - test/fixtures/home/.exercism
 - test/fixtures/ruby/bob/bob.rb
 - test/fixtures/vcr_cassettes/alice-gets-bob.yml
+- test/fixtures/vcr_cassettes/alice-gets-stash-list.yml
+- test/fixtures/vcr_cassettes/alice-gets-stash.yml
 - test/fixtures/vcr_cassettes/alice-gets-word-count.yml
 - test/fixtures/vcr_cassettes/alice-submits-bob.yml
+- test/fixtures/vcr_cassettes/alice-submits-stash.yml
 - test/test_helper.rb