refactor: extract some code to files

Author: yoannfleurydev

.travis.yml

@@ -1,18 +1,19 @@
 language: rust
 rust:
-  - stable
-  - beta
-  - nightly
+    - stable
+    - beta
+    - nightly
 matrix:
-  allow_failures:
-    - rust: nightly
-  fast_finish: true
+    allow_failures:
+        - rust: nightly
+    fast_finish: true
 script:
-  - cargo build --release
+    - cargo build --release
 deploy:
-  provider: releases
-  api_key:
-    secure: GV2nTBbjxp3L07ny/W/jpLQvVR8y/q/3BDhrjVV6NsaQxAdWC5Lk79u5UDgY2HYgeGY2wKOrQO31MJF9cmXfxd3gDS+hRkT8HXwIxbqnE6rjAnC+WcJ9cXGF500pUyhtY4OVjOWNexs3q3JwZgqjDjr1MSRZZM+iv+i+I5ug37d53+no1hBv+008/IczC0MrfluqzsR4oJVBDL9Sw9lhATae4YGaC/LFo343pqb204O5xATUg9do/wXnh0DOsrICliLAuDNncBMRwMf0VqG7oTcd9U+ZyGfHLVAPQ2kFAWTQXz6le9H+A6jZfYISiD2Q3HM57xkJ+vR8HZ9M+szF6VV3nvcDzUt93txEkmXOVRlN/r+nirr/wicPQ/SBOhaPiBCg2LZfHocIoMPpuHxq3RPwFFTTb8gldbLfS6Kt7wmgH/i2t4zQzS1qHTsJO50ru6MFwAiZ0va05LcwPKS4C/4anDH4Xd8ViqUAzRcj5uSCX1+obLV37kCMGqRmdSWdLnu8VgKqLWf3OzydcmD4gr8Q67Ak/3BMGSwmOr5l6JPi3itRz4dzFZjksYwaJj6eNWTuuEQnW0ygvGyMNWPfqcNJZM8KxJIuzWHkbgW6uwS29X+Oyq+M7MRvxWh3G6S6KLsrNk+jAWwfXCfQVdCaaAmkOXllKK86qKrh7h634Dk=
-  file: target/release/gitweb
-  on:
-    repo: yoannfleurydev/gitweb
+    provider: releases
+    api_key:
+        secure: GV2nTBbjxp3L07ny/W/jpLQvVR8y/q/3BDhrjVV6NsaQxAdWC5Lk79u5UDgY2HYgeGY2wKOrQO31MJF9cmXfxd3gDS+hRkT8HXwIxbqnE6rjAnC+WcJ9cXGF500pUyhtY4OVjOWNexs3q3JwZgqjDjr1MSRZZM+iv+i+I5ug37d53+no1hBv+008/IczC0MrfluqzsR4oJVBDL9Sw9lhATae4YGaC/LFo343pqb204O5xATUg9do/wXnh0DOsrICliLAuDNncBMRwMf0VqG7oTcd9U+ZyGfHLVAPQ2kFAWTQXz6le9H+A6jZfYISiD2Q3HM57xkJ+vR8HZ9M+szF6VV3nvcDzUt93txEkmXOVRlN/r+nirr/wicPQ/SBOhaPiBCg2LZfHocIoMPpuHxq3RPwFFTTb8gldbLfS6Kt7wmgH/i2t4zQzS1qHTsJO50ru6MFwAiZ0va05LcwPKS4C/4anDH4Xd8ViqUAzRcj5uSCX1+obLV37kCMGqRmdSWdLnu8VgKqLWf3OzydcmD4gr8Q67Ak/3BMGSwmOr5l6JPi3itRz4dzFZjksYwaJj6eNWTuuEQnW0ygvGyMNWPfqcNJZM8KxJIuzWHkbgW6uwS29X+Oyq+M7MRvxWh3G6S6KLsrNk+jAWwfXCfQVdCaaAmkOXllKK86qKrh7h634Dk=
+    file: "target/release/gitweb"
+    on:
+        repo: yoannfleurydev/gitweb
+        tags: true

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unrealeased]
+
 ## [0.1.2] - 2019-02-17
 
 ### Added

src/git.rs

@@ -0,0 +1,30 @@
+use crate::logger::Logger;
+use git2::{ErrorCode, Repository};
+
+pub fn get_repo() -> Repository {
+    return match Repository::open(".") {
+        Ok(repo) => repo,
+        Err(e) => panic!("failed to open: {}", e),
+    };
+}
+
+pub fn get_branch(repo: &Repository, logger: &Logger) -> String {
+    let head = match repo.head() {
+        Ok(head) => Some(head),
+        Err(ref e) if e.code() == ErrorCode::UnbornBranch || e.code() == ErrorCode::NotFound => {
+            None
+        }
+        Err(e) => panic!("failed to get head ref {}", e),
+    };
+
+    let head = head.as_ref().and_then(|h| h.shorthand());
+    logger.print(
+        format!(
+            "# On branch {}",
+            head.unwrap_or("Not currently on any branch")
+        )
+        .as_str(),
+    );
+
+    String::from(head.unwrap_or("master"))
+}

