mortar 0.15.0 → 0.15.1

data/lib/mortar/local/pig.rb

@@ -181,6 +181,17 @@ class Mortar::Local::Pig
   end
 
   def launch_repl(pig_version, pig_parameters)
+    # The REPL is very likely to be run outside a mortar project and almost equally as likely
+    # to be run in the users home directory.  The default log4j config file references pig log
+    # file as being ../logs/local-pig.log, which is a path relative to the 'pigscripts' directory.
+    # Since we very likely aren't going be run from a mortar project we won't have a pigscripts
+    # directory to cd into, so log4j spits out an ugly error message when it doesn't have permissions
+    # to create /home/logs/local-pig.log. So to work around this we copy the log4j configuration and
+    # overwrite the log file to no longer be relative.
+    File.open(log4j_conf_no_project, 'w') do |out|
+      out << File.open(log4j_conf).read.gsub(/log4j.appender.LogFileAppender.File=.*\n/,
+                                        "log4j.appender.LogFileAppender.File=local-pig.log\n")
+    end
     run_pig_command(" ", pig_version, pig_parameters)
   end
 
@@ -320,6 +331,10 @@ class Mortar::Local::Pig
    "#{lib_directory}/conf/log4j-cli-local-dev.properties"
   end
 
+  def log4j_conf_no_project
+   "#{lib_directory}/conf/log4j-cli-local-no-project.properties"
+  end
+
   # Parameters necessary for rendering the bash script template
   def pig_command_script_template_parameters(cmd, pig_version, pig_parameters)
     template_params = {}
@@ -329,6 +344,7 @@ class Mortar::Local::Pig
     template_params['pig_classpath'] = "#{pig_directory(pig_version)}/lib-local/*:#{lib_directory}/lib-local/*:#{pig_directory(pig_version)}/lib-pig/*:#{pig_directory(pig_version)}/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['no_project_log4j_conf'] = log4j_conf_no_project
     template_params['pig_sub_command'] = cmd
     template_params['pig_opts'] = pig_options
     template_params

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

@@ -10,7 +10,10 @@ export PIG_OPTS="<% @pig_opts.each do |k,v| %>-D<%= k %>=<%= v %> <% end %>"
 
 # UDF paths are relative to this direectory
 if [ -d "<%= @project_home %>/pigscripts" ]; then
+    export LOG4J_CONF_FILE=<%= @log4j_conf %>
     cd <%= @project_home %>/pigscripts
+else
+    export LOG4J_CONF_FILE=<%= @no_project_log4j_conf %>
 fi
 
 # Setup python environment
@@ -18,7 +21,7 @@ source <%= @local_install_dir %>/pythonenv/bin/activate
 
 # Run Pig
 <%= @local_install_dir %>/<%= @pig_dir %>/bin/pig -exectype local \
-    -log4jconf <%= @log4j_conf %> \
+    -log4jconf "$LOG4J_CONF_FILE" \
     -propertyFile <%= @local_install_dir %>/lib-common/conf/pig-hawk-global.properties \
     -propertyFile <%= @local_install_dir %>/lib-common/conf/pig-cli-local-dev.properties \
     -param_file <%= @pig_params_file %> \

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

@@ -5,6 +5,8 @@ set -e
 # Setup python environment
 source <%= @local_install_dir %>/pythonenv/bin/activate
 
+export LUIGI_CONFIG_PATH=`pwd`/`dirname <%= @python_script %>`/client.cfg
+
 # Run Python
 <%= @local_install_dir %>/pythonenv/bin/python \
     <%= @python_arugments %> \

data/lib/mortar/version.rb

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

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
+  prerelease: 
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mortar-api-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,57 +126,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library and command-line tool to interact with the Mortar service.
@@ -299,25 +322,26 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a48ef7a19f19d16af145ed38847a5c316c509361
-  data.tar.gz: 4d554dd57193f50f23b0f98b273695d6e7d1af2c
-SHA512:
-  metadata.gz: d8a722fdcc23c6312b8faac36dba45d9f2399d6bbb64c2187576abd600fead99d0c20dfd7073002d1f4903c9026409b57b219ba49ace184d5334f0b575ab7ba1
-  data.tar.gz: 868f456e447061aaeb90a941a00f2cdf0b0706fa7355fe5753a7554ec99af13d43501bcb553aa3246ff0aa9605382f6cc5f620733ae57327cbe521b1970a5b1c