Merge pull request #293 from chef/components

Merged change 1ae30cd0-126f-4e1a-9e74-4e3763989bfe From review branch components into master Signed-off-by: adam <[email protected]>
habitat-sh · Mar 15, 2016 · 9113240 · 9113240
2 parents d1f01cb + 1ff339b
commit 9113240
Show file tree

Hide file tree

Showing 87 changed files with 16 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -24,27 +24,27 @@ gpg: ## install gpg keys, only run this in a studio
 	(cd plans && make gpg)
 
 build: image ## run cargo build
-	$(run) shell cargo build
+	$(run) shell cargo build --manifest-path components/bldr/Cargo.toml
 
 shell: image ## start a shell for building packages
 	$(run) shell
 
 docs-serve: docs ## serve up the documentation
 	@echo "==> View the docs at:\n\n        http://`\
 		echo ${DOCKER_HOST} | sed -e 's|^tcp://||' -e 's|:[0-9]\{1,\}$$||'`:9633/\n\n"
-	$(run) -p 9633:9633 shell sh -c 'set -e; cd ./target/doc; python -m SimpleHTTPServer 9633;'
+	$(run) -p 9633:9633 shell sh -c 'set -e; cd ./components/bldr/target/doc; python -m SimpleHTTPServer 9633;'
 
 test: image ## run `cargo test`
-	$(run) shell cargo test
+	$(run) shell cargo test --manifest-path components/bldr/Cargo.toml
 
 unit: image ## run unit tests with cargo
-	$(run) shell cargo test --lib
+	$(run) shell cargo test --lib --manifest-path components/bldr/Cargo.toml
 
 functional: image ## run the functional tests
-	$(run) shell cargo test --test functional
+	$(run) shell cargo test --test functional --manifest-path components/bldr/Cargo.toml
 
 clean: ## clean up our docker environment
-	rm -rf target/debug target/release
+	rm -rf components/bldr/target/debug components/bldr/target/release
 	$(compose_cmd) stop
 	$(compose_cmd) rm -f -v
 	$(docker_cmd) rmi $(dimage) || true
@@ -61,10 +61,10 @@ image: ## create an image
 
 docs: image ## build the docs
 	$(run) shell sh -c 'set -ex; \
-		cargo doc; \
-		rustdoc --crate-name bldr README.md -o ./target/doc/bldr; \
-		docco -e .sh -o target/doc/bldr/bldr-build plans/bldr-build; \
-		cp -r images ./target/doc/bldr; \
-		echo "<meta http-equiv=refresh content=0;url=bldr/index.html>" > target/doc/index.html;'
+		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;'
 
 pkg-shell: shell ## Alias to `make shell` for the "old fingers" crowd
