Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: bump deps #25

Merged
merged 2 commits into from
Jun 18, 2020
Merged

Chore: bump deps #25

merged 2 commits into from
Jun 18, 2020

Conversation

tim77
Copy link
Contributor

@tim77 tim77 commented Jun 17, 2020

tui to 0.8
insta to 0.16.0
cargo-insta to 0.16.0

This related to packaging diskonaut for official Linux repos.

tui to 0.8
insta to 0.16.0
cargo-insta to 0.16.0
@imsnif
Copy link
Owner

imsnif commented Jun 18, 2020

I'm going to look into why the tests are failing in a short while (hopefully a little later today). I'm guessing this has to do with some hacks I've done in the test terminal backend. :)

@imsnif
Copy link
Owner

imsnif commented Jun 18, 2020

Hey @tim77 - I found the issue, but for some reason I'm not managing to push the changes to your branch so that this PR is updated.

In order to fix this, you'll need to rename all the files in src/tests/cases/snapshots, adding the prefix diskonaut__tests__cases__ui__
So that (for example):
src/tests/cases/snapshots/ui__two_large_files_one_small_file.snap -> src/tests/cases/snapshots/diskonaut__tests__cases__ui__two_large_files_one_small_file.snap

Makes sense?

@imsnif
Copy link
Owner

imsnif commented Jun 18, 2020

Actually, here are all the mv commands to do this. Apologies for the spam, but I already have them - so why not? :)

mv ui__cannot_move_into_small_files-2.snap diskonaut__tests__cases__ui__cannot_move_into_small_files-2.snap
mv ui__cannot_move_into_small_files-3.snap diskonaut__tests__cases__ui__cannot_move_into_small_files-3.snap
mv ui__cannot_move_into_small_files-4.snap diskonaut__tests__cases__ui__cannot_move_into_small_files-4.snap
mv ui__cannot_move_into_small_files.snap diskonaut__tests__cases__ui__cannot_move_into_small_files.snap
mv ui__cant_delete_file_with_term_too_small.snap diskonaut__tests__cases__ui__cant_delete_file_with_term_too_small.snap
mv ui__clear_selection_when_moving_off_screen_edges-2.snap diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges-2.snap
mv ui__clear_selection_when_moving_off_screen_edges-3.snap diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges-3.snap
mv ui__clear_selection_when_moving_off_screen_edges-4.snap diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges-4.snap
mv ui__clear_selection_when_moving_off_screen_edges.snap diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap
mv ui__delete_file-2.snap diskonaut__tests__cases__ui__delete_file-2.snap
mv ui__delete_file-3.snap diskonaut__tests__cases__ui__delete_file-3.snap
mv ui__delete_file-4.snap diskonaut__tests__cases__ui__delete_file-4.snap
mv ui__delete_file-5.snap diskonaut__tests__cases__ui__delete_file-5.snap
mv ui__delete_file-6.snap diskonaut__tests__cases__ui__delete_file-6.snap
mv ui__delete_file-7.snap diskonaut__tests__cases__ui__delete_file-7.snap
mv ui__delete_file-8.snap diskonaut__tests__cases__ui__delete_file-8.snap
mv ui__delete_file_press_n-2.snap diskonaut__tests__cases__ui__delete_file_press_n-2.snap
mv ui__delete_file_press_n-3.snap diskonaut__tests__cases__ui__delete_file_press_n-3.snap
mv ui__delete_file_press_n-4.snap diskonaut__tests__cases__ui__delete_file_press_n-4.snap
mv ui__delete_file_press_n.snap diskonaut__tests__cases__ui__delete_file_press_n.snap
mv ui__delete_file.snap diskonaut__tests__cases__ui__delete_file.snap
mv ui__delete_folder-2.snap diskonaut__tests__cases__ui__delete_folder-2.snap
mv ui__delete_folder-3.snap diskonaut__tests__cases__ui__delete_folder-3.snap
mv ui__delete_folder-4.snap diskonaut__tests__cases__ui__delete_folder-4.snap
mv ui__delete_folder-5.snap diskonaut__tests__cases__ui__delete_folder-5.snap
mv ui__delete_folder-6.snap diskonaut__tests__cases__ui__delete_folder-6.snap
mv ui__delete_folder-7.snap diskonaut__tests__cases__ui__delete_folder-7.snap
mv ui__delete_folder-8.snap diskonaut__tests__cases__ui__delete_folder-8.snap
mv ui__delete_folder-9.snap diskonaut__tests__cases__ui__delete_folder-9.snap
mv ui__delete_folder_small_window-2.snap diskonaut__tests__cases__ui__delete_folder_small_window-2.snap
mv ui__delete_folder_small_window-3.snap diskonaut__tests__cases__ui__delete_folder_small_window-3.snap
mv ui__delete_folder_small_window-4.snap diskonaut__tests__cases__ui__delete_folder_small_window-4.snap
mv ui__delete_folder_small_window-5.snap diskonaut__tests__cases__ui__delete_folder_small_window-5.snap
mv ui__delete_folder_small_window-6.snap diskonaut__tests__cases__ui__delete_folder_small_window-6.snap
mv ui__delete_folder_small_window-7.snap diskonaut__tests__cases__ui__delete_folder_small_window-7.snap
mv ui__delete_folder_small_window-8.snap diskonaut__tests__cases__ui__delete_folder_small_window-8.snap
mv ui__delete_folder_small_window-9.snap diskonaut__tests__cases__ui__delete_folder_small_window-9.snap
mv ui__delete_folder_small_window.snap diskonaut__tests__cases__ui__delete_folder_small_window.snap
mv ui__delete_folder.snap diskonaut__tests__cases__ui__delete_folder.snap
mv ui__delete_folder_with_multiple_children-2.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-2.snap
mv ui__delete_folder_with_multiple_children-3.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-3.snap
mv ui__delete_folder_with_multiple_children-4.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-4.snap
mv ui__delete_folder_with_multiple_children-5.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-5.snap
mv ui__delete_folder_with_multiple_children-6.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-6.snap
mv ui__delete_folder_with_multiple_children-7.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-7.snap
mv ui__delete_folder_with_multiple_children-8.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-8.snap
mv ui__delete_folder_with_multiple_children-9.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children-9.snap
mv ui__delete_folder_with_multiple_children.snap diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap
mv ui__eleven_files.snap diskonaut__tests__cases__ui__eleven_files.snap
mv ui__empty_folder.snap diskonaut__tests__cases__ui__empty_folder.snap
mv ui__enter_folder-2.snap diskonaut__tests__cases__ui__enter_folder-2.snap
mv ui__enter_folder-3.snap diskonaut__tests__cases__ui__enter_folder-3.snap
mv ui__enter_folder-4.snap diskonaut__tests__cases__ui__enter_folder-4.snap
mv ui__enter_folder-5.snap diskonaut__tests__cases__ui__enter_folder-5.snap
mv ui__enter_folder-6.snap diskonaut__tests__cases__ui__enter_folder-6.snap
mv ui__enter_folder-7.snap diskonaut__tests__cases__ui__enter_folder-7.snap
mv ui__enter_folder_medium_width-2.snap diskonaut__tests__cases__ui__enter_folder_medium_width-2.snap
mv ui__enter_folder_medium_width-3.snap diskonaut__tests__cases__ui__enter_folder_medium_width-3.snap
mv ui__enter_folder_medium_width-4.snap diskonaut__tests__cases__ui__enter_folder_medium_width-4.snap
mv ui__enter_folder_medium_width-5.snap diskonaut__tests__cases__ui__enter_folder_medium_width-5.snap
mv ui__enter_folder_medium_width.snap diskonaut__tests__cases__ui__enter_folder_medium_width.snap
mv ui__enter_folder_small_width-2.snap diskonaut__tests__cases__ui__enter_folder_small_width-2.snap
mv ui__enter_folder_small_width-3.snap diskonaut__tests__cases__ui__enter_folder_small_width-3.snap
mv ui__enter_folder_small_width-4.snap diskonaut__tests__cases__ui__enter_folder_small_width-4.snap
mv ui__enter_folder_small_width-5.snap diskonaut__tests__cases__ui__enter_folder_small_width-5.snap
mv ui__enter_folder_small_width.snap diskonaut__tests__cases__ui__enter_folder_small_width.snap
mv ui__enter_folder.snap diskonaut__tests__cases__ui__enter_folder.snap
mv ui__esc_to_go_up-10.snap diskonaut__tests__cases__ui__esc_to_go_up-10.snap
mv ui__esc_to_go_up-11.snap diskonaut__tests__cases__ui__esc_to_go_up-11.snap
mv ui__esc_to_go_up-12.snap diskonaut__tests__cases__ui__esc_to_go_up-12.snap
mv ui__esc_to_go_up-13.snap diskonaut__tests__cases__ui__esc_to_go_up-13.snap
mv ui__esc_to_go_up-2.snap diskonaut__tests__cases__ui__esc_to_go_up-2.snap
mv ui__esc_to_go_up-3.snap diskonaut__tests__cases__ui__esc_to_go_up-3.snap
mv ui__esc_to_go_up-4.snap diskonaut__tests__cases__ui__esc_to_go_up-4.snap
mv ui__esc_to_go_up-5.snap diskonaut__tests__cases__ui__esc_to_go_up-5.snap
mv ui__esc_to_go_up-6.snap diskonaut__tests__cases__ui__esc_to_go_up-6.snap
mv ui__esc_to_go_up-7.snap diskonaut__tests__cases__ui__esc_to_go_up-7.snap
mv ui__esc_to_go_up-8.snap diskonaut__tests__cases__ui__esc_to_go_up-8.snap
mv ui__esc_to_go_up-9.snap diskonaut__tests__cases__ui__esc_to_go_up-9.snap
mv ui__esc_to_go_up.snap diskonaut__tests__cases__ui__esc_to_go_up.snap
mv ui__files_with_size_zero.snap diskonaut__tests__cases__ui__files_with_size_zero.snap
mv ui__medium_width.snap diskonaut__tests__cases__ui__medium_width.snap
mv ui__minimum_tile_sides.snap diskonaut__tests__cases__ui__minimum_tile_sides.snap
mv ui__move_down_and_enter_folder-2.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-2.snap
mv ui__move_down_and_enter_folder-3.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-3.snap
mv ui__move_down_and_enter_folder-4.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-4.snap
mv ui__move_down_and_enter_folder-5.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-5.snap
mv ui__move_down_and_enter_folder-6.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-6.snap
mv ui__move_down_and_enter_folder-7.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-7.snap
mv ui__move_down_and_enter_folder-8.snap diskonaut__tests__cases__ui__move_down_and_enter_folder-8.snap
mv ui__move_down_and_enter_folder.snap diskonaut__tests__cases__ui__move_down_and_enter_folder.snap
mv ui__move_left_and_enter_folder-2.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-2.snap
mv ui__move_left_and_enter_folder-3.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-3.snap
mv ui__move_left_and_enter_folder-4.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-4.snap
mv ui__move_left_and_enter_folder-5.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-5.snap
mv ui__move_left_and_enter_folder-6.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-6.snap
mv ui__move_left_and_enter_folder-7.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-7.snap
mv ui__move_left_and_enter_folder-8.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-8.snap
mv ui__move_left_and_enter_folder-9.snap diskonaut__tests__cases__ui__move_left_and_enter_folder-9.snap
mv ui__move_left_and_enter_folder.snap diskonaut__tests__cases__ui__move_left_and_enter_folder.snap
mv ui__move_right_and_enter_folder-2.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-2.snap
mv ui__move_right_and_enter_folder-3.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-3.snap
mv ui__move_right_and_enter_folder-4.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-4.snap
mv ui__move_right_and_enter_folder-5.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-5.snap
mv ui__move_right_and_enter_folder-6.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-6.snap
mv ui__move_right_and_enter_folder-7.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-7.snap
mv ui__move_right_and_enter_folder-8.snap diskonaut__tests__cases__ui__move_right_and_enter_folder-8.snap
mv ui__move_right_and_enter_folder.snap diskonaut__tests__cases__ui__move_right_and_enter_folder.snap
mv ui__move_up_and_enter_folder-2.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-2.snap
mv ui__move_up_and_enter_folder-3.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-3.snap
mv ui__move_up_and_enter_folder-4.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-4.snap
mv ui__move_up_and_enter_folder-5.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-5.snap
mv ui__move_up_and_enter_folder-6.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-6.snap
mv ui__move_up_and_enter_folder-7.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-7.snap
mv ui__move_up_and_enter_folder-8.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-8.snap
mv ui__move_up_and_enter_folder-9.snap diskonaut__tests__cases__ui__move_up_and_enter_folder-9.snap
mv ui__move_up_and_enter_folder.snap diskonaut__tests__cases__ui__move_up_and_enter_folder.snap
mv ui__noop_when_entering_file-2.snap diskonaut__tests__cases__ui__noop_when_entering_file-2.snap
mv ui__noop_when_entering_file-3.snap diskonaut__tests__cases__ui__noop_when_entering_file-3.snap
mv ui__noop_when_entering_file-4.snap diskonaut__tests__cases__ui__noop_when_entering_file-4.snap
mv ui__noop_when_entering_file.snap diskonaut__tests__cases__ui__noop_when_entering_file.snap
mv ui__noop_when_moving_off_screen_edges-2.snap diskonaut__tests__cases__ui__noop_when_moving_off_screen_edges-2.snap
mv ui__noop_when_moving_off_screen_edges-3.snap diskonaut__tests__cases__ui__noop_when_moving_off_screen_edges-3.snap
mv ui__noop_when_moving_off_screen_edges-4.snap diskonaut__tests__cases__ui__noop_when_moving_off_screen_edges-4.snap
mv ui__noop_when_moving_off_screen_edges.snap diskonaut__tests__cases__ui__noop_when_moving_off_screen_edges.snap
mv ui__noop_when_pressing_esc_at_base_folder-10.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-10.snap
mv ui__noop_when_pressing_esc_at_base_folder-11.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-11.snap
mv ui__noop_when_pressing_esc_at_base_folder-12.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-12.snap
mv ui__noop_when_pressing_esc_at_base_folder-13.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-13.snap
mv ui__noop_when_pressing_esc_at_base_folder-14.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-14.snap
mv ui__noop_when_pressing_esc_at_base_folder-15.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-15.snap
mv ui__noop_when_pressing_esc_at_base_folder-16.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-16.snap
mv ui__noop_when_pressing_esc_at_base_folder-17.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-17.snap
mv ui__noop_when_pressing_esc_at_base_folder-18.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-18.snap
mv ui__noop_when_pressing_esc_at_base_folder-2.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-2.snap
mv ui__noop_when_pressing_esc_at_base_folder-3.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-3.snap
mv ui__noop_when_pressing_esc_at_base_folder-4.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-4.snap
mv ui__noop_when_pressing_esc_at_base_folder-5.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-5.snap
mv ui__noop_when_pressing_esc_at_base_folder-6.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-6.snap
mv ui__noop_when_pressing_esc_at_base_folder-7.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-7.snap
mv ui__noop_when_pressing_esc_at_base_folder-8.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-8.snap
mv ui__noop_when_pressing_esc_at_base_folder-9.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder-9.snap
mv ui__noop_when_pressing_esc_at_base_folder.snap diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap
mv ui__permission_denied_when_deleting-10.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-10.snap
mv ui__permission_denied_when_deleting-2.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-2.snap
mv ui__permission_denied_when_deleting-3.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-3.snap
mv ui__permission_denied_when_deleting-4.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-4.snap
mv ui__permission_denied_when_deleting-5.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-5.snap
mv ui__permission_denied_when_deleting-6.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-6.snap
mv ui__permission_denied_when_deleting-7.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-7.snap
mv ui__permission_denied_when_deleting-8.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-8.snap
mv ui__permission_denied_when_deleting-9.snap diskonaut__tests__cases__ui__permission_denied_when_deleting-9.snap
mv ui__permission_denied_when_deleting.snap diskonaut__tests__cases__ui__permission_denied_when_deleting.snap
mv ui__pressing_delete_with_no_selected_tile-2.snap diskonaut__tests__cases__ui__pressing_delete_with_no_selected_tile-2.snap
mv ui__pressing_delete_with_no_selected_tile.snap diskonaut__tests__cases__ui__pressing_delete_with_no_selected_tile.snap
mv ui__small_files_non_square.snap diskonaut__tests__cases__ui__small_files_non_square.snap
mv ui__small_files.snap diskonaut__tests__cases__ui__small_files.snap
mv ui__small_files_with_x_as_zero.snap diskonaut__tests__cases__ui__small_files_with_x_as_zero.snap
mv ui__small_files_with_y_as_zero.snap diskonaut__tests__cases__ui__small_files_with_y_as_zero.snap
mv ui__small_width_long_folder_name.snap diskonaut__tests__cases__ui__small_width_long_folder_name.snap
mv ui__small_width.snap diskonaut__tests__cases__ui__small_width.snap
mv ui__too_small_height.snap diskonaut__tests__cases__ui__too_small_height.snap
mv ui__too_small_width_five.snap diskonaut__tests__cases__ui__too_small_width_five.snap
mv ui__too_small_width_four.snap diskonaut__tests__cases__ui__too_small_width_four.snap
mv ui__too_small_width_one.snap diskonaut__tests__cases__ui__too_small_width_one.snap
mv ui__too_small_width_three.snap diskonaut__tests__cases__ui__too_small_width_three.snap
mv ui__too_small_width_two.snap diskonaut__tests__cases__ui__too_small_width_two.snap
mv ui__two_large_files_one_small_file.snap diskonaut__tests__cases__ui__two_large_files_one_small_file.snap

@silwol
Copy link
Contributor

silwol commented Jun 18, 2020

Adding myself to the list of people interested in the deps update, I would like to package diskonaut for Debian main.
@tim77 is there any specific reason why you intend to update tui to 0.8 and not 0.9?

@tim77
Copy link
Contributor Author

tim77 commented Jun 18, 2020

@tim77 is there any specific reason why you intend to update tui to 0.8 and not 0.9?

Unfortunately yes. :) I guess we need to port diskonaut for newer version tui >= 0.8 because of some breaking changes. So this is more like temporal bump probably.

for some reason I'm not managing to push the changes to your branch so that this PR is updated.

@imsnif this is weird. Will look to this very soon.

@silwol
Copy link
Contributor

silwol commented Jun 18, 2020

@tim77 see #30 - wasn't too hard luckily.

Co-authored-by: Aram Drevekenin <[email protected]>
@imsnif
Copy link
Owner

imsnif commented Jun 18, 2020

Thank you very much, @tim77 ! I'm merging this.

@silwol and @tim77 - I'm not sure if you saw it or if this changes anything, but we added another small dependency in main on the filesize crate: #28

@imsnif imsnif merged commit 03f2fe1 into imsnif:main Jun 18, 2020
@imsnif
Copy link
Owner

imsnif commented Sep 1, 2020

Hey @silwol - are you still interested in packaging diskonaut for Debian main? If so, is there anything I can do to help move this forward?

@silwol
Copy link
Contributor

silwol commented Sep 6, 2020

@imsnif I still am. For now, I don't see much you can do, we've still got some problems to solve regarding the Debian tooling before we can start continue to work on packaging, so it's more of a long-term goal. If I stumble over problems where you could help, I'll let you know.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants