mortar 0.15.13 → 0.15.14

data/lib/mortar/project.rb

@@ -142,7 +142,17 @@ module Mortar
         if File.directory? @path
           # get {script_name => full_path}
           file_paths = Dir[File.join(@path, "**", "*#{@filename_extension}")]
-          file_paths_hsh = file_paths.collect{|element_path| [element_name(element_path), element(element_name(element_path), element_path)]}.flatten
+
+          scripts = file_paths.collect{|element_path| [element_name(element_path), element(element_name(element_path), element_path)]}
+
+          #Check for duplicates.
+          name_groups = scripts.group_by{ |x| x[0] }
+          duplicates = name_groups.find_all{ |k,v| v.length > 1 }
+          if duplicates.length > 0
+            raise ProjectError, "Multiple scripts found with the same name.  Each script must have a unique name regardless of what directory it is in.  Duplicate script names found: #{duplicates.collect{|d| d[0]}}"
+          end
+          
+          file_paths_hsh = scripts.flatten
           return Hash[*file_paths_hsh]
         else
           raise ProjectError, "Unable to find #{@name} directory in project" if not @optional
@@ -217,7 +227,7 @@ module Mortar
     class ControlScript < Script
       
       def executable_path
-        "controlscripts/#{self.name}.pig"
+        "#{self.rel_path}/#{self.name}.pig"
       end
       
     end
@@ -225,7 +235,7 @@ module Mortar
     class PigScript < Script
       
       def executable_path
-        "pigscripts/#{self.name}.pig"
+        "#{self.rel_path}/#{self.name}.pig"
       end
     
     end

data/lib/mortar/templates/script/runpig.sh

@@ -7,6 +7,9 @@ export PIG_CLASSPATH=<%= @pig_classpath %>
 export CLASSPATH=<%= @classpath %>
 export PIG_MAIN_CLASS=com.mortardata.hawk.HawkMain
 export PIG_OPTS="<% @pig_opts.each do |k,v| %>-D<%= k %>=<%= v %> <% end %>"
+#Uncomment to debug pig code
+#export PIG_OPTS="$PIG_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000"
+
 
 # UDF paths are relative to this direectory
 if [ -d "<%= @project_home %>/pigscripts" ]; then

data/lib/mortar/version.rb

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

data/spec/mortar/project_spec.rb

@@ -64,7 +64,7 @@ module Mortar
           write_file pigscript_path
           p.pigscripts.my_script.name.should == "my_script"
           p.pigscripts.my_script.path.should == pigscript_path
-          p.pigscripts.my_script.executable_path.should == "pigscripts/my_script.pig"
+          p.pigscripts.my_script.executable_path.end_with?("pigscripts/my_script.pig")
           p.pigscripts.my_script.rel_path.end_with?('pigscripts').should be_true 
         end
       end
@@ -78,6 +78,17 @@ module Mortar
           p.pigscripts.my_script.rel_path.end_with?("pigscripts/subdir").should be_true
         end
       end
+
+      it "throws error on duplicate script stored in a subdirectory" do
+        with_blank_project do |p|
+          pigscript_path = File.join(p.pigscripts_path, "my_script.pig")
+          write_file pigscript_path
+          pigscript_path = File.join(p.pigscripts_path, "subdir", "my_script.pig")
+          write_file pigscript_path
+
+          lambda { p.pigscripts }.should raise_error(Mortar::Project::ProjectError)
+        end
+      end
       
       it "finds multiple scripts in subdirectories with the same name" do
       end

data/spec/spec_helper.rb

@@ -56,6 +56,15 @@ def execute_and_return_command(command_line, project=nil, git=nil)
     end
   end
 
+  # stub the relative paths which get messed up in tests
+  any_instance_of(Mortar::Project::PigScript) do |s|
+    stub(s).rel_path.returns('pigscripts')
+  end
+  any_instance_of(Mortar::Project::ControlScript) do |s|
+    stub(s).rel_path.returns('controlscripts')
+  end
+
+
   # stub git
   if git
     # stub out any operations that affect remote resources

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.13
+  version: 0.15.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc