* Fork glob. Normalise license holder

* Fix more licenses

* unwraps

* bad doc test
This commit is contained in:
JT 2022-03-13 11:30:27 -07:00 committed by GitHub
parent 30bb090cd4
commit ff3dffd813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 1582 additions and 53 deletions

67
Cargo.lock generated
View File

@ -1099,6 +1099,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]] [[package]]
name = "futf" name = "futf"
version = "0.1.5" version = "0.1.5"
@ -2235,7 +2241,6 @@ dependencies = [
"encoding_rs", "encoding_rs",
"filesize", "filesize",
"fs_extra", "fs_extra",
"glob",
"hamcrest2", "hamcrest2",
"htmlescape", "htmlescape",
"ical", "ical",
@ -2250,6 +2255,7 @@ dependencies = [
"nu-ansi-term", "nu-ansi-term",
"nu-color-config", "nu-color-config",
"nu-engine", "nu-engine",
"nu-glob",
"nu-json", "nu-json",
"nu-parser", "nu-parser",
"nu-path", "nu-path",
@ -2299,12 +2305,20 @@ name = "nu-engine"
version = "0.59.1" version = "0.59.1"
dependencies = [ dependencies = [
"chrono", "chrono",
"glob",
"itertools", "itertools",
"nu-glob",
"nu-path", "nu-path",
"nu-protocol", "nu-protocol",
] ]
[[package]]
name = "nu-glob"
version = "0.59.1"
dependencies = [
"doc-comment",
"tempdir",
]
[[package]] [[package]]
name = "nu-json" name = "nu-json"
version = "0.59.1" version = "0.59.1"
@ -2423,9 +2437,9 @@ dependencies = [
"bigdecimal", "bigdecimal",
"chrono", "chrono",
"getset", "getset",
"glob",
"hamcrest2", "hamcrest2",
"indexmap", "indexmap",
"nu-glob",
"nu-path", "nu-path",
"nu-protocol", "nu-protocol",
"num-bigint 0.4.3", "num-bigint 0.4.3",
@ -3238,6 +3252,19 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "rand"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
dependencies = [
"fuchsia-cprng",
"libc",
"rand_core 0.3.1",
"rdrand",
"winapi",
]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.7.3" version = "0.7.3"
@ -3283,6 +3310,21 @@ dependencies = [
"rand_core 0.6.3", "rand_core 0.6.3",
] ]
[[package]]
name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
"rand_core 0.4.2",
]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.5.1" version = "0.5.1"
@ -3363,6 +3405,15 @@ dependencies = [
"num_cpus", "num_cpus",
] ]
[[package]]
name = "rdrand"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
dependencies = [
"rand_core 0.3.1",
]
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.1.57" version = "0.1.57"
@ -4132,6 +4183,16 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "tempdir"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
dependencies = [
"rand 0.4.6",
"remove_dir_all",
]
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.3.0" version = "3.3.0"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
default-run = "nu" default-run = "nu"
description = "A new type of shell" description = "A new type of shell"
documentation = "https://www.nushell.sh/book/" documentation = "https://www.nushell.sh/book/"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
default-run = "nu" default-run = "nu"
description = "A new type of shell" description = "A new type of shell"
documentation = "https://www.nushell.sh/book/" documentation = "https://www.nushell.sh/book/"

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2019 - 2021 Nushell Project Copyright (c) 2019 - 2021 The Nushell Project Developers
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -3,7 +3,7 @@ authors = [
"ogham@bsago.me", "ogham@bsago.me",
"Ryan Scheel (Havvy) <ryan.havvy@gmail.com>", "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>",
"Josh Triplett <josh@joshtriplett.org>", "Josh Triplett <josh@joshtriplett.org>",
"The Nu Project Contributors", "The Nushell Project Developers",
] ]
description = "Library for ANSI terminal colors and styles (bold, underline)" description = "Library for ANSI terminal colors and styles (bold, underline)"
edition = "2018" edition = "2018"

View File

@ -1,6 +1,7 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014 Benjamin Sago Copyright (c) 2014 Benjamin Sago
Copyright (c) 2021-2022 The Nushell Project Developers
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -13,6 +13,7 @@ nu-ansi-term = "0.42.0"
nu-color-config = { path = "../nu-color-config", version = "0.59.1" } nu-color-config = { path = "../nu-color-config", version = "0.59.1" }
nu-engine = { path = "../nu-engine", version = "0.59.1" } nu-engine = { path = "../nu-engine", version = "0.59.1" }
nu-glob = { path = "../nu-glob", version = "0.59.1" }
nu-json = { path = "../nu-json", version = "0.59.1" } nu-json = { path = "../nu-json", version = "0.59.1" }
nu-parser = { path = "../nu-parser", version = "0.59.1" } nu-parser = { path = "../nu-parser", version = "0.59.1" }
nu-path = { path = "../nu-path", version = "0.59.1" } nu-path = { path = "../nu-path", version = "0.59.1" }
@ -39,7 +40,6 @@ eml-parser = "0.1.0"
encoding_rs = "0.8.30" encoding_rs = "0.8.30"
filesize = "0.2.0" filesize = "0.2.0"
fs_extra = "1.2.0" fs_extra = "1.2.0"
glob = "0.3.0"
htmlescape = "0.3.1" htmlescape = "0.3.1"
ical = "0.7.0" ical = "0.7.0"
indexmap = { version="1.7", features=["serde-1"] } indexmap = { version="1.7", features=["serde-1"] }

View File

@ -9,7 +9,7 @@ use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Spanne
use crate::filesystem::util::FileStructure; use crate::filesystem::util::FileStructure;
const GLOB_PARAMS: glob::MatchOptions = glob::MatchOptions { const GLOB_PARAMS: nu_glob::MatchOptions = nu_glob::MatchOptions {
case_sensitive: true, case_sensitive: true,
require_literal_separator: false, require_literal_separator: false,
require_literal_leading_dot: false, require_literal_leading_dot: false,
@ -58,7 +58,7 @@ impl Command for Cp {
let source = path.join(src.item.as_str()); let source = path.join(src.item.as_str());
let destination = path.join(dst.item.as_str()); let destination = path.join(dst.item.as_str());
let sources: Vec<_> = match glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) { let sources: Vec<_> = match nu_glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) {
Ok(files) => files.collect(), Ok(files) => files.collect(),
Err(e) => { Err(e) => {
return Err(ShellError::SpannedLabeledError( return Err(ShellError::SpannedLabeledError(
@ -193,7 +193,7 @@ impl Command for Cp {
} }
// let mut sources = // let mut sources =
// glob::glob(&source.to_string_lossy()).map_or_else(|_| Vec::new(), Iterator::collect); // nu_glob::glob(&source.to_string_lossy()).map_or_else(|_| Vec::new(), Iterator::collect);
// if sources.is_empty() { // if sources.is_empty() {
// return Err(ShellError::FileNotFound(call.positional[0].span)); // return Err(ShellError::FileNotFound(call.positional[0].span));
// } // }

View File

@ -9,7 +9,7 @@ use nu_protocol::{
Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape,
}; };
const GLOB_PARAMS: glob::MatchOptions = glob::MatchOptions { const GLOB_PARAMS: nu_glob::MatchOptions = nu_glob::MatchOptions {
case_sensitive: true, case_sensitive: true,
require_literal_separator: false, require_literal_separator: false,
require_literal_leading_dot: false, require_literal_leading_dot: false,
@ -62,7 +62,7 @@ impl Command for Mv {
let source = path.join(spanned_source.item.as_str()); let source = path.join(spanned_source.item.as_str());
let destination = path.join(spanned_destination.item.as_str()); let destination = path.join(spanned_destination.item.as_str());
let mut sources = glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) let mut sources = nu_glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS)
.map_or_else(|_| Vec::new(), Iterator::collect); .map_or_else(|_| Vec::new(), Iterator::collect);
if sources.is_empty() { if sources.is_empty() {

View File

@ -16,7 +16,7 @@ use nu_protocol::{
Spanned, SyntaxShape, Type, Value, Spanned, SyntaxShape, Type, Value,
}; };
const GLOB_PARAMS: glob::MatchOptions = glob::MatchOptions { const GLOB_PARAMS: nu_glob::MatchOptions = nu_glob::MatchOptions {
case_sensitive: true, case_sensitive: true,
require_literal_separator: false, require_literal_separator: false,
require_literal_leading_dot: false, require_literal_leading_dot: false,
@ -165,9 +165,9 @@ fn rm(
} }
let path = path.join(&target.item); let path = path.join(&target.item);
match glob::glob_with( match nu_glob::glob_with(
&path.to_string_lossy(), &path.to_string_lossy(),
glob::MatchOptions { nu_glob::MatchOptions {
require_literal_leading_dot: true, require_literal_leading_dot: true,
..GLOB_PARAMS ..GLOB_PARAMS
}, },

View File

@ -1,5 +1,5 @@
use filesize::file_real_size_fast; use filesize::file_real_size_fast;
use glob::Pattern; use nu_glob::Pattern;
use nu_protocol::{ShellError, Span, Value}; use nu_protocol::{ShellError, Span, Value};
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};

View File

@ -1,6 +1,6 @@
use crate::{DirBuilder, DirInfo, FileInfo}; use crate::{DirBuilder, DirInfo, FileInfo};
use glob::{GlobError, MatchOptions, Pattern};
use nu_engine::CallExt; use nu_engine::CallExt;
use nu_glob::{GlobError, MatchOptions, Pattern};
use nu_protocol::{ use nu_protocol::{
ast::Call, ast::Call,
engine::{Command, EngineState, Stack}, engine::{Command, EngineState, Stack},
@ -103,9 +103,9 @@ impl Command for Du {
let mut paths = match args.path { let mut paths = match args.path {
Some(p) => { Some(p) => {
let p = p.item.to_str().expect("Why isn't this encoded properly?"); let p = p.item.to_str().expect("Why isn't this encoded properly?");
glob::glob_with(p, GLOB_PARAMS) nu_glob::glob_with(p, GLOB_PARAMS)
} }
None => glob::glob_with("*", GLOB_PARAMS), None => nu_glob::glob_with("*", GLOB_PARAMS),
} }
.map_err(|e| { .map_err(|e| {
ShellError::SpannedLabeledError(e.msg.to_string(), "glob error".to_string(), tag) ShellError::SpannedLabeledError(e.msg.to_string(), "glob error".to_string(), tag)

View File

@ -75,7 +75,7 @@ fn sort_primitive_values() {
"# "#
)); ));
assert_eq!(actual.out, "authors = [\"The Nu Project Contributors\"]"); assert_eq!(actual.out, "authors = [\"The Nushell Project Developers\"]");
} }
#[test] #[test]

View File

@ -6,9 +6,10 @@ edition = "2021"
[dependencies] [dependencies]
nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.59.1" } nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.59.1" }
nu-path = { path = "../nu-path", version = "0.59.1" } nu-path = { path = "../nu-path", version = "0.59.1" }
nu-glob = { path = "../nu-glob", version = "0.59.1" }
itertools = "0.10.1" itertools = "0.10.1"
chrono = { version="0.4.19", features=["serde"] } chrono = { version="0.4.19", features=["serde"] }
glob = "0.3.0"
[features] [features]
plugin = [] plugin = []

View File

@ -5,7 +5,7 @@ use std::path::{Component, Path, PathBuf};
use nu_path::{canonicalize_with, expand_path_with}; use nu_path::{canonicalize_with, expand_path_with};
use nu_protocol::{ShellError, Span, Spanned}; use nu_protocol::{ShellError, Span, Spanned};
/// This function is like `glob::glob` from the `glob` crate, except it is relative to a given cwd. /// This function is like `nu_glob::glob` from the `glob` crate, except it is relative to a given cwd.
/// ///
/// It returns a tuple of two values: the first is an optional prefix that the expanded filenames share. /// It returns a tuple of two values: the first is an optional prefix that the expanded filenames share.
/// This prefix can be removed from the front of each value to give an approximation of the relative path /// This prefix can be removed from the front of each value to give an approximation of the relative path
@ -81,7 +81,7 @@ pub fn glob_from(
let pattern = pattern.to_string_lossy().to_string(); let pattern = pattern.to_string_lossy().to_string();
let glob = glob::glob(&pattern).map_err(|err| { let glob = nu_glob::glob(&pattern).map_err(|err| {
nu_protocol::ShellError::SpannedLabeledError( nu_protocol::ShellError::SpannedLabeledError(
"Error extracting glob pattern".into(), "Error extracting glob pattern".into(),
err.to_string(), err.to_string(),

14
crates/nu-glob/Cargo.toml Normal file
View File

@ -0,0 +1,14 @@
[package]
name = "nu-glob"
version = "0.59.1"
authors = ["The Nushell Project Developers", "The Rust Project Developers"]
license = "MIT/Apache-2.0"
description = """
Fork of glob. Support for matching file paths against Unix shell style patterns.
"""
edition = "2021"
categories = ["filesystem"]
[dev-dependencies]
tempdir = "0.3"
doc-comment = "0.3"

View File

@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -0,0 +1,26 @@
Copyright (c) 2014 The Rust Project Developers
Copyright (c) 2022 The Nushell Project Developers
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

28
crates/nu-glob/README.md Normal file
View File

@ -0,0 +1,28 @@
nu-glob
====
Support for matching file paths against Unix shell style patterns.
## Usage
To use `nu-glob`, add this to your `Cargo.toml`:
```toml
[dependencies]
nu-glob = "0.59.1"
```
## Examples
Print all jpg files in /media/ and all of its subdirectories.
```rust
use nu_nu_glob::glob;
for entry in glob("/media/**/*.jpg").expect("Failed to read glob pattern") {
match entry {
Ok(path) => println!("{:?}", path.display()),
Err(e) => println!("{:?}", e),
}
}
```

1196
crates/nu-glob/src/lib.rs Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors", "Christian Zangl <laktak@cdak.net>"] authors = ["The Nushell Project Developers", "Christian Zangl <laktak@cdak.net>"]
description = "Fork of serde-hjson" description = "Fork of serde-hjson"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -2,7 +2,7 @@ The MIT License (MIT)
Copyright (c) 2014 The Rust Project Developers Copyright (c) 2014 The Rust Project Developers
Copyright (c) 2016 Christian Zangl Copyright (c) 2016 Christian Zangl
Copyright (c) 2020 The Nu Project Contributors Copyright (c) 2020-2022 The Nushell Project Developers
Permission is hereby granted, free of charge, to any Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated person obtaining a copy of this software and associated

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "Path handling library for Nushell" description = "Path handling library for Nushell"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["Andrei Volnin <wolandr@gmail.com>", "The Nu Project Contributors"] authors = ["Andrei Volnin <wolandr@gmail.com>", "The Nushell Project Developers"]
description = "Pretty hex dump of bytes slice in the common style." description = "Pretty hex dump of bytes slice in the common style."
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,6 +1,7 @@
MIT License MIT License
Copyright (c) 2018 Andrei Volnin Copyright (c) 2018 Andrei Volnin
Copyright (c) 2021-2022 The Nushell Project Developers
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors", "procs creators"] authors = ["The Nushell Project Developers", "procs creators"]
description = "Nushell system querying" description = "Nushell system querying"
name = "nu-system" name = "nu-system"
version = "0.59.1" version = "0.59.1"

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2022 procs developers and Nushell developers Copyright (c) 2022 procs developers and The Nushell Project Developers
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "Nushell table printing" description = "Nushell table printing"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "Nushell grid printing" description = "Nushell grid printing"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "Support for writing Nushell tests" description = "Support for writing Nushell tests"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"
@ -12,11 +12,11 @@ doctest = false
[dependencies] [dependencies]
nu-path = { path="../nu-path", version = "0.59.1" } nu-path = { path="../nu-path", version = "0.59.1" }
nu-protocol = { path="../nu-protocol", version = "0.59.1" } nu-protocol = { path="../nu-protocol", version = "0.59.1" }
nu-glob = { path = "../nu-glob", version = "0.59.1" }
bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] } bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
chrono = "0.4.19" chrono = "0.4.19"
getset = "0.1.1" getset = "0.1.1"
glob = "0.3.0"
indexmap = { version="1.6.1", features=["serde-1"] } indexmap = { version="1.6.1", features=["serde-1"] }
num-bigint = { version="0.4.3", features=["serde"] } num-bigint = { version="0.4.3", features=["serde"] }
tempfile = "3.2.0" tempfile = "3.2.0"

View File

@ -2,7 +2,7 @@ use super::Director;
use crate::fs; use crate::fs;
use crate::fs::Stub; use crate::fs::Stub;
use getset::Getters; use getset::Getters;
use glob::glob; use nu_glob::glob;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::str; use std::str;
use tempfile::{tempdir, TempDir}; use tempfile::{tempdir, TempDir};

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A version incrementer plugin for Nushell" description = "A version incrementer plugin for Nushell"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A git status plugin for Nushell" description = "A git status plugin for Nushell"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A version incrementer plugin for Nushell" description = "A version incrementer plugin for Nushell"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A set of query commands for Nushell" description = "A set of query commands for Nushell"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A plugin to display charts" description = "A plugin to display charts"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A converter plugin to the bson format for Nushell" description = "A converter plugin to the bson format for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A converter plugin to the mp4 format for Nushell" description = "A converter plugin to the mp4 format for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A converter plugin to the bson format for Nushell" description = "A converter plugin to the bson format for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "An S3 plugin for Nushell" description = "An S3 plugin for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A plugin to open files/URLs directly from Nushell" description = "A plugin to open files/URLs directly from Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -43,7 +43,7 @@ impl Start {
fn glob_to_values(&self, value: &Value) -> Result<Vec<Tagged<String>>, ShellError> { fn glob_to_values(&self, value: &Value) -> Result<Vec<Tagged<String>>, ShellError> {
let mut result = vec![]; let mut result = vec![];
match glob::glob(&value.as_string()?) { match nu_glob::glob(&value.as_string()?) {
Ok(paths) => { Ok(paths) => {
for path_result in paths { for path_result in paths {
match path_result { match path_result {

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A converter plugin to the bson format for Nushell" description = "A converter plugin to the bson format for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "A converter plugin to the SQLite format for Nushell" description = "A converter plugin to the SQLite format for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "Tree viewer plugin for Nushell" description = "Tree viewer plugin for Nushell"
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

View File

@ -1,4 +1,4 @@
Copyright (c) 2018 Jonathan turner <jonathan.d.turner@gmail.com> Copyright (c) 2019-2022 The Nushell Project Developers
Permission is hereby granted, free of charge, to any Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated person obtaining a copy of this software and associated

View File

@ -1,7 +1,7 @@
[package] [package]
name = "nu" name = "nu"
version = "0.1.1" version = "0.1.1"
authors = ["The Nu Project Contributors"] authors = ["The Nushell Project Developers"]
description = "a new type of shell" description = "a new type of shell"
license = "ISC" license = "ISC"
edition = "2018" edition = "2018"

View File

@ -35,7 +35,7 @@
Id='*' Id='*'
Name='nu' Name='nu'
UpgradeCode='82D756D2-19FA-4F09-B10F-64942E89F364' UpgradeCode='82D756D2-19FA-4F09-B10F-64942E89F364'
Manufacturer='The Nu Project Contributors' Manufacturer='The Nushell Project Developers'
Language='1033' Language='1033'
Codepage='1252' Codepage='1252'
Version='$(var.Version)'> Version='$(var.Version)'>
@ -43,7 +43,7 @@
<Package Id='*' <Package Id='*'
Keywords='Installer' Keywords='Installer'
Description='A new type of shell' Description='A new type of shell'
Manufacturer='The Nu Project Contributors' Manufacturer='The Nushell Project Developers'
InstallerVersion='450' InstallerVersion='450'
Languages='1033' Languages='1033'
Compressed='yes' Compressed='yes'