fix hooks in pre-receive-megaadmins-chef

hooks/pre-receive-megaadmins-chef

@@ -45,6 +45,17 @@ function get_cookbook_version() {
   GIT_DIR=$OLD_GIT_DIR
 }
 
+function get_name_from_file() {
+  local filename=$1
+
+  for ext in '.rb' '.yml' '.json'; do
+    filename=$(basename $filename $ext)
+  done
+
+  echo $filename
+}
+
+
 trap _error ERR
 
 while read old_version new_version ref_name; do
@@ -117,21 +128,21 @@ while read old_version new_version ref_name; do
 
     for role in $(printf "%s\n" ${changed_roles[@]} | uniq ); do
       if [ -f $role ]; then
-        echo "=> Upload role: $(basename $role )"
+        echo "=> Upload role: $(get_name_from_file $role)"
         $KNIFE role from file $role
       else
-        echo "=> Delete role: $(basename $role )"
-        $KNIFE role delete -y $(basename $role .rb)
+        echo "=> Delete role: $(get_name_from_file $role )"
+        $KNIFE role delete -y $(get_name_from_file $role)
       fi
     done
 
     for env in $(printf "%s\n" ${changed_envs[@]} | uniq ); do
       if [ -f $env ]; then
-        echo "=> Upload env: $(basename $env .rb)"
+        echo "=> Upload env: $(get_name_from_file $env)"
         $KNIFE environment from file $env
       else
-        echo "=> Delete env: $(basename $env .rb)"
-        $KNIFE environment delete -y $(basename $env .rb)
+        echo "=> Delete env: $(get_name_from_file $env)"
+        $KNIFE environment delete -y $(get_name_from_file $env)
       fi
     done