Skip to content

Commit

Permalink
0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mckernant1 committed Aug 27, 2019
1 parent 9848d1d commit 5160ab3
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gg"
version = "0.1.0"
version = "0.1.1"
authors = ["Tom McKernan <tmeaglei@gmail.com>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion src/cli.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Global Git
version: 0.0.1
version: 0.1.1
author: Tom McKernan <tmeaglei@gmail.com>
about: A global git manager
subcommands:
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ mod setup;
mod subcommands;

use clap::{App, AppSettings, ArgMatches};
use json::JsonValue;
use subcommands::{pull, list, add, delete, clone};
use setup::SettingsFile;


fn main() {
let mut settings_file = SettingsFile::new();
let settings_file = SettingsFile::new();
let yaml = load_yaml!("cli.yml");
let matches = App::from_yaml(yaml)
.setting(AppSettings::ArgRequiredElseHelp)
.get_matches();
call_subcommands(matches, settings_file)

}

fn call_subcommands(matches: ArgMatches, settings_file: SettingsFile) {
Expand Down
7 changes: 2 additions & 5 deletions src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use json::JsonValue;
use std::{env, fs};
use std::fs::File;
use std::io::{Read, stdout, Write, stdin};
use std::path::PathBuf;

#[derive(Clone)]
pub struct SettingsFile {
Expand All @@ -15,13 +14,11 @@ impl SettingsFile {

let settings_file_res = File::open(settings_file_path.clone());

let mut settings_file_mut = match settings_file_res {
match settings_file_res {
Ok(t) => t,
Err(_) => create_settings_file(settings_file_path.clone())
};

let settings_json = get_settings_json(&mut settings_file_mut);

return SettingsFile {
settings_file_path: settings_file_path.clone(),
};
Expand Down Expand Up @@ -67,7 +64,7 @@ impl SettingsFile {

for member in members {
if member["name"].as_str().unwrap() != repo_name {
new_repos.push(member.clone());
new_repos.push(member.clone()).unwrap();
}
}

Expand Down
6 changes: 2 additions & 4 deletions src/subcommands.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
use clap::ArgMatches;
use json::JsonValue;
use std::process::{Command, Stdio};
use crate::setup::SettingsFile;
use std::path::{PathBuf, Path};
use std::path::{PathBuf};
use std::fs;
use std::ffi::OsStr;

pub fn clone(matches: ArgMatches, settings_file: SettingsFile) {
let repo_string = matches
Expand Down Expand Up @@ -72,7 +70,7 @@ pub fn pull(matches: ArgMatches, settings_file: SettingsFile) {
}
}

pub fn list(matches: ArgMatches, settings_file: SettingsFile) {
pub fn list(_matches: ArgMatches, settings_file: SettingsFile) {
let repos = settings_file.list_repos();
for member in repos.members() {
println!("{}", member["name"].to_string());
Expand Down

0 comments on commit 5160ab3

Please sign in to comment.