mortar 0.15.36 → 0.15.37

data/lib/mortar/local/pig.rb

@@ -323,7 +323,7 @@ class Mortar::Local::Pig
   def template_params_classpath(pig_version=nil)
     # Need to support old watchtower plugins that don't set pig_version
     if pig_version.nil?
-      pig_version = Mortar::PigVersion::Pig09.new
+      pig_version = Mortar::PigVersion::Pig012.new
     end
     [ "#{pig_directory(pig_version)}/*",
       "#{pig_directory(pig_version)}/lib-local/*",

data/lib/mortar/pigversion.rb

@@ -15,57 +15,66 @@
 #
 
 module Mortar
-	module PigVersion
-		PIG_0_9_TGZ_NAME = "pig-0.9.tar.gz"
-  		PIG_0_9_TGZ_DEFAULT_URL_PATH = "resource/pig_0_9"
-  		PIG_0_12_TGZ_NAME = "pig-0.12.tar.gz"
-  		PIG_0_12_TGZ_DEFAULT_URL_PATH = "resource/pig_0_12"
+    module PigVersion
+        PIG_0_12_TGZ_NAME = "pig-0.12.tar.gz"
+        PIG_0_12_TGZ_DEFAULT_URL_PATH = "resource/pig_0_12"
 
-  		def PigVersion.from_string(pig_version_str)
-  			if pig_version_str == '0.9'
-  				return Pig09.new
-  			elsif pig_version_str == '0.12'
-  				return Pig012.new
-  			else
-  				raise ArgumentError, "Unsupported pig version: #{pig_version_str}"
-  			end
-  		end
+        PIG_0_12_HADOOP_2_TGZ_NAME = "pig-0.12-hadoop-2.tar.gz"
+        PIG_0_12_HADOOP_2_TGZ_DEFAULT_URL_PATH = "resource/pig_0_12_hadoop_2"
 
-		class Pig09
-			def tgz_name
-				PIG_0_9_TGZ_NAME
-			end
+        def PigVersion.from_string(pig_version_str)
+            if pig_version_str == '0.12'
+                return Pig012.new
+            elsif pig_version_str == '0.12-Hadoop-2'
+                return Pig012Hadoop2.new 
+            else
+                raise ArgumentError, "Unsupported pig version: #{pig_version_str}.  Options are: ['0.12', '0.12-Hadoop-2]."
+            end
+        end
 
-			def tgz_default_url_path
-				PIG_0_9_TGZ_DEFAULT_URL_PATH
-			end
+        class Pig012
+            def tgz_name
+                PIG_0_12_TGZ_NAME
+            end
 
-			def name
-				"pig-#{version}"
-			end
+            def tgz_default_url_path
+                PIG_0_12_TGZ_DEFAULT_URL_PATH
+            end
 
-			def version
-				"0.9"
-			end
-		end
+            def name
+                "pig-#{version}"
+            end
 
-		class Pig012
-			def tgz_name
-				PIG_0_12_TGZ_NAME
-			end
+            def version
+                "0.12"
+            end
 
-			def tgz_default_url_path
-				PIG_0_12_TGZ_DEFAULT_URL_PATH
-			end
+            def cluster_backend
+                Mortar::API::Jobs::CLUSTER_BACKEND__EMR_HADOOP_1
+            end
+        end
 
-			def name
-				"pig-#{version}"
-			end
+        class Pig012Hadoop2
+            def tgz_name
+                PIG_0_12_HADOOP_2_TGZ_NAME
+            end
 
-			def version
-				"0.12"
-			end
-		end
+            def tgz_default_url_path
+                PIG_0_12_HADOOP_2_TGZ_DEFAULT_URL_PATH
+            end
 
-	end
+            def name
+                "pig-#{version}"
+            end
+
+            def version
+                "0.12-Hadoop-2"
+            end
+
+            def cluster_backend
+                Mortar::API::Jobs::CLUSTER_BACKEND__EMR_HADOOP_2
+            end
+        end
+
+    end
 end

data/lib/mortar/version.rb

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

data/spec/mortar/command/base_spec.rb

@@ -106,7 +106,7 @@ other\tgit@github.com:other.git (push)
     context "method_added" do
       it "replaces help templates" do
         lines = Base.replace_templates(["line", "start <PIG_VERSION_OPTIONS>"])
-        lines.join("").should == 'linestart 0.9 (default) and 0.12'
+        lines.join("").should == 'linestart 0.12 and 0.12-Hadoop-2'
       end
     end
 
@@ -232,7 +232,7 @@ polling_interval=10
           describe_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
           describe_url = "https://mdog.datadoghq.com/describe/#{describe_id}"
 
-          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters=>[]) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :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_SUCCESS, "status_description" => "Success", "web_result_url" => describe_url})).ordered
           write_file(File.join(p.pigscripts_path, "my_script.pig"))
 

data/spec/mortar/command/config_spec.rb

@@ -113,6 +113,41 @@ B=two three
 STDOUT
         end
       end
