comet 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7891c00e84fa9da8333fa05249a587dab2a737a
-  data.tar.gz: ab3c3d48574ff2cdfc4c33ea4eaca39e53e20100
+  metadata.gz: 26089d2f3a83ac8aa43a80a85d8be0b61f731b4e
+  data.tar.gz: dfa7564ca9f58ac5dc9550443178d889c705ee4b
 SHA512:
-  metadata.gz: 581330f97cbc0aae71682861aa0ae79feaafeea32c186c101eecc9db6551917c9bc96bb04a230530d0c3b60552f0f0822ec845693c79b14470d26b1c6533de4e
-  data.tar.gz: b1538d7dfdecda2facdb8791a1b8082edfd05310661e23533faef0a95110b4c66c7a71ce1fc70bee6ea34778394959ec9de64fd54a3ae93307d377bc594906e3
+  metadata.gz: e58c8ce43ac20e2d7ef34c7381e8f0e4b36dc9ee5db18604273ea76047dc19ec9074b47202a3e05d8e2b494c88f11475ef1ba19f003a39197f8592fba69a105a
+  data.tar.gz: 659f2e219fd4bd5b3c1022e6fbb3fcf9094dfedfab2e39ab92abcc48e829c137cac63abdbf1b61475e14edb1240118abe5c41ffd566516245f12a85bf1cae856

data/bin/comet

@@ -32,9 +32,16 @@ command :list do |c|
     if challenges.empty?
       puts "No challenges available."
     else
-      challenges.each do |challenge|
-        printf("\e[33m%4d\e[0m) \e[32m%s\e[0m: %s\n",
-          challenge[:id], challenge[:topic], challenge[:name])
+      sorted_challenges = challenges.sort_by do |challenge|
+        [challenge[:topic_name], challenge[:difficulty]]
+      end
+
+      sorted_challenges.each do |challenge|
+        printf("(%4d) \e[34m%s\e[0m: %s (%s)\n",
+          challenge[:id],
+          challenge[:topic_name],
+          challenge[:name],
+          difficulty_to_string(challenge[:difficulty]))
       end
     end
   end
@@ -50,28 +57,48 @@ command :fetch do |c|
     info = { 'id' => challenge_id.to_i, 'file_name' => "#{challenge.slug}.rb" }
     info_file = File.join(directory, '.challenge')
     File.write(info_file, info.to_yaml)
+
+    puts "Downloaded challenge to #{directory}."
   end
 end
 
 desc 'Submit challenge'
 command :submit do |c|
   c.action do |global_options, options, args|
-    info_file = File.join(Dir.pwd, '.challenge')
-
-    if File.exists?(info_file)
-      info = YAML.load(File.read(info_file))
-
-      challenge_id = info['id']
-      solution_file = File.join(Dir.pwd, info['file_name'])
-
-      if File.exists?(solution_file)
-        Comet::API.submit(@config, challenge_id, solution_file)
-      else
-        puts "Missing solution file (#{solution_file})."
-        exit 1
+    require 'rest_client'
+    require 'tmpdir'
+
+    current_dir = Dir.pwd
+    challenge_file = File.join(current_dir, '.challenge')
+
+    if File.exists?(challenge_file)
+      challenge_info = YAML.load(File.read(challenge_file))
+      lib_dir = File.join(current_dir, 'lib')
+      slug = File.basename(current_dir)
+
+      Dir.mktmpdir do |tmpdir|
+        submission_file = File.join(tmpdir, 'submission.tar.gz')
+        if system("tar zcf #{submission_file} -C #{lib_dir} .")
+          payload = {
+            submission: {
+              challenge_id: challenge_info['id'],
+              archive: File.new(submission_file)
+            }
+          }
+
+          headers = { 'Authorization' => "Token #{@config['token']}" }
+
+          RestClient.post("#{@config['server']}/api/v1/submissions.json", payload, headers)
+
+          puts "Submitted solution for #{slug}."
+        else
+          puts "Unable to create submission archive."
+          exit 1
+        end
       end
+
     else
-      puts "This is not a challenge directory."
+      puts "Not a challenge directory."
       exit 1
     end
   end

data/lib/comet/version.rb

@@ -1,3 +1,3 @@
 module Comet
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/helpers.rb

@@ -13,3 +13,16 @@ def prompt_for_setting(name, existing_settings)
     existing_settings[name]
   end
 end
+
+def difficulty_to_string(difficult_rating)
+  case difficult_rating
+  when 1
+    "\e[32measy\e[0m"
+  when 2
+    "\e[33mintermediate\e[0m"
+  when 3
+    "\e[31mhard\e[0m"
+  else
+    ""
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comet
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: adam.sheehan@launchacademy.com
 executables: