trackler 2.1.0.4 → 2.1.0.5

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

@@ -17,6 +17,9 @@ module Generator
     end
 
     class CanonicalDataFile < Readable
+      def version
+        JSON.parse(to_s)['version'] if to_s
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Generator
       include Exercise
 
       def tests_version
-        TestsVersionFile.new(filename: File.join(exercise_path, '.meta', '.version'))
+        TestsVersionFile.new(filename: File.join(meta_path, '.version'))
       end
 
       def example_solution
@@ -18,7 +18,7 @@ module Generator
       end
 
       def tests_template
-        TestsTemplateFile.new(filename: tests_template_filename)
+        TestsTemplateFile.new(filename: tests_template_absolute_filename)
       end
 
       private
@@ -27,16 +27,34 @@ module Generator
         File.join(paths.track, 'exercises', exercise_name)
       end
 
-      # this method contains a LOT of magic text
-      def tests_template_filename
-        File.exist?(track_tests_template_filename) ? track_tests_template_filename :
-          File.join(paths.track, 'lib', 'generator', 'test_template.erb')
+      def meta_path
+        File.join(exercise_path, '.meta')
+      end
+
+      def tests_template_absolute_filename
+        case
+        when File.exist?(track_tests_template_filename) then track_tests_template_filename
+        when File.exist?(legacy_tests_template_filename) then legacy_tests_template_filename
+        else default_tests_template_filename
+        end
       end
 
       def track_tests_template_filename
+        File.join(meta_path, 'generator', tests_template_filename)
+      end
+
+      def default_tests_template_filename
+        File.join(paths.track, 'lib', 'generator', tests_template_filename)
+      end
+
+      def legacy_tests_template_filename
         File.join(exercise_path, 'example.tt')
       end
 
+      def tests_template_filename
+        'test_template.erb'
+      end
+
       def minitest_tests_filename
         "#{exercise_name.gsub(/[ -]/, '_')}_test.rb"
       end

data/tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/generator/test_template.erb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+gem 'minitest', '>= 5.0.0'
+require 'minitest/autorun'
+require_relative '<%= exercise_name %>'
+
+# Hi. I am a custom comment
+
+# Common test data version: <%= abbreviated_commit_hash %>
+class <%= exercise_name_camel %>Test < Minitest::Test
+<% test_cases.each do |test_case| %>
+  def <%= test_case.name %>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
+  end
+
+<% end %>
+<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+
+  def test_bookkeeping
+    skip
+    assert_equal <%= version %>, BookKeeping::VERSION
+  end
+end

data/tracks/ruby/test/fixtures/xruby/exercises/beta/.meta/.version

@@ -0,0 +1 @@
+1

data/tracks/ruby/test/fixtures/xruby/exercises/beta/example.rb

@@ -0,0 +1,5 @@
+# This is the example
+
+class BookKeeping
+  VERSION = 1
+end

data/tracks/ruby/test/fixtures/xruby/exercises/{alpha → beta}/example.tt

@@ -1,18 +1,21 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
-
+gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
-require_relative 'alpha'
+require_relative '<%= exercise_name %>'
+
+# Hi. I am a custom comment
 
 # Common test data version: <%= abbreviated_commit_hash %>
-class AlphaTest < Minitest::Test<% test_cases.each do |test_case| %>
+class <%= exercise_name_camel %>Test < Minitest::Test
+<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
-    <%= test_case.skip %>
-    string = '<%= test_case.input %>'
-    <%= test_case.assertion %> Alpha.something?(string)
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
+
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION

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

@@ -15,7 +15,7 @@ module Generator
 
       def test_available_returns_exercise_names
         track_path = 'test/fixtures/xruby'
-        Dir.stub :[], %w(/alpha_cases.rb hy_phen_ated_cases.rb) do
+        Dir.stub :glob, %w(/alpha_cases.rb hy_phen_ated_cases.rb) do
           assert_equal %w(alpha hy-phen-ated), GeneratorCases.available(track_path)
         end
       end
@@ -28,6 +28,30 @@ module Generator
       def test_class_name
         assert_equal 'TwoParterCase', GeneratorCases.class_name('two-parter')
       end
+
+      def test_load_filename # test the cases_filename alternative
+        track_path = 'test/fixtures/xruby'
+        exercise_name = 'foo'
+        expected_filename = track_path + '/exercises/foo/.meta/generator/foo_cases.rb'
+        File.stub(:exist?, true) do
+          assert_equal(
+            expected_filename,
+            GeneratorCases.load_filename(track_path, exercise_name)
+          )
+        end
+      end
+
+      def test_load_legacy_filename # test the cases_filename alternative
+        track_path = 'test/fixtures/xruby'
+        exercise_name = 'foo'
+        expected_filename = track_path + '/lib/foo_cases.rb'
+        File.stub(:exist?, false) do
+          assert_equal(
+            expected_filename,
+            GeneratorCases.load_filename(track_path, exercise_name)
+          )
+        end
+      end
     end
   end
 end

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

@@ -21,5 +21,26 @@ module Generator
         assert_instance_of CanonicalDataFile, subject.canonical_data
       end
     end
+
+    class CanonicalDataFileTest < Minitest::Test
+      def test_version_for_file_that_does_not_exist
+        subject = CanonicalDataFile.new(filename: 'nonexistant')
+        assert_nil subject.version
+      end
+
+      def test_version
+        subject = CanonicalDataFile.new(filename: 'has version key')
+        Files.stub(:read, '{"version": "1.2.3"}' ) do
+          assert_equal "1.2.3", subject.version
+        end
+      end
+
+      def test_version_not_present
+        subject = CanonicalDataFile.new(filename: 'no version key')
+        Files.stub(:read, '{ "json": true }' ) do
+          assert_nil subject.version
+        end
+      end
+    end
   end
 end

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

@@ -34,7 +34,8 @@ module Generator
 
       def test_tests_template
         subject = TestTrackFiles.new
-        assert_instance_of TestsTemplateFile, subject.tests_template
+        expected_filename = FixturePaths.track + '/exercises/alpha/.meta/generator/test_template.erb'
+        assert_equal expected_filename, subject.tests_template.filename
       end
 
       class TestTrackFilesUseDefault
@@ -47,8 +48,24 @@ module Generator
       end
 
       def test_default_tests_template
-        subject = TestTrackFiles.new
-        assert_instance_of TestsTemplateFile, subject.tests_template
+        subject = TestTrackFilesUseDefault.new
+        expected_filename = FixturePaths.track + '/lib/generator/test_template.erb'
+        assert_equal expected_filename, subject.tests_template.filename
+      end
+
+      class TestTrackFilesUseLegacy
+        def initialize
+          @paths = FixturePaths
+          @exercise_name = 'beta'
+        end
+        attr_reader :paths, :exercise_name
+        include TrackFiles
+      end
+
+      def test_legacy_tests_template
+        subject = TestTrackFilesUseLegacy.new
+        expected_filename = FixturePaths.track + '/exercises/beta/example.tt'
+        assert_equal expected_filename, subject.tests_template.filename
       end
     end
 

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

@@ -2,6 +2,24 @@ require_relative '../test_helper'
 
 module Generator
   module Files
+
+    class ReadTest < Minitest::Test
+      def test_read_existing_file
+        expected = 'content unimportant'
+        File.stub(:exist?, true) do
+          File.stub(:read, expected ) do
+            assert_equal expected, Files.read('pretend/this/exists')
+          end
+        end
+      end
+
+      def test_read_non_existing_file
+        File.stub(:exist?, false) do
+          assert_nil Files.read('pretend/this/does/not/exist')
+        end
+      end
+    end
+
     class ReadableTest < Minitest::Test
       def test_abbreviated_commit_hash
         mock_git_command = Minitest::Mock.new.expect :call, nil, ['path/.git', 'subdir/file']

data/tracks/ruby/test/wordy_cases_test.rb

@@ -1,5 +1,6 @@
 require 'json'
 require_relative 'test_helper'
+require_relative '../exercises/wordy/.meta/generator/wordy_cases'
 
 class WordyCaseTest < Minitest::Test
   def test_workload_with_expected_and_no_message

data/tracks/typescript/README.md

@@ -21,7 +21,7 @@ Then, `make` commands will install other dependencies as needed.
 
 ## Shared Code
 
-Please keep the `common` folder files synced across all the sub folders. These files should be the same across of problem. 
+Please keep the `common` folder files synced across all the sub folders. These files should be the same across all problems. 
 
 * package.json
 * tsconfig.json

data/tracks/typescript/config.json

@@ -112,6 +112,12 @@
       "difficulty": 1,
       "topics": [
       ]
+    },
+     {
+      "slug": "difference-of-squares",
+      "difficulty": 1,
+      "topics": [
+      ]
     }
 
   ],

data/tracks/typescript/exercises/difference-of-squares/difference-of-squares.example.ts

@@ -0,0 +1,39 @@
+export default class Squares {
+    squareOfSums: number
+    sumOfSquares: number
+    difference: number
+
+    constructor(int: number) {
+        this.squareOfSums = this._squareOfSums(int)
+        this.sumOfSquares = this._sumOfSquares(int)
+        this.difference = this._difference()
+    }
+
+    private _squareOfSums(int: number) {
+        let sum = 0
+        let i = 1
+
+        while (i <= int) {
+            sum += i
+            i++
+        }
+
+        return sum * sum
+    }
+
+    private _sumOfSquares(int: number) {
+        let sum = 0
+        let i = 1
+
+        while (i <= int) {
+            sum += (i * i)
+            i++
+        }
+
+        return sum
+    }
+
+    private _difference() {
+        return this.squareOfSums - this.sumOfSquares
+    }
+}

data/tracks/typescript/exercises/difference-of-squares/difference-of-squares.test.ts

@@ -0,0 +1,56 @@
+import Squares from './difference-of-squares'
+
+describe('Squares', () => {
+
+  describe('up to 5', () => {
+    const squares = new Squares(5)
+
+    it('gets the square of sums', () => {
+      expect(squares.squareOfSums).toBe(225)
+    })
+
+    xit('gets the sum of squares', () => {
+      expect(squares.sumOfSquares).toBe(55)
+    })
+
+    xit('gets the difference', () => {
+      expect(squares.difference).toBe(170)
+    })
+
+  })
+
+  describe('up to 10', () => {
+    const squares = new Squares(10)
+
+    xit('gets the square of sums', () => {
+      expect(squares.squareOfSums).toBe(3025)
+    })
+
+    xit('gets the sum of squares', () => {
+      expect(squares.sumOfSquares).toBe(385)
+    })
+
+    xit('gets the difference', () => {
+      expect(squares.difference).toBe(2640)
+    })
+
+  })
+
+  describe('up to 100', () => {
+    const squares = new Squares(100)
+
+    xit('gets the square of sums', () => {
+      expect(squares.squareOfSums).toBe(25502500)
+    })
+
+    xit('gets the sum of squares', () => {
+      expect(squares.sumOfSquares).toBe(338350)
+    })
+
+    xit('gets the difference', () => {
+      expect(squares.difference).toBe(25164150)
+    })
+
+  })
+
+})

data/tracks/typescript/exercises/difference-of-squares/package.json

@@ -0,0 +1,36 @@
+{
+  "name": "xtypescript",
+  "version": "0",
+  "description": "Exercism exercises in Typescript.",
+  "author": "",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/exercism/xtypescript"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "jest --no-cache",
+    "lint": "tslint '*.ts?(x)'; exit 0"
+  },
+  "dependencies": {
+    "@types/jest": "^18.1.1",
+    "@types/node": "^7.0.5",
+    "jest": "^19.0.2",
+    "ts-jest": "^19.0.0",
+    "tslint": "^4.5.1",
+    "typescript": "^2.2.1"
+  },
+  "jest": {
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "testResultsProcessor": "<rootDir>/node_modules/ts-jest/coverageprocessor.js",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ]
+  }
+}

data/tracks/typescript/exercises/difference-of-squares/tsconfig.json

@@ -0,0 +1,21 @@
+{
+    "compilerOptions": { 
+        "target": "es2017",
+        "module": "commonjs",
+        "alwaysStrict": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "preserveConstEnums": true,
+        "noFallthroughCasesInSwitch":true,
+        "noImplicitThis":true,
+        "noImplicitReturns":true,
+        "sourceMap": true,
+        "outDir": "./build"
+    },
+    "compileOnSave": true, 
+    "exclude": [
+        "node_modules"
+    ]
+}