Merge pull request #338 from chef/fnichol/habitat-crates

Merged change 42bf6eb0-71b9-44e3-9e66-9f068a6cd6be

From review branch fnichol/habitat-crates into master

Signed-off-by: adam <[email protected]>

Makefile

@@ -28,40 +28,37 @@ else
 	docs_run :=
 endif
 
-.PHONY: help all shell docs-serve test unit functional clean image docs gpg
+.PHONY: help all shell serve-docs test unit functional clean image docs gpg
 .DEFAULT_GOAL := all
 
 all: image ## builds the project's Rust components
-	$(run) cargo build --manifest-path components/core/Cargo.toml
-	$(run) cargo build --manifest-path components/bldr/Cargo.toml
-	$(run) cargo build --manifest-path components/depot-core/Cargo.toml
+	$(run) cargo build --manifest-path components/sup/Cargo.toml
 	$(run) cargo build --manifest-path components/depot/Cargo.toml
-	$(run) cargo build --manifest-path components/depot-client/Cargo.toml
 
 test: image ## tests the project's Rust components
 	$(run) cargo test --manifest-path components/core/Cargo.toml
-	$(run) cargo test --manifest-path components/bldr/Cargo.toml
 	$(run) cargo test --manifest-path components/depot-core/Cargo.toml
-	$(run) cargo test --manifest-path components/depot/Cargo.toml
 	$(run) cargo test --manifest-path components/depot-client/Cargo.toml
+	$(run) cargo test --manifest-path components/sup/Cargo.toml
+	$(run) cargo test --manifest-path components/depot/Cargo.toml
 
 unit: image ## executes the components' unit test suites
 	$(run) cargo test --lib --manifest-path components/core/Cargo.toml
-	$(run) cargo test --lib --manifest-path components/bldr/Cargo.toml
 	$(run) cargo test --lib --manifest-path components/depot-core/Cargo.toml
-	$(run) cargo test --lib --manifest-path components/depot/Cargo.toml
 	$(run) cargo test --lib --manifest-path components/depot-client/Cargo.toml
+	$(run) cargo test --lib --manifest-path components/sup/Cargo.toml
+	$(run) cargo test --lib --manifest-path components/depot/Cargo.toml
 
 functional: image ## executes the components' functional test suites
-	$(run) cargo test --test functional --manifest-path components/bldr/Cargo.toml
+	$(run) cargo test --test functional --manifest-path components/sup/Cargo.toml
 	$(run) cargo test --test functional --manifest-path components/depot/Cargo.toml
 
 clean: ## cleans up the project tree
 	$(run) cargo clean --manifest-path components/core/Cargo.toml
-	$(run) cargo clean --manifest-path components/bldr/Cargo.toml
 	$(run) cargo clean --manifest-path components/depot-core/Cargo.toml
-	$(run) cargo clean --manifest-path components/depot/Cargo.toml
 	$(run) cargo clean --manifest-path components/depot-client/Cargo.toml
+	$(run) cargo clean --manifest-path components/sup/Cargo.toml
+	$(run) cargo clean --manifest-path components/depot/Cargo.toml
 
 help:
 	@perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -72,7 +69,7 @@ shell: image ## launches a development shell
 serve-docs: docs ## serves the project documentation from an HTTP server
 	@echo "==> View the docs at:\n\n        http://`\
 		echo $(docs_host) | sed -e 's|^tcp://||' -e 's|:[0-9]\{1,\}$$||'`:9633/\n\n"
-	$(docs_run) sh -c 'set -e; cd ./components/bldr/target/doc; python -m SimpleHTTPServer 9633;'
+	$(docs_run) sh -c 'set -e; cd ./components/sup/target/doc; python -m SimpleHTTPServer 9633;'
 
 ifneq ($(IN_DOCKER),)
 distclean: ## fully cleans up project tree and any associated Docker images and containers
@@ -97,11 +94,11 @@ endif
 
 docs: image ## build the docs
 	$(run) sh -c 'set -ex; \
-		cargo doc --manifest-path components/bldr/Cargo.toml; \
-		rustdoc --crate-name bldr README.md -o ./components/bldr/target/doc/bldr; \
-		docco -e .sh -o components/bldr/target/doc/bldr/bldr-build plans/bldr-build; \
-		cp -r images ./components/bldr/target/doc/bldr; \
-		echo "<meta http-equiv=refresh content=0;url=bldr/index.html>" > components/bldr/target/doc/index.html;'
+		cargo doc --manifest-path components/sup/Cargo.toml; \
+		rustdoc --crate-name habitat_sup README.md -o ./components/sup/target/doc/habitat_sup; \
+		docco -e .sh -o components/sup/target/doc/habitat_sup/bldr-build plans/bldr-build; \
+		cp -r images ./components/sup/target/doc/habitat_sup; \
+		echo "<meta http-equiv=refresh content=0;url=habitat_sup/index.html>" > components/sup/target/doc/index.html;'
 
 gpg: ## installs gpg signing keys, only run this in a Studio
 	(cd plans && make gpg)

components/core/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bldr_core"
+name = "habitat_core"
 version = "0.4.0"
 authors = ["Adam Jacob <[email protected]>", "Jamie Winsor <[email protected]>", "Fletcher Nichol <[email protected]>", "Joshua Timberman <[email protected]>", "Dave Parfitt <[email protected]>"]
 

components/core/src/error.rs

@@ -22,7 +22,7 @@ pub type Result<T> = result::Result<T, Error>;
 /// Core error types
 #[derive(Debug)]
 pub enum Error {
-    /// Occurs when a `bldr_core::package::PackageArchive` is being read.
+    /// Occurs when a `habitat_core::package::PackageArchive` is being read.
     ArchiveError(libarchive::error::ArchiveError),
     /// Occurs when a file that should exist does not or could not be read.
     FileNotFound(String),

components/depot-client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bldr_depot_client"
+name = "habitat_depot_client"
 version = "0.4.0"
 authors = ["Adam Jacob <[email protected]>", "Jamie Winsor <[email protected]>", "Fletcher Nichol <[email protected]>", "Joshua Timberman <[email protected]>", "Dave Parfitt <[email protected]>"]
 
@@ -8,8 +8,8 @@ hyper = "*"
 log = "*"
 rustc-serialize = "*"
 
-[dependencies.bldr_core]
+[dependencies.habitat_core]
 path = "../core"
 
-[dependencies.bldr_depot_core]
+[dependencies.habitat_depot_core]
 path = "../depot-core"

components/depot-client/src/error.rs

@@ -11,11 +11,11 @@ use std::result;
 
 use hyper;
 
-use bldr::{self, package};
+use hcore::{self, package};
 
 #[derive(Debug)]
 pub enum Error {
-    BldrCore(bldr::Error),
+    HabitatCore(hcore::Error),
     HTTP(hyper::status::StatusCode),
     HyperError(hyper::error::Error),
     IO(io::Error),
@@ -30,7 +30,7 @@ pub type Result<T> = result::Result<T, Error>;
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let msg = match *self {
-            Error::BldrCore(ref e) => format!("{}", e),
+            Error::HabitatCore(ref e) => format!("{}", e),
             Error::HTTP(ref e) => format!("{}", e),
             Error::HyperError(ref err) => format!("{}", err),
             Error::IO(ref e) => format!("{}", e),
@@ -55,7 +55,7 @@ impl fmt::Display for Error {
 impl error::Error for Error {
     fn description(&self) -> &str {
         match *self {
-            Error::BldrCore(ref err) => err.description(),
+            Error::HabitatCore(ref err) => err.description(),
             Error::HTTP(_) => "Received an HTTP error",
             Error::HyperError(ref err) => err.description(),
             Error::IO(ref err) => err.description(),
@@ -67,9 +67,9 @@ impl error::Error for Error {
     }
 }
 
-impl From<bldr::Error> for Error {
-    fn from(err: bldr::Error) -> Error {
-        Error::BldrCore(err)
+impl From<hcore::Error> for Error {
+    fn from(err: hcore::Error) -> Error {
+        Error::HabitatCore(err)
     }
 }
 

components/depot-client/src/lib.rs

@@ -4,8 +4,8 @@
 // this file ("Licensee") apply to Licensee's use of the Software until such time that the Software
 // is made available under an open source license such as the Apache 2.0 License.
 
-extern crate bldr_core as bldr;
-extern crate bldr_depot_core as depot_core;
+extern crate habitat_core as hcore;
+extern crate habitat_depot_core as depot_core;
 #[macro_use]
 extern crate hyper;
 #[macro_use]
@@ -20,7 +20,7 @@ use std::fs::{self, File};
 use std::io::{Read, Write, BufWriter, Seek, SeekFrom};
 use std::path::{Path, PathBuf};
 
-use bldr::package::{PackageArchive, PackageIdent};
+use hcore::package::{PackageArchive, PackageIdent};
 use depot_core::{XFileName, data_object};
 use hyper::client::{Client, Body};
 use hyper::status::StatusCode;
@@ -50,10 +50,7 @@ pub fn fetch_key(depot: &str, key: &str, path: &str) -> Result<String> {
 /// * Package cannot be found
 /// * Remote Depot is not available
 /// * File cannot be created and written to
-pub fn fetch_package(depot: &str,
-                     package: &PackageIdent,
-                     store: &str)
-                     -> Result<PackageArchive> {
+pub fn fetch_package(depot: &str, package: &PackageIdent, store: &str) -> Result<PackageArchive> {
     let url = format!("{}/pkgs/{}/download", depot, package);
     match download(&package.name, &url, store) {
         Ok(file) => {

components/depot-core/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bldr_depot_core"
+name = "habitat_depot_core"
 version = "0.4.0"
 authors = ["Adam Jacob <[email protected]>", "Jamie Winsor <[email protected]>", "Fletcher Nichol <[email protected]>", "Joshua Timberman <[email protected]>", "Dave Parfitt <[email protected]>"]
 
@@ -9,5 +9,5 @@ libc = "*"
 lmdb-sys = "*"
 rustc-serialize = "*"
 
-[dependencies.bldr_core]
+[dependencies.habitat_core]
 path = "../core"

components/depot-core/src/data_object.rs

@@ -8,7 +8,7 @@ use std::fmt;
 use std::result;
 use std::slice;
 
-use bldr::{package, Error, Result};
+use hcore::{package, Error, Result};
 use libc::c_void;
 use lmdb_sys;
 use rustc_serialize::{Encoder, Decoder, Encodable, Decodable};

components/depot-core/src/lib.rs

@@ -4,7 +4,7 @@
 // this file ("Licensee") apply to Licensee's use of the Software until such time that the Software
 // is made available under an open source license such as the Apache 2.0 License.
 
-extern crate bldr_core as bldr;
+extern crate habitat_core as hcore;
 #[macro_use]
 extern crate hyper;
 extern crate libc;