Merge pull request #6 from mozilla-services/features/cmd-folder

All scripts in `scripts` folder, and adjust to the commands being in the...

Makefile

@@ -77,14 +77,19 @@ src/github.com/mozilla-services/heka/README.md:
 heka-source: src/github.com/mozilla-services/heka/README.md
 
 bin/hekad: pluginloader heka-source $(GOBIN)
-	@GOPATH=$GOPATH python update_deps.py package_deps.txt
+	@GOPATH=$GOPATH python scripts/update_deps.py package_deps.txt
 	@perl -pi.bak -e "s,HEKABUILDPATH,$(BIN),g" $(SANDBOX)
 	@cd src && \
-		$(GOCMD) install -ldflags="-r ./" github.com/mozilla-services/heka/hekad
+		$(GOCMD) install -ldflags="-r ./" github.com/mozilla-services/heka/cmd/hekad
 	@mv $(SANDBOX).bak $(SANDBOX)
 
 hekad: sandbox bin/hekad
 
+bin/flood:
+	$(GOCMD) install github.com/mozilla-services/heka/cmd/flood
+
+flood: bin/flood
+
 src/github.com/mozilla-services/heka-mozsvc-plugins/README.md:
 	mkdir -p src/github.com/mozilla-services
 	cd src/github.com/mozilla-services && \

scripts/setup_pluginloader.py

@@ -33,7 +33,7 @@ def main():
             sys.exit(1)
 
     packages = pkgs_data.get(pkgs_key, [])
-    outfile_path = ("src/github.com/mozilla-services/heka/hekad/"
+    outfile_path = ("src/github.com/mozilla-services/heka/cmd/hekad/"
                     "plugin_loader.go")
     if os.path.exists(outfile_path):
         os.remove(outfile_path)

update_deps.py → scripts/update_deps.py

@@ -230,7 +230,8 @@ def main():
         package_lines = [x.strip() for x in f.readlines() if x.strip()]
 
     here_dir = os.path.dirname(os.path.abspath(__file__))
-    src_dir = os.path.join(here_dir, 'src')
+    parent_dir = os.path.dirname(here_dir)
+    src_dir = os.path.join(parent_dir, 'src')
     packages = parse_package_file(package_lines, src_dir)
 
     # Last sanity check to see that we have what we need