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

refactor commands for better separation #313

Merged
merged 2 commits into from
Apr 21, 2022
Merged

refactor commands for better separation #313

merged 2 commits into from
Apr 21, 2022

Conversation

conradludgate
Copy link
Collaborator

@conradludgate conradludgate commented Apr 20, 2022

Bit of a random one. I want us to start using tracing on server, but keep log for client for now. This also adds a better separation of concerns to me

@ellie
Copy link
Member

ellie commented Apr 21, 2022

Happy to merge once the conflicts are sorted! I agree it makes more sense this way :)

@ellie ellie enabled auto-merge (squash) April 21, 2022 09:10
@conradludgate
Copy link
Collaborator Author

For sake of clarity, this is the output of atuin --help before and after

before:

atuin 0.8.1
Ellie Huxtable <e@elm.sh>
Magical shell history

USAGE:
    atuin <SUBCOMMAND>

OPTIONS:
    -h, --help       Print help information
    -V, --version    Print version information

SUBCOMMANDS:
    history            Manipulate shell history
    import             Import shell history from file
    server             Start an atuin server
    stats              Calculate statistics for your history
    init               Output shell setup
    uuid               Generate a UUID
    search             Interactive history search
    sync               Sync with the configured server
    login              Login to the configured server
    logout             Log out
    register           Register with the configured server
    key                Print the encryption key for transfer to another machine
    gen-completions    Generate shell completions
    help               Print this message or the help of the given subcommand(s)

after:

atuin 0.8.1
Ellie Huxtable <e@elm.sh>
Magical shell history

USAGE:
    atuin <SUBCOMMAND>

OPTIONS:
    -h, --help       Print help information
    -V, --version    Print version information

SUBCOMMANDS:
    history            Manipulate shell history
    import             Import shell history from file
    stats              Calculate statistics for your history
    init               Output shell setup
    uuid               Generate a UUID
    search             Interactive history search
    sync               Sync with the configured server
    login              Login to the configured server
    logout             Log out
    register           Register with the configured server
    key                Print the encryption key for transfer to another machine
    gen-completions    Generate shell completions
    server             Start an atuin server
    help               Print this message or the help of the given subcommand(s)

(To save you from spot the difference, all that is changed is the position of the server subcommand)

@ellie ellie merged commit d57f549 into main Apr 21, 2022
@ellie ellie deleted the command-refactoring branch April 21, 2022 09:12
ellie added a commit that referenced this pull request Apr 23, 2022
89549b3 Bump uuid from 0.8.2 to 1.0.0 (#311)
831cc98 Fix typos in the docs. (#171)
7436e4f feature-flags (#328)
508d4f4 History filter (#329)
02c70de refactor (#327)
a9d1ece Added docker-compose.yml (#325)
b8bdd83 Bump clap from 3.1.10 to 3.1.11 (#323)
52a3d0c Bump tracing from 0.1.33 to 0.1.34 (#324)
79597b0 Bump clap_complete from 3.1.1 to 3.1.2 (#316)
5aca611 Allow for larger commands (#321)
9085485 tracing (#315)
98d70fb treat popos as ubuntu (#319)
d57f549 refactor commands for better separation (#313)
24e2971 Fix SQL cache query (#318)
fe05d86 Fix delete trigger (#317)
48747e3 A few minor tweaks (#314)
ed4e07d Use the count cache (#312)
6e11b8e Bump clap from 3.1.9 to 3.1.10 (#309)
44e417d Bump axum from 0.5.1 to 0.5.3 (#310)
b98a378 Add count trigger (#308)
7fe523a Bump sqlx from 0.5.11 to 0.5.13 (#305)
c5ab2a4 Bump clap from 3.1.8 to 3.1.9 (#306)
55f66c8 Bump cli-table from 0.4.6 to 0.4.7 (#297)
69279d2 Bump config from 0.13.0 to 0.13.1 (#303)
d94cdae README: add MacPorts installation instructions (#302)
f4240aa Initial implementation of calendar API (#298)
3c5fbc5 provide better error messages (#300)
bc45bab remove default db uri (#299)
4897f4a Bump rmp-serde from 0.15.5 to 1.0.0 (#264)
5b2e828 Bump directories from 3.0.2 to 4.0.1 (#246)
016386c Bump urlencoding from 1.3.3 to 2.1.0 (#208)
a95018c goodbye warp, hello axum (#296)
3b7ed7c fix env config parsing (#295)
@ellie ellie mentioned this pull request Apr 23, 2022
ellie added a commit that referenced this pull request Apr 23, 2022
89549b3 Bump uuid from 0.8.2 to 1.0.0 (#311)
831cc98 Fix typos in the docs. (#171)
7436e4f feature-flags (#328)
508d4f4 History filter (#329)
02c70de refactor (#327)
a9d1ece Added docker-compose.yml (#325)
b8bdd83 Bump clap from 3.1.10 to 3.1.11 (#323)
52a3d0c Bump tracing from 0.1.33 to 0.1.34 (#324)
79597b0 Bump clap_complete from 3.1.1 to 3.1.2 (#316)
5aca611 Allow for larger commands (#321)
9085485 tracing (#315)
98d70fb treat popos as ubuntu (#319)
d57f549 refactor commands for better separation (#313)
24e2971 Fix SQL cache query (#318)
fe05d86 Fix delete trigger (#317)
48747e3 A few minor tweaks (#314)
ed4e07d Use the count cache (#312)
6e11b8e Bump clap from 3.1.9 to 3.1.10 (#309)
44e417d Bump axum from 0.5.1 to 0.5.3 (#310)
b98a378 Add count trigger (#308)
7fe523a Bump sqlx from 0.5.11 to 0.5.13 (#305)
c5ab2a4 Bump clap from 3.1.8 to 3.1.9 (#306)
55f66c8 Bump cli-table from 0.4.6 to 0.4.7 (#297)
69279d2 Bump config from 0.13.0 to 0.13.1 (#303)
d94cdae README: add MacPorts installation instructions (#302)
f4240aa Initial implementation of calendar API (#298)
3c5fbc5 provide better error messages (#300)
bc45bab remove default db uri (#299)
4897f4a Bump rmp-serde from 0.15.5 to 1.0.0 (#264)
5b2e828 Bump directories from 3.0.2 to 4.0.1 (#246)
016386c Bump urlencoding from 1.3.3 to 2.1.0 (#208)
a95018c goodbye warp, hello axum (#296)
3b7ed7c fix env config parsing (#295)
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.

2 participants