mortar 0.7.9 → 0.8.0

data/lib/mortar/command/base.rb

@@ -310,11 +310,12 @@ protected
   end
 
   def validate_script!(script_name)
-    pigscript = project.pigscripts[script_name]
-    controlscript = project.controlscripts[script_name]
+    shortened_script_name = File.basename(script_name, ".*")
+    pigscript = project.pigscripts[shortened_script_name]
+    controlscript = project.controlscripts[shortened_script_name]
     unless pigscript || controlscript
-      available_pigscripts = project.pigscripts.none? ? "No pigscripts found" : "Available pigscripts:\n#{project.pigscripts.keys.sort.join("\n")}"
-      available_controlscripts = project.controlscripts.none? ? "No controlscripts found" : "Available controlscripts:\n#{project.controlscripts.keys.sort.join("\n")}"
+      available_pigscripts = project.pigscripts.none? ? "No pigscripts found" : "Available pigscripts:\n#{project.pigscripts.collect{|k,v| v.executable_path}.sort.join("\n")}"
+      available_controlscripts = project.controlscripts.none? ? "No controlscripts found" : "Available controlscripts:\n#{project.controlscripts.collect{|k,v| v.executable_path}.sort.join("\n")}"
       error("Unable to find a pigscript or controlscript for #{script_name}\n\n#{available_pigscripts}\n\n#{available_controlscripts}")
     end
 
@@ -326,8 +327,9 @@ protected
   end
   
   def validate_pigscript!(pigscript_name)
-    unless pigscript = project.pigscripts[pigscript_name]
-      available_scripts = project.pigscripts.none? ? "No pigscripts found" : "Available scripts:\n#{project.pigscripts.keys.sort.join("\n")}"
+    shortened_pigscript_name = File.basename(pigscript_name, ".*")
+    unless pigscript = project.pigscripts[shortened_pigscript_name]
+      available_scripts = project.pigscripts.none? ? "No pigscripts found" : "Available scripts:\n#{project.pigscripts.collect{|k,v| v.executable_path}.sort.join("\n")}"
       error("Unable to find pigscript #{pigscript_name}\n#{available_scripts}")
     end
     pigscript

data/lib/mortar/command/describe.rb

@@ -31,8 +31,8 @@ class Mortar::Command::Describe < Mortar::Command::Base
   #
   # Examples:
   #     
-  #     Describe the songs_sample relation in the generate_regression_model_coefficients script.
-  #          $ mortar describe generate_regression_model_coefficients songs_sample
+  #     Describe the songs_sample relation in the generate_regression_model_coefficients.pig pigscript.
+  #          $ mortar describe pigscripts/generate_regression_model_coefficients.pig songs_sample
   def index
     pigscript_name = shift_argument
     alias_name = shift_argument

data/lib/mortar/command/illustrate.rb

@@ -33,8 +33,9 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
   #
   # Examples:
   #  
-  #     Illustrate the songs_sample relation in the generate_regression_model_coefficients script.
-  #         $ mortar illustrate generate_regression_model_coefficients songs_sample
+  #     Illustrate all relations in the generate_regression_model_coefficients pigscript.
+  #         $ mortar illustrate pigscripts/generate_regression_model_coefficients.pig
+  #
   def index
     pigscript_name = shift_argument
     alias_name = shift_argument

data/lib/mortar/command/jobs.rb

@@ -65,11 +65,16 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
   # -d, --donotnotify           # Don't send an email on job completion.  (Default: false--an email will be sent to you once the job completes)
+  # -P, --project PROJECTNAME   # Use a project that is not checked out in the current directory.  Runs code from project's master branch in github rather than snapshotting local code.
+  # -B, --branch BRANCHNAME     # Used with --project to specify a non-master branch
   #
   #Examples:
   #
