mortar 0.15.3 → 0.15.4

data/lib/mortar/command/base.rb

@@ -76,6 +76,23 @@ class Mortar::Command::Base
   def git
     @git ||= Mortar::Git::Git.new
   end
+
+  def config_parameters
+    param_list = []
+    begin
+      if project.name
+        vars = api.get_config_vars(project.name).body['config']
+        unless vars.empty?
+          vars.each{|k, v| param_list.push({"name"=>k, "value"=>v})}
+        end
+      end
+    rescue Mortar::Command::CommandFailed, Mortar::API::Errors::ErrorWithResponse
+        # When running locally we're not guaranteed this is a project
+        # or that it has a config, so lets keep running.
+        vars = []
+    end
+    param_list
+  end
   
   def pig_parameters
     paramfile_params = {}

data/lib/mortar/command/local.rb

@@ -71,8 +71,10 @@ class Mortar::Command::Local < Mortar::Command::Base
     end
     Dir.chdir(project_root)
     script = validate_script!(script_name)
+    params = config_parameters.concat(pig_parameters)
+
     ctrl = Mortar::Local::Controller.new
-    ctrl.run(script, pig_version, pig_parameters)
+    ctrl.run(script, pig_version, params)
   end
 
   # local:characterize -f PARAMFILE
@@ -119,8 +121,10 @@ class Mortar::Command::Local < Mortar::Command::Base
     gen = Mortar::Generators::CharacterizeGenerator.new
     gen.generate_characterize
     script = validate_script!(controlscript_name)
+    params = config_parameters.concat(pig_parameters)
+
     ctrl = Mortar::Local::Controller.new
-    ctrl.run(script, pig_version, pig_parameters)
+    ctrl.run(script, pig_version, params)
     gen.cleanup_characterize(project_root)
   end
 
@@ -161,9 +165,10 @@ class Mortar::Command::Local < Mortar::Command::Base
     Dir.chdir(project_root)
 
     pigscript = validate_pigscript!(pigscript_name)
+    params = config_parameters.concat(pig_parameters)
 
     ctrl = Mortar::Local::Controller.new
-    ctrl.illustrate(pigscript, alias_name, pig_version, pig_parameters, skip_pruning, no_browser)
+    ctrl.illustrate(pigscript, alias_name, pig_version, params, skip_pruning, no_browser)
   end
 
 
@@ -195,8 +200,10 @@ class Mortar::Command::Local < Mortar::Command::Base
     Dir.chdir(project_root)
 
     script = validate_script!(script_name)
+    params = config_parameters.concat(pig_parameters)
+
     ctrl = Mortar::Local::Controller.new
-    ctrl.validate(script, pig_version, pig_parameters)
+    ctrl.validate(script, pig_version, params)
   end
 
 
@@ -209,8 +216,11 @@ class Mortar::Command::Local < Mortar::Command::Base
   #
   def repl
     validate_arguments!
+
+    params = config_parameters.concat(pig_parameters)
+    
     ctrl = Mortar::Local::Controller.new
-    ctrl.repl(pig_version, pig_parameters)
+    ctrl.repl(pig_version, params)
   end
 
 

data/lib/mortar/generators/project_generator.rb

@@ -80,6 +80,11 @@ module Mortar
             end
           end
 
+          mkdir "lib"
+          inside "lib" do
+            copy_file "gitkeep", ".gitkeep"
+          end
+
           mkdir "vendor"
 
           inside "vendor" do

data/lib/mortar/git.rb

@@ -181,6 +181,9 @@ module Mortar
           if File.directory? "#{path}/vendor"
             manifest.puts "vendor"
           end
+          if File.directory? "#{path}/lib"
+            manifest.puts "lib"
+          end
         end
       end
     

data/lib/mortar/local/pig.rb

@@ -324,7 +324,29 @@ class Mortar::Local::Pig
     if pig_version.nil?
       pig_version = Mortar::PigVersion::Pig09.new
     end
-    "#{pig_directory(pig_version)}/*:#{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:#{lib_directory}/conf/jets3t.properties"
+    [ "#{pig_directory(pig_version)}/*",
+      "#{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",
+      "#{lib_directory}/conf/jets3t.properties",
+      "#{project_root}/lib/*",
+    ].join(":")
+  end
+
+  def pig_classpath(pig_version)
+    [ "#{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",
+      "#{project_root}/lib/*",
+    ].join(":")
   end
 
   def log4j_conf