src/logger.rs

@@ -0,0 +1,15 @@
+pub struct Logger {
+    verbose: bool,
+}
+
+impl Logger {
+    pub fn new(verbose: bool) -> Logger {
+        Logger { verbose: verbose }
+    }
+
+    pub fn print(&self, text: &str) {
+        if self.verbose {
+            println!("gitweb: {}", text)
+        }
+    }
+}

src/main.rs

@@ -3,12 +3,14 @@ extern crate open;
 extern crate regex;
 extern crate structopt;
 
-use git2::{ErrorCode, Repository};
 use regex::Regex;
 use std::env;
 use std::process::Command;
 use structopt::StructOpt;
 
+mod git;
+mod logger;
+
 #[derive(Debug, StructOpt)]
 // Rename all will use the name of the field
 #[structopt(rename_all = "kebab-case")]
@@ -30,82 +32,39 @@ pub struct Opt {
     verbose: bool,
 }
 
-#[cfg(target_os = "linux")]
+/// Function to open the browser using the system shell.
 fn open_browser(browser: &String, url: &String) {
     Command::new(browser)
         .arg(url)
         .output()
         .expect("failed to execute process");
 }
 
-#[cfg(target_os = "windows")]
-fn open_browser(browser: &String, url: &String) {
-    Command::new(browser)
-        .arg(url)
-        .output()
-        .expect("failed to execute process");
-}
-
-fn get_repo() -> Repository {
-    return match Repository::open(".") {
-        Ok(repo) => repo,
-        Err(e) => panic!("failed to open: {}", e),
-    };
-}
-
-fn get_branch(repo: &Repository, verbose: &bool) -> String {
-    let head = match repo.head() {
-        Ok(head) => Some(head),
-        Err(ref e) if e.code() == ErrorCode::UnbornBranch || e.code() == ErrorCode::NotFound => {
-            None
-        }
-        Err(e) => panic!("failed to get head ref {}", e),
-    };
-
-    let head = head.as_ref().and_then(|h| h.shorthand());
-    print_verbose(
-        format!(
-            "# On branch {}",
-            head.unwrap_or("Not currently on any branch")
-        )
-        .as_str(),
-        verbose,
-    );
-
-    String::from(head.unwrap_or("master"))
-}
-
-fn print_verbose(string: &str, verbose: &bool) {
-    if *verbose {
-        println!("{}", string)
-    }
-}
+const BROWSER: &str = "BROWSER";
 
 fn main() {
     // Get the command line options
     let opt = Opt::from_args();
+    let logger = logger::Logger::new(opt.verbose);
 
-    print_verbose("Verbose is active", &opt.verbose);
+    logger.print("Verbose is active");
 
     // Check that the user is in a git repository.
-    let repo = get_repo();
+    let repo = git::get_repo();
 
     // Get the branch to show in the browser.
     let branch = match opt.branch {
         Some(branch) => branch,
         None => {
-            print_verbose("No branch given, getting current one", &opt.verbose);
+            logger.print("No branch given, getting current one");
 
-            get_branch(&repo, &opt.verbose)
+            git::get_branch(&repo, &logger)
         }
     };
 
-    let remote_name = &opt.remote.unwrap_or("origin".to_string());
+    let remote_name = &opt.remote.unwrap_or("origin".to_owned());
 
-    print_verbose(
-        format!("Getting remote for {}", remote_name).as_str(),
-        &opt.verbose,
-    );
+    logger.print(format!("Getting remote for {}", remote_name).as_str());
 
     let optional_remote = match repo.find_remote(remote_name) {
         Ok(remote) => remote,
@@ -136,23 +95,17 @@ fn main() {
     if opt.browser.is_some() {
         let option_browser = opt.browser.unwrap();
 
-        print_verbose(
-            format!("Browser {} given as option", option_browser).as_str(),
-            &opt.verbose,
-        );
+        logger.print(format!("Browser {} given as option", option_browser).as_str());
 
         open_browser(&option_browser, &url);
     } else {
-        match env::var("BROWSER") {
+        match env::var(BROWSER) {
             // If the environment variable is available, open the web browser.
             Ok(browser) => open_browser(&browser, &url),
+            // Else, open the default browser of the system.
             Err(e) => {
-                print_verbose(
-                    format!("BROWSER variable not available : {}", e).as_str(),
-                    &opt.verbose,
-                );
-
-                print_verbose("Opening default browser", &opt.verbose);
+                logger.print(format!("{} variable not available : {}", BROWSER, e).as_str());
+                logger.print("Opening default browser");
 
                 // Open the default web browser on the current system.
                 match open::that(url) {