Merge branch 'master' of https://github.com/HariSekhon/DevOps-Bash-tools

.bash.d/network.sh

@@ -24,6 +24,7 @@ bash_tools="${bash_tools:-$(dirname "${BASH_SOURCE[0]}")/..}"
 . "$bash_tools/.bash.d/os_detection.sh"
 
 alias 4="ping 4.2.2.1"
+alias 8="ping 8.8.8.8"
 
 alias ping="ping -n"
 

Makefile

@@ -119,6 +119,7 @@ desktop: install
 	@$(MAKE) perl-desktop
 	@$(MAKE) golang-desktop
 	@$(MAKE) nodejs-desktop
+	@$(MAKE) ruby-desktop
 	@# no packages any more since jgrep is no longer found
 	@#$(MAKE) ruby-desktop
 
@@ -150,15 +151,11 @@ brew:
 	NO_FAIL=1 NO_UPDATE=1 TAP=1 $(BASH_TOOLS)/brew_install_packages.sh setup/brew-packages-desktop-taps.txt
 
 .PHONY: perl-desktop
-perl-desktop: system-packages cpan
+perl-desktop: system-packages cpan-desktop
 	@:
 
-.PHONY: cpan
-cpan:: cpanm
-	@:
-
-.PHONY: cpanm
-cpanm:
+.PHONY: cpan-desktop
+cpan-desktop: cpan
 	NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/perl_cpanm_install_if_absent.sh setup/cpan-packages-desktop.txt
 
 .PHONY: golang-desktop
@@ -174,29 +171,25 @@ go:
 	NO_FAIL=1 $(BASH_TOOLS)/golang_get_install_if_absent.sh setup/go-packages-desktop.txt
 
 .PHONY: ruby-desktop
-ruby-desktop: system-packages gems
-	@:
-
-.PHONY: gems
-gems: gem
+ruby-desktop: system-packages gem-desktop
 	@:
 
-.PHONY: gem
-gem:
+.PHONY: gem-desktop
+gem-desktop: gem
 	NO_FAIL=1 $(BASH_TOOLS)/ruby_gem_install_if_absent.sh setup/gem-packages-desktop.txt
 
 .PHONY: python-desktop
-python-desktop: system-packages pip
+python-desktop: system-packages pip-desktop
 
 .PHONY: pip
-pip:: python-version
+pip-desktop: pip
 	./python_pip_install_if_absent.sh setup/pip-packages-desktop.txt
 
 .PHONY: nodejs-desktop
 nodejs-desktop: system-packages npm
 
-.PHONY: npm
-npm::
+.PHONY: npm-desktop
+npm-desktop: npm
 	$(BASH_TOOLS)/nodejs_npm_install_if_absent.sh $(BASH_TOOLS)/setup/npm-packages-desktop.txt
 
 .PHONY: aws

Makefile.in

@@ -105,7 +105,8 @@ define MAKEFILE_USAGE_COMMON
     make init                   same as above, often useful to do in CI systems to get access to additional submodule provided targets such as 'make ci'
 
     make cpan                   install any modules listed in any cpan-requirements.txt files if not already installed
-
+    make gem                    install any modules listed in any gem-requirements.txt files if not already installed
+    make npm                    install any modules listed in any npm-requirements.txt files if not already installed
     make pip                    install any modules listed in any requirements.txt files if not already installed
 
     make python-compile         compile any python files found in the current directory and 1 level of subdirectory
@@ -427,6 +428,28 @@ cpan::
 cpan-optional::
 	find . -maxdepth 3 -path '*/setup/cpan-requirements-optional.txt' | NO_FAIL=1 xargs $(BASH_TOOLS)/perl_cpanm_install_if_absent.sh
 
+.PHONY: gems
+gems:: gem
+	@:
+
+.PHONY: gem
+gem::
+	find . -maxdepth 3 -path '*/setup/gem-requirements.txt' | xargs $(BASH_TOOLS)/ruby_gem_install_if_absent.sh
+	@$(MAKE) gem-optional
+
+.PHONY: gem-optional
+gem-optional::
+	find . -maxdepth 3 -path '*/setup/gem-requirements-optional.txt' | NO_FAIL=1 xargs $(BASH_TOOLS)/python_pip_install_if_absent.sh
+
+.PHONY: npm
+npm::
+	find . -maxdepth 3 -path '*/setup/npm-requirements.txt' | $(BASH_TOOLS)/nodejs_npm_install_if_absent.sh
+	@$(MAKE) npm-optional
+
+.PHONY: npm-optional
+npm-optional::
+	find . -maxdepth 3 -path '*/setup/npm-requirements-optional.txt' | NO_FAIL=1 $(BASH_TOOLS)/nodejs_npm_install_if_absent.sh
+
 .PHONY: pip
 pip::
 	find . -maxdepth 3 -path '*/requirements.txt' | xargs $(BASH_TOOLS)/python_pip_install_if_absent.sh

kubectl_busybox.sh

@@ -36,7 +36,7 @@ help_usage "$@"
 name=busybox
 
 if kubectl get po "$name" "$@" &>/dev/null; then
-    kubectl exec -ti "$name" "$@" /bin/sh
+    kubectl exec -ti "$name" "$@" -- /bin/sh
 else
-    kubectl run -ti --rm --restart=Never "$name" --image=busybox "$@" /bin/sh
+    kubectl run -ti --rm --restart=Never "$name" --image=busybox "$@" -- /bin/sh
 fi

kubectl_dnsutils.sh

@@ -36,7 +36,7 @@ help_usage "$@"
 name=dnsutils
 
 if kubectl get po "$name" "$@" &>/dev/null; then
-    kubectl exec -ti "$name" "$@" /bin/bash
+    kubectl exec -ti "$name" "$@" -- /bin/bash
 else
-    kubectl run -ti --rm --restart=Never "$name" --image=tutum/dnsutils "$@" /bin/bash
+    kubectl run -ti --rm --restart=Never "$name" --image=tutum/dnsutils "$@" -- /bin/bash
 fi

setup/gem-packages.txt

@@ -0,0 +1,7 @@
+#
+#  Author: Hari Sekhon
+#  Date: 2013-02-18 10:47:57 +0000 (Mon, 18 Feb 2013)
+#
+#  vim:ts=4:sw=4:et
+
+json