@@ -341,7 +363,7 @@ class Mortar::Local::Pig
     template_params['pig_params_file'] = make_pig_param_file(pig_parameters)
     template_params['pig_dir'] = pig_version.name
     template_params['pig_home'] = pig_directory(pig_version)
-    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['pig_classpath'] = pig_classpath(pig_version)
     template_params['classpath'] = template_params_classpath
     template_params['log4j_conf'] = log4j_conf
     template_params['no_project_log4j_conf'] = log4j_conf_no_project

data/lib/mortar/local/python.rb

@@ -146,7 +146,7 @@ class Mortar::Local::Python
   end
 
   def pip_requirements_path
-    return ENV.fetch('PIP_REQ_FILE', File.join(Dir.getwd, "udfs", "python", "requirements.txt"))
+    return ENV.fetch('PIP_REQ_FILE', File.join(Dir.getwd, "requirements.txt"))
   end
 
   def has_python_requirements
@@ -185,15 +185,10 @@ class Mortar::Local::Python
       return false
     end
     if should_do_requirements_install
-      action "Installing python UDF dependencies" do
-        pip_output = `. #{python_env_dir}/bin/activate &&
-          #{python_env_dir}/bin/pip install --requirement #{pip_requirements_path}`
-          if 0 != $?.to_i
-            File.open(pip_error_log_path, 'w') { |f|
-              f.write(pip_output)
-            }
-            return false
-          end
+      action "Installing user defined python dependencies" do
+        unless install_user_python_dependencies()
+          return false
+        end
         note_install("pythonenv")
       end
     end
@@ -288,7 +283,7 @@ class Mortar::Local::Python
     return "#{python_env_dir}/bin/pip"
   end
 
-  def pip_install package_url
+  def run_pip_command subcmd
     # Note that we're executing pip by passing it as a script for python to execute, this is
     # explicitly done to deal with this command breaking due to the maximum size of the path
     # to the interpreter in a shebang.  Since the containing virtualenv is already buried
@@ -296,7 +291,7 @@ class Mortar::Local::Python
     # this limit.  This unfortunately leads to very vague errors about pip not existing when
     # in fact it is the truncated path to the interpreter that does not exist.  I would now
     # like the last day of my life back.
-    pip_output = `. #{local_activate_path} && #{local_python_bin} #{local_pip_bin} install  #{package_url} --use-mirrors;`
+    pip_output = `. #{local_activate_path} && #{local_python_bin} #{local_pip_bin} #{subcmd}`
     if 0 != $?.to_i
       File.open(pip_error_log_path, 'w') { |f|
         f.write(pip_output)
@@ -305,6 +300,15 @@ class Mortar::Local::Python
     else
       return true
     end
+
+  end
+
+  def install_user_python_dependencies
+    return run_pip_command "install --requirement #{pip_requirements_path}"
+  end
+
+  def pip_install package_url
+    return run_pip_command "install  #{package_url} --use-mirrors;"
   end
 
   def install_mortar_python_package(package_name)

data/lib/mortar/version.rb

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

data/spec/mortar/command/base_spec.rb

@@ -92,6 +92,31 @@ other\tgit@github.com:other.git (push)
       end
     end
 
+    context "config_parameters" do
+      it "handles when not in mortar project" do
+        stub_core
+        @base.config_parameters.should == []
+      end
+
+      it "handles when in valid mortar project that isn't registered" do
+        with_blank_project_with_name('proj_name') do |p|
+          stub_core
+          mock(Mortar::Auth.api).get_config_vars('proj_name').returns { raise Mortar::API::Errors::ErrorWithResponse.new("meessage",400) }
+          @base.config_parameters.should == []
+        end
+      end
+
+      it "works" do
+         with_blank_project_with_name('proj_name') do |p|
+          stub_core
+          configs = {"foo" => "ABCDEFGHIJKLMNOP", "BAR" => "sheepdog"}
+          mock(Mortar::Auth.api).get_config_vars("proj_name").returns(Excon::Response.new(:body => {"config" => configs}))
+          @base.config_parameters.should =~ [{"name"=>"foo", "value"=>"ABCDEFGHIJKLMNOP"},
+                                             {"name"=>"BAR", "value"=>"sheepdog"}]
+        end
+      end
+    end
+
     context "load_defaults" do
       it "no errors with no .mortar-defaults file" do
         with_git_initialized_project do |p|

data/spec/mortar/command/local_spec.rb

@@ -43,6 +43,9 @@ STDERR
           write_file(script_path)
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([])
+          end
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).illustrate(pigscript, "some_alias", is_a(Mortar::PigVersion::Pig09), [], false, false).returns(nil)
           end
