software_smithy 1.6.4 → 1.6.5

data/lib/smithy/formula.rb

@@ -20,7 +20,11 @@ module Smithy
         # guess name and build_name
         @name = self.formula_name
         @build_name = operating_system
-        initialize_modules
+      end
+
+      if ENV["MODULESHOME"]
+        @modulecmd = "modulecmd sh"
+        @modulecmd = "#{ENV["MODULESHOME"]}/bin/modulecmd sh" if File.exists?("#{ENV["MODULESHOME"]}/bin/modulecmd")
       end
     end
 
@@ -34,8 +38,6 @@ module Smithy
 
       if ENV["MODULESHOME"]
         @module_commands = @modules = nil # re-evaluates the blocks
-        @modulecmd = "modulecmd sh"
-        @modulecmd = "#{ENV["MODULESHOME"]}/bin/modulecmd sh" if File.exists?("#{ENV["MODULESHOME"]}/bin/modulecmd")
         if modules.present?
           @module_setup << `#{@module_setup} #{@modulecmd} purge 2>/dev/null` << " "
           raise "modules must return a list of strings" unless modules.is_a? Array
@@ -54,7 +56,6 @@ module Smithy
       @version    = p.version
       @build_name = p.build_name
       @prefix     = p.prefix
-      initialize_modules
     end
 
     # DSL Methods
@@ -99,7 +100,7 @@ module Smithy
     end
 
     def run_install
-      check_dependencies if depends_on
+      initialize_modules
       install
       notice_success "SUCCESS #{@prefix}"
       return true
@@ -175,6 +176,7 @@ module Smithy
     end
 
     def check_dependencies
+      return true unless depends_on
       @depends_on = [depends_on] if depends_on.is_a? String
       missing_packages = []
       notice "Searching for dependencies"

data/lib/smithy/formula_command.rb

@@ -126,6 +126,7 @@ module Smithy
 
       packages.each do |package|
         f = build_formula(package, options[:"formula-name"])
+        f.check_dependencies
         f.package.create(:formula => true)
 
         formula_prefix_contents = Dir["#{f.prefix}/*"]

data/lib/smithy_version.rb

@@ -36,5 +36,5 @@
 # }}}
 
 module Smithy
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 end

data/smithy.rdoc

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_smithy
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3203549928499552605
+      hash: -348248461402119234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3203549928499552605
+      hash: -348248461402119234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2