mortar 0.8.7 → 0.8.8

data/lib/mortar/auth.rb

@@ -88,8 +88,9 @@ class Mortar::Auth
       get_credentials[1]
     end
 
-    def user_s3_safe
-      return user.gsub(/[^0-9a-zA-Z]/i, '-')
+    def user_s3_safe(local = false)
+      user_email = (local && !has_credentials) ? "notloggedin@user.org" : user
+      return user_email.gsub(/[^0-9a-zA-Z]/i, '-')
     end
 
     def api_key(user = get_credentials[0], password = get_credentials[1])

data/lib/mortar/command/base.rb

@@ -74,8 +74,9 @@ class Mortar::Command::Base
     paramfile_params = {}
     if options[:param_file]
       File.open(options[:param_file], "r").each do |line|
+        line = line.chomp
         # If the line isn't empty
-        if not line.chomp.empty? and not line.chomp.match(/^;/)
+        if not line.empty? and not line.match(/^;/) and not line.start_with?("#")
           name, value = line.split('=', 2)
           if not name or not value
             error("Parameter file is malformed")

data/lib/mortar/generators/project_generator.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+require "fileutils"
 require "mortar/generators/generator_base"
 module Mortar
   module Generators
@@ -42,7 +43,10 @@ module Mortar
           mkdir "controlscripts" 
 
           inside "controlscripts" do
-            copy_file "gitkeep", ".gitkeep"
+            mkdir "lib"
+            inside "lib" do
+              copy_file "__init__.py", "__init__.py"
+            end
           end
           
           mkdir "macros"
@@ -64,6 +68,56 @@ module Mortar
             inside "python" do
               copy_file "python_udf.py", "#{project_name}.py"
             end
+
+            mkdir "jython"
+            inside "jython" do
+              copy_file "gitkeep", ".gitkeep"
+            end
+
+            mkdir "java"
+            inside "java" do
+              copy_file "gitkeep", ".gitkeep"
+            end
+          end
+
+          mkdir "vendor"
+
+          inside "vendor" do
+            mkdir "controlscripts"
+            inside "controlscripts" do
+              mkdir "lib"
+              inside "lib" do
+                copy_file "__init__.py", "__init__.py"
+              end
+            end
+
+            mkdir "pigscripts"
+            inside "pigscripts" do
+              copy_file "gitkeep", ".gitkeep"
+            end
+
+            mkdir "macros"
+            inside "macros" do
+              copy_file "gitkeep", ".gitkeep"
+            end
+
+            mkdir "udfs"
+            inside "udfs" do
+              mkdir "python"
+              inside "python" do
+                copy_file "gitkeep", ".gitkeep"
+              end
+
+              mkdir "jython"
+              inside "jython" do
+                copy_file "gitkeep", ".gitkeep"
+              end
+
+              mkdir "java"
+              inside "java" do
+                copy_file "gitkeep", ".gitkeep"
+              end
+            end
           end
           
         rescue => e 

data/lib/mortar/git.rb

@@ -154,6 +154,10 @@ module Mortar
             if File.directory?('controlscripts') and not contents.include?('controlscripts')
               manifest.puts "controlscripts"
             end
+
+            if File.directory?("vendor") and not contents.include?("vendor")
+              manifest.puts "vendor"
+            end
           end
         else
           create_mortar_project_manifest('.')
@@ -174,6 +178,9 @@ module Mortar
           manifest.puts "pigscripts"
           manifest.puts "macros"
           manifest.puts "udfs"
+          if File.directory? "#{path}/vendor"
+            manifest.puts "vendor"
+          end
         end
       end
     

data/lib/mortar/local/pig.rb

@@ -305,7 +305,7 @@ class Mortar::Local::Pig
     opts['python.verbose'] = 'error'
     opts['jython.output'] = true
     opts['python.home'] = jython_directory
-    opts['python.path'] = local_install_directory + "/../controlscripts"
+    opts['python.path'] = "#{local_install_directory}/../controlscripts/lib:#{local_install_directory}/../vendor/controlscripts/lib"
     opts['python.cachedir'] = jython_cache_directory
     return opts
   end
@@ -318,13 +318,7 @@ class Mortar::Local::Pig
     if ENV['MORTAR_EMAIL_S3_ESCAPED']
       params['MORTAR_EMAIL_S3_ESCAPED'] = ENV['MORTAR_EMAIL_S3_ESCAPED']
     else
-      params['MORTAR_EMAIL_S3_ESCAPED'] = Mortar::Auth.user_s3_safe
-    end
-    
-    if ENV['MORTAR_SOFTWARE_MIRROR']
-      params['BACON_BITS'] = "s3n://" + ENV['MORTAR_SOFTWARE_MIRROR'] + "/bacon-bits"
-    else
-      params['BACON_BITS'] = "s3n://mhc-software-mirror/bacon-bits"
+      params['MORTAR_EMAIL_S3_ESCAPED'] = Mortar::Auth.user_s3_safe(true)
     end
 
     # Coerce into the same format as pig parameters that were

data/lib/mortar/version.rb

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

data/spec/mortar/command/jobs_spec.rb

@@ -388,7 +388,7 @@ STDOUT
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR\n"}]), 
+            :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
             :notify_on_job_finish => true,
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id})}
@@ -413,7 +413,7 @@ PARAMS
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR\n"}]), 
+            :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
             :notify_on_job_finish => true,
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id})}

data/spec/mortar/command/projects_spec.rb

@@ -128,7 +128,8 @@ STDOUT
 \e[1;32m      create\e[0m  pigscripts
 \e[1;32m      create\e[0m  pigscripts/some_new_project.pig
 \e[1;32m      create\e[0m  controlscripts
-\e[1;32m      create\e[0m  controlscripts/.gitkeep
+\e[1;32m      create\e[0m  controlscripts/lib
+\e[1;32m      create\e[0m  controlscripts/lib/__init__.py
 \e[1;32m      create\e[0m  macros
 \e[1;32m      create\e[0m  macros/.gitkeep
 \e[1;32m      create\e[0m  fixtures
@@ -136,6 +137,25 @@ STDOUT
 \e[1;32m      create\e[0m  udfs
 \e[1;32m      create\e[0m  udfs/python
 \e[1;32m      create\e[0m  udfs/python/some_new_project.py
+\e[1;32m      create\e[0m  udfs/jython
+\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  vendor
+\e[1;32m      create\e[0m  vendor/controlscripts
+\e[1;32m      create\e[0m  vendor/controlscripts/lib
+\e[1;32m      create\e[0m  vendor/controlscripts/lib/__init__.py
+\e[1;32m      create\e[0m  vendor/pigscripts
+\e[1;32m      create\e[0m  vendor/pigscripts/.gitkeep
+\e[1;32m      create\e[0m  vendor/macros
+\e[1;32m      create\e[0m  vendor/macros/.gitkeep
+\e[1;32m      create\e[0m  vendor/udfs
+\e[1;32m      create\e[0m  vendor/udfs/python
+\e[1;32m      create\e[0m  vendor/udfs/python/.gitkeep
+\e[1;32m      create\e[0m  vendor/udfs/jython
+\e[1;32m      create\e[0m  vendor/udfs/jython/.gitkeep
+\e[1;32m      create\e[0m  vendor/udfs/java
+\e[1;32m      create\e[0m  vendor/udfs/java/.gitkeep
 Sending request to register project: some_new_project... done\n\n\r\e[0KStatus: ACTIVE  \n\nYour project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n
 NOTE: You'll need to change to the new directory to use your project:
     cd some_new_project

data/spec/mortar/local/pig_spec.rb

@@ -17,14 +17,13 @@
 require 'spec_helper'
 require 'fakefs/spec_helpers'
 require 'mortar/local/pig'
+require 'mortar/auth'
 require 'launchy'
 
-
 class Mortar::Local::Pig
   attr_reader :command
 end
 
-
 module Mortar::Local
   describe Pig do
 
@@ -199,6 +198,16 @@ module Mortar::Local
         pig.illustrate_alias(script, 'my_alias', false, [])
       end
 
+      it "does not require login credentials for illustration" do
+        any_instance_of(Mortar::Project::PigScripts, :elements => nil, :path => "/foo/bar/baz.pig")
+        script = Mortar::Project::PigScripts.new('/foo/bar/baz.pig', 'baz', 'pig')
+        pig = Mortar::Local::Pig.new
+        mock(Mortar::Auth).user_s3_safe(true).returns('notloggedin-user-org')
+        mock(pig).run_pig_command.with_any_args.returns(true)
+        mock(pig).show_illustrate_output.with_any_args
+        pig.illustrate_alias(script, 'my_alias', false, [])
+      end
+
     end
 
     context "reset_local_logs" do

metadata

@@ -1,164 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.8.8
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 7
-  version: 0.8.7
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mortar-api-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: netrc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !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: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 15
-        version: "0.15"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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
-  version_requirements: *id009
+  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.
 email: support@mortardata.com
-executables: 
+executables:
 - mortar
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - bin/mortar
 - css/illustrate.css
@@ -207,12 +210,20 @@ files:
 - lib/mortar/templates/pigscript/pigscript.pig
 - lib/mortar/templates/pigscript/python_udf.py
 - lib/mortar/templates/project/README.md
-- lib/mortar/templates/project/controlscripts/gitkeep
+- lib/mortar/templates/project/controlscripts/lib/__init__.py
 - lib/mortar/templates/project/fixtures/gitkeep
 - lib/mortar/templates/project/gitignore
 - lib/mortar/templates/project/macros/gitkeep
 - lib/mortar/templates/project/pigscripts/pigscript.pig
+- lib/mortar/templates/project/udfs/java/gitkeep
+- lib/mortar/templates/project/udfs/jython/gitkeep
 - lib/mortar/templates/project/udfs/python/python_udf.py
+- lib/mortar/templates/project/vendor/controlscripts/lib/__init__.py
+- lib/mortar/templates/project/vendor/macros/gitkeep
+- lib/mortar/templates/project/vendor/pigscripts/gitkeep
+- lib/mortar/templates/project/vendor/udfs/java/gitkeep
+- lib/mortar/templates/project/vendor/udfs/jython/gitkeep
+- lib/mortar/templates/project/vendor/udfs/python/gitkeep
 - lib/mortar/templates/report/illustrate-report.html
 - lib/mortar/templates/script/runpig.sh
 - lib/mortar/templates/udf/python_udf.py
@@ -249,38 +260,26 @@ 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 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-