-  #    Run the generate_regression_model_coefficients script on a 3 node cluster.
-  #        $ mortar jobs:run generate_regression_model_coefficients --clustersize 3
+  #    Run the generate_regression_model_coefficients pigscript on a 3 node cluster.
+  #        $ mortar jobs:run pigscripts/generate_regression_model_coefficients.pig --clustersize 3
+  #
+  #    Run the regression_controller control script on a 3 node cluster.
+  #        $ mortar jobs:run controlscripts/regression_controller.py --clustersize 3
   def run
     script_name = shift_argument
     unless script_name
@@ -77,18 +82,35 @@ class Mortar::Command::Jobs < Mortar::Command::Base
     end
     
     validate_arguments!
-    script = validate_script!(script_name)
-    
-    case script
-    when Mortar::Project::PigScript
-      is_control_script = false
-    when Mortar::Project::ControlScript
-      is_control_script = true
+    if options[:project]
+      project_name = options[:project]
+
+      if File.extname(script_name) == ".pig"
+        is_control_script = false
+        script_name = File.basename(script_name, ".*")
+      elsif File.extname(script_name) == ".py"
+        is_control_script = true
+        script_name = File.basename(script_name, ".*")
+      else
+        error "Unable to guess script type (controlscript vs pigscript).\n" + 
+          "When running a script with the --project option, please provide the full path and filename, e.g.\n" +
+          " mortar run pigscripts/#{script_name}.pig --project #{project_name}"
+      end
     else
-      error "Unknown Script Type"
+      project_name = project.name
+      script = validate_script!(script_name)
+
+      script_name = script.name
+      case script
+      when Mortar::Project::PigScript
+        is_control_script = false
+      when Mortar::Project::ControlScript
+        is_control_script = true
+      else
+        error "Unknown Script Type"
+      end
     end
     
-
     unless options[:clusterid] || options[:clustersize]
       clusters = api.get_clusters().body['clusters']
 
@@ -114,7 +136,15 @@ class Mortar::Command::Jobs < Mortar::Command::Base
       end
     end
  
-    git_ref = sync_code_with_cloud()
+    if options[:project]
+      if options[:branch]
+        git_ref = options[:branch]
+      else
+        git_ref = "master"
+      end
+    else
+      git_ref = sync_code_with_cloud()
+    end
     
     notify_on_job_finish = ! options[:donotnotify]
     
@@ -131,14 +161,14 @@ class Mortar::Command::Jobs < Mortar::Command::Base
         elsif options[:permanentcluster]
           cluster_type = CLUSTER_TYPE__PERMANENT
         end
-        api.post_job_new_cluster(project.name, script.name, git_ref, cluster_size, 
+        api.post_job_new_cluster(project_name, script_name, git_ref, cluster_size, 
           :parameters => pig_parameters,
           :cluster_type => cluster_type,
           :notify_on_job_finish => notify_on_job_finish,
           :is_control_script => is_control_script).body
       else
         cluster_id = options[:clusterid]
-        api.post_job_existing_cluster(project.name, script.name, git_ref, cluster_id,
+        api.post_job_existing_cluster(project_name, script_name, git_ref, cluster_id,
           :parameters => pig_parameters,
           :notify_on_job_finish => notify_on_job_finish,
           :is_control_script => is_control_script).body

data/lib/mortar/command/local.rb

@@ -42,7 +42,7 @@ class Mortar::Command::Local < Mortar::Command::Base
   #Examples:
   #
   #    Run the generate_regression_model_coefficients script locally.
-  #        $ mortar local:run generate_regression_model_coefficients
+  #        $ mortar local:run pigscripts/generate_regression_model_coefficients.pig
   def run
     script_name = shift_argument
     unless script_name
@@ -67,8 +67,8 @@ class Mortar::Command::Local < Mortar::Command::Base
   #
   # Examples:
   #
-  #     Illustrate the songs_sample relation in the generate_regression_model_coefficients script.
-  #         $ mortar illustrate generate_regression_model_coefficients songs_sample
+  #     Illustrate all relations in the generate_regression_model_coefficients pigscript:
+  #         $ mortar illustrate pigscripts/generate_regression_model_coefficients.pig
   def illustrate
     pigscript_name = shift_argument
     alias_name = shift_argument
@@ -95,8 +95,8 @@ class Mortar::Command::Local < Mortar::Command::Base
   #
   #Examples:
   #
-  #    Check the pig syntax of the generate_regression_model_coefficients script locally.
-  #        $ mortar local:validate generate_regression_model_coefficients
+  #    Check the pig syntax of the generate_regression_model_coefficients pigscript locally.
+  #        $ mortar local:validate pigscripts/generate_regression_model_coefficients.pig
   def validate
     script_name = shift_argument
     unless script_name

data/lib/mortar/command/pigscripts.rb

@@ -28,7 +28,7 @@ class Mortar::Command::PigScripts < Mortar::Command::Base
     validate_arguments!
     if project.pigscripts.any?
       styled_header("pigscripts")
-      styled_array(project.pigscripts.keys)
+      styled_array(project.pigscripts.collect{|k,v| v.executable_path}.sort)
     else
       display("You have no pigscripts.")
     end

data/lib/mortar/project.rb

@@ -182,8 +182,19 @@ module Mortar
     end
     
     class ControlScript < Script
+      
+      def executable_path
+        "controlscripts/#{self.name}.pig"
+      end
+      
     end
+    
     class PigScript < Script
+      
+      def executable_path
+        "pigscripts/#{self.name}.pig"
+      end
+    
     end
     
   end

data/lib/mortar/version.rb

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

data/spec/mortar/command/describe_spec.rb

@@ -33,7 +33,7 @@ module Mortar::Command
       it "errors when an alias is not provided" do
         with_git_initialized_project do |p|
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("describe my_script", p)
+          stderr, stdout = execute("describe pigscripts/my_script.pig", p)
           stderr.should == <<-STDERR
  !    Usage: mortar describe PIGSCRIPT ALIAS
  !    Must specify PIGSCRIPT and ALIAS.
@@ -46,14 +46,14 @@ STDERR
           @git.git('remote rm mortar')
           p.remote = nil
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("describe my_script my_alias", p, @git)
+          stderr, stdout = execute("describe pigscripts/my_script.pig my_alias", p, @git)
           stderr.should == <<-STDERR
  !    Unable to find git remote for project myproject
 STDERR
         end
       end
 
-      it "errors when requested pigscript cannot be found" do
+      it "errors when requested pigscript cannot be found with old pigscript access style" do
         with_git_initialized_project do |p|
           stderr, stdout = execute("describe does_not_exist my_alias", p, @git)
           stderr.should == <<-STDERR
@@ -62,6 +62,19 @@ STDERR
  !    No pigscripts found
  !    
  !    No controlscripts found
+ STDERR
+        end
+      end
+
+      it "errors when requested pigscript cannot be found with new full-path pigscript access style" do
+        with_git_initialized_project do |p|
+          stderr, stdout = execute("describe pigscripts/does_not_exist.pig my_alias", p, @git)
+          stderr.should == <<-STDERR
+ !    Unable to find a pigscript or controlscript for pigscripts/does_not_exist.pig
+ !    
+ !    No pigscripts found
+ !    
+ !    No controlscripts found
  STDERR
         end
       end
@@ -76,7 +89,7 @@ STDERR
         end
       end
       
-      it "requests and reports on a successful describe" do
+      it "requests and reports on a successful describe using deprecated no-path pigscript syntax" do
         with_git_initialized_project do |p|
           # stub api requests
           describe_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
@@ -101,6 +114,37 @@ Starting describe... done
 
 \r\e[0K[/] Calculating schema for my_alias and ancestors...\r\e[0K[-] Calculating schema for my_alias and ancestors...\r\e[0K[\\] Calculating schema for my_alias and ancestors...\r\e[0K[|] Calculating schema for my_alias and ancestors...
 
+Results available at https://api.mortardata.com/describe/c571a8c7f76a4fd4a67c103d753e2dd5
+Opening web browser to show results... done
+STDOUT
+        end
+      end
+      
+      it "requests and reports on a successful describe using new full path pigscript syntax" do
+        with_git_initialized_project do |p|
+          # stub api requests
+          describe_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          describe_url = "https://api.mortardata.com/describe/#{describe_id}"
+          parameters = ["name"=>"key", "value"=>"value" ]
+          
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :parameters => parameters) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).get_describe(describe_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Describe::STATUS_QUEUED, "status_description" => "Pending"})).ordered
+          mock(Mortar::Auth.api).get_describe(describe_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Describe::STATUS_GATEWAY_STARTING, "status_description" => "Gateway starting"})).ordered
+          mock(Mortar::Auth.api).get_describe(describe_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Describe::STATUS_PROGRESS, "status_description" => "Starting pig"})).ordered
+          mock(Mortar::Auth.api).get_describe(describe_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Describe::STATUS_SUCCESS, "status_description" => "Success", "web_result_url" => describe_url})).ordered
+          
+          # stub launchy
+          mock(Launchy).open(describe_url) {Thread.new {}}
+                    
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("describe pigscripts/my_script.pig my_alias --polling_interval 0.05 -p key=value", p, @git)
+          stdout.should == <<-STDOUT
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Starting describe... done
+
+\r\e[0K[/] Calculating schema for my_alias and ancestors...\r\e[0K[-] Calculating schema for my_alias and ancestors...\r\e[0K[\\] Calculating schema for my_alias and ancestors...\r\e[0K[|] Calculating schema for my_alias and ancestors...
+
 Results available at https://api.mortardata.com/describe/c571a8c7f76a4fd4a67c103d753e2dd5
 Opening web browser to show results... done
 STDOUT
@@ -126,7 +170,7 @@ STDOUT
             "error_type" => error_type})).ordered
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("describe my_script my_alias --polling_interval 0.05", p, @git)
+          stderr, stdout = execute("describe pigscripts/my_script.pig my_alias --polling_interval 0.05", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -164,7 +208,7 @@ STDERR
           mock(Launchy).open(describe_url) {Thread.new {}}
                     
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("describe my_script my_alias --polling_interval 0.05 -p key=value", p, @git)
+          stderr, stdout = execute("describe pigscripts/my_script.pig my_alias --polling_interval 0.05 -p key=value", p, @git)
         end
     end
   end

data/spec/mortar/command/illustrate_spec.rb

@@ -34,7 +34,7 @@ module Mortar::Command
           @git.git('remote rm mortar')
           p.remote = nil
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script my_alias", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias", p, @git)
           stderr.should == <<-STDERR
  !    Unable to find git remote for project myproject
 STDERR
@@ -43,9 +43,9 @@ STDERR
 
       it "errors when requested pigscript cannot be found" do
         with_git_initialized_project do |p|
-          stderr, stdout = execute("illustrate does_not_exist my_alias", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/does_not_exist.pig my_alias", p, @git)
           stderr.should == <<-STDERR
- !    Unable to find a pigscript or controlscript for does_not_exist
+ !    Unable to find a pigscript or controlscript for pigscripts/does_not_exist.pig
  !    
  !    No pigscripts found
  !    
@@ -57,14 +57,14 @@ STDERR
       it "errors when requested with controlscript" do
         with_git_initialized_project do |p|
           write_file(File.join(p.controlscripts_path, "my_script.py"))
-          stderr, stdout = execute("illustrate my_script my_alias", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias", p, @git)
           stderr.should == <<-STDERR
  !    Currently Mortar does not support illustrating control scripts
  STDERR
         end
       end
       
-      it "requests and reports on a successful illustrate" do
+      it "requests and reports on a successful illustrate using deprecated no-path pigscript syntax" do
         with_git_initialized_project do |p|
           # stub api requests
           illustrate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
@@ -92,6 +92,40 @@ Starting illustrate... done
 
 \r\e[0KStatus: Pending... /\r\e[0KStatus: GATEWAY_STARTING... -\r\e[0KStatus: In progress... \\\r\e[0KStatus: Reading data... |\r\e[0KStatus: Pruning data... /\r\e[0KStatus: Succeeded  
 
+Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
+Opening web browser to show results... done
+STDOUT
+        end
+      end
+
+      it "requests and reports on a successful illustrate using new full-path pigscript syntax" do
+        with_git_initialized_project do |p|
+          # stub api requests
+          illustrate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          illustrate_url = "https://api.mortardata.com/illustrates/#{illustrate_id}"
+          parameters = ["name"=>"key", "value"=>"value" ]
+          
+          # These don't test the validity of the error message, it only tests that the CLI can handle a message returned from the server
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", false, is_a(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_QUEUED,           "status_description" => "Pending"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_GATEWAY_STARTING, "status_description" => "GATEWAY_STARTING"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_PROGRESS,         "status_description" => "In progress"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_READING_DATA,     "status_description" => "Reading data"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_PRUNING_DATA,     "status_description" => "Pruning data"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
+          
+          # stub launchy
+          mock(Launchy).open(illustrate_url) {Thread.new {}}
+                    
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias --polling_interval 0.05 -p key=value", p, @git)
+          stdout.should == <<-STDOUT
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Starting illustrate... done
+
+\r\e[0KStatus: Pending... /\r\e[0KStatus: GATEWAY_STARTING... -\r\e[0KStatus: In progress... \\\r\e[0KStatus: Reading data... |\r\e[0KStatus: Pruning data... /\r\e[0KStatus: Succeeded  
+
 Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
 Opening web browser to show results... done
 STDOUT
@@ -111,7 +145,7 @@ STDOUT
           mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
                     
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script my_alias --polling_interval 0.05 -p key=value --no_browser", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias --polling_interval 0.05 -p key=value --no_browser", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -138,7 +172,7 @@ STDOUT
           mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
                     
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script my_alias --polling_interval 0.05 -p key=value -s --no_browser", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias --polling_interval 0.05 -p key=value -s --no_browser", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -171,7 +205,7 @@ STDOUT
           mock(Launchy).open(illustrate_url) {Thread.new {}}
                     
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script --polling_interval 0.05 -p key=value", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig --polling_interval 0.05 -p key=value", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -206,7 +240,7 @@ STDOUT
             "status_description" => "Failed"})).ordered
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script my_alias --polling_interval 0.05", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig my_alias --polling_interval 0.05", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -246,7 +280,7 @@ STDERR
           mock(Launchy).open(illustrate_url) {Thread.new {}}
                     
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script --polling_interval 0.05 -p key=value", p, @git)
+          stderr, stdout = execute("illustrate pigscripts/my_script.pig --polling_interval 0.05 -p key=value", p, @git)
         end
       end
     end

data/spec/mortar/command/jobs_spec.rb

@@ -53,7 +53,7 @@ module Mortar::Command
             :is_control_script=> false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script -1 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig -1 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -86,7 +86,7 @@ STDOUT
                                                       :is_control_script=> false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script -2 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig -2 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -110,7 +110,7 @@ Or by running:
         with_git_initialized_project do |p|
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script -2 -1 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig -2 -1 --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
           stderr.should == <<-STDERR
  !    Cannot declare cluster as both --singlejobcluster and --permanentcluster
 STDERR
@@ -122,7 +122,7 @@ STDERR
           cluster_id = "e2790e7e8c7d48e39157238d58191346"
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script -2 --clusterid e2790e7e8c7d48e39157238d58191346 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig -2 --clusterid e2790e7e8c7d48e39157238d58191346 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
           stderr.should == <<-STDERR
  !    Option permanentcluster cannot be set when running a job on an existing cluster (with --clusterid option)
           STDERR
@@ -143,7 +143,7 @@ STDERR
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -162,7 +162,39 @@ STDOUT
         end
       end
       
-      it "runs a control script" do
+      it "runs a control script using new full-path syntax" do
+        with_git_initialized_project do |p|
+          # stub api requests
+          job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
+          cluster_id = "e2790e7e8c7d48e39157238d58191346"
+
+          mock(Mortar::Auth.api).post_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id,
+              :parameters => [],
+              :notify_on_job_finish => false,
+              :is_control_script=>true) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
+
+          write_file(File.join(p.controlscripts_path, "my_script.py"))
+          stderr, stdout = execute("jobs:run controlscripts/my_script.pig --clusterid e2790e7e8c7d48e39157238d58191346 -d", p, @git)
+          stdout.should == <<-STDOUT
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Requesting job execution... done
+job_id: c571a8c7f76a4fd4a67c103d753e2dd5
+
+Job status can be viewed on the web at:
+
+ http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5
+
+Or by running:
+
+  mortar jobs:status c571a8c7f76a4fd4a67c103d753e2dd5 --poll
+
+STDOUT
+        end
+      end
+
+      it "runs a control script using deprecated no-path controlscript syntax" do
         with_git_initialized_project do |p|
           # stub api requests
           job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
@@ -194,7 +226,42 @@ STDOUT
         end
       end
 
-      it "runs a job with no cluster defined" do
+      it "runs a job with no cluster defined using deprecated no-path pigscript syntax" do
+        with_git_initialized_project do |p|
+          job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
+          cluster_size = 2
+
+          mock(Mortar::Auth.api).get_clusters() {Excon::Response.new(:body => {'clusters' => []})}
+          mock(Mortar::Auth.api).post_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
+            :parameters => [], 
+            :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
+            :notify_on_job_finish => true,
+            :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
+
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("jobs:run my_script", p, @git)
+          stdout.should == <<-STDOUT
+Defaulting to running job on new cluster of size 2
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Requesting job execution... done
+job_id: c571a8c7f76a4fd4a67c103d753e2dd5
+
+Job status can be viewed on the web at:
+
+ http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5
+
+Or by running:
+
+  mortar jobs:status c571a8c7f76a4fd4a67c103d753e2dd5 --poll
+
+STDOUT
+
+        end
+      end
+      
+      it "runs a job with no cluster defined using new full-path pigscript syntax" do
         with_git_initialized_project do |p|
           job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
           job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
@@ -208,7 +275,7 @@ STDOUT
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script ", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig ", p, @git)
           stdout.should == <<-STDOUT
 Defaulting to running job on new cluster of size 2
 Taking code snapshot... done
@@ -239,7 +306,7 @@ STDOUT
           mock(Mortar::Auth.api).post_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id, :parameters => [], :notify_on_job_finish => false, :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script --clusterid e2790e7e8c7d48e39157238d58191346 -d", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clusterid e2790e7e8c7d48e39157238d58191346 -d", p, @git)
           stdout.should == <<-STDOUT
 Taking code snapshot... done
 Sending code snapshot to Mortar... done
@@ -294,7 +361,7 @@ STDOUT
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script ", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig ", p, @git)
           stdout.should == <<-STDOUT
 Defaulting to running job on largest existing free cluster, id = 510bf0db3004860820ab6590, size = 5
 Taking code snapshot... done
@@ -336,7 +403,7 @@ THIRD=BEAR
 PARAMS
 
           write_file(File.join(p.root_path, "params.ini"), parameters)
-          stderr, stdout = execute("jobs:run my_script --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
         end
       end
 
@@ -362,7 +429,7 @@ THIRD=BEAR
 PARAMS
 
           write_file(File.join(p.root_path, "params.ini"), parameters)
-          stderr, stdout = execute("jobs:run my_script --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
         end
       end
 
@@ -382,7 +449,7 @@ THIRD=BEAR
 PARAMS
 
           write_file(File.join(p.root_path, "params.ini"), parameters)
-          stderr, stdout = execute("jobs:run my_script --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clustersize 5 -p FIRST=FOO -p SECOND=BAR --param-file params.ini", p, @git)
           stderr.should == <<-STDERR
  !    Parameter file is malformed
 STDERR
@@ -405,7 +472,7 @@ STDERR
             :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
 
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("jobs:run my_script --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
+          stderr, stdout = execute("jobs:run pigscripts/my_script.pig --clustersize 5 -p FIRST_PARAM=FOO -p SECOND_PARAM=BAR", p, @git)
         end
       end
     end

data/spec/mortar/command/local_spec.rb

@@ -26,11 +26,11 @@ module Mortar::Command
       it "errors when the script doesn't exist" do
         with_git_initialized_project do |p|
           write_file(File.join(p.pigscripts_path, "my_other_script.pig"))
-          stderr, stdout = execute("local:illustrate my_script some_alias", p)
+          stderr, stdout = execute("local:illustrate pigscripts/my_script.pig some_alias", p)
           stderr.should == <<-STDERR
- !    Unable to find pigscript my_script
+ !    Unable to find pigscript pigscripts/my_script.pig
  !    Available scripts:
- !    my_other_script
+ !    pigscripts/my_other_script.pig
 STDERR
         end
       end
@@ -74,15 +74,15 @@ STDERR
         with_git_initialized_project do |p|
           write_file(File.join(p.pigscripts_path, "my_other_script.pig"))
           write_file(File.join(p.controlscripts_path, "my_control_script.py"))
-          stderr, stdout = execute("local:run my_script", p)
+          stderr, stdout = execute("local:run pigscripts/my_script.pig", p)
           stderr.should == <<-STDERR
- !    Unable to find a pigscript or controlscript for my_script
+ !    Unable to find a pigscript or controlscript for pigscripts/my_script.pig
  !    
  !    Available pigscripts:
- !    my_other_script
+ !    pigscripts/my_other_script.pig
  !    
  !    Available controlscripts:
- !    my_control_script
+ !    controlscripts/my_control_script.pig
 STDERR
         end
       end
@@ -97,7 +97,7 @@ STDERR
           any_instance_of(Mortar::Local::Controller) do |u|
             mock(u).run(pigscript, []).returns(nil)
           end
-          stderr, stdout = execute("local:run #{script_name}", p)
+          stderr, stdout = execute("local:run pigscripts/#{script_name}.pig", p)
           stderr.should == ""
         end
       end
@@ -156,7 +156,7 @@ STDERR
 
     context "local:validate" do
 
-      it "Runs pig with the -check command option" do
+      it "Runs pig with the -check command option for deprecated no-path pigscript syntax" do
         with_git_initialized_project do |p|
           script_name = "some_script"
           script_path = File.join(p.pigscripts_path, "#{script_name}.pig")
@@ -174,6 +174,24 @@ STDERR
         end
       end
 
+      it "Runs pig with the -check command option for new full-path pigscript syntax" 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)
+          mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Local::Controller) do |u|
+            mock(u).install_and_configure
+          end
+          any_instance_of(Mortar::Local::Pig) do |u|
+            mock(u).run_pig_command(" -check #{pigscript.path}", [])
+          end
+          stderr, stdout = execute("local:validate pigscripts/#{script_name}.pig", p)
+          stderr.should == ""
+        end
+      end
+
     end
 
   end

data/spec/mortar/command/pigscripts_spec.rb

@@ -46,7 +46,7 @@ STDOUT
           stderr, stdout = execute("pigscripts", p)
           stdout.should == <<-STDOUT
 === pigscripts
-my_script
+pigscripts/my_script.pig
 
 STDOUT
         end
@@ -59,8 +59,8 @@ STDOUT
           stderr, stdout = execute("pigscripts", p)
           stdout.should == <<-STDOUT
 === pigscripts
-a_script
-b_script
+pigscripts/a_script.pig
+pigscripts/b_script.pig
 
 STDOUT
         end

data/spec/mortar/project_spec.rb

@@ -64,6 +64,7 @@ module Mortar
           write_file pigscript_path
           p.pigscripts.my_script.name.should == "my_script"
           p.pigscripts.my_script.path.should == pigscript_path
+          p.pigscripts.my_script.executable_path.should == "pigscripts/my_script.pig"
         end
       end
 

metadata

@@ -1,167 +1,164 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.7.9
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-10 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: []
+