mortar 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890d6f0f6d9f9171abb6ebafd62d23c70912eca5
-  data.tar.gz: 89ff5f77688e7e4b49d1c5215f3e7186c0f22759
+  metadata.gz: d643020c710e35bc6e2d56f9a198c929e217714b
+  data.tar.gz: def521e6e47a46ae7d709c2600e49ea53e045154
 SHA512:
-  metadata.gz: 924bc9cafb357195565616fbf77bc91b8aa3b58b9271ff09d7365ad44f2c8e8ebef718180c2d6df77bf7280ea3c1834159d555f52effa5d419a06cff136946a2
-  data.tar.gz: 63812c555e2a84345d3d1b82779dcaac9a4c4d67a18004cfb38e43c17a8263944f1c8bc8a4b04567d2248b313a4dc35fa65147b1b3c1117e5dfda8fe5b93faf7
+  metadata.gz: b5654ab7840cafcb10429187eed1ce137d74d4520afe3f0516e252c259059b3151baa6ac65cff78f38bd184094db35c1c9e4ef36a249798f3848e65d55b13bc1
+  data.tar.gz: 1c443daf52acbfb73fce9b2f15d9699cae0b3359ee1ab4fef126c2d78b90146d9ffcf19199e959f522435c20f24012142f3d2d824290e7237e80d574feb1f5fb

data/lib/mortar/local/pig.rb

@@ -145,6 +145,11 @@ class Mortar::Local::Pig
 
   # Installs pig for this project if it is not already present
   def install_pig
+    #Delete the directory if it already exists to ensure cruft isn't left around.
+    if File.directory? pig_directory
+      FileUtils.rm_rf pig_directory
+    end
+
     FileUtils.mkdir_p(local_install_directory)
     local_tgz = File.join(local_install_directory, PIG_TGZ_NAME)
     download_file(pig_archive_url, local_tgz)
@@ -159,6 +164,11 @@ class Mortar::Local::Pig
   end
 
   def install_lib
+    #Delete the directory if it already exists to ensure cruft isn't left around.
+    if File.directory? lib_directory
+      FileUtils.rm_rf lib_directory
+    end
+
     FileUtils.mkdir_p(local_install_directory)
     local_tgz = File.join(local_install_directory, LIB_TGZ_NAME)
     download_file(lib_archive_url, local_tgz)
@@ -323,7 +333,7 @@ class Mortar::Local::Pig
   end
 
   def template_params_classpath
-    "#{pig_directory}/*:#{pig_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar:#{lib_directory}/conf/jets3t.properties"
+    "#{pig_directory}/*:#{pig_directory}/lib-local/*:#{lib_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar:#{lib_directory}/conf/jets3t.properties"
   end
 
   def log4j_conf
@@ -335,7 +345,7 @@ class Mortar::Local::Pig
     template_params = {}
     template_params['pig_params_file'] = make_pig_param_file(pig_parameters)
     template_params['pig_home'] = pig_directory
-    template_params['pig_classpath'] = "#{pig_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar"
+    template_params['pig_classpath'] = "#{pig_directory}/lib-local/*:#{lib_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar"
     template_params['classpath'] = template_params_classpath
     template_params['log4j_conf'] = log4j_conf
     template_params['project_home'] = File.expand_path("..", local_install_directory)

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc