codewars 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f5e4e5fc5d3914c287de427edddb75aae6ceb5
-  data.tar.gz: 9c311240e76d668cfaa22901db04bcddd147db19
+  metadata.gz: 2cd0746ec8b08a3b1b025438cb6e18a8889b03f8
+  data.tar.gz: 8ece0ca9d47fbd804bfa38f72a7a44fff36b7e9c
 SHA512:
-  metadata.gz: f65727fe081d5e766eb370fb19d6b3be6a413d6a2ded9f765d3bd778052b5cb87a7266d877d517efed90dbe12b633641012f248355a715f04429fa44b70233ad
-  data.tar.gz: 827374254b2bafee4bc1a871311af3c3c4487fc30d45cddf7462c61c6e99b5731709b1b5834f7f1853960e82336465e3359a57b27a4671533f69078d7535104b
+  metadata.gz: 4df508ffa205cdb6bc6b47b9002458df09d61fd2351c62260e330d0c971d97c3f0a2943c47cc527bcf9338c59eb5dfc83cf63facaacfb0febf0eafa5c8890ec9
+  data.tar.gz: 13e16751a845fbca0d8dcbfa03778ee6892b91e6c365b9cd0ce6dc157663b29a4e9ff3a33548cc529ac9282d9a809d9cf1dc3c8e0b7aedee91626f105b56f2fc

data/README.md

@@ -2,44 +2,28 @@
 
 ## Installation
 
-Execute `gem install codewars`
+1. Make sure that Ruby is installed `ruby -v`
+2. Run `gem install codewars`
 
 ## Usage
 
-Execute `codewars help` to see all available commands.
+Run `codewars help` to see all available commands.
 
-1. Set an API ACCESS TOKEN from the codewars website (https://www.codewars.com/users/edit) `codewars config key your-secret-key`
-2. Set a language you want to use `codewars config language ruby|javascript|etc`
-3. Choose a kata which you want to solve `codewars train`
-4. Start solving the kata `codewars train name-of-kata`
-5. Go to created folder `cd name-of-kata/language/`
-6. Look at description.md (use a Markdown viewer)
-7. According to the description of the kata change or create tests using your favorite test framework
-8. Change the solution.* file so the tests become green
-9. Upload the solution and wait for a response of tests on the server `codewars attempt`
-10. If there are no mistakes finalize the previously attempted solution `codewars finalize`
-11. Look at results of other people, rest and pick up another kata or the same kata but using another language
+1. Set TOKEN from https://www.codewars.com/users/edit `codewars config key your-secret-key`
+2. Set a language `codewars config language ruby|javascript|etc`
+3. Choose a kata `codewars train`
+4. Start solving `codewars train name-of-kata`
+5. Open a folder `cd name-of-kata/language/`
+6. Create tests according on description.md
+7. Make the tests green
+8. Attempt the solution on the server `codewars attempt`
+9. Refactor your code
+10. Finalize `codewars finalize`
 
 ### Problems
 
 Not sure for purpose or not but API sometimes caches a request for the next kata. To solve the problem go to the link http://www.codewars.com/dashboard in your browser.
 
-## Development
-
-### TO-DO
-
-- [ ] Refactor anything you can
-- [ ] Add travis, coveralls, etc
-- [ ] After `codewars finalize` show a link with the language of submission
-- [ ] Change the name of commands: attempt and finalize (join them to one command?)
-- [ ] Rename 'config' command? Maybe to 'set'?
-- [ ] Add options to commands that can be added: --strategy=something, --language=something, etc.
-- [ ] Make 100% coverage in simplecov
-- [ ] Write RSpec module tests
-- [ ] Divide description.md to task.md + info.yml?
-- [ ] Refactor features so stubbing (mocking) become more obvious
-- [ ] Make a bug report "Author's name in an API response is yours name"
-
 ## Contributing
 
 Bug reports, pull requests and ideas are welcome!

data/codewars.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'aruba', '~> 0.11'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rspec-mocks'
+  spec.add_development_dependency 'rspec-core'
 
   spec.add_dependency 'codewars_api', '~> 0.2'
   spec.add_dependency 'thor', '~> 0.19'

data/lib/codewars.rb

@@ -1,4 +1,4 @@
-CODEWARS_URL = 'http://www.codewars.com'
+CODEWARS_URL = 'http://www.codewars.com'.freeze
 
 require 'codewars_api'
 require 'thor'

data/lib/codewars/attempt.rb

@@ -1,15 +1,14 @@
 module Codewars
   class Attempt < Thor
-    def initialize
+    def initialize(client)
       api_key = Configuration.option('api_key')
-      fail Thor::Error, 'You should set an api-key to use this command' unless api_key
+      raise Thor::Error, 'You should set an api-key to use this command' unless api_key
 
       desc = Description.new
       project_id = desc.take_value_from_file(/Project ID: (.+)/, 'Project ID')
       solution_id = desc.take_value_from_file(/Solution ID: (.+)/, 'Solution ID')
       solution = read_solution_file
 
-      client = CodewarsApi::Client.new(api_key: api_key)
       attempt = client.attempt_solution(
         project_id: project_id,
         solution_id: solution_id,
@@ -28,7 +27,7 @@ module Codewars
       file_name = 'solution.*'
       solution_filename = Dir.glob(file_name).first
       unless solution_filename
-        fail Thor::Error, "The file '#{file_name}' has not been found in the current directory."
+        raise Thor::Error, "The file '#{file_name}' has not been found in the current directory."
       end
       File.read File.expand_path(solution_filename)
     end
@@ -45,7 +44,7 @@ module Codewars
 
     def handle_deferred_response(deferred_response)
       if deferred_response.nil? || !deferred_response.success
-        fail Thor::Error, "Can't get a result of tests on the server. Try it again."
+        raise Thor::Error, "Can't get a result of tests on the server. Try it again."
       end
 
       if deferred_response.valid
@@ -53,7 +52,7 @@ module Codewars
         say 'Type to finalize the solution: ' + set_color('codewars finalize', :blue, true)
       else
         error 'The solution has not passed tests on the server. Response:'
-        fail Thor::Error, set_color(deferred_response.reason, :red)
+        raise Thor::Error, set_color(deferred_response.reason, :red)
       end
     end
   end

data/lib/codewars/cli.rb

@@ -6,20 +6,32 @@ module Codewars
     desc 'train', 'Train a next kata'
     def train(id_or_slug = nil)
       if id_or_slug
-        TrainSpecific.new(id_or_slug)
+        TrainSpecific.new(client, id_or_slug)
       else
-        TrainNext.new
+        TrainNext.new(client)
       end
     end
 
     desc 'attempt', 'Send a solution and get a result'
     def attempt
-      Attempt.new
+      Attempt.new(client)
     end
 
     desc 'finalize', 'Finalize the previously attempted solution'
     def finalize
-      Finalize.new
+      Finalize.new(client)
+    end
+
+    private
+
+    def client
+      api_key = read_api_key
+      CodewarsApi::Client.new(api_key: api_key)
+    end
+
+    def read_api_key
+      api_key = Configuration.option('api_key')
+      api_key || raise(Thor::Error, 'You should set an api-key to use this command')
     end
   end
 end

data/lib/codewars/configuration.rb

@@ -2,7 +2,7 @@ require 'yaml'
 
 module Codewars
   class Configuration
-    CONFIG_NAME = '.codewarsrc'
+    CONFIG_NAME = '.codewarsrc'.freeze
 
     def self.write_option_to_config(option, value)
       config_hash = config

data/lib/codewars/description.rb

@@ -1,13 +1,13 @@
 module Codewars
   class Description < Thor
-    DESCRIPTION_FILE_NAME = 'description.md'
+    DESCRIPTION_FILE_NAME = 'description.md'.freeze
 
     no_commands do
       def take_value_from_file(regex_with_group, param_key)
         @data ||= read_file(DESCRIPTION_FILE_NAME)
         param = @data.match(regex_with_group)
         unless param
-          fail Thor::Error, "'#{param_key}' has not been found in the 'description.md' file."
+          raise Thor::Error, "'#{param_key}' has not been found in the 'description.md' file."
         end
         param[1]
       end
@@ -29,7 +29,7 @@ module Codewars
     def read_file(file_name)
       desc_path = File.expand_path(file_name)
       unless File.exist? desc_path
-        fail Thor::Error, "The file '#{file_name}' has not been found in the current directory."
+        raise Thor::Error, "The file '#{file_name}' has not been found in the current directory."
       end
       File.read(desc_path)
     end

data/lib/codewars/finalize.rb

@@ -1,15 +1,11 @@
 module Codewars
   class Finalize < Thor
-    def initialize
-      api_key = Configuration.option('api_key')
-      fail Thor::Error, 'You should set an api-key to use this command' unless api_key
-
+    def initialize(client)
       desc = Description.new
       slug = desc.take_value_from_file(/Slug: (.+)/, 'Slug')
       project_id = desc.take_value_from_file(/Project ID: (.+)/, 'Project ID')
       solution_id = desc.take_value_from_file(/Solution ID: (.+)/, 'Solution ID')
 
-      client = CodewarsApi::Client.new(api_key: api_key)
       result = client.finalize_solution(
         project_id: project_id,
         solution_id: solution_id
@@ -24,7 +20,7 @@ module Codewars
         say 'Your solution has been finalized.'
         say "Other solutions can be found here: #{CODEWARS_URL}/kata/#{slug}/solutions/"
       else
-        fail Thor::Error, 'Something went wrong. Try to sumbit the solution again.'
+        raise Thor::Error, 'Something went wrong. Try to sumbit the solution again.'
       end
     end
   end

data/lib/codewars/language_extensions.rb

@@ -8,7 +8,7 @@ module Codewars
       'haskell' => 'hs',
       'csharp' => 'cs',
       'closure' => 'clj'
-    }
+    }.freeze
 
     def self.get(language)
       extension = MAPPING[language]

data/lib/codewars/runner.rb

@@ -1,7 +1,5 @@
 require 'codewars'
 
-# to use Webmock we need the Runner class
-# https://github.com/cucumber/aruba#testing-ruby-cli-programs-without-spawning-a-new-ruby-process
 module Codewars
   class Runner
     def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)

data/lib/codewars/train_next.rb

@@ -1,14 +1,9 @@
 module Codewars
   class TrainNext < Thor
-    def initialize
-      message = []
-      api_key = Configuration.option('api_key')
-      message.push 'You should set an api-key to use this command' unless api_key
+    def initialize(client)
       language = Configuration.option('language')
-      message.push 'You should set an default language to use this command' unless language
-      fail Thor::Error, message.join("\n") unless message.empty?
+      raise Thor::Error, 'You should set an default language to use this command' unless language
 
-      client = CodewarsApi::Client.new(api_key: api_key)
       kata = client.train_next_kata(
         language: language.split(',').first,
         peek: 'true',
@@ -21,7 +16,7 @@ module Codewars
 
     def handle_next_kata(kata)
       if !kata.success && (kata.reason.eql? 'unauthorized')
-        fail Thor::Error, 'Wrong api key'
+        raise Thor::Error, 'Wrong api key'
       end
       Description.new.print_kata_desc(kata)
     end

data/lib/codewars/train_specific.rb

@@ -3,21 +3,15 @@ require 'fileutils'
 
 module Codewars
   class TrainSpecific < Thor
-    def initialize(id_or_slug)
-      message = []
-      api_key = Configuration.option('api_key')
-      message.push 'You should set an api-key to use this command' unless api_key
-      languages = Configuration.option('language')
-      message.push 'You should set an default language to use this command' unless languages
-      fail Thor::Error, message.join("\n") unless message.empty?
+    def initialize(client, id_or_slug)
+      language = Configuration.option('language')
+      raise Thor::Error, 'You should set an default language to use this command' unless language
 
+      language = language.split(',').sample # pick a random language
       say "Starting the '#{id_or_slug}' kata."
 
-      client = CodewarsApi::Client.new(api_key: api_key)
-      languages.split(',').each do |language|
-        kata = client.train_specific_kata(language: language, id_or_slug: id_or_slug) rescue next
-        handle_specific_kata(kata, language)
-      end
+      kata = client.train_specific_kata(language: language, id_or_slug: id_or_slug)
+      handle_specific_kata(kata, language)
     end
 
     private
@@ -37,7 +31,7 @@ module Codewars
       FileUtils.mkdir_p "#{dir_to_write}/#{language}"
       file_path = File.expand_path("#{dir_to_write}/#{language}/#{file_name}")
       relative_path = "./#{slug}/#{language}/#{file_name}"
-      fail Thor::Error, "'#{relative_path}' already exists." if File.exist? file_path
+      raise Thor::Error, "'#{relative_path}' already exists." if File.exist? file_path
 
       File.write(file_path, content)
       say "'#{relative_path}' has been created."
@@ -49,7 +43,7 @@ module Codewars
       b.local_variable_set(:language, language)
       b.local_variable_set(:codewars_url, CODEWARS_URL)
       template_path = File.expand_path("#{File.dirname(__FILE__)}/description_template.erb")
-      ERB.new(File.read template_path).result(b)
+      ERB.new(File.read(template_path)).result(b)
     end
   end
 end

data/lib/codewars/version.rb

@@ -1,3 +1,3 @@
 module Codewars
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codewars
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Evgeny Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="