trackler 2.1.0.48 → 2.1.0.49

data/tracks/ruby/exercises/collatz-conjecture/.meta/solutions/collatz_conjecture.rb

@@ -0,0 +1,22 @@
+module BookKeeping
+  VERSION = 1
+end
+
+module CollatzConjecture
+  def self.steps(num)
+    raise ArgumentError if num < 1
+    n = num
+    steps = 0
+    until n == 1
+      steps += 1
+      if n.even?
+        n /= 2
+      else
+        n = 3 * n + 1
+      end
+    end
+    steps
+  end
+end
+
+

data/tracks/ruby/exercises/collatz-conjecture/collatz_conjecture_test.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+require 'minitest/autorun'
+require_relative 'collatz_conjecture'
+
+# Common test data version: 1.1.1 25c4479
+class CollatzConjectureTest < Minitest::Test
+  def test_zero_steps_for_one
+    # skip
+    assert_equal 0, CollatzConjecture.steps(1)
+  end
+
+  def test_divide_if_even
+    skip
+    assert_equal 4, CollatzConjecture.steps(16)
+  end
+
+  def test_even_and_odd_steps
+    skip
+    assert_equal 9, CollatzConjecture.steps(12)
+  end
+
+  def test_large_number_of_even_and_odd_steps
+    skip
+    assert_equal 152, CollatzConjecture.steps(1_000_000)
+  end
+
+  def test_zero_is_an_error
+    skip
+    assert_raises(ArgumentError) { CollatzConjecture.steps(0) }
+  end
+
+  def test_negative_value_is_an_error
+    skip
+    assert_raises(ArgumentError) { CollatzConjecture.steps(-15) }
+  end
+
+  # Problems in exercism evolve over time, as we find better ways to ask
+  # questions.
+  # The version number refers to the version of the problem you solved,
+  # not your solution.
+  #
+  # Define a constant named VERSION inside of the top level BookKeeping
+  # module, which may be placed near the end of your file.
+  #
+  # In your file, it will look like this:
+  #
+  # module BookKeeping
+  #   VERSION = 1 # Where the version number matches the one in the test.
+  # end
+  #
+  # If you are curious, read more about constants on RubyDoc:
+  # http://ruby-doc.org/docs/ruby-doc-bundle/UsersGuide/rg/constants.html
+
+  def test_bookkeeping
+    skip
+    assert_equal 1, BookKeeping::VERSION
+  end
+end

data/tracks/ruby/lib/generator/command_line.rb

@@ -13,10 +13,11 @@ module Generator
     end
 
     private
+
     attr_reader :paths
 
     def generators
-      implementations.map { |slug| generator(implementation(exercise(slug))) }
+      implementations.map { |slug| generator(implementation(slug)) }
     end
 
     def implementations
@@ -35,13 +36,11 @@ module Generator
       @options[:freeze] || @options[:all]
     end
 
-    def exercise(slug)
-      Exercise.new(slug: slug)
-    end
-
-    def implementation(exercise)
+    def implementation(slug)
+      exercise = Exercise.new(slug: slug)
+      repository = Repository.new(paths: paths, slug: slug)
       LoggingImplementation.new(
-        implementation: Implementation.new(paths: paths, exercise: exercise),
+        implementation: Implementation.new(repository: repository, exercise: exercise),
         logger: logger
       )
     end

data/tracks/ruby/lib/generator/command_line/generator_optparser.rb

@@ -61,9 +61,9 @@ module Generator
     def metadata_repository_missing_message(repository)
       <<-EOM.gsub(/^ {6}/, '')
 
-      'x-common' repository not found.
+      'problem-specifications' repository not found.
       Try running the command:
-        git clone https://github.com/exercism/x-common.git "#{repository}"
+        git clone https://github.com/exercism/problem-specifications.git "#{repository}"
 
       EOM
     end

data/tracks/ruby/lib/generator/files/metadata_files.rb

@@ -3,14 +3,14 @@ module Generator
     module MetadataFiles
       def canonical_data
         CanonicalDataFile.new(
-          filename: File.join(exercise_metadata_path, 'canonical-data.json'),
+          filename: File.join(metadata_path, 'canonical-data.json'),
           repository_root: paths.metadata)
       end
 
       private
 
-      def exercise_metadata_path
-        File.join(paths.metadata, 'exercises', exercise.slug)
+      def metadata_path
+        File.join(paths.metadata, 'exercises', slug)
       end
     end
 

data/tracks/ruby/lib/generator/files/track_files.rb

@@ -19,22 +19,30 @@ module Generator
         TestsTemplateFile.new(filename: tests_template_absolute_filename)
       end
 
+      def test_case
+        TestCaseFile.new(filename: File.join(generator_path, case_filename))
+      end
+
       private
 
       def exercise_path
-        File.join(paths.track, 'exercises', exercise.slug)
+        File.join(paths.track, 'exercises', slug)
       end
 
       def meta_path
         File.join(exercise_path, '.meta')
       end
 
+      def generator_path
+        File.join(meta_path, 'generator')
+      end
+
       def solutions_path
         File.join(meta_path, 'solutions')
       end
 
       def minitest_tests_filename
-        "#{exercise.name}_test.rb"
+        "#{slug_underscored}_test.rb"
       end
 
       def version_filename
@@ -42,7 +50,7 @@ module Generator
       end
 
       def example_filename
-        "#{exercise.name}.rb"
+        "#{slug_underscored}.rb"
       end
 
       def tests_template_absolute_filename
@@ -61,6 +69,14 @@ module Generator
       def tests_template_filename
         'test_template.erb'
       end
+
+      def case_filename
+        "#{slug_underscored}_case.rb"
+      end
+
+      def slug_underscored
+        slug.tr('-', '_')
+      end
     end
 
     class TestsVersionFile < Writable
@@ -89,5 +105,8 @@ module Generator
 
     class TestsTemplateFile < Readable
     end
+
+    class TestCaseFile < Readable
+    end
   end
 end

data/tracks/ruby/lib/generator/implementation.rb

@@ -1,17 +1,19 @@
 require 'delegate'
+require 'forwardable'
 
 module Generator
   class Implementation
-    include Files::TrackFiles
-    include Files::MetadataFiles
+    extend Forwardable
     include TemplateValuesFactory
 
-    def initialize(paths:, exercise:)
-      @paths = paths
+    def_delegators :@repository, :tests_version, :example_solution, :tests_template, :minitest_tests, :canonical_data, :test_case
+
+    def initialize(repository:, exercise:)
+      @repository = repository
       @exercise = exercise
     end
 
-    attr_reader :paths, :exercise
+    attr_reader :repository, :exercise
 
     def version
       tests_version.to_i

data/tracks/ruby/lib/generator/repository.rb

@@ -0,0 +1,12 @@
+module Generator
+  class Repository
+    include Files::TrackFiles
+    include Files::MetadataFiles
+
+    attr_reader :paths, :slug
+    def initialize(paths:, slug:)
+      @paths = paths
+      @slug = slug
+    end
+  end
+end

data/tracks/ruby/lib/generator/template_values.rb

@@ -47,7 +47,7 @@ module Generator
     end
 
     def cases_load_name
-      Files::GeneratorCases.source_filepath(paths.track, exercise.slug)
+      test_case.filename
     end
   end
 end

data/tracks/ruby/lib/helper.rb

@@ -1,5 +1,5 @@
 XRUBY_ROOT = File.join(File.dirname(__FILE__), '..').freeze
 XRUBY_LIB = File.join(XRUBY_ROOT, 'lib').freeze
-METADATA_REPOSITORY_PATH = File.join(XRUBY_ROOT, '..', 'x-common').freeze
+METADATA_REPOSITORY_PATH = File.join(XRUBY_ROOT, '..', 'problem-specifications').freeze
 
 $LOAD_PATH.unshift(XRUBY_LIB)

data/tracks/ruby/test/generator/command_line/generator_optparser_test.rb

@@ -89,9 +89,9 @@ module Generator
     def test_invalid_metadata_repository_outputs_message_to_stderr
       paths = Paths.new(metadata: 'test/fixtures/nonexistent', track: nil)
       expected_stderr = <<-MESSAGE.gsub(/^ {6}/, '')
-      'x-common' repository not found.
+      'problem-specifications' repository not found.
       Try running the command:
-        git clone https://github.com/exercism/x-common.git "test/fixtures/nonexistent"
+        git clone https://github.com/exercism/problem-specifications.git "test/fixtures/nonexistent"
       MESSAGE
       assert_output nil, /#{expected_stderr}/ do
         refute GeneratorOptparser.new([], paths).options_valid?

data/tracks/ruby/test/generator/command_line_test.rb

@@ -17,9 +17,9 @@ module Generator
     def test_invalid_metadata_repository_outputs_message_to_stderr
       paths = Paths.new(metadata: 'test/fixtures/nonexistent', track: nil)
       expected_stderr = <<-MESSAGE.gsub(/^ {6}/, '')
-      'x-common' repository not found.
+      'problem-specifications' repository not found.
       Try running the command:
-        git clone https://github.com/exercism/x-common.git "test/fixtures/nonexistent"
+        git clone https://github.com/exercism/problem-specifications.git "test/fixtures/nonexistent"
       MESSAGE
       assert_output nil, /#{expected_stderr}/ do
         refute CommandLine.new(paths).parse([])

data/tracks/ruby/test/generator/files/metadata_files_test.rb

@@ -10,9 +10,9 @@ module Generator
       class TestMetadataFiles
         def initialize
           @paths = FixturePaths
-          @exercise = Exercise.new(slug: 'alpha')
+          @slug = 'alpha'
         end
-        attr_reader :paths, :exercise
+        attr_reader :paths, :slug
         include MetadataFiles
       end
 

data/tracks/ruby/test/generator/files/track_files_test.rb

@@ -11,9 +11,9 @@ module Generator
       class TestTrackFiles
         def initialize
           @paths = FixturePaths
-          @exercise = Exercise.new(slug: 'alpha-beta')
+          @slug  = 'alpha-beta'
         end
-        attr_reader :paths, :exercise
+        attr_reader :paths, :slug
         include TrackFiles
       end
 
@@ -39,13 +39,18 @@ module Generator
         assert_equal expected_filename, subject.tests_template.filename
       end
 
+      def test_test_case
+        subject = TestTrackFiles.new
+        expected_filename = FixturePaths.track + '/exercises/alpha-beta/.meta/generator/alpha_beta_case.rb'
+        assert_equal expected_filename, subject.test_case.filename
+      end
 
       class TestTrackFilesUseDefault
         def initialize
           @paths = FixturePaths
-          @exercise = Exercise.new(slug: 'notemplate')
+          @slug = 'no-template'
         end
-        attr_reader :paths, :exercise
+        attr_reader :paths, :slug
         include TrackFiles
       end
 

data/tracks/ruby/test/generator/implementation_test.rb

@@ -9,13 +9,16 @@ module Generator
 
     def test_version
       exercise = Minitest::Mock.new.expect :slug, 'alpha'
-      subject = Implementation.new(paths: FixturePaths, exercise: exercise)
+      repository = Repository.new(paths: FixturePaths, slug: 'alpha')
+      subject = Implementation.new(repository: repository, exercise: exercise)
       assert_equal 1, subject.version
     end
 
     def test_update_tests_version
       mock_file = Minitest::Mock.new.expect :write, '2'.length, [2]
-      subject = Implementation.new(paths: FixturePaths, exercise: Exercise.new(slug: 'alpha'))
+      exercise = Exercise.new(slug: 'alpha')
+      repository = Repository.new(paths: FixturePaths, slug: 'alpha')
+      subject = Implementation.new(repository: repository, exercise: exercise)
       # Verify iniital condition from fixture file
       assert_equal 1, subject.tests_version.to_i
       File.stub(:open, true, mock_file) do
@@ -27,7 +30,9 @@ module Generator
     def test_update_example_solution
       expected_content = "# This is the example\n\nclass BookKeeping\n  VERSION = 1\nend\n"
       mock_file = Minitest::Mock.new.expect :write, expected_content.length, [expected_content]
-      subject = Implementation.new(paths: FixturePaths, exercise: Exercise.new(slug: 'alpha'))
+      exercise = Exercise.new(slug: 'alpha')
+      repository = Repository.new(paths: FixturePaths, slug: 'alpha')
+      subject = Implementation.new(repository: repository, exercise: exercise)
       File.stub(:open, true, mock_file) do
         assert_equal expected_content, subject.update_example_solution
       end
@@ -80,7 +85,9 @@ class AlphaTest < Minitest::Test
 end
 TESTS_FILE
       mock_file = Minitest::Mock.new.expect :write, expected_content.length, [expected_content]
-      subject = Implementation.new(paths: FixturePaths, exercise: Exercise.new(slug: 'alpha'))
+      exercise = Exercise.new(slug: 'alpha')
+      repository = Repository.new(paths: FixturePaths, slug: 'alpha')
+      subject = Implementation.new(repository: repository, exercise: exercise)
       GitCommand.stub(:abbreviated_commit_hash, '123456789') do
         File.stub(:open, true, mock_file) do
           assert_equal expected_content, subject.build_tests

data/tracks/ruby/test/generator/repository_test.rb

@@ -0,0 +1,10 @@
+require_relative '../test_helper'
+
+module Generator
+  class RepositoryTest < Minitest::Test
+    def test_construction
+      subject = Repository.new(paths: nil, slug: nil)
+      assert_instance_of Repository, subject
+    end
+  end
+end

data/tracks/ruby/test/generator/template_values_test.rb

@@ -62,10 +62,8 @@ module Generator
         mock_canonical_data
       end
 
-      def paths
-        mock_paths = Minitest::Mock.new
-        mock_paths.expect :track, 'test/fixtures/xruby'
-        mock_paths
+      def test_case
+        Files::TestCaseFile.new(filename: 'test/fixtures/xruby/exercises/alpha/.meta/generator/alpha_case.rb')
       end
 
       include TemplateValuesFactory

data/tracks/rust/exercises/bob/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "bob"
-version = "0.0.0"
+version = "1.0.0"

data/tracks/rust/exercises/bob/example.rs

@@ -6,13 +6,14 @@ pub fn reply(message: &str) -> &str {
 }
 
 fn is_silence(message: &str) -> bool {
-    message == ""
+    message.trim().is_empty()
 }
 
 fn is_yelling(message: &str) -> bool {
-    message.chars().all(|char| !char.is_lowercase())
+    let s = message.trim_matches(|c: char| !c.is_alphabetic());
+    !s.is_empty() && s.to_uppercase() == s
 }
 
 fn is_question(message: &str) -> bool {
-    message.ends_with("?")
+    message.trim_right().ends_with("?")
 }

data/tracks/rust/exercises/bob/tests/bob.rs

@@ -1,7 +1,7 @@
 extern crate bob;
 
 #[test]
-fn test_statement() {
+fn test_stating_something() {
     assert_eq!("Whatever.", bob::reply("Tom-ay-to, tom-aaaah-to."));
 }
 
@@ -11,6 +11,31 @@ fn test_shouting() {
     assert_eq!("Whoa, chill out!", bob::reply("WATCH OUT!"));
 }
 
+#[test]
+#[ignore]
+fn test_shouting_gibberish() {
+    assert_eq!("Whoa, chill out!", bob::reply("FCECDFCAAB"));
+}
+
+#[test]
+#[ignore]
+fn test_asking() {
+    assert_eq!("Sure.",
+               bob::reply("Does this cryogenic chamber make me look fat?"));
+}
+
+#[test]
+#[ignore]
+fn test_ask_numeric_question() {
+    assert_eq!("Sure.", bob::reply("You are, what, like 15?"));
+}
+
+#[test]
+#[ignore]
+fn test_asking_gibberish() {
+    assert_eq!("Sure.", bob::reply("fffbbcbeab?"));
+}
+
 #[test]
 #[ignore]
 fn test_exclaiming() {
@@ -19,37 +44,113 @@ fn test_exclaiming() {
 
 #[test]
 #[ignore]
-fn test_asking() {
-    assert_eq!("Sure.", bob::reply("Does this cryogenic chamber make me look fat?"));
+fn test_using_acronyms_in_regular_speech() {
+    assert_eq!("Whatever.",
+               bob::reply("It's OK if you don't want to go to the DMV."));
+}
+
+#[test]
+#[ignore]
+fn test_forceful_question() {
+    assert_eq!("Whoa, chill out!",
+               bob::reply("WHAT THE HELL WERE YOU THINKING?"));
 }
 
 #[test]
 #[ignore]
-fn test_shout_numbers() {
+fn test_shouting_numbers() {
     assert_eq!("Whoa, chill out!", bob::reply("1, 2, 3 GO!"));
 }
 
+#[test]
+fn test_only_numbers() {
+    assert_eq!("Whatever.", bob::reply("1, 2, 3"));
+}
+
+#[test]
+#[ignore]
+fn test_question_with_only_numbers() {
+    assert_eq!("Sure.", bob::reply("4?"));
+}
+
 #[test]
 #[ignore]
-fn test_shout_weird_characters() {
-    assert_eq!("Whoa, chill out!", bob::reply("ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!"));
+fn test_shouting_with_special_characters() {
+    assert_eq!("Whoa, chill out!",
+               bob::reply("ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!"));
 }
 
 #[test]
 #[ignore]
-fn test_shout_without_punctuation() {
+fn test_shouting_with_no_exclamation_mark() {
     assert_eq!("Whoa, chill out!", bob::reply("I HATE YOU"));
 }
 
 #[test]
 #[ignore]
-fn test_non_question_with_question_mark() {
+fn test_statement_containing_question_mark() {
     assert_eq!("Whatever.", bob::reply("Ending with ? means a question."));
 }
 
 #[test]
 #[ignore]
-fn test_silent_treatment() {
+fn test_non_letters_with_question() {
+    assert_eq!("Sure.", bob::reply(":) ?"));
+}
+
+#[test]
+#[ignore]
+fn test_prattling_on() {
+    assert_eq!("Sure.", bob::reply("Wait! Hang on. Are you going to be OK?"));
+}
+
+#[test]
+#[ignore]
+fn test_silence() {
     assert_eq!("Fine. Be that way!", bob::reply(""));
 }
 
+#[test]
+#[ignore]
+fn test_prolonged_silence() {
+    assert_eq!("Fine. Be that way!", bob::reply("          "));
+}
+
+#[test]
+#[ignore]
+fn test_alternate_silence() {
+    assert_eq!("Fine. Be that way!", bob::reply("\t\t\t\t\t\t\t\t\t\t"));
+}
+
+#[test]
+#[ignore]
+fn test_multiple_line_question() {
+    assert_eq!("Whatever.", bob::reply(
+        "\nDoes this cryogenic chamber make me look fat?\nno"));
+}
+
+#[test]
+#[ignore]
+fn test_starting_with_whitespace() {
+    assert_eq!("Whatever.", bob::reply("         hmmmmmmm..."));
+}
+
+#[test]
+#[ignore]
+fn test_ending_with_whitespace() {
+    assert_eq!("Sure.",
+               bob::reply("Okay if like my  spacebar  quite a bit?   "));
+}
+
+#[test]
+#[ignore]
+fn test_other_whitespace() {
+    assert_eq!("Fine. Be that way!", bob::reply("\n\r \t"));
+}
+
+#[test]
+#[ignore]
+fn test_non_question_ending_with_whitespace() {
+    assert_eq!("Whatever.",
+               bob::reply("This is a statement ending with whitespace      "));
+}