comet 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b6d2a5d333cf1258c4665f213ca49595393708d
-  data.tar.gz: fea2e7915350a93ee46419e353c12d600954178a
+  metadata.gz: 49ebcc395830a1dc6cc0670c0d199a04e2fcd0bc
+  data.tar.gz: cfa6efb0f36fadf6531fe9ec992786ccdda26fb8
 SHA512:
-  metadata.gz: 2454cc479c5c0e5ae218c1fdd5894d0cecdde08d92f2c41da8301a2dd1af112d49e273ca505b07ce6ced90cdde1f941e077b86948380e5711c85fdbd7e856124
-  data.tar.gz: 381073006479c4e9bd37d25bf2e46383fd897f42babf401c8db469533da4a40270c90f6b4136cf125e62ef57c90a36590b6203000bb14eed2a2e5ae5fbbcc6d2
+  metadata.gz: c3116fb988de10b2928da84610bc1dddc38d45e35befaf9798ed2fb92e8d347350b4c57dce645619b6b79f81dbc7d3610b2e48b80a13673ab8a584f614782dcc
+  data.tar.gz: 0b3281a3042f811813172cbc0c0a4455edbd7c7ebaa34834b3e08b8b86b282ef123f883c1813c61ce4c363a1aa63a5d849e7a1a8da832103b14bdcb62ef99f8a

data/bin/comet

@@ -1,152 +1,4 @@
 #!/usr/bin/env ruby
-require 'gli'
-require 'yaml'
-require 'comet'
-require 'helpers'
-require 'openssl'
-require 'shellwords'
-
-include GLI::App
-
-program_desc 'Test your Ruby skills! Download Ruby exercises and submit your solutions for grading.'
-
-version Comet::VERSION
-
-desc 'Initialize the current directory as a comet project directory'
-skips_pre
-command :init do |c|
-  c.action do |global_options, options, args|
-    answers = Comet::Init.find_config(Dir.pwd) || {}
-
-    ['email', 'token', 'server'].each do |setting|
-      answers[setting] = prompt_for_setting(setting, answers)
-    end
-
-    Comet::Init.init_project_dir(Dir.pwd, answers)
-  end
-end
-
-desc 'List the available challenges'
-command :list do |c|
-  c.action do |global_options,options,args|
-    challenges = Comet::Challenge.list(@config)
-
-    if challenges.empty?
-      puts "No challenges available."
-    else
-      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
-end
-
-desc 'Download a challenge'
-command :fetch do |c|
-  c.action do |global_options, options, args|
-    challenge_id = args.first
-    challenge = Comet::Challenge.find(@config, challenge_id)
-    directory = challenge.download
-
-    info_file = File.join(directory, '.kata')
-    info = YAML.load(File.read(info_file))
-    info['id'] = challenge_id.to_i
-
-    File.write(info_file, info.to_yaml)
-
-    puts "Downloaded kata to #{directory}."
-  end
-end
-
-desc 'Run test suite'
-command :test do |c|
-  c.action do |global_options, options, args|
-    current_dir = Dir.pwd
-    info_file = File.join(current_dir, '.kata')
-
-    if File.exists?(info_file)
-      kata_info = YAML.load(File.read(info_file))
 
-      case kata_info['test_runner']
-      when 'ruby'
-        runner = 'ruby'
-      when 'rspec'
-        runner = 'rspec --color --fail-fast'
-      else
-        runner = 'ruby'
-      end
-
-      slug = File.basename(current_dir)
-      test_file = File.join(current_dir, 'test', "#{slug}_test.rb")
-
-      exec("#{runner} #{test_file}")
-    else
-      puts "Not a challenge directory."
-    end
-  end
-end
-
-desc 'Submit challenge'
-command :submit do |c|
-  c.action do |global_options, options, args|
-    require 'rest_client'
-    require 'tmpdir'
-
-    current_dir = Dir.pwd
-    kata_file = File.join(current_dir, '.kata')
-
-    if File.exists?(kata_file)
-      kata_info = YAML.load(File.read(kata_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 #{Shellwords.escape(submission_file)} -C #{Shellwords.escape(lib_dir)} .")
-          payload = {
-            submission: {
-              challenge_id: kata_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 "Not a kata directory."
-      exit 1
-    end
-  end
-end
-
-pre do |global,command,options,args|
-  @config = Comet::Init.find_config(Dir.pwd)
-  !@config.nil?
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  raise exception
-end
-
-exit run(ARGV)
+require 'comet'
+exit Comet::Runner.go(ARGV, Dir.pwd)

data/lib/comet.rb

@@ -1,4 +1,7 @@
-require 'comet/api.rb'
-require 'comet/challenge.rb'
-require 'comet/version.rb'
-require 'comet/init.rb'
+require 'comet/exceptions'
+require 'comet/api'
+require 'comet/kata'
+require 'comet/version'
+require 'comet/init'
+require 'comet/tester'
+require 'comet/runner'

data/lib/comet/api.rb

@@ -1,9 +1,17 @@
 require 'net/http'
 require 'json'
+require 'rest-client'
 
 module Comet
   class API
-    def self.get_challenges(config)
+    RUBYGEMS_URL = 'https://rubygems.org/api/v1/gems/comet.json'
+
+    def self.latest_gem_version
+      results = JSON.parse(RestClient.get(RUBYGEMS_URL))
+      results['version']
+    end
+
+    def self.get_katas(config)
       response = request_with_token("#{config['server']}/api/v1/challenges.json",
         config['token'])
 
@@ -11,11 +19,11 @@ module Comet
       results[:challenges]
     end
 
-    def self.get_challenge(config, id)
+    def self.get_kata(config, id)
       response = request_with_token("#{config['server']}/api/v1/challenges/#{id}.json",
         config['token'])
 
-      if response.code == '200'
+      if response.code == 200
         results = JSON.parse(response.body, symbolize_names: true)
         results[:challenge]
       else
@@ -39,7 +47,7 @@ module Comet
       dest
     end
 
-    def self.submit(config, challenge_id, file_path)
+    def self.submit(config, kata_id, file_path)
       uri = URI("#{config['server']}/api/v1/submissions.json")
       req = Net::HTTP::Post.new(uri)
 
@@ -49,7 +57,7 @@ module Comet
       req['Authorization'] = "Token #{config['token']}"
 
       req.set_form_data({
-          'submission[challenge_id]' => challenge_id,
+          'submission[challenge_id]' => kata_id,
           'submission[file_name]' => file_name,
           'submission[body]' => body
         })
@@ -62,15 +70,11 @@ module Comet
     private
 
     def self.request_with_token(url, token)
-      uri = URI(url)
-
-      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)
+      begin
+        RestClient.get(url, { 'Authorization' => "Token #{token}" })
+      rescue RestClient::Unauthorized => e
+        raise Comet::UnauthorizedError
       end
-
-      response
     end
   end
 end

data/lib/comet/exceptions.rb

@@ -0,0 +1,3 @@
+module Comet
+  class UnauthorizedError < StandardError; end
+end

data/lib/comet/kata.rb

@@ -0,0 +1,50 @@
+require 'shellwords'
+
+class Comet::Kata
+  attr_reader :id, :name, :slug, :download_link, :basedir
+
+  def initialize(params)
+    @id = params[:id]
+    @name = params[:name]
+    @slug = params[:slug]
+    @download_link = params[:download_link]
+    @basedir = params[:basedir]
+  end
+
+  def download
+    archive = Comet::API.download_archive(download_link, File.join(basedir, "#{slug}.tar.gz"))
+    `tar zxf #{Shellwords.escape(archive)} -C #{Shellwords.escape(basedir)}`
+    File.delete(archive)
+    File.join(basedir, slug)
+  end
+
+  def self.list(config)
+    Comet::API.get_katas(config)
+  end
+
+  def self.find(config, id)
+    kata_info = Comet::API.get_kata(config, id)
+
+    if kata_info.nil?
+      raise ArgumentError.new("Could not find kata with id = #{id}")
+    else
+      Comet::Kata.new(kata_info.merge({ basedir: config['basedir'] }))
+    end
+  end
+
+  def self.find_kata_dir(dir)
+    kata_file = File.join(dir, '.kata')
+
+    if File.exists?(kata_file)
+      kata_file
+    else
+      parent_dir = File.dirname(dir)
+
+      if parent_dir != '/' && parent_dir != '.'
+        find_kata_dir(parent_dir)
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/comet/runner.rb

@@ -0,0 +1,149 @@
+require 'gli'
+require 'yaml'
+require 'helpers'
+require 'openssl'
+require 'shellwords'
+
+module Comet
+  class Runner
+    extend GLI::App
+    version Comet::VERSION
+
+    def self.go(args, cwd)
+      program_desc 'Test your Ruby skills! Download Ruby exercises and submit your solutions for grading.'
+
+      desc 'Initialize the current directory as a comet project directory'
+      skips_pre
+      command :init do |c|
+        c.action do |global_options, options, args|
+          answers = Comet::Init.find_config(cwd) || {}
+
+          ['email', 'token', 'server'].each do |setting|
+            answers[setting] = prompt_for_setting(setting, answers)
+          end
+
+          Comet::Init.init_project_dir(cwd, answers)
+        end
+      end
+
+      desc 'List the available katas'
+      command :list do |c|
+        c.action do |global_options,options,args|
+          katas = Comet::Kata.list(@config)
+
+          if katas.empty?
+            puts "No katas available."
+          else
+            katas.each do |kata|
+              printf("(%4d) \e[34m%s\e[0m: %s (%s)\n",
+                kata[:id],
+                kata[:topic_name],
+                kata[:name],
+                difficulty_to_string(kata[:difficulty]))
+            end
+          end
+        end
+      end
+
+      desc 'Download a kata'
+      command :fetch do |c|
+        c.action do |global_options, options, args|
+          kata_id = args.first
+          kata = Comet::Kata.find(@config, kata_id)
+          directory = kata.download
+
+          info_file = File.join(directory, '.kata')
+          info = YAML.load(File.read(info_file))
+          info['id'] = kata_id.to_i
+
+          File.write(info_file, info.to_yaml)
+
+          puts "Downloaded kata to #{directory}."
+        end
+      end
+
+      desc 'Run test suite'
+      command :test do |c|
+        c.action do |global_options, options, args|
+          kata_file = Comet::Kata.find_kata_dir(cwd)
+
+          if !kata_file.nil?
+            Comet::Tester.run_test_suite(kata_file)
+          else
+            $stderr.puts "\e[31mNot a kata directory.\e[0m"
+          end
+        end
+      end
+
+      desc 'Submit kata'
+      command :submit do |c|
+        c.action do |global_options, options, args|
+          require 'rest_client'
+          require 'tmpdir'
+
+          current_dir = cwd
+          kata_file = File.join(current_dir, '.kata')
+
+          if File.exists?(kata_file)
+            kata_info = YAML.load(File.read(kata_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 #{Shellwords.escape(submission_file)} -C #{Shellwords.escape(lib_dir)} .")
+                payload = {
+                  submission: {
+                    challenge_id: kata_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 "Not a kata directory."
+            exit 1
+          end
+        end
+      end
+
+      pre do |global,command,options,args|
+        # Only query for newer versions when running commands that makes
+        # network calls.
+        if [:submit, :fetch, :list].include?(command.name)
+          latest_version = Comet::API.latest_gem_version
+          if Comet::Version.is_more_recent(latest_version)
+            $stderr.puts "\e[33mNOTICE: An updated version of comet exists. " +
+              "Run `gem update comet` to upgrade.\e[0m"
+          end
+        end
+
+        @config = Comet::Init.find_config(cwd)
+        !@config.nil?
+      end
+
+      on_error do |exception|
+        case exception
+        when Comet::UnauthorizedError
+          $stderr.puts "\e[31mERROR: Invalid credentials. " +
+            "Verify that the e-mail, token, and server are correctly " +
+            "configured in #{File.join(@config['basedir'], '.comet')}\e[0m"
+        else
+          raise exception
+        end
+      end
+
+      run(args)
+    end
+  end
+end

data/lib/comet/tester.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+
+class Comet::Tester
+  def self.run_test_suite(kata_file)
+    kata_info = YAML.load(File.read(kata_file))
+    runner = test_runner_command(kata_info['test_runner'])
+
+    kata_dir = File.dirname(kata_file)
+    slug = File.basename(kata_dir)
+    test_file = File.join(kata_dir, 'test', "#{slug}_test.rb")
+
+    Kernel.exec("#{runner} #{test_file}")
+  end
+
+  private
+
+  def self.test_runner_command(key)
+    case key
+    when 'ruby'
+      'ruby'
+    when 'rspec'
+      'rspec --color --fail-fast'
+    else
+      key
+    end
+  end
+end

data/lib/comet/version.rb

@@ -1,3 +1,47 @@
 module Comet
-  VERSION = '0.0.7'
+  class Version
+    def self.build(major, minor, patch)
+      "#{major}.#{minor}.#{patch}"
+    end
+
+    def self.parse(string)
+      version_levels = string.split('.').map { |version| version.to_i }
+      [version_levels[0], version_levels[1], version_levels[2]]
+    end
+
+    def self.compare(version_a, version_b)
+      a_major, a_minor, a_patch = parse(version_a)
+      b_major, b_minor, b_patch = parse(version_b)
+
+      if a_major > b_major
+        1
+      elsif a_major < b_major
+        -1
+      else
+        if a_minor > b_minor
+          1
+        elsif a_minor < b_minor
+          -1
+        else
+          if a_patch > b_patch
+            1
+          elsif a_patch < b_patch
+            -1
+          else
+            0
+          end
+        end
+      end
+    end
+
+    def self.is_more_recent(other_version)
+      compare(VERSION, other_version) < 0
+    end
+  end
+
+  MAJOR_VERSION = 0
+  MINOR_VERSION = 0
+  PATCH_LEVEL = 8
+
+  VERSION = Version.build(MAJOR_VERSION, MINOR_VERSION, PATCH_LEVEL)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,8 +95,11 @@ files:
 - comet.rdoc
 - lib/comet.rb
 - lib/comet/api.rb
-- lib/comet/challenge.rb
+- lib/comet/exceptions.rb
 - lib/comet/init.rb
+- lib/comet/kata.rb
+- lib/comet/runner.rb
+- lib/comet/tester.rb
 - lib/comet/version.rb
 - lib/helpers.rb
 homepage: http://www.launchacademy.com

data/lib/comet/challenge.rb

@@ -1,36 +0,0 @@
-require 'shellwords'
-
-class Comet::Challenge
-  attr_reader :id, :name, :slug, :download_link, :basedir
-
-  def initialize(params)
-    @id = params[:id]
-    @name = params[:name]
-    @slug = params[:slug]
-    @download_link = params[:download_link]
-    @basedir = params[:basedir]
-  end
-
-  def download
-    archive = Comet::API.download_archive(download_link, File.join(basedir, "#{slug}.tar.gz"))
-    `tar zxf #{Shellwords.escape(archive)} -C #{Shellwords.escape(basedir)}`
-    File.delete(archive)
-    File.join(basedir, slug)
-  end
-
-  class << self
-    def list(config)
-      Comet::API.get_challenges(config)
-    end
-
-    def find(config, id)
-      challenge_info = Comet::API.get_challenge(config, id)
-
-      if challenge_info.nil?
-        raise ArgumentError.new("Could not find challenge with id = #{id}")
-      else
-        Comet::Challenge.new(challenge_info.merge({ basedir: config['basedir'] }))
-      end
-    end
-  end
-end