@@ -58,6 +61,9 @@ STDERR
           write_file(script_path)
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([])
+          end
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).illustrate(pigscript, nil, is_a(Mortar::PigVersion::Pig012), [], false, false).returns(nil)
           end
@@ -66,6 +72,25 @@ STDERR
         end
       end
 
+      it "puts config params before pig params" do
+        with_git_initialized_project do |p|
+          script_name = "some_script"
+          script_path = File.join(p.pigscripts_path, "#{script_name}.pig")
+          write_file(script_path)
+          pigscript = Mortar::Project::PigScript.new(script_name, script_path)
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([{"name"=>"first", "value"=>1}])
+            mock(u).pig_parameters.returns([{"name"=>"second", "value"=>2}])
+          end
+          mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Local::Controller) do |u|
+            mock(u).illustrate(pigscript, nil, is_a(Mortar::PigVersion::Pig012), [{"name"=>"first", "value"=>1},{"name"=>"second", "value"=>2}], false, false).returns(nil)
+          end
+          stderr, stdout = execute("local:illustrate #{script_name} -g 0.12", p)
+          stderr.should == ""
+        end
+      end
+
     # illustrate
     end
 
@@ -95,6 +120,9 @@ STDERR
           write_file(script_path)
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([])
+          end
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).run(pigscript, is_a(Mortar::PigVersion::Pig09), []).returns(nil)
           end
@@ -197,11 +225,15 @@ PARAMS
           write_file(script_path)
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([{"key"=>"k", "value"=>"v"}])
+          end
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09), 'validate')
           end
           any_instance_of(Mortar::Local::Pig) do |u|
-            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig09), [])
+            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig09), [{"key"=>"k", "value"=>"v"}])
           end
           stderr, stdout = execute("local:validate #{script_name}", p)
           stderr.should == ""
@@ -215,6 +247,9 @@ PARAMS
           write_file(script_path)
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Command::Local) do |u|
+            mock(u).config_parameters.returns([])
+          end
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09), 'validate')
           end

data/spec/mortar/command/projects_spec.rb

@@ -146,6 +146,8 @@ Sending request to register project: some_new_project... done
 \e[1;32m      create\e[0m  udfs/jython/.gitkeep
 \e[1;32m      create\e[0m  udfs/java
 \e[1;32m      create\e[0m  udfs/java/.gitkeep
+\e[1;32m      create\e[0m  lib
+\e[1;32m      create\e[0m  lib/.gitkeep
 \e[1;32m      create\e[0m  vendor
 \e[1;32m      create\e[0m  vendor/controlscripts
 \e[1;32m      create\e[0m  vendor/controlscripts/lib

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
+  prerelease: 
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !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,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -248,6 +271,7 @@ files:
 - lib/mortar/templates/project/controlscripts/lib/__init__.py
 - lib/mortar/templates/project/fixtures/gitkeep
 - lib/mortar/templates/project/gitignore
+- lib/mortar/templates/project/lib/gitkeep
 - lib/mortar/templates/project/macros/gitkeep
 - lib/mortar/templates/project/pigscripts/pigscript.pig
 - lib/mortar/templates/project/udfs/java/gitkeep
@@ -299,25 +323,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.2.2
+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,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGY5ZmJiNTI3MmViNmRiNTkzZDA2YmViYWVkZDNhMGE3ZDQzYmYyYg==
-  data.tar.gz: !binary |-
-    NmExMDVmODVkODQ2NzUxMWUyZTAzZTA1YzkzN2QyZjM2ZWRhZTUwZg==
-SHA512:
-  metadata.gz: !binary |-
-    NjJmZGMwOWZkMjVkMmJkODIwZjJkZmU2OTIzMWY4ZmFiNGExNzJlN2YxOGE5
-    ZmQ2YmQ1MzlhMGFlZWY2Y2QxMjMxYWFlYjdhYmJhOGRkYzFlMjFkMzVmNmJj
-    MmE0NmQ4NTYyODkxMWEwOTY2YWI5M2ZlMWIyZTYxOTBlZDBmN2U=
-  data.tar.gz: !binary |-
-    OTQ4NjFmN2QyMGZiNjZhODQ2OWVmMDlmZWM4OTgyNzVhODc2Mjk5N2ViNWVk
-    OGUxMzNmNWFhMGM4MTgyMWRhZDViZWZkNzVlNjZjYTlhNmQzY2Q5ZjdiMTVh
-    MDIzZWEyMDhjY2VlMDNlYjNhYzk0NjcxNzNkN2VmNWIwMzE1YTY=