mortar 0.15.1 → 0.15.2

data/lib/mortar/local/controller.rb

@@ -113,7 +113,7 @@ EOF
   
   # Main entry point to perform installation and configuration necessary
   # to run pig on the users local machine
-  def install_and_configure(pig_version=nil)
+  def install_and_configure(pig_version=nil, command=nil)
     #To support old watchtower plugins we'll accept nil pig_version
     if pig_version.nil?
       pig_version = Mortar::PigVersion::Pig09.new
@@ -124,7 +124,7 @@ EOF
     end
 
     pig = Mortar::Local::Pig.new()
-    pig.install_or_update(pig_version)
+    pig.install_or_update(pig_version, command)
 
     py = Mortar::Local::Python.new()
     unless py.check_or_install
@@ -175,7 +175,7 @@ EOF
   # Main entry point for user running a pig script
   def run(pig_script, pig_version, pig_parameters)
     require_aws_keys
-    install_and_configure(pig_version)
+    install_and_configure(pig_version, 'run')
     pig = Mortar::Local::Pig.new()
     pig.run_script(pig_script, pig_version, pig_parameters)
   end
@@ -183,25 +183,25 @@ EOF
   # Main entry point for illustrating a pig alias
   def illustrate(pig_script, pig_alias, pig_version, pig_parameters, skip_pruning, no_browser)
     require_aws_keys
-    install_and_configure(pig_version)
+    install_and_configure(pig_version, 'illustrate')
     pig = Mortar::Local::Pig.new()
     pig.illustrate_alias(pig_script, pig_alias, skip_pruning, no_browser, pig_version, pig_parameters)
   end
 
   def validate(pig_script, pig_version, pig_parameters)
-    install_and_configure(pig_version)
+    install_and_configure(pig_version, 'validate')
     pig = Mortar::Local::Pig.new()
     pig.validate_script(pig_script, pig_version, pig_parameters)
   end
 
   def repl(pig_version, pig_parameters)
-    install_and_configure(pig_version)
+    install_and_configure(pig_version, 'repl')
     pig = Mortar::Local::Pig.new()
     pig.launch_repl(pig_version, pig_parameters)
   end
 
   def run_luigi(luigi_script, user_script_args)
-    install_and_configure()
+    install_and_configure(nil, 'luigi')
     py = Mortar::Local::Python.new()
     py.run_luigi_script(luigi_script, user_script_args)
   end

data/lib/mortar/local/installutil.rb

@@ -39,7 +39,7 @@ module Mortar
       end
 
       def local_install_directory
-        File.join(project_root, local_install_directory_name)
+        ENV.fetch('MORTAR_LOCAL_DIR', File.join(project_root, local_install_directory_name))
       end
 
       def local_log_dir
@@ -112,8 +112,8 @@ module Mortar
       end
 
       # Downloads the file at a specified url into the supplied directory
-      def download_file(url, dest_file_path)
-        response = get_resource(url)
+      def download_file(url, dest_file_path, command=nil)
+        response = get_resource(url, command)
         
         File.open(dest_file_path, "wb") do |dest_file|
           dest_file.write(response.body)
@@ -122,13 +122,13 @@ module Mortar
       end
 
       # Perform a get request to a url and follow redirects if necessary.
-      def get_resource(url)
-        make_call(url, 'get')
+      def get_resource(url, command=nil)
+        make_call(url, 'get', 0, 0, command)
       end
 
       # Perform a head request to a url and follow redirects if necessary.
-      def head_resource(url)
-        make_call(url, 'head')
+      def head_resource(url, command=nil)
+        make_call(url, 'head', 0, 0, command)
       end
 
       # Make a request to a mortar resource url.  Check response for a 
@@ -136,7 +136,7 @@ module Mortar
       # support automatically following redirects.  Adds parameter that
       # checks an environment variable to identify the test making this call
       # (if being run by a test).
-      def make_call(url, call_func, redirect_times=0, errors=0)
+      def make_call(url, call_func, redirect_times=0, errors=0, command=nil)
         if redirect_times >= 5
           raise RuntimeError, "Too many redirects.  Last url: #{url}"
         end
@@ -150,6 +150,12 @@ module Mortar
         if test_name
           query[:test_name] = test_name
         end
+        if command
+          query[:command] = command
+          if Mortar::Auth.has_credentials
+            query[:user] = Mortar::Auth.user
+          end
+        end
 
         headers = {'User-Agent' => Mortar::USER_AGENT}
         if call_func == 'head'
@@ -190,21 +196,21 @@ module Mortar
         return Time.httpdate(date_str).to_i
       end
 
-      def url_date(url)
-        result = head_resource(url)
+      def url_date(url, command=nil)
+        result = head_resource(url, command)
         http_date_to_epoch(result.get_header('Last-Modified'))
       end
 
       # Given a subdirectory where we have installed some software
       # and a url to the tgz file it's sourced from, check if the
       # remote version is newer than the installed version
-      def is_newer_version(subdir, url)
+      def is_newer_version(subdir, url, command=nil)
         existing_install_date = install_date(subdir)
         if not existing_install_date then
           # There is no existing install
           return true
         end
-        remote_archive_date = url_date(url)
+        remote_archive_date = url_date(url, command)
         return existing_install_date < remote_archive_date
       end
 

data/lib/mortar/local/pig.rb

@@ -111,20 +111,20 @@ class Mortar::Local::Pig
 
   # Determines if a pig install needs to occur, true if server side
   # pig tgz is newer than date of the existing install
-  def should_do_pig_update?(pig_version)
-    return is_newer_version(pig_version.name, pig_archive_url(pig_version))
+  def should_do_pig_update?(pig_version, command=nil)
+    return is_newer_version(pig_version.name, pig_archive_url(pig_version), command)
   end
 
   def should_do_lib_update?
     return is_newer_version('lib-common', lib_archive_url)
   end
 
-  def install_or_update(pig_version)
+  def install_or_update(pig_version, command=nil)
     if should_do_pig_install?(pig_version)
       action "Installing #{pig_version.name} to #{local_install_directory_name}" do
-        install_pig(pig_version)
+        install_pig(pig_version, command)
       end
-    elsif should_do_pig_update?(pig_version)
+    elsif should_do_pig_update?(pig_version, command)
       action "Updating to latest #{pig_version.name} in #{local_install_directory_name}" do
         install_pig(pig_version)
       end
@@ -142,7 +142,7 @@ class Mortar::Local::Pig
   end
 
   # Installs pig for this project if it is not already present
-  def install_pig(pig_version)
+  def install_pig(pig_version, command=nil)
     #Delete the directory if it already exists to ensure cruft isn't left around.
     if File.directory? pig_directory(pig_version)
       FileUtils.rm_rf pig_directory(pig_version)
@@ -150,7 +150,7 @@ class Mortar::Local::Pig
 
     FileUtils.mkdir_p(local_install_directory)
     local_tgz = File.join(local_install_directory, pig_version.tgz_name)
-    download_file(pig_archive_url(pig_version), local_tgz)
+    download_file(pig_archive_url(pig_version), local_tgz, command)
     extract_tgz(local_tgz, local_install_directory)
 
     # This has been seening coming out of the tgz w/o +x so we do
@@ -366,8 +366,14 @@ class Mortar::Local::Pig
     opts['python.home'] = jython_directory
     opts['python.path'] = "#{local_install_directory}/../controlscripts/lib:#{local_install_directory}/../vendor/controlscripts/lib"
     opts['python.cachedir'] = jython_cache_directory
-    opts['java.security.krb5.realm'] = ''
-    opts['java.security.krb5.kdc'] = ''
+    if osx? then
+      opts['java.security.krb5.realm'] = 'OX.AC.UK'
+      opts['java.security.krb5.kdc'] = 'kdc0.ox.ac.uk:kdc1.ox.ac.uk'
+      opts['java.security.krb5.conf'] = '/dev/null'
+    else
+      opts['java.security.krb5.realm'] = ''
+      opts['java.security.krb5.kdc'] = ''
+    end
     return opts
   end
 

data/lib/mortar/version.rb

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

data/spec/mortar/command/local_spec.rb

@@ -198,7 +198,7 @@ PARAMS
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09))
+            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), [])
@@ -216,7 +216,7 @@ PARAMS
           pigscript = Mortar::Project::PigScript.new(script_name, script_path)
           mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09))
+            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), [])
@@ -261,7 +261,7 @@ STDERR
             mock(u).run_luigi_script(luigi_script, %W{--myoption 2 --myotheroption 3})
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure
+            mock(u).install_and_configure(nil,'luigi')
           end
           stderr, stdout = execute("local:luigi some_luigi_script -p myoption=2 -p myotheroption=3", p)
           stderr.should == ""

data/spec/mortar/local/controller_spec.rb

@@ -136,7 +136,7 @@ module Mortar::Local
           mock(j).check_install.returns(true)
         end
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).install_or_update(is_a(Mortar::PigVersion::Pig09))
+          mock(p).install_or_update(is_a(Mortar::PigVersion::Pig09), nil)
         end
         any_instance_of(Mortar::Local::Python) do |p|
           mock(p).check_or_install.returns(true)
@@ -156,7 +156,7 @@ module Mortar::Local
       it "checks for aws keys, checks depenendency installation, runs script" do
         c = Mortar::Local::Controller.new
         mock(c).require_aws_keys
-        mock(c).install_and_configure("0.9")
+        mock(c).install_and_configure("0.9", "run")
         test_script = "foobar-script"
         the_parameters = []
         any_instance_of(Mortar::Local::Pig) do |p|
@@ -171,7 +171,7 @@ module Mortar::Local
       it "checks for aws keys, checks depenendency installation, runs the illustrate process" do
         c = Mortar::Local::Controller.new
         mock(c).require_aws_keys
-        mock(c).install_and_configure("0.9")
+        mock(c).install_and_configure("0.9", "illustrate")
         test_script = "foobar-script"
         script_alias = "some_alias"
         prune = false

data/spec/mortar/local/installutil_spec.rb

@@ -31,6 +31,34 @@ module Mortar::Local
       @installutil.extend(Mortar::Local::InstallUtil)
     end
 
+    context("install directory") do
+      @old_local_dir = nil
+
+      before(:each) do
+        if ENV.has_key?('MORTAR_LOCAL_DIR')
+          @old_local_dir = ENV['MORTAR_LOCAL_DIR']
+        end
+      end
+
+      after(:all) do
+        if nil != @old_local_dir
+          ENV['MORTAR_LOCAL_DIR'] = @old_local_dir
+        end
+      end
+
+      it "Uses Environment override if specified" do
+        ENV['MORTAR_LOCAL_DIR'] = "/tmp/mortar-local"
+        expect(@installutil.local_install_directory).to eq("/tmp/mortar-local")
+      end
+
+      it "Uses the default project directory otherwise" do
+        ENV.delete('MORTAR_LOCAL_DIR')
+        with_blank_project do |p|
+          expect(@installutil.local_install_directory).to eq("#{p.root_path}/.mortar-local")
+        end
+      end
+    end
+
     context("install_date") do
 
       it "nil if never installed" do

data/spec/mortar/local/pig_spec.rb

@@ -37,7 +37,7 @@ module Mortar::Local
           pig = Mortar::Local::Pig.new
           pig09 = Mortar::PigVersion::Pig09.new
           local_pig_archive = File.join(pig.local_install_directory, pig09.tgz_name)
-          mock(pig).download_file(pig.pig_archive_url(pig09), local_pig_archive) do
+          mock(pig).download_file(pig.pig_archive_url(pig09), local_pig_archive, nil) do
             # Simulate the tgz file being downloaded, this should be deleted
             # before the method finishes executing
             FileUtils.touch(local_pig_archive)
@@ -64,7 +64,7 @@ module Mortar::Local
         pig09 = Mortar::PigVersion::Pig09.new
 
         mock(pig).should_do_pig_install?(pig09).returns(false)
-        mock(pig).should_do_pig_update?(pig09).returns(false)
+        mock(pig).should_do_pig_update?(pig09, nil).returns(false)
         mock(pig).should_do_lib_install?.returns(false)
         mock(pig).should_do_lib_update?.returns(false)
         FakeFS do
@@ -84,7 +84,7 @@ module Mortar::Local
         mock(pig).should_do_pig_install?(pig09).returns(true)
         mock(pig).should_do_lib_install?.returns(true)
 
-        mock(pig).install_pig(pig09)
+        mock(pig).install_pig(pig09, nil)
         mock(pig).install_lib
         capture_stdout do
           pig.install_or_update(pig09)
@@ -96,7 +96,7 @@ module Mortar::Local
         pig09 = Mortar::PigVersion::Pig09.new
 
         mock(pig).should_do_pig_install?(pig09).returns(false)
-        mock(pig).should_do_pig_update?(pig09).returns(true)
+        mock(pig).should_do_pig_update?(pig09, nil).returns(true)
         mock(pig).should_do_lib_install?.returns(false)
         mock(pig).should_do_lib_update?.returns(true)
         mock(pig).install_pig(pig09)

metadata

@@ -1,199 +1,196 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.15.1
+version: !ruby/object:Gem::Version 
+  hash: 39
   prerelease: 
+  segments: 
+  - 0
+  - 15
+  - 2
+  version: 0.15.2
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-03-11 00:00:00 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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: mortar-api-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mortar-api-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: netrc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: netrc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.28'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.28'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 28
+        version: "0.28"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: gem-release
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
   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
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rr
   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
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Client library and command-line tool to interact with the Mortar service.
 email: support@mortardata.com
-executables:
+executables: 
 - mortar
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - bin/mortar
 - css/illustrate.css
@@ -322,26 +319,38 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
+