Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Add section to show Conda version #91

Merged
merged 14 commits into from
Oct 21, 2018
Merged

Conversation

jskrnbindra
Copy link
Contributor

Implement Conda section based on the implementation in spaceship.

  • Show conda version when CONDA_DEFAULT_ENV and conda is installed
  • Write tests for new section
  • Update documentation with the new section

Motivation and Context

Closes #70

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Screenshots (if appropriate):

spacefish conda

How Has This Been Tested?

  • I have tested using MacOS
  • I have tested using Linux

Checklist:

  • I have checked that no other PR duplicates mine
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have updated the tests accordingly.

Copy link
Collaborator

@Snuggle Snuggle left a comment

Choose a reason for hiding this comment

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

This looks good to me, for the most part. I just have a couple issues with inconsistent indentation that I'd like to get cleaned up beforehand. 🙂

tests/__sf_section_conda.test.fish Outdated Show resolved Hide resolved
tests/__sf_section_conda.test.fish Outdated Show resolved Hide resolved
tests/__sf_section_conda.test.fish Outdated Show resolved Hide resolved
@jskrnbindra
Copy link
Contributor Author

@Snuggle I don't know why my editor (VS Code) is doing this. 🤯
My VS Code is configured to insert 4 spaces when tab is pressed.
What editor do you guys use?

@Snuggle
Copy link
Collaborator

Snuggle commented Oct 18, 2018

I usually use micro for editing shell files, but I have made similar mistakes in the past. I think it's mostly something you'll have to pay attention to.

Micro is similar to nano, but has a lot more awesome features like copy/paste, ctrl + c/v shortcuts, automatic syntax highlighting and smart sudo.
image

@Snuggle
Copy link
Collaborator

Snuggle commented Oct 18, 2018

This part is all over the place! The first two lines are at completely different indentation levels to the rest of this test.

image

@jskrnbindra
Copy link
Contributor Author

@Snuggle I think this should do. Had to do in a trial-error way.
I'll setup micro.

@jskrnbindra
Copy link
Contributor Author

@Snuggle 🎉

@Snuggle
Copy link
Collaborator

Snuggle commented Oct 18, 2018

Woo! Things now look pretty and I'm happy now! ✨

Now to see if @matchai has any more comments or feedback before being merged. 😊

docs/README.md Outdated Show resolved Hide resolved
@matchai
Copy link
Owner

matchai commented Oct 18, 2018

@jskrnbindra I also use VSCode. Be sure to install the EditorConfig extension, which will read the .editorconfig file in the project root and use the correct indentation. 😄

Copy link
Owner

@matchai matchai left a comment

Choose a reason for hiding this comment

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

Just a few quick changes ☝️ 😄

@jskrnbindra
Copy link
Contributor Author

@Snuggle @matchai Got a bit occupied, I'm travelling. Will do it in a couple of days.

@jskrnbindra
Copy link
Contributor Author

@matchai good to go now?

Copy link
Owner

@matchai matchai left a comment

Choose a reason for hiding this comment

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

Aside from that quick note, looks good to me 👍
Thank you for your contribution! 😁

functions/__sf_section_conda.fish Outdated Show resolved Hide resolved
@matchai matchai merged commit b0f5747 into matchai:master Oct 21, 2018
@jskrnbindra jskrnbindra deleted the conda-section branch October 22, 2018 00:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement a prompt section for Conda version (🅒)
3 participants