software_smithy 1.1 → 1.6

data/bin/smithy

@@ -54,8 +54,14 @@ require 'uri'
 require 'kramdown'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
+require 'active_support/inflector'
+
 # require 'debugger'      #XXX
 # require 'awesome_print' #XXX
+# require 'pry'
+# require 'pry-doc'
+
+@@global_argv = ARGV.dup
 
 require 'gli'
 include GLI::App
@@ -65,6 +71,8 @@ include Smithy
 
 version Smithy::VERSION
 
+subcommand_option_handling :normal
+
 program_desc "Smithy will help you build, test, and install software with ease."
 
 desc "Machine architecure to operate on"
@@ -94,7 +102,8 @@ desc "The root level directory global description files"
 arg_name "PATH"
 flag ["descriptions-root"]
 
-desc "Disable or enable color output (default: enabled)"
+desc "Disable or enable color output"
+default_value true
 switch "colors"
 
 desc "Alternate config file, also set by $SMITHY_CONFIG"
@@ -104,6 +113,9 @@ flag [:"config-file"]
 desc "Always overwrite existing files"
 switch [:f, :force], :negatable => false
 
+desc "Be more verbose"
+switch [:v, :verbose], :negatable => false
+
 desc "Search currently installed software"
 arg_name "PATTERN"
 command ['search'] do |c|
@@ -134,9 +146,9 @@ command ['search'] do |c|
     formatter = output_formats[options[:format]]
     raise "Unknow format \"#{options[:format]}\" valid formats include: #{output_formats.keys.join(',')}" if formatter.nil?
 
-    notice "Searching in #{swroot}" unless formatter.class == Format::Doku
+    notice "Searching in #{swroot}" unless formatter.class == Format::Doku || formatter.class == Format::Name
 
-    software = Package.all :root => swroot
+    software = Package.all
 
     count = 0
     formatter.before
@@ -152,7 +164,7 @@ command ['search'] do |c|
     end
     formatter.after
 
-    notice "#{count} Found" unless formatter.class == Format::Doku
+    notice "#{count} Found" unless formatter.class == Format::Doku || formatter.class == Format::Name
   end
 end
 
@@ -199,7 +211,7 @@ end
 
 
 desc "Build software"
-long_desc "The software to build may be either the absolute path or the full name of the software. The full name includes version numbers and build names using the format: NAME/VERSION/BUILD."
+long_desc "The software to build may be either the absolute path or the full name of the software. The full name includes version numbers and build names using the format: APPLICATION/VERSION/BUILD."
 arg_name "PATH"
 command ['build'] do |c|
   c.desc 'Build log file name located within the software prefix.'
@@ -243,9 +255,9 @@ end
 
 desc "Generate a new build and all necessary files"
 long_desc <<-EOS
-The new command will create all necessary files needed to add a new software package. Some care should be given to naming new packages. Some considerations are package names, version numbers, and build names. New package names should be of the format NAME/VERSION/BUILD
+The new command will create all necessary files needed to add a new software package. Some care should be given to naming new packages. Some considerations are package names, version numbers, and build names. New package names should be of the format APPLICATION/VERSION/BUILD
 
-- NAME of the package should be all lower case and one word. If multiple words are necessary separate them with dashes '-'.
+- APPLICATION of the package should be all lower case and one word. If multiple words are necessary separate them with dashes '-'.
 
 - VERSION numbers should be standard numbers separated by periods. If another format is necessary ensure that the numbers can be lexigraphically sorted in order of oldest release to newest.
 
@@ -267,42 +279,46 @@ command ['new'] do |c|
   c.desc "Skip modulefile generation"
   c.switch ["skip-modulefile"], :negatable => false
 
+  c.desc "Use an existing software's build scripts"
+  c.arg_name "PATH"
+  c.flag [:e, "existing-scripts"]
+
   c.desc "Provide a tarball to unpack, either a file or URL (optional)"
   c.arg_name "FILE|URL"
-  c.flag [:t, :tarball]
+  c.flag [:t, :tarball, :tarfile]
   c.action do |global_options,options,args|
     raise "You must supply a name to create new packages" if args.empty?
 
     p = Package.new :path => args.first
-
     p.valid?
-
-    if options[:tarball] =~ URI::ABS_URI
-      url = options[:tarball]
-    elsif options[:tarball]
-      archive = File.absolute_path options[:tarball]
-      raise "The archive #{archive} does not exist" unless File.exists? archive
-    end
     p.create :dry_run => options[:"dry-run"],
+            :existing => options[:"existing-scripts"],
                  :web => options[:"web-description"]
 
     if options[:tarball]
-      downloaded = p.download(url) if url
-      archive = downloaded if downloaded
+      if options[:tarball] =~ URI::ABS_URI
+        d = DownloadCache.new(p)
+        archive = d.get(options[:tarball])
+      else
+        archive = File.absolute_path options[:tarball]
+        raise "The archive #{archive} does not exist" unless File.exists? archive
+      end
       p.extract :archive => archive, :dry_run => options[:"dry-run"]
     end
 
     unless options[:"skip-modulefile"]
       m = ModuleFile.new :package => p
-      m.create :dry_run => options[:"dry-run"]
+      m.create :dry_run => options[:"dry-run"], :existing => options[:"existing-scripts"]
     end
 
-    notice "Next Steps"
-    notice_command " smithy edit last"            , "Edit build scripts or modulefile"
-    notice_command " smithy build last"           , "Run build script"
-    notice_command " smithy module create"        , "Generate a modulefile" if options[:"skip-modulefile"]
-    notice_command " smithy module deploy last"   , "Install modulefile"
-    notice_command " smithy publish last"         , "Publish web description"
+    if global_options[:verbose]
+      notice "Next Steps"
+      notice_command " smithy edit last"            , "Edit build scripts or modulefile"
+      notice_command " smithy build last"           , "Run build script"
+      notice_command " smithy module create"        , "Generate a modulefile" if options[:"skip-modulefile"]
+      notice_command " smithy module deploy last"   , "Install modulefile"
+      notice_command " smithy publish last"         , "Publish web description"
+    end
   end
 end
 
@@ -337,7 +353,6 @@ command ['edit'] do |c|
       p = Package.new :path => arguments.first
       p.valid?
       p.prefix_exists!
-      p.rebuild_script_exists!
 
       # if no file, prompt
       if operation.nil?
@@ -491,9 +506,11 @@ command ['module'] do |c|
       m = ModuleFile.new :package => p
 
       m.create :dry_run => options[:"dry-run"]
-      notice "Next Steps"
-      notice_command " smithy edit modulefile last" , "Edit generated modulefile"
-      notice_command " smithy module deploy last"   , "Install modulefile"
+      if global_options[:verbose]
+        notice "Next Steps"
+        notice_command " smithy edit modulefile last" , "Edit generated modulefile"
+        notice_command " smithy module deploy last"   , "Install modulefile"
+      end
     end
   end
 
@@ -534,8 +551,94 @@ command ['show'] do |c|
 
   c.desc "List all architectures know to smithy."
   c.command :arch do |arch|
-    arch.action do
-      Smithy::Config.architectures
+    arch.desc "list all architectures"
+    arch.switch [:a, "all"], :negatable => false
+    arch.action do |global_options,options,args|
+      Smithy::Config.architectures(options)
+    end
+  end
+
+  c.desc "Display an example config file."
+  c.command :example_config do |example_config|
+    example_config.action do
+      puts Smithy::Config.example_config
+    end
+  end
+end
+
+desc "Install software from predefined formulas"
+command ['formula'] do |c|
+  c.desc "Specify one or more additional formula directories separated with commas"
+  c.arg_name "PATH"
+  c.flag [:d, :directories], :type => Array
+
+  c.desc "List known formulas"
+  c.command :list do |subcommand|
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.list_command(options,args)
+    end
+  end
+
+  c.desc "Display a formula location"
+  c.arg_name "FORMULA"
+  c.command :which do |subcommand|
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.which_command(options,args)
+    end
+  end
+
+  c.desc "Display a formula"
+  c.arg_name "FORMULA"
+  c.command :display do |subcommand|
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.display_command(options,args)
+    end
+  end
+
+  c.desc "Create a new formula"
+  c.arg_name "URL"
+  c.command :new do |subcommand|
+    subcommand.desc "Formula name"
+    subcommand.arg_name "NAME"
+    subcommand.flag [:n, "name"]
+
+    subcommand.desc "Formula homepage"
+    subcommand.arg_name "URL"
+    subcommand.flag [:h, "homepage"]
+
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.new_command(options,args)
+    end
+  end
+
+  c.desc "Install a package using a formula"
+  c.arg_name "APPLICATION | APPLICATION/VERSION | APPLICATION/VERSION/BUILD"
+  c.command :install do |subcommand|
+    subcommand.desc "Formula name"
+    subcommand.arg_name "NAME"
+    subcommand.flag [:f, "formula-name"]
+
+    subcommand.desc "Create modulefiles as well"
+    subcommand.switch [:m, "modulefile"], :negatable => false
+
+    subcommand.desc "Clean exiting install prefix"
+    subcommand.default_value false
+    subcommand.switch [:c, "clean"]
+
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.install_command(options,args)
+    end
+  end
+
+  c.desc "Create a modulefile for a given package"
+  c.arg_name "APPLICATION | APPLICATION/VERSION | APPLICATION/VERSION/BUILD"
+  c.command :create_modulefile do |subcommand|
+    subcommand.desc "Formula name"
+    subcommand.arg_name "NAME"
+    subcommand.flag [:f, "formula-name"]
+
+    subcommand.action do |global_options,options,args|
+      FormulaCommand.create_module_command(options,args)
     end
   end
 end
@@ -557,12 +660,13 @@ end
 # end
 
 pre do |global,command,options,args|
-  # ap global #XXX
   Sickill::Rainbow.enabled = false if global[:"colors"] == false
 
   Smithy::Config.config_file_name = File.join(@@smithy_bin_root,"etc/smithyrc")
   Smithy::Config.load_configuration(global)
 
+  @@global_config = global
+
   # Pre logic here
   # Return true to proceed; false to abort and not call the chosen command
   # Use skips_pre before a command to skip this block on that command only
@@ -576,9 +680,12 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
+  notice_exception exception.message unless exception.message.blank?
+
+  log_exception(exception, @@global_argv, @@global_config)
   # Error logic here
   # return false to skip default error handling
-  true
+  false
 end
 
 exit run(ARGV)

data/etc/completion/smithy-completion.bash

@@ -83,25 +83,32 @@ _smithy ()
       -*)
         __smithycomp "
         --arch=
+        --no-colors
+        --colors
         --config-file=
+        --descriptions-root=
         --disable-group-writable
+        --force
         --file-group-name=
         --help
-        --no-color
+        --prgenv-prefix=
         --software-root=
+        --verbose
         --web-root="
         return
         ;;
       *)
         __smithycomp "
         build
-        deploy
         edit
+        formula
         help
         module
         new
+        publish
         repair
         search
+        show
         test"
         return
         ;;
@@ -113,11 +120,14 @@ _smithy ()
 	case "$cmd" in
 	build|test)    _smithy_build  ;;
 	edit)          _smithy_edit   ;;
+	formula)       _smithy_formula ;;
 	help)          _smithy_help   ;;
 	module)        _smithy_module ;;
 	new)           _smithy_new    ;;
-	repair|deploy) _smithy_repair ;;
+	publish)       _smithy_publish ;;
+	repair)        _smithy_repair ;;
 	search)        _smithy_search ;;
+	show)          _smithy_show   ;;
 	*)        ;;
 	esac
 }
@@ -129,6 +139,13 @@ __smithy_complete_packages ()
 	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"))
+}
+
 _smithy_build () {
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	local prv="${COMP_WORDS[COMP_CWORD-1]}"
@@ -151,12 +168,25 @@ _smithy_build () {
   __smithy_complete_packages
 }
 
+_smithy_publish () {
+	local cur="${COMP_WORDS[COMP_CWORD]}"
+	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+	case "$cur" in
+	-*)
+		__smithycomp "
+      --dry-run"
+		return
+		;;
+	esac
+  __smithy_complete_packages
+}
+
 _smithy_module () {
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	local prv="${COMP_WORDS[COMP_CWORD-1]}"
   case "$prv" in
   module)
-    __smithycomp "create use deploy"
+    __smithycomp "create deploy edit use"
     return
     ;;
   esac
@@ -176,7 +206,7 @@ _smithy_edit () {
 	local prv="${COMP_WORDS[COMP_CWORD-1]}"
   case "$prv" in
   edit)
-    __smithycomp "build test modules modulefile"
+    __smithycomp "build test env modulefile"
     return
     ;;
   -e)
@@ -192,6 +222,7 @@ _smithy_edit () {
     ;;
 	-*)
 		__smithycomp "
+      --split
       --editor="
 		return
 		;;
@@ -199,13 +230,76 @@ _smithy_edit () {
   __smithy_complete_packages
 }
 
+_smithy_formula () {
+	local cur="${COMP_WORDS[COMP_CWORD]}"
+	local prv="${COMP_WORDS[COMP_CWORD-1]}"
+  case "$prv" in
+  formula)
+    case "$cur" in
+    --directories=*)
+      local t=`echo "$cur" | sed -e 's/--directories=//g'`
+      COMPREPLY=($(compgen -f "$t"))
+      return
+      ;;
+    -*)
+      __smithycomp "
+        --directories="
+      return
+      ;;
+    esac
+    __smithycomp "create_modulefile display install list new which"
+    return
+    ;;
+  new)
+    case "$cur" in
+    -*)
+      __smithycomp "
+        --name=
+        --homepage="
+      return
+      ;;
+    esac
+    return
+    ;;
+  install)
+    case "$cur" in
+    -*)
+      __smithycomp "
+        --no-clean
+        --clean
+        --formula-name=
+        --modulefile"
+      return
+      ;;
+    esac
+    __smithy_complete_formulas
+    return
+    ;;
+  create_modulefile)
+    case "$cur" in
+    -*)
+      __smithycomp "
+        --formula-name="
+      return
+      ;;
+    esac
+    __smithy_complete_formulas
+    return
+    ;;
+  -d)
+    COMPREPLY=($(compgen -f "$cur"))
+    return
+    ;;
+  esac
+}
+
 _smithy_search () {
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	local prv="${COMP_WORDS[COMP_CWORD-1]}"
 
   case "$prv" in
   --format=*)
-    __smithycomp "path name table csv"
+    __smithycomp "path name table csv dokuwiki"
     return
     ;;
   esac
@@ -236,6 +330,7 @@ _smithy_new () {
     ;;
 	-*)
 		__smithycomp "
+      --existing-scripts=
       --dry-run
       --tarball=
       --web-description
@@ -247,7 +342,11 @@ _smithy_new () {
 }
 
 _smithy_help () {
-  __smithycomp "build search new edit repair deploy"
+  __smithycomp "build edit formula help module new publish repair search show test"
+}
+
+_smithy_show () {
+  __smithycomp "arch example_config last"
 }
 
 _smithy_repair () {