Merge branch 'develop'

.github/workflows/release.yml

@@ -12,9 +12,8 @@
 # title/body based on your changelogs.
 
 name: Release
-
 permissions:
-  contents: write
+  "contents": "write"
 
 # This task will run whenever you push a git tag that looks like a version
 # like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc.
@@ -62,7 +61,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.17.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.18.0/cargo-dist-installer.sh | sh"
       - name: Cache cargo-dist
         uses: actions/upload-artifact@v4
         with:
@@ -116,10 +115,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: swatinem/rust-cache@v2
-        with:
-          key: ${{ join(matrix.targets, '-') }}
-          cache-provider: ${{ matrix.cache_provider }}
       - name: Install cargo-dist
         run: ${{ matrix.install_dist }}
       # Get the dist-manifest

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "phraze"
 description = "Random passphrase generator"
-version = "0.3.11"
+version = "0.3.12"
 edition = "2021"
 authors = ["sts10 <[email protected]>"]
 license = "MPL-2.0"
@@ -31,7 +31,7 @@ lto = "thin"
 # Config for 'cargo dist'
 [workspace.metadata.dist]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.17.0"
+cargo-dist-version = "0.18.0"
 # CI backends to support
 ci = "github"
 # The installers to generate for each app

readme.markdown

@@ -1,5 +1,6 @@
 # Phraze
 [![Crates.io](https://img.shields.io/crates/v/phraze?link=https%3A%2F%2Fcrates.io%2Fcrates%2Fphraze)](https://crates.io/crates/phraze)
+[![Crates.io number of downloads](https://img.shields.io/crates/d/phraze)](https://crates.io/crates/phraze)
 [![](https://deps.rs/repo/github/sts10/phraze/status.svg)](https://deps.rs/repo/github/sts10/phraze)
 [![Crates.io](https://img.shields.io/crates/l/phraze)](./LICENSE.txt)
 [![Packaging status](https://repology.org/badge/tiny-repos/phraze.svg)](https://repology.org/project/phraze/versions)
@@ -149,7 +150,7 @@ Before generating a passphrase from a given custom list, Phraze will remove any
 ### Copying passphrase to clipboard
 You can pipe Phraze's outputted passphrase to other tools. For example, you can copy generated passphrase to xclip (a common Linux clipboard tool):
 ```bash
-$ phraze | xclip -selection clipboard
+$ phraze | xclip -selection clipboard -rmlastnl
 ```
 
 ## Usage
@@ -216,9 +217,7 @@ Options:
 
   -c, --custom-list <CUSTOM_LIST_FILE_PATH>
           Provide a text file with a list of words to randomly generate passphrase 
-          from.
-          
-          Should be a text file with one word per line.
+          from. Should be a text file with one word per line.
 
   -t, --title-case
           Use Title Case for words in generated passphrases
@@ -511,7 +510,9 @@ There are already a few good passphrase generators, including [passphraseme](htt
 Admittedly, part of my motivation to create Phraze was to highlight my [Orchard Street Wordlists](https://github.com/sts10/orchard-street-wordlists), which I think are pretty good!
 
 ## For developers
-I welcome both pull requests and issues. See included [LICENSE.txt](./LICENSE.txt) file.
+I'm trying to do development work on the `development` git branch, then merge the work into the `main` branch when it feels like time for a new release.
+
+In general I welcome both pull requests and issues. See included [LICENSE.txt](./LICENSE.txt) file. This project doesn't have a formal Code of Conduct yet (it may in the future), but informally just try to be kind to each other.
 
 ### Testing and benchmarking Phraze
 Run `cargo test` to run Phraze's tests.

src/main.rs

@@ -72,9 +72,8 @@ struct Args {
     #[clap(short = 'l', long = "list", value_parser=parse_list_choice, default_value="m")]
     list_choice: ListChoice,
 
-    /// Provide a text file with a list of words to randomly generate passphrase from.
-    ///
-    /// Should be a text file with one word per line.
+    /// Provide a text file with a list of words to randomly generate passphrase
+    /// from. Should be a text file with one word per line.
     #[clap(short = 'c', long = "custom-list", conflicts_with = "list_choice")]
     custom_list_file_path: Option<PathBuf>,
 

word-lists/orchard-street-long.txt

@@ -169,11 +169,8 @@ acidity
 acids
 acknowledge
 acknowledged
-acknowledgement
 acknowledges
 acknowledging
-acknowledgment
-acknowledgments
 acne
 acorn
 acoustic
@@ -3939,6 +3936,7 @@ criterion
 critic
 critical
 critically
+criticism
 criticisms
 criticize
 criticized
@@ -5755,6 +5753,7 @@ epidemiology
 epidermal
 epidermis
 epilepsy
+epilogue
 episcopal
 episode
 episodes
@@ -7397,6 +7396,7 @@ growing
 growled
 grown
 grows
+growth
 grunted
 guarantee
 guaranteed
@@ -7670,7 +7670,6 @@ hemp
 henceforth
 henchmen
 hens
-hepatic
 hepatitis
 herald
 heralded
@@ -8193,7 +8192,6 @@ inaccessible
 inaccurate
 inaction
 inactive
-inactivity
 inadequacies
 inadequacy
 inadequate
@@ -8209,6 +8207,7 @@ incapacity
 incarcerated
 incarceration
 incarnate
+incarnation
 incarnations
 incense
 incentive
@@ -8458,7 +8457,6 @@ initiative
 initiatives
 inject
 injected
-injecting
 injection
 injections
 injunction
@@ -9080,6 +9078,7 @@ knights
 knit
 knitting
 knives
+knob
 knock
 knocked
 knocking
@@ -9111,6 +9110,7 @@ lacked
 lacking
 lacks
 lacrosse
+lactate
 lactation
 lactose
 lacy
@@ -9715,6 +9715,7 @@ marketed
 marketers
 marketing
 marketplace
+marking
 markings
 markup
 marlins
@@ -9908,6 +9909,7 @@ menacing
 meningitis
 menopause
 menstrual
+menstruation
 mentality
 mentally
 mention
@@ -10910,7 +10912,6 @@ outfielder
 outfit
 outfits
 outgoing
-outgrowth
 outlaw
 outlawed
 outlaws
@@ -12559,7 +12560,6 @@ quantities
 quantity
 quantum
 quarantine
-quark
 quarrel
 quarrels
 quarries
@@ -12630,6 +12630,7 @@ radiating
 radical
 radicalism
 radically
+radicals
 radio
 radioactive
 radioactivity
@@ -13018,7 +13019,6 @@ reigned
 reigning
 reigns
 reimbursement
-reincarnation
 reindeer
 reinforce
 reinforced
@@ -13104,7 +13104,6 @@ remark
 remarkable
 remarkably
 remarked
-remarking
 remarks
 remarried
 rematch
@@ -17270,6 +17269,7 @@ welcoming
 weld
 welded
 welding
+welfare
 wellington
 welsh
 welt

word-lists/orchard-street-medium.txt

@@ -1759,6 +1759,7 @@ criterion
 critic
 critical
 critically
+criticism
 criticisms
 criticized
 critics
@@ -3055,7 +3056,6 @@ fluids
 flute
 flux
 flying
-foam
 focal
 focus
 focused
@@ -3541,7 +3541,6 @@ helps
 hemisphere
 hemorrhage
 hepatitis
-herald
 herb
 herbs
 herd
@@ -5820,6 +5819,7 @@ radial
 radiation
 radical
 radically
+radicals
 radio
 radius
 raiders
@@ -5948,7 +5948,6 @@ referee
 referenced
 references
 referendum
-referral
 referring
 refers
 refined
@@ -8038,6 +8037,7 @@ weighted
 weights
 welcome
 welcomed
+welfare
 wells
 welsh
 western