mortar 0.8.1 → 0.8.2

data/lib/mortar/command/jobs.rb

@@ -279,7 +279,11 @@ class Mortar::Command::Jobs < Mortar::Command::Base
 
         # If the job is not complete, but not in the running state, just display its status
         else
-          redisplay("[#{spinner(ticks)}] Status: #{job_status['status_description']}")
+          job_display_status = job_status['status_description']
+          if !job_status['status_details'].nil?
+            job_display_status += " - #{job_status['status_details']}"
+          end
+          redisplay("[#{spinner(ticks)}] Status: #{job_display_status}")
         end
       end
     # If not polling, get the job status and display the results

data/lib/mortar/command/local.rb

@@ -24,8 +24,7 @@ class Mortar::Command::Local < Mortar::Command::Base
 
   # local:configure
   #
-  # Install dependencies for running this pig project locally, other
-  # commands will also perform this step automatically.
+  # Install dependencies for running this mortar project locally - other mortar:local commands will also perform this step automatically.
   #
   def configure
     ctrl = Mortar::Local::Controller.new
@@ -34,7 +33,7 @@ class Mortar::Command::Local < Mortar::Command::Base
 
   # local:run SCRIPT
   #
-  # Run a job on your local machine
+  # Run a job on your local machine.
   #
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
@@ -88,7 +87,7 @@ class Mortar::Command::Local < Mortar::Command::Base
 
   # local:validate SCRIPT
   #
-  # Run a job on your local machine
+  # Locally validate the syntax of a script.
   #
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.

data/lib/mortar/command/projects.rb

@@ -78,6 +78,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
       git.git("add .")
       git.git("commit -m \"Mortar project scaffolding\"")
       Mortar::Command::run("projects:register", [name])
+      display "NOTE: You'll need to change to the new directory to use your project:\n    cd #{name}\n\n"
     end
   end
   alias_command "new", "projects:create"

data/lib/mortar/generators/pigscript_generator.rb

@@ -32,6 +32,7 @@ module Mortar
         def set_script_binding(script_name, options)
           options = options
           script_name = script_name
+          script_name_alias = script_name.gsub /[^0-9a-z]/i, ''
           @script_binding = binding
         end 
       

data/lib/mortar/generators/project_generator.rb

@@ -83,6 +83,7 @@ module Mortar
         def set_script_binding(project_name, options)
           options = options
           project_name = project_name
+          project_name_alias = project_name.gsub /[^0-9a-z]/i, ''
           @script_binding = binding
         end
     end

data/lib/mortar/templates/pigscript/pigscript.pig

@@ -7,7 +7,7 @@
  */
  
 <%= '%default'%> INPUT_PATH 's3n://mortar-example-data/tutorial/excite.log.bz2'
-<%= '%default'%> OUTPUT_PATH 's3n://my-output-bucket/$MORTAR_EMAIL_S3_ESCAPED/<%= script_name %>'
+<%= '%default'%> OUTPUT_PATH 's3n://my-output-bucket/$MORTAR_EMAIL_S3_ESCAPED/<%= script_name_alias %>'
 
 <% if not options[:skip_udf] %>
 /**
@@ -29,7 +29,7 @@ filtered = FILTER my_input_data
 -- This is an example call to a python user-defined function
 with_udf_output = FOREACH filtered 
                  GENERATE field0..field2, 
-                          <%= script_name %>.example_udf(field0) AS example_udf_field;
+                          <%= script_name_alias %>.example_udf(field0) AS example_udf_field;
 
 -- remove any existing data
 rmf $OUTPUT_PATH;

data/lib/mortar/templates/project/pigscripts/pigscript.pig

@@ -12,7 +12,8 @@
 /**
  * User-Defined Functions (UDFs)
  */
-REGISTER '../udfs/python/<%= project_name %>.py' USING streaming_python AS <%= project_name %>;
+
+REGISTER '../udfs/python/<%= project_name %>.py' USING streaming_python AS <%= project_name_alias %>;
 
 -- This is an example of loading up input data
 my_input_data = LOAD '$INPUT_PATH' 
@@ -26,7 +27,7 @@ filtered = FILTER my_input_data
 -- This is an example call to a python user-defined function
 with_udf_output = FOREACH filtered 
                  GENERATE field0..field2, 
-                          <%= project_name %>.example_udf(field0) AS example_udf_field;
+                          <%= project_name_alias %>.example_udf(field0) AS example_udf_field;
 
 -- remove any existing data
 rmf $OUTPUT_PATH;

data/lib/mortar/version.rb

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

data/spec/mortar/command/projects_spec.rb

@@ -137,6 +137,9 @@ STDOUT
 \e[1;32m      create\e[0m  udfs/python
 \e[1;32m      create\e[0m  udfs/python/some_new_project.py
 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
+
 STDOUT
       end
 

metadata

@@ -1,167 +1,164 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.8.1
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mortar-api-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 6
+        - 3
         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: *id001
+- !ruby/object:Gem::Dependency 
+  name: netrc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !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'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :development
   prerelease: false
-  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
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 15
+        version: "0.15"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   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: 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: *id005
+- !ruby/object:Gem::Dependency 
+  name: gem-release
   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
+  requirement: &id006 !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: *id006
+- !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: &id007 !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: *id007
+- !ruby/object:Gem::Dependency 
+  name: rr
   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: rspec
-  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: rspec
   prerelease: false
-  version_requirements: !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
 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
@@ -252,26 +249,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: []
+