comet 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 311404210d27d916830617aa2b22cec4ffc8b4d5
-  data.tar.gz: f4e135e0cde0a242b802a088e643eaa50a4f4ca7
+  metadata.gz: a7891c00e84fa9da8333fa05249a587dab2a737a
+  data.tar.gz: ab3c3d48574ff2cdfc4c33ea4eaca39e53e20100
 SHA512:
-  metadata.gz: 554afd290442793b4525442a4e2a621d2b52bc20e59c1f65751e3beff5a6911b8352e2f35df917e488786cfc21f28d5636f46f02d19c313bac1b0c39658d7bbe
-  data.tar.gz: 878b45b3e72b9b2f4cb0f7b271ab3df86c9aaa6e34a997e243f00184ed880aa00f285aa3c615530c6c4521156f8d50968326d54aedf40ed25a788dd2001f20c3
+  metadata.gz: 581330f97cbc0aae71682861aa0ae79feaafeea32c186c101eecc9db6551917c9bc96bb04a230530d0c3b60552f0f0822ec845693c79b14470d26b1c6533de4e
+  data.tar.gz: b1538d7dfdecda2facdb8791a1b8082edfd05310661e23533faef0a95110b4c66c7a71ce1fc70bee6ea34778394959ec9de64fd54a3ae93307d377bc594906e3

data/bin/comet

@@ -2,6 +2,7 @@
 require 'gli'
 require 'yaml'
 require 'comet'
+require 'helpers'
 
 include GLI::App
 
@@ -13,16 +14,11 @@ desc 'Initialize the current directory as a comet project directory'
 skips_pre
 command :init do |c|
   c.action do |global_options, options, args|
-    answers = {}
+    answers = Comet::Init.find_config(Dir.pwd) || {}
 
-    print 'E-mail: '
-    answers['email'] = gets.chomp
-
-    print 'Token: '
-    answers['token'] = gets.chomp
-
-    print 'Server: '
-    answers['server'] = gets.chomp
+    ['email', 'token', 'server'].each do |setting|
+      answers[setting] = prompt_for_setting(setting, answers)
+    end
 
     Comet::Init.init_project_dir(Dir.pwd, answers)
   end
@@ -37,7 +33,8 @@ command :list do |c|
       puts "No challenges available."
     else
       challenges.each do |challenge|
-        puts "#{challenge[:id]}: #{challenge[:name]}"
+        printf("\e[33m%4d\e[0m) \e[32m%s\e[0m: %s\n",
+          challenge[:id], challenge[:topic], challenge[:name])
       end
     end
   end
@@ -94,7 +91,7 @@ end
 on_error do |exception|
   # Error logic here
   # return false to skip default error handling
-  true
+  raise exception
 end
 
 exit run(ARGV)

data/lib/comet/api.rb

@@ -4,7 +4,7 @@ require 'json'
 module Comet
   class API
     def self.get_challenges(config)
-      response = request_with_token("http://#{config['server']}/api/v1/challenges.json",
+      response = request_with_token("#{config['server']}/api/v1/challenges.json",
         config['token'])
 
       results = JSON.parse(response.body, symbolize_names: true)
@@ -12,7 +12,7 @@ module Comet
     end
 
     def self.get_challenge(config, id)
-      response = request_with_token("http://#{config['server']}/api/v1/challenges/#{id}.json",
+      response = request_with_token("#{config['server']}/api/v1/challenges/#{id}.json",
         config['token'])
 
       if response.code == '200'
@@ -40,7 +40,7 @@ module Comet
     end
 
     def self.submit(config, challenge_id, file_path)
-      uri = URI("http://#{config['server']}/api/v1/submissions.json")
+      uri = URI("#{config['server']}/api/v1/submissions.json")
       req = Net::HTTP::Post.new(uri)
 
       file_name = File.basename(file_path)
@@ -64,7 +64,7 @@ module Comet
     def self.request_with_token(url, token)
       uri = URI(url)
 
-      request = Net::HTTP::Get.new(uri)
+      request = Net::HTTP::Get.new(uri.request_uri)
       request['Authorization'] = "Token #{token}"
       response = Net::HTTP.start(uri.hostname, uri.port) do |http|
         http.request(request)

data/lib/comet/init.rb

@@ -23,20 +23,27 @@ module Comet
       def init_project_dir(dirname, user_answers)
         config_file = File.join(dirname, '.comet')
 
-        unless File.exists?(config_file)
-          config = {
-            'email' => user_answers['email'],
-            'token' => user_answers['token'],
-            'server' => user_answers['server']
-          }
-
-          File.write(config_file, config.to_yaml)
+        if File.exists?(config_file)
+          existing_settings = YAML.load(File.read(config_file))
+        else
+          existing_settings = {}
         end
+
+        settings = existing_settings.merge(user_answers)
+        settings['server'] = normalize_url(settings['server']) if settings['server']
+
+        File.write(config_file, settings.to_yaml)
       end
 
       private
 
-
+      def normalize_url(input)
+        unless input.include?('://')
+          'http://' + input
+        else
+          input
+        end
+      end
     end
   end
 end

data/lib/comet/version.rb

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

data/lib/helpers.rb

@@ -0,0 +1,15 @@
+def prompt_for_setting(name, existing_settings)
+  if existing_settings.has_key?(name)
+    print "#{name.capitalize} (#{existing_settings[name]}): "
+  else
+    print "#{name.capitalize}: "
+  end
+
+  input = gets.chomp.strip
+
+  if !input.empty?
+    input
+  else
+    existing_settings[name]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,6 +81,7 @@ files:
 - lib/comet/challenge.rb
 - lib/comet/init.rb
 - lib/comet/version.rb
+- lib/helpers.rb
 - README.rdoc
 - comet.rdoc
 homepage: http://www.launchacademy.com