diff --git a/README.md b/README.md
@@ -122,6 +122,7 @@ read the docs at `http://<DOCKER_HOST>:9633/` (with working JavaScript-based sea
 
 1. Start a new feature branch
 1. Open a terminal and run `make shell`
+1. Change directory to a component `cd components/bldr`
 1. Build with `cargo build` or `cargo test`
 1. You can use `cargo run -- foobar` to pass options to the built binary
 1. Commit your change
@@ -269,4 +270,3 @@ $ ./target/debug/bldr start chef/redis
 
 Will work just fine (as will running bldr on other host operating
 systems, cause thats all we're up to).
-
diff --git a/Cargo.lock → components/bldr/Cargo.lock b/Cargo.lock → components/bldr/Cargo.lock
diff --git a/Cargo.toml → components/bldr/Cargo.toml b/Cargo.toml → components/bldr/Cargo.toml
@@ -6,7 +6,6 @@ exclude = ["plans/**/*","web/**/*"]
 
 [lib]
 name = "bldr"
-path = "src/bldr/lib.rs"
 
 [[bin]]
 name = "bldr"
@@ -46,14 +45,14 @@ openssl = "*"
 walkdir = "*"
 
 [dependencies.wonder]
-path = "./vendor/wonder"
+path = "../../vendor/wonder"
 
 [dependencies.mustache]
 git = "https://github.com/adamhjk/rust-mustache"
 branch = "fallback_on_missing_extension"
 
 [dependencies.libarchive]
-path = "./vendor/libarchive-rust"
+path = "../../vendor/libarchive-rust"
 
 [dependencies.clap]
 features = [ "suggestions", "color" ]

diff --git a/src/bldr/census.rs → components/bldr/src/census.rs b/src/bldr/census.rs → components/bldr/src/census.rs
diff --git a/src/bldr/command/configure.rs → components/bldr/src/command/configure.rs b/src/bldr/command/configure.rs → components/bldr/src/command/configure.rs
diff --git a/src/bldr/command/depot.rs → components/bldr/src/command/depot.rs b/src/bldr/command/depot.rs → components/bldr/src/command/depot.rs
diff --git a/src/bldr/command/install.rs → components/bldr/src/command/install.rs b/src/bldr/command/install.rs → components/bldr/src/command/install.rs
diff --git a/src/bldr/command/key.rs → components/bldr/src/command/key.rs b/src/bldr/command/key.rs → components/bldr/src/command/key.rs
diff --git a/src/bldr/command/mod.rs → components/bldr/src/command/mod.rs b/src/bldr/command/mod.rs → components/bldr/src/command/mod.rs
diff --git a/src/bldr/command/start.rs → components/bldr/src/command/start.rs b/src/bldr/command/start.rs → components/bldr/src/command/start.rs
diff --git a/src/bldr/command/upload.rs → components/bldr/src/command/upload.rs b/src/bldr/command/upload.rs → components/bldr/src/command/upload.rs
diff --git a/src/bldr/config.rs → components/bldr/src/config.rs b/src/bldr/config.rs → components/bldr/src/config.rs
diff --git a/src/bldr/depot/client.rs → components/bldr/src/depot/client.rs b/src/bldr/depot/client.rs → components/bldr/src/depot/client.rs
diff --git a/src/bldr/depot/data_object.rs → components/bldr/src/depot/data_object.rs b/src/bldr/depot/data_object.rs → components/bldr/src/depot/data_object.rs
diff --git a/src/bldr/depot/data_store.rs → components/bldr/src/depot/data_store.rs b/src/bldr/depot/data_store.rs → components/bldr/src/depot/data_store.rs
diff --git a/src/bldr/depot/doctor.rs → components/bldr/src/depot/doctor.rs b/src/bldr/depot/doctor.rs → components/bldr/src/depot/doctor.rs
diff --git a/src/bldr/depot/mod.rs → components/bldr/src/depot/mod.rs b/src/bldr/depot/mod.rs → components/bldr/src/depot/mod.rs
diff --git a/src/bldr/discovery/etcd.rs → components/bldr/src/discovery/etcd.rs b/src/bldr/discovery/etcd.rs → components/bldr/src/discovery/etcd.rs
diff --git a/src/bldr/discovery/mod.rs → components/bldr/src/discovery/mod.rs b/src/bldr/discovery/mod.rs → components/bldr/src/discovery/mod.rs
diff --git a/src/bldr/election.rs → components/bldr/src/election.rs b/src/bldr/election.rs → components/bldr/src/election.rs
diff --git a/src/bldr/error.rs → components/bldr/src/error.rs b/src/bldr/error.rs → components/bldr/src/error.rs
diff --git a/src/bldr/fs.rs → components/bldr/src/fs.rs b/src/bldr/fs.rs → components/bldr/src/fs.rs
diff --git a/src/bldr/gossip/client.rs → components/bldr/src/gossip/client.rs b/src/bldr/gossip/client.rs → components/bldr/src/gossip/client.rs
diff --git a/src/bldr/gossip/detector.rs → components/bldr/src/gossip/detector.rs b/src/bldr/gossip/detector.rs → components/bldr/src/gossip/detector.rs
diff --git a/src/bldr/gossip/lamport_clock.rs → components/bldr/src/gossip/lamport_clock.rs b/src/bldr/gossip/lamport_clock.rs → components/bldr/src/gossip/lamport_clock.rs
diff --git a/src/bldr/gossip/member.rs → components/bldr/src/gossip/member.rs b/src/bldr/gossip/member.rs → components/bldr/src/gossip/member.rs
diff --git a/src/bldr/gossip/mod.rs → components/bldr/src/gossip/mod.rs b/src/bldr/gossip/mod.rs → components/bldr/src/gossip/mod.rs
diff --git a/src/bldr/gossip/rumor.rs → components/bldr/src/gossip/rumor.rs b/src/bldr/gossip/rumor.rs → components/bldr/src/gossip/rumor.rs
diff --git a/src/bldr/gossip/server.rs → components/bldr/src/gossip/server.rs b/src/bldr/gossip/server.rs → components/bldr/src/gossip/server.rs
diff --git a/src/bldr/health_check.rs → components/bldr/src/health_check.rs b/src/bldr/health_check.rs → components/bldr/src/health_check.rs
diff --git a/src/bldr/lib.rs → components/bldr/src/lib.rs b/src/bldr/lib.rs → components/bldr/src/lib.rs
diff --git a/src/main.rs → components/bldr/src/main.rs b/src/main.rs → components/bldr/src/main.rs
diff --git a/src/bldr/output.rs → components/bldr/src/output.rs b/src/bldr/output.rs → components/bldr/src/output.rs
@@ -180,7 +180,7 @@ mod tests {
         so.verbose = Some(true);
         so.color = Some(false);
         assert_eq!(format!("{}", so),
-                   "bldr(SOT)[src/bldr/output.rs:1:2]: opeth is amazing");
+                   "bldr(SOT)[components/bldr/src/output.rs:1:2]: opeth is amazing");
     }
 
     #[test]
@@ -192,7 +192,7 @@ mod tests {
                    format!("{}({})[{}]: opeth is amazing",
                    Cyan.paint("bldr"),
                    White.bold().paint("SOT"),
-                   White.underline().paint("src/bldr/output.rs:1:2"),
+                   White.underline().paint("components/bldr/src/output.rs:1:2"),
                    ));
     }
 }
diff --git a/src/bldr/package/archive.rs → components/bldr/src/package/archive.rs b/src/bldr/package/archive.rs → components/bldr/src/package/archive.rs
diff --git a/src/bldr/package/hooks.rs → components/bldr/src/package/hooks.rs b/src/bldr/package/hooks.rs → components/bldr/src/package/hooks.rs
diff --git a/src/bldr/package/mod.rs → components/bldr/src/package/mod.rs b/src/bldr/package/mod.rs → components/bldr/src/package/mod.rs
diff --git a/src/bldr/package/updater.rs → components/bldr/src/package/updater.rs b/src/bldr/package/updater.rs → components/bldr/src/package/updater.rs
diff --git a/src/bldr/service_config.rs → components/bldr/src/service_config.rs b/src/bldr/service_config.rs → components/bldr/src/service_config.rs
diff --git a/src/bldr/sidecar.rs → components/bldr/src/sidecar.rs b/src/bldr/sidecar.rs → components/bldr/src/sidecar.rs
diff --git a/src/bldr/state_machine.rs → components/bldr/src/state_machine.rs b/src/bldr/state_machine.rs → components/bldr/src/state_machine.rs
diff --git a/src/bldr/topology/initializer.rs → components/bldr/src/topology/initializer.rs b/src/bldr/topology/initializer.rs → components/bldr/src/topology/initializer.rs
diff --git a/src/bldr/topology/leader.rs → components/bldr/src/topology/leader.rs b/src/bldr/topology/leader.rs → components/bldr/src/topology/leader.rs
diff --git a/src/bldr/topology/mod.rs → components/bldr/src/topology/mod.rs b/src/bldr/topology/mod.rs → components/bldr/src/topology/mod.rs
diff --git a/src/bldr/topology/standalone.rs → components/bldr/src/topology/standalone.rs b/src/bldr/topology/standalone.rs → components/bldr/src/topology/standalone.rs
diff --git a/src/bldr/user_config.rs → components/bldr/src/user_config.rs b/src/bldr/user_config.rs → components/bldr/src/user_config.rs
diff --git a/src/bldr/util/convert.rs → components/bldr/src/util/convert.rs b/src/bldr/util/convert.rs → components/bldr/src/util/convert.rs
diff --git a/src/bldr/util/gpg.rs → components/bldr/src/util/gpg.rs b/src/bldr/util/gpg.rs → components/bldr/src/util/gpg.rs
diff --git a/src/bldr/util/mod.rs → components/bldr/src/util/mod.rs b/src/bldr/util/mod.rs → components/bldr/src/util/mod.rs
diff --git a/src/bldr/util/perm.rs → components/bldr/src/util/perm.rs b/src/bldr/util/perm.rs → components/bldr/src/util/perm.rs
diff --git a/src/bldr/util/signals.rs → components/bldr/src/util/signals.rs b/src/bldr/util/signals.rs → components/bldr/src/util/signals.rs
diff --git a/src/bldr/util/sys.rs → components/bldr/src/util/sys.rs b/src/bldr/util/sys.rs → components/bldr/src/util/sys.rs
diff --git a/tests/bldr/depot.rs → components/bldr/tests/bldr/depot.rs b/tests/bldr/depot.rs → components/bldr/tests/bldr/depot.rs
diff --git a/tests/bldr/gossip.rs → components/bldr/tests/bldr/gossip.rs b/tests/bldr/gossip.rs → components/bldr/tests/bldr/gossip.rs
diff --git a/tests/bldr/key.rs → components/bldr/tests/bldr/key.rs b/tests/bldr/key.rs → components/bldr/tests/bldr/key.rs
diff --git a/tests/bldr/mod.rs → components/bldr/tests/bldr/mod.rs b/tests/bldr/mod.rs → components/bldr/tests/bldr/mod.rs
diff --git a/tests/bldr/start.rs → components/bldr/tests/bldr/start.rs b/tests/bldr/start.rs → components/bldr/tests/bldr/start.rs
diff --git a/tests/bldr/topology/leader.rs → ...onents/bldr/tests/bldr/topology/leader.rs b/tests/bldr/topology/leader.rs → ...onents/bldr/tests/bldr/topology/leader.rs
diff --git a/tests/bldr/topology/mod.rs → components/bldr/tests/bldr/topology/mod.rs b/tests/bldr/topology/mod.rs → components/bldr/tests/bldr/topology/mod.rs
diff --git a/tests/bldr_build/mod.rs → components/bldr/tests/bldr_build/mod.rs b/tests/bldr_build/mod.rs → components/bldr/tests/bldr_build/mod.rs
diff --git a/tests/fixtures/bldr_build/bin/simple_service → ...ts/fixtures/bldr_build/bin/simple_service b/tests/fixtures/bldr_build/bin/simple_service → ...ts/fixtures/bldr_build/bin/simple_service
diff --git a/tests/fixtures/bldr_build/bldr → ...nents/bldr/tests/fixtures/bldr_build/bldr b/tests/fixtures/bldr_build/bldr → ...nents/bldr/tests/fixtures/bldr_build/bldr
diff --git a/tests/fixtures/bldr_build/config/simple.conf → ...ts/fixtures/bldr_build/config/simple.conf b/tests/fixtures/bldr_build/config/simple.conf → ...ts/fixtures/bldr_build/config/simple.conf
diff --git a/tests/fixtures/bldr_build/default.toml → ...dr/tests/fixtures/bldr_build/default.toml b/tests/fixtures/bldr_build/default.toml → ...dr/tests/fixtures/bldr_build/default.toml
diff --git a/tests/fixtures/bldr_build/plan.sh → ...ts/bldr/tests/fixtures/bldr_build/plan.sh b/tests/fixtures/bldr_build/plan.sh → ...ts/bldr/tests/fixtures/bldr_build/plan.sh
diff --git a/tests/fixtures/chef-private.gpg → ...ents/bldr/tests/fixtures/chef-private.gpg b/tests/fixtures/chef-private.gpg → ...ents/bldr/tests/fixtures/chef-private.gpg
diff --git a/tests/fixtures/chef-public.gpg → ...nents/bldr/tests/fixtures/chef-public.gpg b/tests/fixtures/chef-public.gpg → ...nents/bldr/tests/fixtures/chef-public.gpg
diff --git a/...ixtures/simple_service/bin/simple_service → ...ixtures/simple_service/bin/simple_service b/...ixtures/simple_service/bin/simple_service → ...ixtures/simple_service/bin/simple_service
diff --git a/tests/fixtures/simple_service/bldr → ...s/bldr/tests/fixtures/simple_service/bldr b/tests/fixtures/simple_service/bldr → ...s/bldr/tests/fixtures/simple_service/bldr
diff --git a/...ixtures/simple_service/config/simple.conf → ...ixtures/simple_service/config/simple.conf b/...ixtures/simple_service/config/simple.conf → ...ixtures/simple_service/config/simple.conf
diff --git a/tests/fixtures/simple_service/default.toml → ...ests/fixtures/simple_service/default.toml b/tests/fixtures/simple_service/default.toml → ...ests/fixtures/simple_service/default.toml
diff --git a/tests/fixtures/simple_service/plan.sh → ...ldr/tests/fixtures/simple_service/plan.sh b/tests/fixtures/simple_service/plan.sh → ...ldr/tests/fixtures/simple_service/plan.sh
diff --git a/.../simple_service_gossip/bin/simple_service → .../simple_service_gossip/bin/simple_service b/.../simple_service_gossip/bin/simple_service → .../simple_service_gossip/bin/simple_service
diff --git a/tests/fixtures/simple_service_gossip/bldr → ...tests/fixtures/simple_service_gossip/bldr b/tests/fixtures/simple_service_gossip/bldr → ...tests/fixtures/simple_service_gossip/bldr
diff --git a/.../simple_service_gossip/config/simple.conf → .../simple_service_gossip/config/simple.conf b/.../simple_service_gossip/config/simple.conf → .../simple_service_gossip/config/simple.conf
diff --git a/...xtures/simple_service_gossip/default.toml → ...xtures/simple_service_gossip/default.toml b/...xtures/simple_service_gossip/default.toml → ...xtures/simple_service_gossip/default.toml
diff --git a/tests/fixtures/simple_service_gossip/plan.sh → ...ts/fixtures/simple_service_gossip/plan.sh b/tests/fixtures/simple_service_gossip/plan.sh → ...ts/fixtures/simple_service_gossip/plan.sh
diff --git a/..._config/bin/simple_service_without_config → ..._config/bin/simple_service_without_config b/..._config/bin/simple_service_without_config → ..._config/bin/simple_service_without_config
diff --git a/...xtures/simple_service_without_config/bldr → ...xtures/simple_service_without_config/bldr b/...xtures/simple_service_without_config/bldr → ...xtures/simple_service_without_config/bldr
diff --git a/...res/simple_service_without_config/plan.sh → ...res/simple_service_without_config/plan.sh b/...res/simple_service_without_config/plan.sh → ...res/simple_service_without_config/plan.sh
diff --git a/tests/functional.rs → components/bldr/tests/functional.rs b/tests/functional.rs → components/bldr/tests/functional.rs
diff --git a/tests/util/command.rs → components/bldr/tests/util/command.rs b/tests/util/command.rs → components/bldr/tests/util/command.rs
diff --git a/tests/util/discovery.rs → components/bldr/tests/util/discovery.rs b/tests/util/discovery.rs → components/bldr/tests/util/discovery.rs
diff --git a/tests/util/docker.rs → components/bldr/tests/util/docker.rs b/tests/util/docker.rs → components/bldr/tests/util/docker.rs
diff --git a/tests/util/mod.rs → components/bldr/tests/util/mod.rs b/tests/util/mod.rs → components/bldr/tests/util/mod.rs
diff --git a/tests/util/path.rs → components/bldr/tests/util/path.rs b/tests/util/path.rs → components/bldr/tests/util/path.rs
diff --git a/tests/util/supervisor.rs → components/bldr/tests/util/supervisor.rs b/tests/util/supervisor.rs → components/bldr/tests/util/supervisor.rs