Skip to content

Conversation

@ABaldwinHunter
Copy link
Contributor

resolved merge conflicts to incorporate changes from https://github.com/jacobi007/codeclimate-fixme/tree/jk-add-include-paths

  • Makes Fixme engine accept include_paths

@codeclimat/review

Jacek Kubiak and others added 3 commits September 30, 2015 12:56
@gdiggs
Copy link
Contributor

gdiggs commented Nov 11, 2015

I believe this repo has automated tests now, can you add some?

index.js Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think of putting this in its own module and requiring it at the top of the file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be something like this (I think):

// diff.js module.exports = function(a1, a2) { ... }; // index.js var diff = require("diff");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good! Adding tests too ...

@ABaldwinHunter
Copy link
Contributor Author

@codeclimate/review @gordondiggs

Ready for another look!

Main changes:

  • Makes fixme engine use include paths
  • adds testing suite with mocha and chai, integrated with circle. One real spec, a few pending
  • refactors the Fixme code from one large file into a couple of smaller files. This change makes the code more readable and makes it easier to package the tooling in future.

The circle build runs tests! https://circleci.com/gh/codeclimate/codeclimate-fixme/35

@ABaldwinHunter
Copy link
Contributor Author

It also does some renaming of files, and updates the .codeclimate.yml to use eslint.

*Adding tests feels important, but it felt like a large enough change to add the main suite and structure. We can make tests more robust in separate PR.

@ABaldwinHunter
Copy link
Contributor Author

P.S. I can also squash commit history if preferred.

bin/fixme Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think generally all filenames should be underscored (but the variable name looks good)

@gdiggs
Copy link
Contributor

gdiggs commented Nov 13, 2015

Minor CC nits but LGTM! I think it might be good to squash the commits before you merge.

@ABaldwinHunter
Copy link
Contributor Author

@gordondiggs thanks for the feedback! I added .eslintrc.

I also added a few things to our package.json. Could you take another look when you have a moment?

new stuff

 "main": "./lib/fix-me.js", }, "files": [ "LICENSE", "README.md", "bin", "lib" ], "repository": { "type": "git", "url": "https://github.com/codeclimate/codeclimate-fixme" }, "keywords": [ "fixme", "codeclimate" ], "engines": { "node": ">=0.10" }, "license": "MIT" 

If those changes look okay, I'll go ahead and squash commits.

.eslintrc Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our default file is much bigger. What made you go with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh cool. Updated.

I originally tried to mimic https://github.com/codeclimate/codeclimate-eslint/blob/master/.eslintrc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can update that one to match after

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah that one needs to be changed

@gdiggs
Copy link
Contributor

gdiggs commented Nov 13, 2015

LGTM

@ABaldwinHunter ABaldwinHunter force-pushed the jacobi007-jk-add-include-paths branch from de27e03 to fef0d9f Compare November 13, 2015 17:14
ABaldwinHunter pushed a commit that referenced this pull request Nov 13, 2015
@ABaldwinHunter ABaldwinHunter merged commit d761d0a into master Nov 13, 2015
@ABaldwinHunter ABaldwinHunter deleted the jacobi007-jk-add-include-paths branch November 13, 2015 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants