software_smithy 1.6.1 → 1.6.2

data/bin/smithy

@@ -90,9 +90,9 @@ desc "The root level directory for software"
 arg_name "PATH"
 flag ["software-root"]
 
-desc "The prefix of programming environments for this machine"
-arg_name "NAME"
-flag ["prgenv-prefix"]
+# desc "The prefix of programming environments for this machine"
+# arg_name "NAME"
+# flag ["prgenv-prefix"]
 
 desc "The root level directory for published web files"
 arg_name "PATH"
@@ -250,6 +250,7 @@ command ['build'] do |c|
           :suppress_stdout => options[:"suppress-stdout"],
                     :force => options[:"force"]
     end
+    Smithy::Config.reindex_completion_caches
   end
 end
 
@@ -319,6 +320,7 @@ command ['new'] do |c|
       notice_command " smithy module deploy last"   , "Install modulefile"
       notice_command " smithy publish last"         , "Publish web description"
     end
+    Smithy::Config.reindex_completion_caches
   end
 end
 
@@ -511,6 +513,7 @@ command ['module'] do |c|
         notice_command " smithy edit modulefile last" , "Edit generated modulefile"
         notice_command " smithy module deploy last"   , "Install modulefile"
       end
+      Smithy::Config.reindex_completion_caches
     end
   end
 
@@ -627,6 +630,7 @@ command ['formula'] do |c|
 
     subcommand.action do |global_options,options,args|
       FormulaCommand.install_command(options,args)
+      Smithy::Config.reindex_completion_caches
     end
   end
 
@@ -639,10 +643,18 @@ command ['formula'] do |c|
 
     subcommand.action do |global_options,options,args|
       FormulaCommand.create_module_command(options,args)
+      Smithy::Config.reindex_completion_caches
     end
   end
 end
 
+desc "reindex auto-completion cache"
+command ['reindex'] do |c|
+  c.action do |global_options,options,args|
+    Smithy::Config.reindex_completion_caches
+  end
+end
+
 # command ['publish_cray'] do |c|
 #   c.desc "See what files will be created without creating them"
 #   c.switch [:n, "dry-run"], :negatable => false

data/etc/completion/smithy-completion.bash

@@ -4,45 +4,45 @@ fi
 
 __smithycomp_words_include ()
 {
-	local i=1
-	while [[ $i -lt $COMP_CWORD ]]; do
-		if [[ "${COMP_WORDS[i]}" = "$1" ]]; then
-			return 0
-		fi
-		i=$((++i))
-	done
-	return 1
+  local i=1
+  while [[ $i -lt $COMP_CWORD ]]; do
+    if [[ "${COMP_WORDS[i]}" = "$1" ]]; then
+      return 0
+    fi
+    i=$((++i))
+  done
+  return 1
 }
 
 # Find the previous non-switch word
 __smithycomp_prev ()
 {
-	local idx=$((COMP_CWORD - 1))
-	local prv="${COMP_WORDS[idx]}"
-	while [[ $prv == -* ]]; do
-		idx=$((--idx))
-		prv="${COMP_WORDS[idx]}"
-	done
+  local idx=$((COMP_CWORD - 1))
+  local prv="${COMP_WORDS[idx]}"
+  while [[ $prv == -* ]]; do
+    idx=$((--idx))
+    prv="${COMP_WORDS[idx]}"
+  done
 }
 
 
 __smithycomp ()
 {
-	# break $1 on space, tab, and newline characters,
-	# and turn it into a newline separated list of words
-	local list s sep=$'\n' IFS=$' '$'\t'$'\n'
-	local cur="${COMP_WORDS[COMP_CWORD]}"
+  # break $1 on space, tab, and newline characters,
+  # and turn it into a newline separated list of words
+  local list s sep=$'\n' IFS=$' '$'\t'$'\n'
+  local cur="${COMP_WORDS[COMP_CWORD]}"
 
-	for s in $1; do
-		__smithycomp_words_include "$s" && continue
-		list="$list$s$sep"
-	done
+  for s in $1; do
+    __smithycomp_words_include "$s" && continue
+    list="$list$s$sep"
+  done
 
-	case "$cur" in
-	--*=)
-		COMPREPLY=()
-		;;
-	*)
+  case "$cur" in
+  --*=)
+    COMPREPLY=()
+    ;;
+  *)
     IFS=$sep
     COMPREPLY=( $(compgen -W "$list" -- "$cur" | sed -e 's/[^=]$/& /g') )
     ;;
@@ -53,31 +53,31 @@ _smithy ()
 {
   #echo "cur: $cur, prev: $prev" > /dev/pts/33
 
-	local i=1 cmd
+  local i=1 cmd
 
-	if [[ -n ${ZSH_VERSION-} ]]; then
-		emulate -L bash
-		setopt KSH_TYPESET
+  if [[ -n ${ZSH_VERSION-} ]]; then
+    emulate -L bash
+    setopt KSH_TYPESET
 
-		# workaround zsh's bug that leaves 'words' as a special
-		# variable in versions < 4.3.12
-		typeset -h words
-	fi
+    # workaround zsh's bug that leaves 'words' as a special
+    # variable in versions < 4.3.12
+    typeset -h words
+  fi
 
-	# find the subcommand
-	while [[ $i -lt $COMP_CWORD ]]; do
-		local s="${COMP_WORDS[i]}"
-		case "$s" in
+  # find the subcommand
+  while [[ $i -lt $COMP_CWORD ]]; do
+    local s="${COMP_WORDS[i]}"
+    case "$s" in
     --*) ;;
-		-*) ;;
-		*) 	cmd="$s"
-			break
-			;;
-		esac
-		i=$((++i))
-	done
+    -*) ;;
+    *)  cmd="$s"
+      break
+      ;;
+    esac
+    i=$((++i))
+  done
 
-	if [[ $i -eq $COMP_CWORD ]]; then
+  if [[ $i -eq $COMP_CWORD ]]; then
     local cur="${COMP_WORDS[COMP_CWORD]}"
     case "$cur" in
       -*)
@@ -113,97 +113,109 @@ _smithy ()
         return
         ;;
     esac
-		return
-	fi
+    return
+  fi
 
-	# subcommands have their own completion functions
-	case "$cmd" in
-	build|test)    _smithy_build  ;;
-	edit)          _smithy_edit   ;;
-	formula)       _smithy_formula ;;
-	help)          _smithy_help   ;;
-	module)        _smithy_module ;;
-	new)           _smithy_new    ;;
-	publish)       _smithy_publish ;;
-	repair)        _smithy_repair ;;
-	search)        _smithy_search ;;
-	show)          _smithy_show   ;;
-	*)        ;;
-	esac
+  # subcommands have their own completion functions
+  case "$cmd" in
+  build|test)    _smithy_build  ;;
+  edit)          _smithy_edit   ;;
+  formula)       _smithy_formula ;;
+  help)          _smithy_help   ;;
+  module)        _smithy_module ;;
+  new)           _smithy_new    ;;
+  publish)       _smithy_publish ;;
+  repair)        _smithy_repair ;;
+  search)        _smithy_search ;;
+  show)          _smithy_show   ;;
+  *)        ;;
+  esac
 }
 
 __smithy_complete_packages ()
 {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local packages=$(smithy search --format=name ${cur})
-	COMPREPLY=($(compgen -W "$packages" -- "$cur"))
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local cache_file=$HOME/.smithy/completion_packages
+  if [[ -e $cache_file ]] 
+  then
+    local packages=$(cat $cache_file)
+  else
+    local packages=$(smithy search --format=name ${cur})
+  fi
+  COMPREPLY=($(compgen -W "$packages" -- "$cur"))
 }
 
 __smithy_complete_formulas ()
 {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local packages=$(smithy formula list ${cur})
-	COMPREPLY=($(compgen -W "$packages" -- "$cur"))
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local cache_file=$HOME/.smithy/completion_formulas
+  if [[ -e $cache_file ]] 
+  then
+    local packages=$(cat $cache_file)
+  else
+    local packages=$(smithy formula list ${cur})
+  fi
+  COMPREPLY=($(compgen -W "$packages" -- "$cur"))
 }
 
 _smithy_build () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
-	case "$cur" in
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  case "$cur" in
   --log-name=*)
     local t=`echo "$cur" | sed -e 's/--log-name=//g'`
     COMPREPLY=($(compgen -f "$t"))
     return
     ;;
-	-*)
-		__smithycomp "
+  -*)
+    __smithycomp "
       --disable-log
       --force
       --log-name=
       --dry-run
       --suppress-stdout"
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
 _smithy_publish () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
-	case "$cur" in
-	-*)
-		__smithycomp "
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  case "$cur" in
+  -*)
+    __smithycomp "
       --dry-run"
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
 _smithy_module () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
   case "$prv" in
   module)
     __smithycomp "create deploy edit use"
     return
     ;;
   esac
-	case "$cur" in
-	-*)
+  case "$cur" in
+  -*)
 
-		__smithycomp "
+    __smithycomp "
       --dry-run"
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
 _smithy_edit () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
   case "$prv" in
   edit)
     __smithycomp "build test env modulefile"
@@ -214,25 +226,25 @@ _smithy_edit () {
     return
     ;;
   esac
-	case "$cur" in
+  case "$cur" in
   --editor=*)
     local t=`echo "$cur" | sed -e 's/--editor=//g'`
     COMPREPLY=($(compgen -c "$t"))
     return
     ;;
-	-*)
-		__smithycomp "
+  -*)
+    __smithycomp "
       --split
       --editor="
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
 _smithy_formula () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
   case "$prv" in
   formula)
     case "$cur" in
@@ -294,8 +306,8 @@ _smithy_formula () {
 }
 
 _smithy_search () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
 
   case "$prv" in
   --format=*)
@@ -303,18 +315,18 @@ _smithy_search () {
     return
     ;;
   esac
-	case "$cur" in
-	-*)
-		__smithycomp "--format="
-		return
-		;;
-	esac
+  case "$cur" in
+  -*)
+    __smithycomp "--format="
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
 _smithy_new () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prv="${COMP_WORDS[COMP_CWORD-1]}"
 
   case "$prv" in
   -t)
@@ -322,22 +334,22 @@ _smithy_new () {
     return
     ;;
   esac
-	case "$cur" in
+  case "$cur" in
   --tarball=*)
     local t=`echo "$cur" | sed -e 's/--tarball=//g'`
     COMPREPLY=($(compgen -f "$t"))
     return
     ;;
-	-*)
-		__smithycomp "
+  -*)
+    __smithycomp "
       --existing-scripts=
       --dry-run
       --tarball=
       --web-description
       --skip-modulefile"
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 
@@ -350,15 +362,15 @@ _smithy_show () {
 }
 
 _smithy_repair () {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
+  local cur="${COMP_WORDS[COMP_CWORD]}"
 
-	case "$cur" in
-	-*)
-		__smithycomp "
+  case "$cur" in
+  -*)
+    __smithycomp "
       --dry-run"
-		return
-		;;
-	esac
+    return
+    ;;
+  esac
   __smithy_complete_packages
 }
 

data/etc/completion/zsh/_smithy

@@ -1,15 +1,35 @@
 #compdef smithy
 
 _smithy_packages() {
-	packages=(`smithy search --format=name`)
+  cache_file=$HOME/.smithy/completion_packages 
+  if [[ -e $cache_file ]] 
+  then
+    packages=(`cat $cache_file`)
+  else
+    packages=(`smithy search --format=name`)
+  fi
+  _wanted packages expl 'packages' compadd -a packages
 }
 
 _smithy_formulas() {
-	formulas=(`smithy formula list`)
+  cache_file=$HOME/.smithy/completion_formulas
+  if [[ -e $cache_file ]] 
+  then
+    formulas=(`cat $cache_file`)
+  else
+    formulas=(`smithy formula list`)
+  fi
+  _wanted packages expl 'formulas' compadd -a formulas
 }
 
 _smithy_architectures() {
-	arches=(`smithy show arch --all`)
+  cache_file=$HOME/.smithy/completion_arches
+  if [[ -e $cache_file ]] 
+  then
+    arches=(`cat $cache_file`)
+  else
+    arches=(`smithy show arch --all`)
+  fi
   _wanted packages expl 'architectures' compadd -a arches
 }
 
@@ -29,7 +49,6 @@ _1st_arguments=(
 )
 
 local expl
-local -a formulae
 
 _arguments \
   '(--arch=)--arch=[Machine architecture to operate on]:architecture:_smithy_architectures' \
@@ -46,10 +65,6 @@ _arguments \
   '(-v --verbose)'{-v,--verbose}'[Be more verbose]' \
   '(--web-root=)--web-root=[The root level directory for web files]:directory:_files -/' \
   '*:: :->subcmds' && return 0
-#[[ "$PREFIX" = --* ]] && _arguments -- \
-  #'*=FILE*:file:_files' \
-  #'*=PATH*:directory:_files -/' \
-  #'*=NAME*:directory:_files -/' && return 0
 
 # Match Sub-command
 if (( CURRENT == 1 )); then
@@ -77,7 +92,6 @@ case "$words[1]" in
 
     if [[ "$state" == forms ]]; then
       _smithy_packages
-      _wanted packages expl 'packages' compadd -a packages
     fi
     ;;
 
@@ -101,7 +115,6 @@ case "$words[1]" in
 
     if [[ "$state" == forms ]]; then
       _smithy_packages
-      _wanted packages expl 'packages' compadd -a packages
     fi
     ;;
 
@@ -124,7 +137,6 @@ case "$words[1]" in
 
     if [[ "$state" == forms ]]; then
       _smithy_packages
-      _wanted packages expl 'packages' compadd -a packages
     fi
     ;;
 
@@ -144,7 +156,6 @@ case "$words[1]" in
 
     if [[ "$state" == forms ]]; then
       _smithy_packages
-      _wanted packages expl 'packages' compadd -a packages
     fi
     ;;
 
@@ -173,7 +184,6 @@ case "$words[1]" in
 
     if [[ "$state" == forms ]]; then
       _smithy_packages
-      _wanted packages expl 'packages' compadd -a packages
     fi
     ;;
 
@@ -190,9 +200,9 @@ case "$words[1]" in
     )
 
     # not sure how to make this work right
-    # _arguments \
+    # [[ "$PREFIX" = -* ]] && _arguments \
     #   '(-d --directories=)'{-d,--directories=}'[Specify one or more additional formula directories separated with commas]:directory:_files -/' \
-    #   '1: :->forms' &&  return 0
+    #   '1: :->subcmds' &&  return 0
 
     # Match subsub-command
     if (( CURRENT == 2 )); then
@@ -200,20 +210,25 @@ case "$words[1]" in
       return
     fi
 
+    # echo $state > /dev/ttys004
+
     # Match subsub-command arguments
-    if (( CURRENT == 3 )); then
+    if (( CURRENT >= 3 )); then
       case "$words[2]" in
         install)
-          _arguments \
+          [[ "$PREFIX" = -* ]] && _arguments \
             '(--clean)--clean[clean existing install prefix]' \
             '(--no-clean)--no-clean[leave existing install prefix files intact]' \
             '(-f --formula-name)'{-f,--formula-name}'[Formula name]' \
             '(-m --modulefile)'{-m,--modulefile}'[Create modulefiles as well]' \
-            '1: :->forms' &&  return 0
-          if [[ "$state" == forms ]]; then
-            _smithy_formulas
-            _wanted packages expl 'formulas' compadd -a formulas
-          fi
+            '1: :->subcmds' &&  return 0
+          _smithy_formulas
+          ;;
+        create_modulefile)
+          _smithy_formulas
+          ;;
+        display)
+          _smithy_formulas
           ;;
       esac
 

data/lib/smithy/config.rb

@@ -65,7 +65,7 @@ module Smithy
 
         set_hostname_and_arch
         options_to_merge[:arch] = @arch
-        options_to_merge[:"prgenv-prefix"] = get_prgenv_prefix
+        # options_to_merge[:"prgenv-prefix"] = get_prgenv_prefix
 
         # Merge the config file values with command line values,
         # options on the command line take precedence.
@@ -123,18 +123,18 @@ module Smithy
         config_file_hash.try(:[], "compilers")
       end
 
-      def get_prgenv_prefix
-        default_prefix = "PrgEnv-"
+      # def get_prgenv_prefix
+      #   default_prefix = "PrgEnv-"
 
-        default_prefix_from_config = @config_file_hash.try(:[], "programming-environment-prefix").try(:[], "default")
-        default_prefix = default_prefix_from_config unless default_prefix_from_config.blank?
+      #   default_prefix_from_config = @config_file_hash.try(:[], "programming-environment-prefix").try(:[], "default")
+      #   default_prefix = default_prefix_from_config unless default_prefix_from_config.blank?
 
-        prefix_from_config = @config_file_hash.try(:[], "programming-environment-prefix").try(:[], @arch)
+      #   prefix_from_config = @config_file_hash.try(:[], "programming-environment-prefix").try(:[], @arch)
 
-        return prefix_from_config unless prefix_from_config.blank?
+      #   return prefix_from_config unless prefix_from_config.blank?
 
-        return default_prefix
-      end
+      #   return default_prefix
+      # end
 
       def set_hostname_and_arch
         @hostname ||= ENV.try(:[], 'HOSTNAME').try(:dup)
@@ -179,6 +179,25 @@ module Smithy
         end
       end
 
+      def reindex_completion_caches
+        notice "Reindexing packages"
+        FormulaCommand.initialize_directories
+        formulas = FormulaCommand.formula_names
+        packages = Package.all.collect{|s| s.gsub(/#{full_root}\//, '')}
+
+        FileUtils.mkdir_p(File.join(ENV["HOME"], ".smithy"))
+
+        File.open(File.join(ENV["HOME"], ".smithy", "completion_formulas"), "w+") do |f|
+          f.puts formulas
+        end
+        File.open(File.join(ENV["HOME"], ".smithy", "completion_packages"), "w+") do |f|
+          f.puts packages
+        end
+        File.open(File.join(ENV["HOME"], ".smithy", "completion_arches"), "w+") do |f|
+          f.puts @config_file_hash["hostname-architectures"].values.uniq.sort
+        end
+      end
+
       def example_config
         example = {}
         example["software-root"]       = "/sw"
@@ -197,11 +216,11 @@ module Smithy
           "analysis-x64" => "lens",
           "smoky"        => "smoky"
         }
-        example["programming-environment-prefix"] = {
-          "default" => "PrgEnv-",
-          "smoky"   => "PE-",
-          "sith"    => "PE-"
-        }
+        # example["programming-environment-prefix"] = {
+        #   "default" => "PrgEnv-",
+        #   "smoky"   => "PE-",
+        #   "sith"    => "PE-"
+        # }
         example["hostname-architectures"] = {
           "everest-login" => "redhat6",
           "everest"       => "redhat6",

data/lib/smithy/formula_command.rb

@@ -53,7 +53,7 @@ module Smithy
       File.read(formula_file_path(name))
     end
 
-    def self.initialize_directories(options)
+    def self.initialize_directories(options = {})
       prepend_formula_directory(options[:d]) if options[:d]
     end
 

data/lib/smithy_version.rb

@@ -36,5 +36,5 @@
 # }}}
 
 module Smithy
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

data/man/man1/smithy.1

@@ -52,16 +52,16 @@ Build scripts are shell scripts that live inside of a package\'s PREFIX and exec
 
 /sw/xk6/subversion/1\.6\.17
 `\-\-\- sles11\.1_gnu4\.3\.4
-   `\-\-\- bin
-   `\-\-\- build\-notes
-   `\-\-\- dependencies
-   `\-\-\- include
-   `\-\-\- lib
-   `\-\-\- rebuild
-   `\-\-\- relink
-   `\-\-\- remodule
-   `\-\-\- retest
-   `\-\-\- share
+   |\-\-\- bin
+   |\-\-\- build\-notes
+   |\-\-\- dependencies
+   |\-\-\- include
+   |\-\-\- lib
+   |\-\-\- rebuild
+   |\-\-\- relink
+   |\-\-\- remodule
+   |\-\-\- retest
+   |\-\-\- share
    `\-\-\- subversion\-1\.6\.17
 .
 .fi
@@ -86,10 +86,10 @@ A package installed with a formula has a simpler prefix directory structure\. Th
 
 /sw/xk6/subversion/1\.7\.8
 `\-\-\- sles11\.1_gnu4\.3\.4
-   `\-\-\- bin
-   `\-\-\- include
-   `\-\-\- lib
-   `\-\-\- source
+   |\-\-\- bin
+   |\-\-\- include
+   |\-\-\- lib
+   |\-\-\- source
    `\-\-\- share
 .
 .fi
@@ -183,14 +183,14 @@ Assuming we install subversion with the previous command and our software\-root
 .nf
 
 /sw/xk6/subversion/1\.7\.8
-`\-\-\- modulefile
+|\-\-\- modulefile
 |  `\-\-\- subversion
 |     `\-\-\- 1\.7\.8
 `\-\-\- sles11\.1_gnu4\.3\.4
-   `\-\-\- bin
-   `\-\-\- include
-   `\-\-\- lib
-   `\-\-\- source
+   |\-\-\- bin
+   |\-\-\- include
+   |\-\-\- lib
+   |\-\-\- source
    `\-\-\- share
 .
 .fi
@@ -445,5 +445,211 @@ smithy publish petsc
 .
 .IP "" 0
 .
+.SH "SMITHY CONFIG FILE"
+To see an up to date example of what a smithy config file should look like run \fBsmithy show example_config\fR\. Most of the options specified in a config file can be overridden by global command line options\. See \fBsmithy help\fR for info on global command line options\. The smithy config file uses the yaml \fIhttp://www\.yaml\.org/\fR syntax and looks something like this:
+.
+.IP "" 4
+.
+.nf
+
+\-\-\-
+software\-root: /sw
+download\-cache: /sw/sources
+formula\-directories:
+\- /sw/tools/smithy/formulas
+\- /sw/tools/smithy/another_formula_directory
+global\-error\-log: /sw/tools/smithy/exceptions\.log
+file\-group\-name: ccsstaff
+descriptions\-root: /sw/descriptions
+web\-root: /sw/descriptions_in_html
+web\-architecture\-names:
+  xk6: titan
+  xk7: titan
+  analysis\-x64: lens
+  smoky: smoky
+hostname\-architectures:
+  everest\-login: redhat6
+  everest: redhat6
+  lens: analysis\-x64
+  sith\-login: redhat6
+  sith: redhat6
+  smoky\-login: smoky
+  titan\-login: xk6
+  titan\-ext: xk6
+  yona\-login: yona
+  yona: yona
+.
+.fi
+.
+.IP "" 0
+.
+.SS "software\-root"
+This option defines the top level directory used as the location of architecture directories\. Good choices might be \fB/opt/smithy\fR or \fB/usr/local/smithy\fR\. Someplace under your home directory would work too\.
+.
+.SS "file\-group\-name"
+Software compiled with smithy is intended to be group writable so that more that one user may install software in the same location\. This option defines the group name used for installing software\.
+.
+.SS "hostname\-architectures"
+This option defines what hostnames map to which architecture directories\. Smithy will use the mapped directories whenever it is run on machines with hostnames specified by this option\. Smithy will ignore trailing digits on hostnames\. For example:
+.
+.IP "" 4
+.
+.nf
+
+hostname\-architectures:
+  everest: redhat6
+  titan\-login: xk6
+  titan\-ext: xk6
+  yona\-login: yona
+  yona: yona
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Would produce the following matches:
+.
+.IP "\(bu" 4
+everest > redhat6
+.
+.IP "\(bu" 4
+titan\-login1 > xk6
+.
+.IP "\(bu" 4
+titan\-ext12 > xk6
+.
+.IP "\(bu" 4
+yona\-login2 > yona
+.
+.IP "" 0
+.
+.SS "download\-cache"
+This directory is used when software archives are downloaded via formulas or through the \fBsmithy new \-\-tarfile=\fR option\.
+.
+.SS "formula\-directories"
+This option specifies one or more directories where formulas are stored\. If multiple directories are used then smithy will use the first formula it finds in the order directories are specified\.
+.
+.SS "global\-error\-log"
+This file will log internal errors smithy encounters\. It is usually used for development\. You can also get extra error output by setting \fBGLI_DEBUG=true\fR in your shell\.
+.
+.SS "web\-architecture\-names"
+The \fBsmithy publish\fR command outputs architecture names at the top of description files\. If you wish to use a different name this option allows for that\. For example:
+.
+.IP "" 4
+.
+.nf
+
+web\-architecture\-names:
+  xk6: titan
+  xk7: titan
+  analysis\-x64: lens
+.
+.fi
+.
+.IP "" 0
+.
+.SS "web\-root"
+This directory is the target output directory when running \fBsmithy publish\fR
+.
+.SS "descriptions\-root"
+Setting this option changes the way smithy handles description files\. When NOT set smithy will expect descriptions to live inside each application folder inside each architecture folder\. For example, assuming a software\-root of \fB/sw\fR and an architecture of \fBxk6\fR smithy would expect the description files in these locations:
+.
+.IP "" 4
+.
+.nf
+
+/sw
+|\-\-\- redhat6
+|  |\-\-\- subversion
+|  |  |\-\-\- 1\.6\.17
+|  |  |\-\-\- 1\.7\.8
+|  |  `\-\-\- description\.markdown
+|  `\-\-\- git
+|     |\-\-\- 1\.7\.9\.5
+|     |\-\-\- 1\.8\.2\.1
+|     `\-\-\- description\.markdown
+`\-\-\- xk6
+   |\-\-\- subversion
+   |  |\-\-\- 1\.6\.17
+   |  |\-\-\- 1\.7\.8
+   |  `\-\-\- description\.markdown
+   `\-\-\- git
+      |\-\-\- 1\.7\.9\.5
+      |\-\-\- 1\.8\.2\.1
+      `\-\-\- description\.markdown
+.
+.fi
+.
+.IP "" 0
+.
+.P
+This setup has multiple description files per application\. This might make sense if your documentation is highly dependent on the architecture\. If we set \fBdescriptions\-root\fR to \fB/sw/descriptions\fR smithy would expect the descriptions in:
+.
+.IP "" 4
+.
+.nf
+
+/sw
+|\-\-\- redhat6
+|  |\-\-\- subversion
+|  |  |\-\-\- 1\.6\.17
+|  |  `\-\-\- 1\.7\.8
+|  `\-\-\- git
+|     |\-\-\- 1\.7\.9\.5
+|     `\-\-\- 1\.8\.2\.1
+|\-\-\- xk6
+|  |\-\-\- subversion
+|  |  |\-\-\- 1\.6\.17
+|  |  `\-\-\- 1\.7\.8
+|  `\-\-\- git
+|     |\-\-\- 1\.7\.9\.5
+|     `\-\-\- 1\.8\.2\.1
+`\-\-\- descriptions
+   |\-\-\- subversion
+   |  `\-\-\- description\.markdown
+   `\-\-\- git
+      `\-\-\- description\.markdown
+.
+.fi
+.
+.IP "" 0
+.
+.P
+With this we have only one description file per application\.
+.
+.SS "compilers"
+This option allows you to override the complier definition for creating modulefiles\. The syntax is yaml and the default values are:
+.
+.IP "" 4
+.
+.nf
+
+compilers:
+\- :prg_env: PrgEnv\-gnu
+  :compiler_name: gcc
+  :human_name: gnu
+  :regex: !ruby/regexp /(gnu|gcc)(\.*)/
+  :build_name_regex: !ruby/regexp /(gnu|gcc)([\ed\e\.]+)/
+\- :prg_env: PrgEnv\-pgi
+  :compiler_name: pgi
+  :human_name: pgi
+  :regex: !ruby/regexp /(pgi)(\.*)/
+  :build_name_regex: !ruby/regexp /(pgi)([\ed\e\.]+)/
+\- :prg_env: PrgEnv\-intel
+  :compiler_name: intel
+  :human_name: intel
+  :regex: !ruby/regexp /(intel)(\.*)/
+  :build_name_regex: !ruby/regexp /(intel)([\ed\e\.]+)/
+\- :prg_env: PrgEnv\-cray
+  :compiler_name: cce
+  :human_name: cray
+  :regex: !ruby/regexp /(cce|cray)(\.*)/
+  :build_name_regex: !ruby/regexp /(cce|cray)([\ed\e\.]+)/
+.
+.fi
+.
+.IP "" 0
+.
 .SH "SEE ALSO"
 smithyformula(5)

data/smithy.rdoc

@@ -1,6 +1,6 @@
 == smithy - Smithy will help you build, test, and install software with ease.
 
-v1.6.1
+v1.6.2
 
 === Global Options
 === --arch NAME
@@ -31,13 +31,6 @@ Group name for files created by smithy
 [Default Value] None
 
 
-=== --prgenv-prefix NAME
-
-The prefix of programming environments for this machine
-
-[Default Value] None
-
-
 === --software-root PATH
 
 The root level directory for software
@@ -302,6 +295,10 @@ See what files will be created without creating them
 
 
 
+==== Command: <tt>reindex </tt>
+reindex auto-completion cache
+
+
 ==== Command: <tt>repair  NAME</tt>
 Repair a package
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_smithy
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &6195940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6195940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: interactive_editor
-  requirement: &6194100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6194100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &6202960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6202960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &6213580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6213580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6221940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6221940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6217040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6217040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &6231860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6231860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &6230800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6230800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6229600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6229600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &6227920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +165,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6227920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &6224920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *6224920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &6238200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *6238200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &6236360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6236360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &6233620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,21 +229,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6233620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &6246620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.2.14
   type: :runtime
   prerelease: false
-  version_requirements: *6246620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &6241040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +261,12 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *6241040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 description: 
 email: anthony.digirolamo@gmail.com
 executables:
@@ -256,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1350694811849315920
+      hash: -1093726032562910331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,10 +345,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1350694811849315920
+      hash: -1093726032562910331
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Smithy can help maintain a collection of software installed from source.