tmc-client 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .DS_Store?
-*.gem
+*.gem
+Gemfile.lock

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
 script: bundle exec rspec specs
 notifications:
-  irc: "irc.cc.hut.fi#tmcee"
-  email: false
+  irc: "irc.jippii.fi#tmcee"
+  email: false

data/Gemfile

@@ -1,9 +1,3 @@
 source 'https://rubygems.org'
-gem 'json'
-gem 'faraday'
-gem 'pry'
-gem 'fileutils'
-gem 'mocha'
-gem 'highline' # brew install imagemagick
-gem 'rake'
-gem 'rspec'
+
+gemspec

data/README.md

@@ -0,0 +1,31 @@
+TMC-Client
+==========
+
+[![Build Status](https://travis-ci.org/TMCee/tmc-client.png)](https://travis-ci.org/TMCee/tmc-client)
+[![Code Climate](https://codeclimate.com/github/TMCee/tmc-client.png)](https://codeclimate.com/github/TMCee/tmc-client)
+
+TMC-Client is a command line interface for operating with the [TMC-server](http://github.com/testmycode/tmc-server). This client can be used to submit, download, and update exercises.
+
+Installation
+------------
+You may install tmc-client using rubygems `gem install tmc-client`
+
+
+Commands
+--------
+*  `tmc list`, short for `tmc list courses`, lists all available courses for the configured TMC-server  
+* `tmc init <coursename>` will initialize a folder for your course to your working directory  
+* `tmc list exercises` lists all available exercises for the current working course (working dir)  
+* `tmc download <exercisename>` will download all files of the specified exercise to the current course directory  
+* `tmc download all` will download all exercises to the working course directory  
+* `tmc submit` or `tmc submit <path-of-the-exercise>` will submit the specified exercise or the current working exercise to the server, and the client will wait for a response from the server. If you do not wish to wait for the response, provide the additional argument `--silent` or `-s` or `--quiet` or `-q`.  
+* `tmc status` or `tmc status <path-of-the-exercise>` will inquire the server about the status of the exercise, and display a short result summary.  
+* `tmc update` or `tmc update <path-of-the-exercise>` will download updates to the specified or working exercise. This will not replace any source files without asking the user first.  
+* `tmc solution` or `tmc solution <path-of-the-exercise>` will download model solutions to the specified or working exercise if they are available. Again, the user will be asked for permission per file before replacement.  
+* `tmc auth` can be used to manually trigger authentication
+* `tmc get url` displays the server url in use
+* `tmc set url <url>` configures a new server url for TMC-Client, which is persisted for later use.
+
+Configuration
+-------------
+All configuration is done via commandline interface. If no server url is given it's asked on startup.

data/lib/tmc-client/client.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'highline/import'
-
+require 'pry'
 require 'json'
 require 'faraday'
 require 'yaml'
-require 'pry'
 require 'fileutils'
 require 'tempfile'
 require 'pp'
+require 'zip/zip'
 require_relative 'my_config'
 
 class Client
@@ -16,21 +16,7 @@ class Client
     @config = MyConfig.new
     @output = output
     @input = input
-    begin
-      @config.server_url ||= request_server_url
-    rescue
-      request_server_url
-    end
-    init_connection()
-    if @config.auth
-      begin
-        @courses = JSON.parse get_courses_json
-      rescue => e
-        auth
-      end
-    else
-      output.puts "No username/password. run tmc auth"
-    end
+    setup_client
   end
 
   # stupid name - this should create connection, but not fetch courses.json!
@@ -156,7 +142,6 @@ class Client
     output.print "Would you like to download all available exercises? Yn"
     if ["", "y", "Y"].include? @input.gets.strip.chomp
       Dir.chdir(course_name) do
-        course = @courses['courses'].select { |course| course['name'] == course_name }.first
         download_new_exercises
       end
     end
@@ -201,7 +186,10 @@ class Client
     Dir.mktmpdir do |tmpdir|
       Dir.chdir tmpdir do
         File.open("tmp.zip", 'wb') {|file| file.write(zip.body)}
-        `unzip -n tmp.zip && rm tmp.zip`
+        #`unzip -n tmp.zip && rm tmp.zip`
+        full_path = File.join(Dir.pwd, 'tmp.zip')
+        unzip_file(full_path, Dir.pwd, exercise_dir_name)
+        `rm tmp.zip`
         files = Dir.glob('**/*')
         all_selected = false
         files.each do |file|
@@ -222,8 +210,6 @@ class Client
             rescue ArgumentError => e
              output.puts "An error occurred #{e}"
             end
-          elsif input == "b"
-            binding.pry
           else
             output.puts "Skipping file #{file}"
           end
@@ -243,7 +229,10 @@ class Client
     Dir.mktmpdir do |tmpdir|
       Dir.chdir tmpdir do
         File.open("tmp.zip", 'wb') {|file| file.write(zip.body)}
-        `unzip -n tmp.zip && rm tmp.zip`
+        # `unzip -n tmp.zip && rm tmp.zip`
+        full_path = File.join(Dir.pwd, 'tmp.zip')
+        unzip_file(full_path, Dir.pwd, exercise_dir_name)
+        `rm tmp.zip`
         files = Dir.glob('**/*')
 
         files.each do |file|
@@ -294,7 +283,21 @@ class Client
     raise "Exercise already downloaded" if File.exists? exercise['name']
     zip = fetch_zip(exercise['zip_url'])
     File.open("tmp.zip", 'wb') {|file| file.write(zip.body)}
-    `unzip -n tmp.zip && rm tmp.zip`
+    full_path = File.join(Dir.pwd, 'tmp.zip')
+    unzip_file(full_path, Dir.pwd, exercise_dir_name)
+    #`unzip -n tmp.zip && rm tmp.zip`
+    `rm tmp.zip`
+  end
+
+  def unzip_file (file, destination, exercise_dir_name)
+    Zip::ZipFile.open(file) do |zip_file|
+      zip_file.each do |f|
+        merged_path = f.name.sub(exercise_dir_name.gsub("-", "/"), "")
+        f_path=File.join(destination, exercise_dir_name, merged_path)
+        FileUtils.mkdir_p(File.dirname(f_path))
+        zip_file.extract(f, f_path) unless File.exist?(f_path)
+      end
+    end
   end
 
   # Filepath can be either relative or absolute
@@ -383,4 +386,23 @@ class Client
       update_automatically_detected_project_from_zip(exercise['zip_url'], exercise_dir_name, course_dir_name, exercise, course)
     end
   end
+
+  protected
+  def setup_client
+    begin
+      @config.server_url ||= request_server_url
+    rescue
+      request_server_url
+    end
+    init_connection()
+    if @config.auth
+      begin
+        @courses = JSON.parse get_courses_json
+      rescue => e
+        auth
+      end
+    else
+      output.puts "No username/password. run tmc auth"
+    end
+  end
 end

data/specs/config.yml

@@ -0,0 +1,3 @@
+---
+:server_url: http://0.0.0.0
+:auth: Basic YXNkOmFzZGFzZGFzZGFzZA==

data/specs/download_spec.rb

@@ -2,11 +2,20 @@ require_relative '../lib/tmc-client/client.rb'
 require 'rspec'
 require 'mocha/setup'
 
+Client.class_eval do
+  def setup_client
+  end
+end
+
 describe Client do
   subject do
     c = Client.new
   end
 
+  before(:each) do
+    subject.config = MyConfig.new
+  end
+
   it "should be able to download a zip" do
     received_zip_data = mock("faraday_object")
     received_zip_data.expects(:body).returns(File.read(File.join(File.dirname(File.expand_path(__FILE__)), "ex.zip")))

data/specs/list_spec.rb

@@ -7,6 +7,10 @@ describe Client do
     Client.new
   end
 
+  before(:each) do
+    subject.config = MyConfig.new
+  end
+  
   it "should print all course names when listing courses" do
     subject.courses = {"courses" =>  [{ "name" => "test_course1"}, {"name" => "test_course2" }] }
     output = mock("output")

data/specs/submit_spec.rb

@@ -2,11 +2,20 @@ require_relative '../lib/tmc-client/client.rb'
 require 'rspec'
 require 'mocha'
 
+Client.class_eval do
+  def setup_client
+  end
+end
+
 describe Client do
   subject do
     Client.new
   end
 
+  before(:each) do
+    subject.config = MyConfig.new
+  end
+
   its(:current_directory_name) { should ==  `pwd`.split("/").last.chomp }
   its(:previous_directory_name) { should == `pwd`.split("/")[-2].chomp }
 

data/specs/update_spec.rb

@@ -2,11 +2,20 @@ require_relative '../lib/tmc-client/client.rb'
 require 'rspec'
 require 'mocha/setup'
 
+Client.class_eval do
+  def setup_client
+  end
+end
+
 describe Client do
   subject do
     c = Client.new
   end
 
+  before(:each) do
+    subject.config = MyConfig.new
+  end
+  
   after(:each) do
     `rm -r update_universal_ex`
     `rm -r update_ex`

data/tmc-client.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
-	s.name          = 'tmc-client'
-	s.version       = '0.0.1'
+  s.name          = 'tmc-client'
+  s.version       = '0.0.2'
   s.platform      = Gem::Platform::RUBY
-	s.summary       = 'TestMyCode Commandline client'
-	s.authors       = ['Jarmo Isotalo', 'Tony Kovanen']
-	s.homepage      = "https://github.com/TMCee/tmc-client/"
+  s.summary       = 'TestMyCode Commandline client'
+  s.authors       = ['Jarmo Isotalo', 'Tony Kovanen']
+  s.homepage      = "https://github.com/TMCee/tmc-client/"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -12,13 +12,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "faraday"
-  s.add_dependency "pry"
   s.add_dependency "fileutils"
   s.add_dependency "mocha"
   s.add_dependency "highline"
   s.add_dependency "rake"
-  s.add_dependency "rspec"
+  s.add_dependency "rubyzip"
 
-  s.add_development_dependency "rspec", "~> 2.8"
+  s.add_development_dependency "rspec"
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmc-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: fileutils
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -145,17 +129,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
 description: 
 email: 
 executables:
@@ -166,8 +150,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
-- Readme.md
+- README.md
 - bin/tmc-client
 - lib/tmc-client.rb
 - lib/tmc-client/client.rb
@@ -175,6 +158,7 @@ files:
 - lib/tmc-client/config.yml
 - lib/tmc-client/my_config.rb
 - lib/tmc-client/old-client.rb
+- specs/config.yml
 - specs/download_spec.rb
 - specs/ex.zip
 - specs/list_spec.rb
@@ -183,7 +167,6 @@ files:
 - specs/update_spec.rb
 - specs/update_universal_ex.zip
 - tmc
-- tmc-client-0.0.1.gem
 - tmc-client.gemspec
 homepage: https://github.com/TMCee/tmc-client/
 licenses: []

data/Gemfile.lock

@@ -1,44 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.0.9)
-    diff-lcs (1.1.3)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    fileutils (0.7)
-      rmagick (>= 2.13.1)
-    highline (1.6.18)
-    json (1.7.7)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multipart-post (1.2.0)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.0.4)
-    rmagick (2.13.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  faraday
-  fileutils
-  highline
-  json
-  mocha
-  pry
-  rake
-  rspec