software_smithy 1.6.2 → 1.6.3

data/bin/smithy

@@ -43,6 +43,7 @@ $: << File.expand_path(@@smithy_bin_root + '/lib')
 
 require 'English'
 require 'fileutils'
+require 'etc'
 
 require 'rubygems'
 require 'open4'
@@ -57,7 +58,7 @@ require 'active_support/core_ext/string'
 require 'active_support/inflector'
 
 # require 'debugger'      #XXX
-# require 'awesome_print' #XXX
+# require 'pp'            #XXX
 # require 'pry'
 # require 'pry-doc'
 

data/etc/completion/zsh/_smithy

@@ -1,8 +1,8 @@
 #compdef smithy
 
 _smithy_packages() {
-  cache_file=$HOME/.smithy/completion_packages 
-  if [[ -e $cache_file ]] 
+  cache_file=$HOME/.smithy/completion_packages
+  if [[ -e $cache_file ]]
   then
     packages=(`cat $cache_file`)
   else
@@ -13,7 +13,7 @@ _smithy_packages() {
 
 _smithy_formulas() {
   cache_file=$HOME/.smithy/completion_formulas
-  if [[ -e $cache_file ]] 
+  if [[ -e $cache_file ]]
   then
     formulas=(`cat $cache_file`)
   else
@@ -24,7 +24,7 @@ _smithy_formulas() {
 
 _smithy_architectures() {
   cache_file=$HOME/.smithy/completion_arches
-  if [[ -e $cache_file ]] 
+  if [[ -e $cache_file ]]
   then
     arches=(`cat $cache_file`)
   else
@@ -219,7 +219,7 @@ case "$words[1]" in
           [[ "$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]' \
+            '(-f --formula-name=)'{-f,--formula-name=}'[Formula name]:formula:_smithy_formulas' \
             '(-m --modulefile)'{-m,--modulefile}'[Create modulefiles as well]' \
             '1: :->subcmds' &&  return 0
           _smithy_formulas
@@ -230,6 +230,12 @@ case "$words[1]" in
         display)
           _smithy_formulas
           ;;
+        new)
+          [[ "$PREFIX" = -* ]] && _arguments \
+            '(-h --homepage=)'{-h,--homepage=}'[Formula homepage]' \
+            '(-n --name=)'{-n,--name=}'[Formula name]' \
+            '1: :->subcmds' &&  return 0
+          ;;
       esac
 
       return

data/lib/smithy/config.rb

@@ -161,8 +161,13 @@ module Smithy
         return s
       end
 
+      def homedir
+        @homedir ||= File.join(Dir.home(Etc.getlogin))
+        @homedir
+      end
+
       def last_prefix
-        rc_file = File.join(ENV['HOME'], '.smithyrc')
+        rc_file = File.join(homedir, '.smithyrc')
         if File.exists?(rc_file)
           h = YAML.load_file(rc_file).stringify_keys rescue nil
           return h["last"]
@@ -172,7 +177,7 @@ module Smithy
       end
 
       def save_last_prefix(prefix)
-        rc_file = File.join(ENV['HOME'], '.smithyrc')
+        rc_file = File.join(homedir, '.smithyrc')
         h = {:last => prefix.encode('UTF-8')}
         File.open(rc_file, "w+") do |f|
           f.write(h.to_yaml)
@@ -185,15 +190,15 @@ module Smithy
         formulas = FormulaCommand.formula_names
         packages = Package.all.collect{|s| s.gsub(/#{full_root}\//, '')}
 
-        FileUtils.mkdir_p(File.join(ENV["HOME"], ".smithy"))
+        FileUtils.mkdir_p(File.join(homedir, ".smithy"))
 
-        File.open(File.join(ENV["HOME"], ".smithy", "completion_formulas"), "w+") do |f|
+        File.open(File.join(homedir, ".smithy", "completion_formulas"), "w+") do |f|
           f.puts formulas
         end
-        File.open(File.join(ENV["HOME"], ".smithy", "completion_packages"), "w+") do |f|
+        File.open(File.join(homedir, ".smithy", "completion_packages"), "w+") do |f|
           f.puts packages
         end
-        File.open(File.join(ENV["HOME"], ".smithy", "completion_arches"), "w+") do |f|
+        File.open(File.join(homedir, ".smithy", "completion_arches"), "w+") do |f|
           f.puts @config_file_hash["hostname-architectures"].values.uniq.sort
         end
       end

data/lib/smithy/download_cache.rb

@@ -22,7 +22,7 @@ module Smithy
 
     def download_cache_dir
       dir = Smithy::Config.global[:"download-cache"]
-      dir = File.join(ENV['HOME'], '.smithy/cache') if dir.blank?
+      dir = File.join(Smithy::Config.homedir, '.smithy/cache') if dir.blank?
       dir
     end
 

data/lib/smithy/file_operations.rb

@@ -197,7 +197,7 @@ module Smithy
 
       def install_from_string(content, dest, options = {})
         if options[:noop]
-          updated_file = File.join(ENV["HOME"]+"/.smithy_#{File.basename(dest)}_#{Time.now.to_i}")
+          updated_file = File.join(Smithy::Config.homedir+"/.smithy_#{File.basename(dest)}_#{Time.now.to_i}")
         else
           updated_file = File.join(File.dirname(dest), ".#{File.basename(dest)}_#{Time.now.to_i}")
         end
@@ -218,7 +218,7 @@ module Smithy
         dest          = args[:destination]
 
         if options[:noop]
-          rendered_file = ENV["HOME"]+"/.#{File.basename(dest)}_#{Time.now.to_i}"
+          rendered_file = Smithy::Config.homedir+"/.#{File.basename(dest)}_#{Time.now.to_i}"
         else
           rendered_file = "#{File.dirname(dest)}/.#{File.basename(dest)}_#{Time.now.to_i}"
         end

data/lib/smithy/formula.rb

@@ -30,6 +30,7 @@ module Smithy
       @module_commands = nil # re-evaluate module_commands block
       @module_setup = ""
       raise "please specify modules OR modules_command, not both" if modules.present? && module_commands.present?
+      raise "module_commands method must return an array" if module_commands.present? && module_commands.class != Array
       if ENV["MODULESHOME"]
         @modulecmd = "modulecmd sh"
         @modulecmd = "#{ENV["MODULESHOME"]}/bin/modulecmd sh" if File.exists?("#{ENV["MODULESHOME"]}/bin/modulecmd")
@@ -108,8 +109,8 @@ module Smithy
       m = ModuleFile.new :package => package
       FileUtils.mkdir_p(File.dirname(m.module_file))
       FileOperations.render_erb(:erb_string => modulefile, :binding => m.get_binding, :destination => m.module_file)
-      FileOperations.make_group_writable(m.module_file)
-      FileOperations.set_group(m.module_file, package.group)
+      FileOperations.make_group_writable(m.module_path, :recursive => true)
+      FileOperations.set_group(m.module_path, package.group, :recursive => true)
       return true
     end
 
@@ -131,9 +132,9 @@ module Smithy
     end
 
     def module_environment_variable(mod, var)
-      module_display = `#{@modulecmd} display #{mod} 2>&1`
+      module_display = `#{module_setup} #{@modulecmd} display #{mod} 2>&1`
       if module_display =~ /(\S+)\s+#{var}\s+(.*)$/
-        return $2
+        return $2.strip
       else
         return ""
       end

data/lib/smithy/formula_command.rb

@@ -7,7 +7,7 @@ module Smithy
     # 3. smithy's built in formulas
     def self.formula_directories
       unless @formula_directories
-        @formula_directories = [ File.join(ENV["HOME"], ".smithy/formulas") ]
+        @formula_directories = [ File.join(Smithy::Config.homedir, ".smithy/formulas") ]
         if Smithy::Config.global[:"formula-directories"]
           Smithy::Config.global[:"formula-directories"].reverse.each do |dir|
             @formula_directories << dir
@@ -81,15 +81,16 @@ module Smithy
       raise "unknown formula #{formula_name}" unless formula_names.include?(formula_name)
 
       require formula_file_path(formula_name)
-      f = "#{formula_name.underscore.camelize}Formula".constantize.new
+
+      formula_class = "#{formula_name.underscore.camelize}Formula".constantize
+      version = formula_class.version if version.blank?
+      build = operating_system        if build.blank?
+      p = Package.new :path => [name, version, build].join("/"), :group_writable => !formula_class.disable_group_writable
+
+      f = "#{formula_name.underscore.camelize}Formula".constantize.new(p)
       # Set the actual formula file path, otherwise it's just formula.rb
       f.formula_file = formula_file_path(formula_name)
 
-      version = f.version      if version.blank?
-      build = operating_system if build.blank?
-      p = Package.new :path => [name, version, build].join("/"), :group_writable => f.group_writable?
-      f.set_package(p) if p.valid?
-
       return f
     end
 
@@ -165,7 +166,7 @@ module Smithy
       @formula_homepage = options[:homepage]
       @formula_homepage = "#{URI(@formula_url).scheme}://#{URI(@formula_url).host}/" unless options[:homepage]
 
-      destination = File.join(ENV["HOME"], ".smithy/formulas")
+      destination = File.join(Smithy::Config.homedir, ".smithy/formulas")
       destination = Smithy::Config.global[:"formula-directories"].first if Smithy::Config.global[:"formula-directories"]
       FileUtils::mkdir_p(destination)
 

data/lib/smithy/module_file.rb

@@ -133,10 +133,13 @@ module Smithy
     def module_build_list(package, builds, args = {})
       output = ""
 
-
       notice "Multiple Builds Found" if Smithy::Config.global[:verbose]
       notice_info "Build Name".rjust(25)+"   Required Modules" if Smithy::Config.global[:verbose]
       ModuleFile::compilers.each_with_index do |e,i|
+
+        prgenv =  e[:prg_env]
+        prgenv.gsub!(/PrgEnv-/, args.fetch(:prgenv_prefix)) if args[:prgenv_prefix]
+
         if i == 0
           output << "if "
         else

data/lib/smithy_version.rb

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

data/smithy.rdoc

@@ -1,6 +1,6 @@
 == smithy - Smithy will help you build, test, and install software with ease.
 
-v1.6.2
+v1.6.3
 
 === Global Options
 === --arch NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_smithy
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -336,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1093726032562910331
+      hash: -3602502256992475544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1093726032562910331
+      hash: -3602502256992475544
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23