+
+      it "shows shadowed config vars" do
+        with_git_initialized_project do |p|
+          # stup api request
+          config = {'A' => 'one', 'B' => 'two'}
+          shadow_config = {'B' => 'three'}
+          mock(Mortar::Auth.api).get_config_vars("myproject").returns(Excon::Response.new(:body => {"config" => config,"shadow_config" => shadow_config}))
+       
+          stderr, stdout = execute("config",  p, @git)
+          stdout.should == <<-STDOUT
+=== myproject Config Vars
+A: one
+B: two
+
+=== Project config settings overriden by user config
+B: three
+STDOUT
+        end
+      end
+
+      it "doesn't show shadowed config vars on shell output" do
+        with_git_initialized_project do |p|
+          # stup api request
+          config = {'A' => 'one', 'B' => 'two'}
+          shadow_config = {'B' => 'three'}
+          mock(Mortar::Auth.api).get_config_vars("myproject").returns(Excon::Response.new(:body => {"config" => config,"shadow_config" => shadow_config}))
+       
+          stderr, stdout = execute("config --shell",  p, @git)
+          stdout.should == <<-STDOUT
+A=one
+B=two
+STDOUT
+        end
+      end
+
     end
     
     context("get") do
@@ -187,6 +222,21 @@ STDOUT
           stdout.should == <<-STDOUT
 Setting config vars for project myproject... done
 a: b
+STDOUT
+        end
+      end
+
+      it "sets config vars for user" do
+        with_git_initialized_project do |p|
+          # stub api request
+          configs = {'a' => 'b'}
+          mock(Mortar::Auth.api).put_user_config_vars(configs).returns(Excon::Response.new(:body => {}))
+          
+          stderr, stdout = execute("config:set a=b -u", p, @git)
+          stderr.should == ""
+          stdout.should == <<-STDOUT
+Setting config vars for your user... done
+a: b
 STDOUT
         end
       end
@@ -214,6 +264,19 @@ STDERR
           stderr.should == ""
           stdout.should == <<-STDOUT
 Unsetting A for project myproject... done
+STDOUT
+        end
+      end
+
+      it "unsets one key for user" do
+        with_git_initialized_project do |p|
+          # stub api requests
+          mock(Mortar::Auth.api).delete_user_config_var("A").returns(Excon::Response.new(:body => {}))
+          
+          stderr, stdout = execute("config:unset A --user", p, @git)
+          stderr.should == ""
+          stdout.should == <<-STDOUT
+Unsetting A for your user... done
 STDOUT
         end
       end

data/spec/mortar/command/describe_spec.rb

@@ -98,7 +98,7 @@ STDERR
           describe_url = "https://mdog.datadoghq.com/describe/#{describe_id}"
           parameters = ["name"=>"key", "value"=>"value" ]
           
-          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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
@@ -129,7 +129,7 @@ STDOUT
           describe_url = "https://mdog.datadoghq.com/describe/#{describe_id}"
           parameters = ["name"=>"key", "value"=>"value" ]
           
-          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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
@@ -163,7 +163,7 @@ STDOUT
           column_number = 32
           error_type = 'PigError'
           
-          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => []) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :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_FAILURE, "status_description" => "Failed",
             "error_message" => error_message,
@@ -198,7 +198,7 @@ STDERR
           describe_url = "https://mdog.datadoghq.com/describe/#{describe_id}"
           parameters = ["name"=>"key", "value"=>"value" ]
           
-          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"describe_id" => describe_id})}
+          mock(Mortar::Auth.api).post_describe("myproject", "my_script", "my_alias", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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

data/spec/mortar/command/illustrate_spec.rb

@@ -74,7 +74,7 @@ STDERR
           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), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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
@@ -108,7 +108,7 @@ STDOUT
           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), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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
@@ -142,7 +142,7 @@ STDOUT
           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), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
                     
@@ -169,7 +169,7 @@ STDOUT
           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", true, is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", true, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
                     
@@ -195,7 +195,7 @@ STDOUT
           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", nil, false, is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", nil, false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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
@@ -232,7 +232,7 @@ STDOUT
           error_type = 'PigError'
           
           # 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), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => []) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :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_FAILURE, 
             "error_message" => error_message,
@@ -268,7 +268,7 @@ STDERR
           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", nil, false, is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", nil, false, is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(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

data/spec/mortar/command/jobs_spec.rb

@@ -47,7 +47,7 @@ module Mortar::Command
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9",
+            :pig_version => "0.12",
             :project_script_path => be_a_kind_of(String),
             :parameters => match_array([{"name" => "FIRST_PARAM", "value" => "FOO"}, {"name" => "SECOND_PARAM", "value" => "BAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__SINGLE_JOB,
@@ -83,7 +83,7 @@ STDOUT
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String),cluster_size,
-                                                      :pig_version => "0.9", 
+                                                      :pig_version => "0.12", 
                                                       :project_script_path => be_a_kind_of(String),
                                                       :parameters => match_array([{"name" => "FIRST_PARAM", "value" => "FOO"}, {"name" => "SECOND_PARAM", "value" => "BAR"}]),
                                                       :cluster_type => Jobs::CLUSTER_TYPE__PERMANENT,
@@ -143,7 +143,7 @@ STDERR
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String),cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => match_array([{"name" => "FIRST_PARAM", "value" => "FOO"}, {"name" => "SECOND_PARAM", "value" => "BAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -179,7 +179,7 @@ STDOUT
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String),cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => match_array([{"name" => "FIRST_PARAM", "value" => "FOO"}, {"name" => "SECOND_PARAM", "value" => "BAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -215,7 +215,7 @@ STDOUT
           cluster_id = "e2790e7e8c7d48e39157238d58191346"
 
           mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id,
-              :pig_version => "0.9", 
+              :pig_version => "0.12", 
               :project_script_path => be_a_kind_of(String),
               :parameters => [],
               :notify_on_job_finish => false,
@@ -249,7 +249,7 @@ STDOUT
           cluster_id = "e2790e7e8c7d48e39157238d58191346"
 
           mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id,
-              :pig_version => "0.9", 
+              :pig_version => "0.12", 
               :project_script_path => be_a_kind_of(String),
               :parameters => [],
               :notify_on_job_finish => false,
@@ -283,7 +283,7 @@ STDOUT
 
           mock(Mortar::Auth.api).get_clusters(Mortar::API::Jobs::CLUSTER_BACKEND__EMR_HADOOP_1) {Excon::Response.new(:body => {'clusters' => []})}
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => [], 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -321,7 +321,7 @@ STDOUT
 
           mock(Mortar::Auth.api).get_clusters(Mortar::API::Jobs::CLUSTER_BACKEND__EMR_HADOOP_1) {Excon::Response.new(:body => {'clusters' => []})}
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => [], 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -358,7 +358,7 @@ STDOUT
           job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
           cluster_id = "e2790e7e8c7d48e39157238d58191346"
 
-          mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id, :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => [], :notify_on_job_finish => false, :is_control_script=>false) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
+          mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), cluster_id, :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :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 pigscripts/my_script.pig --clusterid e2790e7e8c7d48e39157238d58191346 -d", p, @git)
@@ -411,7 +411,7 @@ STDOUT
               ]})
           }
           mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), large_cluster_id, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => [], 
             :notify_on_job_finish => true,
@@ -426,6 +426,54 @@ 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 by default on the largest existing running cluster for Hadoop 2" do
+        with_git_initialized_project do |p|
+          job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
+
+          small_h2_cluster_id = '510beb6b3004860820ab6538'
+          small_h2_cluster_size = 2
+          small_h2_cluster_status = Mortar::API::Clusters::STATUS_RUNNING
+          large_h2_cluster_id = '510bf0db3004860820ab6590'
+          large_h2_cluster_size = 5
+          large_h2_cluster_status = Mortar::API::Clusters::STATUS_RUNNING
+
+          mock(Mortar::Auth.api).get_clusters(Mortar::API::Jobs::CLUSTER_BACKEND__EMR_HADOOP_2) {
+            Excon::Response.new(:body => {
+              'clusters' => [
+                  { 'cluster_id' => small_h2_cluster_id, 'size' => small_h2_cluster_size, 'running_jobs' => [], 'status_code' => small_h2_cluster_status },
+                  { 'cluster_id' => large_h2_cluster_id, 'size' => large_h2_cluster_size, 'running_jobs' => [], 'status_code' => large_h2_cluster_status },
+              ]})
+          }
+          mock(Mortar::Auth.api).post_pig_job_existing_cluster("myproject", "my_script", is_a(String), large_h2_cluster_id,
+            :pig_version => "0.12-Hadoop-2",
+            :project_script_path => be_a_kind_of(String),
+            :parameters => [],
+            :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 pigscripts/my_script.pig -g 0.12-Hadoop-2", p, @git)
+          stdout.should == <<-STDOUT
+Defaulting to running job on largest existing free cluster, id = 510bf0db3004860820ab6590, size = 5
+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
@@ -445,7 +493,7 @@ STDOUT
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9",
+            :pig_version => "0.12",
             :project_script_path => be_a_kind_of(String), 
             :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -473,7 +521,7 @@ PARAMS
           cluster_size = 5
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => match_array([{"name" => "FIRST", "value" => "FOO"}, {"name" => "SECOND", "value" => "BAR"}, {"name" => "THIRD", "value" => "BEAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,
@@ -529,7 +577,7 @@ STDERR
           mock(@git).sync_embedded_project.with_any_args.times(1) { "somewhere_over_the_rainbow" }
 
           mock(Mortar::Auth.api).post_pig_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
-            :pig_version => "0.9", 
+            :pig_version => "0.12", 
             :project_script_path => be_a_kind_of(String),
             :parameters => match_array([{"name" => "FIRST_PARAM", "value" => "FOO"}, {"name" => "SECOND_PARAM", "value" => "BAR"}]), 
             :cluster_type => Jobs::CLUSTER_TYPE__PERSISTENT,