mortar 0.15.39 → 0.15.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2RjODE0YjhlMmJjNDAyMjAxNmZhM2MxM2M2YTI1MjZlMjY2YWU4Yg==
+    YTVjMGVkNTRjZGJjMjQyODI3Yjg3ZDkzMjE5NzU3ZThjZDE4NGNlZA==
   data.tar.gz: !binary |-
-    MzI0Y2NiMWEwNTI2MWRjNGIxYjRiMDhhZGJiNTZjNzY5ZDZkMDAwOQ==
+    YTRkN2M3MDQ3YTA4MDY1MDMyOWRmY2YzYjc5NGRjZjYzM2IyNjk5Nw==
 SHA512:
   metadata.gz: !binary |-
-    MjQ0MWRiMWUxZGJlNTQ2YjI5ODljNzJkZjg3ZjUwZDAyYjVhZmY4OGU5NzUy
-    OWZkMzQ5MWEzYWMxZDg2ZmZkN2VhNmFjZjgyYWI3MGE5YzM3Nzg1MDY2ZmEy
-    NDdmZjljYzMwNjI1YTAyZTUxYWUxYjM3M2FmMzk0MTg2MzEzZWQ=
+    MTk1ZTZmNGZlMjRmYWU3OGM4OTUzYmI0NTg1M2RlM2Q1Mjk2MmFlY2U1MWRh
+    MjVkZWZlZjhkYjE5MWMzYzFmNDhlN2QyZjZhNDhiYzIyMjM4NzliNTczZjUy
+    YjM0MzQ3NDI1NzRiZjAyY2I2YmZkYWFmNzdkNGQxMGI2NWFkN2U=
   data.tar.gz: !binary |-
-    N2NhNjE5MThkNDQ2MjVmZTc1ZWEwMWNmYTJjZmM2OWE3NzdjMWI0NGYyODFk
-    NmZmYjgzYjNkMzAxNmI4MjliMDM0MzMzYTM3NTk3NmFjMGJiZjI5ZWNmYjkw
-    ZDc1MjI1YzQ5NmU5NzdlM2ZjMDU0ZmFjMmM0MzFmM2I5ZmY4MzY=
+    YzExMTA1YjgxMzU5NjQ3NTBlYjdlYzgyZTJlMzEyOGZhYWFmNjc3MjcyZTU5
+    OTVlZTA2NDc4ODA0ZWM5NDk4MGEwM2EyY2JkMDFhNzJmNDVmYTk2Nzg4NmQ0
+    MTU1ZDQ0NmZiNTZhYTEwM2U2YzUwYjIwYzNmNjYyNDk1M2ZhMjk=

data/lib/mortar/local/python.rb

@@ -36,6 +36,7 @@ class Mortar::Local::Python
 
   @candidate_pythons = nil
 
+
   # Execute either an installation of python or an inspection
   # of the local system to see if a usable python is available
   def check_or_install
@@ -330,7 +331,7 @@ class Mortar::Local::Python
     parameters = merge_parameters(auto_params, project_config_parameters)
     stillson_template_params = {
       :parameters => parameters,
-      :luigi_script => luigi_script.executable_path()
+      :luigiscripts_path => File.join(project_root, 'luigiscripts')
     }
     run_templated_script(stillson_command_script_template_path, stillson_template_params)
   end
@@ -358,7 +359,8 @@ class Mortar::Local::Python
     return {
       :python_arugments => "",
       :python_script => luigi_script.executable_path(),
-      :script_arguments => script_args.join(" ")
+      :script_arguments => script_args.join(" "),
+      :python_path => File.join(project_root, 'luigiscripts')
     }
   end
 

data/lib/mortar/project.rb

@@ -20,22 +20,22 @@ require 'pathname'
 module Mortar
   module Project
     class ProjectError < RuntimeError; end
-    
+
     class Project
       def self.required_directories
         ["macros", "pigscripts", "udfs"]
       end
-      
+
       attr_accessor :name
       attr_accessor :remote
       attr_accessor :root_path
-      
+
       def initialize(name, root_path, remote)
         @name = name
         @root_path = root_path
         @remote = remote
       end
-      
+
       def python_udfs_path
         File.join(@root_path, "udfs/python")
       end
@@ -46,7 +46,7 @@ module Mortar
           "python",
           ".py")
       end
-      
+
       def pigscripts_path
         File.join(@root_path, "pigscripts")
       end
@@ -88,7 +88,7 @@ module Mortar
       def sparkjobs_path
         File.join(@root_path, "src/main/scala")
       end
-        
+
       def sparkscripts_path
         File.join(@root_path, "sparkscripts")
       end
@@ -114,11 +114,11 @@ module Mortar
         File.exists?(File.join(@root_path, ".mortar-project-remote"))
       end
     end
-    
+
     class ProjectEntity
-      
+
       include Enumerable
-      
+
       def initialize(path, name, filename_extension, optional=false)
         @path = path
         @name = name
@@ -126,27 +126,27 @@ module Mortar
         @optional = optional
         @elements = elements
       end
-      
+
       def method_missing(method, *args)
         method_name = method.to_s
         return @elements[method_name] if @elements[method_name]
         super
       end
-      
+
       def each
         @elements.each {|key, value| yield [key, value]}
       end
-      
+
       def [](key)
         @elements[key]
       end
-      
+
       def keys
         @elements.keys
       end
-      
+
       protected
-      
+
       def element_name(element_path)
         File.basename(element_path, @filename_extension)
       end
@@ -163,7 +163,7 @@ module Mortar
           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
@@ -171,12 +171,12 @@ module Mortar
         end
         return Hash[]
       end
-      
+
       def element(path)
         raise NotImplementedError, "Implement in subclass"
       end
     end
-    
+
     class PigScripts < ProjectEntity
       def element(name, path)
         PigScript.new(name, path)
@@ -206,12 +206,12 @@ module Mortar
         Script.new(name, path)
       end
     end
-    
+
     class Script
-      
+
       attr_reader :name
       attr_reader :path
-      
+
       def initialize(name, path)
         @name = name
         @path = path
@@ -228,43 +228,43 @@ module Mortar
         p = Pathname.new(@path).dirname
         rel_path = p.relative_path_from(Pathname.pwd).to_s
       end
-      
+
       def to_s
         code
       end
     end
 
     class LuigiScript < Script
-      
+
       def executable_path
-        "luigiscripts/#{self.name}.py"
+        "#{self.rel_path}/#{self.name}.py"
       end
-      
+
     end
 
     class SparkScript < Script
-      
+
       def executable_path
         "sparkscripts/#{self.name}"
       end
-      
+
     end
-    
+
     class ControlScript < Script
-      
+
       def executable_path
         "#{self.rel_path}/#{self.name}.pig"
       end
-      
+
     end
-    
+
     class PigScript < Script
-      
+
       def executable_path
         "#{self.rel_path}/#{self.name}.pig"
       end
-    
+
     end
-    
+
   end
 end

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

@@ -4,11 +4,12 @@ set -e
 
 # Setup python environment
 source <%= @local_install_dir %>/pythonenv/bin/activate
+export PYTHONPATH=$PYTHONPATH:<%= @python_path %>
 
-export LUIGI_CONFIG_PATH=`pwd`/`dirname <%= @python_script %>`/client.cfg
+export LUIGI_CONFIG_PATH=<%= @python_path %>/client.cfg
 
 # Run Python
 <%= @local_install_dir %>/pythonenv/bin/python \
     <%= @python_arugments %> \
     <%= @python_script %> \
-    <%= @script_arguments %>
+    <%= @script_arguments %>

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

@@ -6,10 +6,10 @@ set -e
 source <%= @local_install_dir %>/pythonenv/bin/activate
 
 # template config file
-export LUIGI_CONFIG_TEMPLATE_PATH=`pwd`/`dirname <%= @luigi_script %>`/client.cfg.template
+export LUIGI_CONFIG_TEMPLATE_PATH=<%= @luigiscripts_path %>/client.cfg.template
 
 # expanded config file
-export LUIGI_CONFIG_PATH=`pwd`/`dirname <%= @luigi_script %>`/client.cfg
+export LUIGI_CONFIG_PATH=<%= @luigiscripts_path %>/client.cfg
 
 # Setup parameters in environment variables
 <% @parameters.each do |p| %>
@@ -17,8 +17,8 @@ export <%= p['name'] %>="<%= p['value'] %>";
 <% end %>
 
 # Run stillson to expand the configuration template
-if [ -f "$LUIGI_CONFIG_TEMPLATE_PATH" ] 
-then 
+if [ -f "$LUIGI_CONFIG_TEMPLATE_PATH" ]
+then
     stillson "$LUIGI_CONFIG_TEMPLATE_PATH" -o $LUIGI_CONFIG_PATH
 else
     echo "No luigi client configuration template found in expected location $LUIGI_CONFIG_TEMPLATE_PATH. Not expanding."

data/lib/mortar/version.rb

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

data/spec/mortar/local/python_spec.rb

@@ -131,19 +131,27 @@ module Mortar::Local
     context "running python commands" do
 
       it "Generates the appropriate tempate variables" do
-        with_git_initialized_project do |p|
-          script_name = "some_luigi_script"
-          script_path = File.join(p.luigiscripts_path, "#{script_name}.py")
-          write_file(script_path)
-          luigi_script = Mortar::Project::LuigiScript.new(script_name, script_path)
-          args = %W{--myoption 2 --myotheroption 3}
-          py = Mortar::Local::Python.new
-          expected_hash = {
-            :python_arugments => "",
-            :python_script => "luigiscripts/#{script_name}.py",
-            :script_arguments => "--local-scheduler --logging-conf-file #{py.luigi_logging_config_file_path} --myoption 2 --myotheroption 3",
-          }
-          expect(py.luigi_command_template_parameters(luigi_script, args)).to eq(expected_hash)
+        FakeFS do
+          with_git_initialized_project do |p|
+            script_name = "some_luigi_script"
+            script_path = File.join(p.luigiscripts_path, "#{script_name}.py")
+            write_file(script_path)
+            luigi_script = Mortar::Project::LuigiScript.new(script_name, script_path)
+            args = %W{--myoption 2 --myotheroption 3}
+            py = Mortar::Local::Python.new
+
+            dir = Pathname.new(script_path).dirname
+            rel_path = dir.relative_path_from(Pathname.pwd).to_s + '/' + script_name + '.py'
+
+            expected_hash = {
+              :python_arugments => "",
+              :python_script => rel_path,
+              :script_arguments => "--local-scheduler --logging-conf-file #{py.luigi_logging_config_file_path} --myoption 2 --myotheroption 3",
+              :python_path => p.luigiscripts_path
+            }
+
+            expect(py.luigi_command_template_parameters(luigi_script, args)).to eq(expected_hash)
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.39
+  version: 0.15.40
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc