diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 31c2074..ab846a1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,14 +9,6 @@ updates: directory: / schedule: interval: "monthly" - - package-ecosystem: cargo - directory: /jig-cli - schedule: - interval: "monthly" - - package-ecosystem: cargo - directory: /jira - schedule: - interval: "monthly" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2864740..0d22f77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: id: "crate-version" shell: "bash" run: | - echo CRATE_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' jig-cli/Cargo.toml) >> $GITHUB_OUTPUT + echo CRATE_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' Cargo.toml) >> $GITHUB_OUTPUT - run: "echo '::notice:: Tag = v${{ steps.crate-version.outputs.CRATE_VERSION }}'" diff --git a/Cargo.toml b/Cargo.toml index 5c007ad..2a93c17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,14 +1,27 @@ -[workspace] -resolver = "2" -members = [ - "jig-cli", -] -default-members = [ - "jig-cli" -] +[package] +name = "jig" +version = "0.5.0" +edition = "2021" +authors = ["Steffen Baarsgaard "] +repository = "https://github.com/baarsgaard/jig" -[workspace.dependencies] +[dependencies] +chrono = { version = "0.4.26", default-features = false, features = ["clock"]} +clap = { version = "4.3.0", default-features = false, features = ["help", "std", "color", "derive"] } +clap_complete = "4.4.4" color-eyre = { version = "0.6.2", default-features = false } +etcetera = "0.8.0" +gix = { version = "0.57.1", default-features = false } +inquire = { git = "https://github.com/mikaelmello/inquire.git", features = ["date"] } +jira = { git = "https://github.com/baarsgaard/jira-api.git", default-features = false } regex = { version = "1.8.4", features = ["std"], default-features = false } +self_update = { version = "0.39.0", default-features = false, features = ["rustls"] } serde = { version = "1.0.164", features = ["derive"] } serde_json = "1.0.97" +toml = "0.8.6" +url = { version = "2.4.0", default-features = false } + +[features] +default = [] +server = [] # simplifies GH releases +cloud = ["jira/cloud"] diff --git a/jig-cli/Cargo.toml b/jig-cli/Cargo.toml deleted file mode 100644 index cd3c0fd..0000000 --- a/jig-cli/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "jig" -version = "0.5.0" -edition = "2021" -authors = ["Steffen Baarsgaard "] - -[dependencies] -chrono = { version = "0.4.26", default-features = false, features = ["clock"]} -clap = { version = "4.3.0", default-features = false, features = ["help", "std", "color", "derive"] } -clap_complete = "4.4.4" -color-eyre = { workspace = true } -etcetera = "0.8.0" -gix = { version = "0.57.1", default-features = false } -inquire = { git = "https://github.com/mikaelmello/inquire.git", features = ["date"] } -jira = { git = "https://github.com/baarsgaard/jira-api.git", default-features = false } -regex = { workspace = true } -self_update = { version = "0.39.0", default-features = false, features = ["rustls"] } -serde = { workspace = true } -serde_json = { workspace = true } -toml = "0.8.6" -url = { version = "2.4.0", default-features = false } - -[features] -default = [] -server = [] # simplifies GH releases -cloud = ["jira/cloud"] diff --git a/jig-cli/src/commands/assign.rs b/src/commands/assign.rs similarity index 100% rename from jig-cli/src/commands/assign.rs rename to src/commands/assign.rs diff --git a/jig-cli/src/commands/branch.rs b/src/commands/branch.rs similarity index 100% rename from jig-cli/src/commands/branch.rs rename to src/commands/branch.rs diff --git a/jig-cli/src/commands/comment.rs b/src/commands/comment.rs similarity index 100% rename from jig-cli/src/commands/comment.rs rename to src/commands/comment.rs diff --git a/jig-cli/src/commands/completion.rs b/src/commands/completion.rs similarity index 100% rename from jig-cli/src/commands/completion.rs rename to src/commands/completion.rs diff --git a/jig-cli/src/commands/hooks.rs b/src/commands/hooks.rs similarity index 100% rename from jig-cli/src/commands/hooks.rs rename to src/commands/hooks.rs diff --git a/jig-cli/src/commands/init_config.rs b/src/commands/init_config.rs similarity index 100% rename from jig-cli/src/commands/init_config.rs rename to src/commands/init_config.rs diff --git a/jig-cli/src/commands/mod.rs b/src/commands/mod.rs similarity index 100% rename from jig-cli/src/commands/mod.rs rename to src/commands/mod.rs diff --git a/jig-cli/src/commands/open.rs b/src/commands/open.rs similarity index 100% rename from jig-cli/src/commands/open.rs rename to src/commands/open.rs diff --git a/jig-cli/src/commands/print_configs.rs b/src/commands/print_configs.rs similarity index 100% rename from jig-cli/src/commands/print_configs.rs rename to src/commands/print_configs.rs diff --git a/jig-cli/src/commands/query.rs b/src/commands/query.rs similarity index 100% rename from jig-cli/src/commands/query.rs rename to src/commands/query.rs diff --git a/jig-cli/src/commands/shared.rs b/src/commands/shared.rs similarity index 100% rename from jig-cli/src/commands/shared.rs rename to src/commands/shared.rs diff --git a/jig-cli/src/commands/transition.rs b/src/commands/transition.rs similarity index 100% rename from jig-cli/src/commands/transition.rs rename to src/commands/transition.rs diff --git a/jig-cli/src/commands/upgrade.rs b/src/commands/upgrade.rs similarity index 100% rename from jig-cli/src/commands/upgrade.rs rename to src/commands/upgrade.rs diff --git a/jig-cli/src/commands/worklog.rs b/src/commands/worklog.rs similarity index 100% rename from jig-cli/src/commands/worklog.rs rename to src/commands/worklog.rs diff --git a/jig-cli/src/config.rs b/src/config.rs similarity index 100% rename from jig-cli/src/config.rs rename to src/config.rs diff --git a/jig-cli/src/hooks/commit_msg.rs b/src/hooks/commit_msg.rs similarity index 100% rename from jig-cli/src/hooks/commit_msg.rs rename to src/hooks/commit_msg.rs diff --git a/jig-cli/src/hooks/lib.rs b/src/hooks/lib.rs similarity index 100% rename from jig-cli/src/hooks/lib.rs rename to src/hooks/lib.rs diff --git a/jig-cli/src/hooks/mod.rs b/src/hooks/mod.rs similarity index 100% rename from jig-cli/src/hooks/mod.rs rename to src/hooks/mod.rs diff --git a/jig-cli/src/interactivity.rs b/src/interactivity.rs similarity index 100% rename from jig-cli/src/interactivity.rs rename to src/interactivity.rs diff --git a/jig-cli/src/main.rs b/src/main.rs similarity index 100% rename from jig-cli/src/main.rs rename to src/main.rs diff --git a/jig-cli/src/repo.rs b/src/repo.rs similarity index 100% rename from jig-cli/src/repo.rs rename to src/repo.rs