mortar 0.15.36 → 0.15.37

data/spec/mortar/command/local_spec.rb

@@ -48,7 +48,7 @@ STDERR
             mock(u).config_parameters.returns([])
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).illustrate(pigscript, "some_alias", is_a(Mortar::PigVersion::Pig09), [], false, false).returns(nil)
+            mock(u).illustrate(pigscript, "some_alias", is_a(Mortar::PigVersion::Pig012), [], false, false).returns(nil)
           end
           stderr, stdout = execute("local:illustrate #{script_name} some_alias", p)
           stderr.should == ""
@@ -125,9 +125,9 @@ STDERR
             mock(u).config_parameters.returns([])
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).run(pigscript, is_a(Mortar::PigVersion::Pig09), []).returns(nil)
+            mock(u).run(pigscript, is_a(Mortar::PigVersion::Pig012Hadoop2), []).returns(nil)
           end
-          stderr, stdout = execute("local:run pigscripts/#{script_name}.pig -g 0.9", p)
+          stderr, stdout = execute("local:run pigscripts/#{script_name}.pig -g 0.12-Hadoop-2", p)
           stderr.should == ""
         end
       end
@@ -218,9 +218,6 @@ PARAMS
           any_instance_of(Mortar::Local::Jython) do |j|
             mock(j).install_or_update.returns(true)
           end
-          any_instance_of(Mortar::Local::Sqoop) do |j|
-            mock(j).install_or_update.returns(true)
-          end
           any_instance_of(Mortar::Local::Controller) do |j|
             mock(j).write_local_readme
             mock(j).ensure_local_install_dirs_in_gitignore.returns(true)
@@ -247,10 +244,10 @@ PARAMS
             mock(u).config_parameters.returns([{"key"=>"k", "value"=>"v"}])
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09), 'validate')
+            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig012), 'validate')
           end
           any_instance_of(Mortar::Local::Pig) do |u|
-            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig09), [{"key"=>"k", "value"=>"v"}])
+            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig012), [{"key"=>"k", "value"=>"v"}])
           end
           stderr, stdout = execute("local:validate #{script_name}", p)
           stderr.should == ""
@@ -268,10 +265,10 @@ PARAMS
             mock(u).config_parameters.returns([])
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09), 'validate')
+            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig012), 'validate')
           end
           any_instance_of(Mortar::Local::Pig) do |u|
-            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig09), [])
+            mock(u).run_pig_command(" -check #{pigscript.path}", is_a(Mortar::PigVersion::Pig012), [])
           end
           stderr, stdout = execute("local:validate pigscripts/#{script_name}.pig", p)
           stderr.should == ""
@@ -319,7 +316,7 @@ STDERR
             mock(u).run_stillson_luigi_client_cfg_expansion(luigi_script, config_parameters).returns(true)
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09),'luigi')
+            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig012),'luigi')
           end
           any_instance_of(Mortar::Command::Local) do |u|
             mock(u).sync_code_with_cloud().returns("some-git-ref")
@@ -350,7 +347,7 @@ STDERR
             mock(u).run_luigi_script(luigi_script, %W{--myoption 2 --myotheroption 3})
           end
           any_instance_of(Mortar::Local::Controller) do |u|
-            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig09),'luigi')
+            mock(u).install_and_configure(is_a(Mortar::PigVersion::Pig012),'luigi')
           end
           any_instance_of(Mortar::Command::Local) do |u|
             mock(u).sync_code_with_cloud().returns("some-git-ref")
@@ -364,227 +361,5 @@ STDERR
 
     end
 
-    context "local:sqoop_table" do
-      it "requires a db type" do
-          stderr, stdout = execute "local:sqoop_table"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_table dbtype database-name table s3-destination
- !    Must specify database type.
-STDERR
-      end
-
-      it "requires the physical db name" do
-          stderr, stdout = execute "local:sqoop_table mysql"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_table dbtype database-name table s3-destination
- !    Must specify database name.
-STDERR
-      end
-
-      it "requires the table name" do
-          stderr, stdout = execute "local:sqoop_table mysql myappdb"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_table dbtype database-name table s3-destination
- !    Must specify database table.
-STDERR
-      end
-
-      it "requires the s3 destination" do
-          stderr, stdout = execute "local:sqoop_table mysql myappdb customers"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_table dbtype database-name table s3-destination
- !    Must specify s3 destination.
-STDERR
-      end
-
-      it "sends everything to the controller" do
-        connstr = Shellwords.escape("jdbc:mysql://foobar.com/mydb?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_table(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, s3dest, {:host => "foobar.com"})
-        end
-        stderr, stdout = execute "local:sqoop_table mysql mydb #{dbtable} #{s3dest} --host foobar.com"
-      end
-
-      it "defaults to 'localhost' if no host specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydb?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_table(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_table mysql mydb #{dbtable} #{s3dest}"
-      end
-
-      it "overrides the JDBC connection string if one is specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_table(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_table mysql mydb #{dbtable} #{s3dest} -c jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull"
-      end
-
-    end
-
-    context "local:sqoop_query" do
-      it "requires a db type" do
-          stderr, stdout = execute "local:sqoop_query"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_query dbtype database-name query s3-destination
- !    Must specify database type.
-STDERR
-      end
-
-      it "requires the physical db name" do
-          stderr, stdout = execute "local:sqoop_query mysql"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_query dbtype database-name query s3-destination
- !    Must specify database name.
-STDERR
-      end
-
-      it "requires the table name" do
-          stderr, stdout = execute "local:sqoop_query mysql myappdb"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_query dbtype database-name query s3-destination
- !    Must specify sql query.
-STDERR
-      end
-
-      it "requires the s3 destination" do
-          stderr, stdout = execute "local:sqoop_query mysql myappdb customers"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_query dbtype database-name query s3-destination
- !    Must specify s3 destination.
-STDERR
-      end
-
-      it "sends everything to the controller" do
-        connstr = Shellwords.escape("jdbc:mysql://foobar.com/mydb?zeroDateTimeBehavior=convertToNull")
-        query = "select_*_from_customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_query(is_a(Mortar::PigVersion::Pig09), connstr, query, s3dest, {:host => "foobar.com"})
-        end
-        stderr, stdout = execute "local:sqoop_query mysql mydb #{query} #{s3dest} --host foobar.com"
-        stderr.should == ''
-      end
-
-      it "defaults to 'localhost' if no host specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydb?zeroDateTimeBehavior=convertToNull")
-        query = "select_*_from_customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_query(is_a(Mortar::PigVersion::Pig09), connstr, query, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_query mysql mydb #{query} #{s3dest}"
-        stderr.should == ''
-      end
-
-      it "overrides the JDBC connection string if one is specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull")
-        query = "select_*_from_customers"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_query(is_a(Mortar::PigVersion::Pig09), connstr, query, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_query mysql mydb #{query} #{s3dest} -c jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull"
-        stderr.should == ''
-      end
-
-    end
-
-    context "local:sqoop_incremental" do
-      it "requires a db type" do
-          stderr, stdout = execute "local:sqoop_incremental"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify database type.
-STDERR
-      end
-
-      it "requires the physical db name" do
-          stderr, stdout = execute "local:sqoop_incremental mysql"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify database name.
-STDERR
-      end
-
-      it "requires the table name" do
-          stderr, stdout = execute "local:sqoop_incremental mysql myappdb"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify database table.
-STDERR
-      end
-
-      it "requires the column name" do
-          stderr, stdout = execute "local:sqoop_incremental mysql myappdb mytable"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify column.
-STDERR
-      end
-
-      it "requires the column value" do
-          stderr, stdout = execute "local:sqoop_incremental mysql myappdb mytable mycolumn"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify value.
-STDERR
-      end
-
-      it "requires the s3 destination" do
-          stderr, stdout = execute "local:sqoop_incremental mysql myappdb mytable mycolumn customers"
-          stderr.should == <<-STDERR
- !    Usage: mortar local:sqoop_incremental dbtype database-name table column value s3-destination
- !    Must specify s3 destination.
-STDERR
-      end
-
-      it "sends everything to the controller" do
-        connstr = Shellwords.escape("jdbc:mysql://foobar.com/mydb?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        column = "customer_id"
-        column_value = "12345"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_incremental(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, column, column_value, s3dest, {:host => "foobar.com"})
-        end
-        stderr, stdout = execute "local:sqoop_incremental mysql mydb #{dbtable} #{column} #{column_value} #{s3dest} --host foobar.com"
-      end
-
-      it "defaults to 'localhost' if no host specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydb?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        column = "customer_id"
-        column_value = "12345"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_incremental(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, column, column_value, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_incremental mysql mydb #{dbtable} #{column} #{column_value} #{s3dest}"
-      end
-
-      it "overrides the JDBC connection string if one is specified" do
-        connstr = Shellwords.escape("jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull")
-        dbtable = "customers"
-        column = "customer_id"
-        column_value = "12345"
-        s3dest = "s3n://a-bucket/a-directory"
-        any_instance_of(Mortar::Local::Controller) do |c|
-          mock(c).sqoop_export_incremental(is_a(Mortar::PigVersion::Pig09), connstr, dbtable, column, column_value, s3dest, {})
-        end
-        stderr, stdout = execute "local:sqoop_incremental mysql mydb #{dbtable} #{column} #{column_value} #{s3dest} -c jdbc:mysql://localhost/mydbother?zeroDateTimeBehavior=convertToNull"
-      end
-
-    end
-
-
-
   end
 end

data/spec/mortar/command/validate_spec.rb

@@ -73,7 +73,7 @@ STDERR
           validate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
           parameters = ["name"=>"key", "value"=>"value" ]
 
-          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"validate_id" => validate_id})}
+          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :parameters => parameters) {Excon::Response.new(:body => {"validate_id" => validate_id})}
           mock(Mortar::Auth.api).get_validate(validate_id).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Validate::STATUS_QUEUED, "status_description" => "Pending"})).ordered
           mock(Mortar::Auth.api).get_validate(validate_id).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Validate::STATUS_GATEWAY_STARTING, "status_description" => "GATEWAY_STARTING"})).ordered
           mock(Mortar::Auth.api).get_validate(validate_id).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Validate::STATUS_PROGRESS, "status_description" => "Starting"})).ordered
@@ -103,7 +103,7 @@ STDOUT
           column_number = 32
           error_type = 'PigError'
           
-          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(String), :pig_version => "0.9", :project_script_path => be_a_kind_of(String), :parameters => []) {Excon::Response.new(:body => {"validate_id" => validate_id})}
+          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(String), :pig_version => "0.12", :project_script_path => be_a_kind_of(String), :parameters => []) {Excon::Response.new(:body => {"validate_id" => validate_id})}
           mock(Mortar::Auth.api).get_validate(validate_id).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Validate::STATUS_QUEUED, "status_description" => "Pending"})).ordered
           mock(Mortar::Auth.api).get_validate(validate_id).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Validate::STATUS_FAILURE, "status_description" => "Failed",
             "error_message" => error_message,

data/spec/mortar/local/controller_spec.rb

@@ -135,7 +135,7 @@ module Mortar::Local
           mock(j).check_install.returns(true)
         end
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).install_or_update(is_a(Mortar::PigVersion::Pig09), nil)
+          mock(p).install_or_update(is_a(Mortar::PigVersion::Pig012), nil)
         end
         any_instance_of(Mortar::Local::Python) do |p|
           mock(p).check_or_install.returns(true)
@@ -152,53 +152,19 @@ module Mortar::Local
         ENV['MORTAR_PROJECT_NAME'].should eq('myproject')
       end
 
-      it "install sqoop with command" do
-        ENV.delete('MORTAR_PROJECT_NAME')
-        command = 'command'
-        ctrl = Mortar::Local::Controller.new
-
-        any_instance_of(Mortar::Command::Base) do |b|
-          mock(b).project.returns(Mortar::Project::Project)
-          mock(b).options.returns({:project =>'myproject'})
-        end
-        any_instance_of(Mortar::Local::Java) do |j|
-          mock(j).check_install.returns(true)
-        end
-        any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).install_or_update(is_a(Mortar::PigVersion::Pig012), command)
-        end
-        any_instance_of(Mortar::Local::Python) do |p|
-          mock(p).check_or_install.returns(true)
-          mock(p).check_virtualenv.returns(true)
-          mock(p).setup_project_python_environment.returns(true)
-        end
-        any_instance_of(Mortar::Local::Jython) do |j|
-          mock(j).install_or_update
-        end
-        any_instance_of(Mortar::Local::Sqoop) do |s|
-          mock(s).install_or_update
-        end
-
-        mock(ctrl).write_local_readme
-        mock(ctrl).ensure_local_install_dirs_in_gitignore
-        ctrl.install_and_configure(Mortar::PigVersion::Pig012.new, command, true)
-        begin
-          ENV['MORTAR_PROJECT_NAME'].should eq('myproject')
-        end
-      end
     end
 
     context("run") do
 
       it "checks for aws keys, checks depenendency installation, runs script" do
         c = Mortar::Local::Controller.new
-        mock(c).install_and_configure("0.9", "run")
+        mock(c).install_and_configure("0.12", "run")
         test_script = "foobar-script"
         the_parameters = []
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).run_script(test_script, "0.9", the_parameters)
+          mock(p).run_script(test_script, "0.12", the_parameters)
         end
-        c.run(test_script, "0.9", the_parameters)
+        c.run(test_script, "0.12", the_parameters)
       end
 
     end
@@ -206,16 +172,16 @@ module Mortar::Local
     context("illustrate") do
       it "checks for aws keys, checks depenendency installation, runs the illustrate process" do
         c = Mortar::Local::Controller.new
-        mock(c).install_and_configure("0.9", "illustrate")
+        mock(c).install_and_configure("0.12", "illustrate")
         test_script = "foobar-script"
         script_alias = "some_alias"
         prune = false
         no_browser = false
         the_parameters = []
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).illustrate_alias(test_script, script_alias, prune, no_browser, "0.9", the_parameters)
+          mock(p).illustrate_alias(test_script, script_alias, prune, no_browser, "0.12", the_parameters)
         end
-        c.illustrate(test_script, script_alias, "0.9", the_parameters, prune, no_browser)
+        c.illustrate(test_script, script_alias, "0.12", the_parameters, prune, no_browser)
       end
     end
 

data/spec/mortar/local/pig_spec.rb

@@ -35,19 +35,19 @@ module Mortar::Local
         # chmods bin/pig, removes tgz, and notes the installation
         FakeFS do
           pig = Mortar::Local::Pig.new
-          pig09 = Mortar::PigVersion::Pig09.new
-          local_pig_archive = File.join(pig.local_install_directory, pig09.tgz_name)
-          mock(pig).download_file(pig.pig_archive_url(pig09), local_pig_archive, nil) do
+          pig012 = Mortar::PigVersion::Pig012.new
+          local_pig_archive = File.join(pig.local_install_directory, pig012.tgz_name)
+          mock(pig).download_file(pig.pig_archive_url(pig012), local_pig_archive, nil) do
             # Simulate the tgz file being downloaded, this should be deleted
             # before the method finishes executing
             FileUtils.touch(local_pig_archive)
           end
           mock(pig).extract_tgz(local_pig_archive, pig.local_install_directory)
-          mock(pig).note_install(pig09.name)
-          mock(pig).command(pig09)
+          mock(pig).note_install(pig012.name)
+          mock(pig).command(pig012)
           begin
             previous_stdout, $stdout = $stdout, StringIO.new
-            pig.install_pig(pig09)
+            pig.install_pig(pig012)
           ensure
             $stdout = previous_stdout
           end
@@ -61,17 +61,17 @@ module Mortar::Local
 
       it "does nothing if existing install and no update available" do
         pig = Mortar::Local::Pig.new
-        pig09 = Mortar::PigVersion::Pig09.new
+        pig012 = Mortar::PigVersion::Pig012.new
 
-        mock(pig).should_do_pig_install?(pig09).returns(false)
-        mock(pig).should_do_pig_update?(pig09, nil).returns(false)
+        mock(pig).should_do_pig_install?(pig012).returns(false)
+        mock(pig).should_do_pig_update?(pig012, nil).returns(false)
         mock(pig).should_do_lib_install?.returns(false)
         mock(pig).should_do_lib_update?.returns(false)
         FakeFS do
           FileUtils.mkdir_p(File.dirname(pig.local_install_directory))
           FileUtils.rm_rf(pig.local_install_directory, :force => true)
-          pig.install_or_update(pig09)
-          expect(File.exists?(pig.pig_directory(pig09))).to be_false
+          pig.install_or_update(pig012)
+          expect(File.exists?(pig.pig_directory(pig012))).to be_false
           expect(File.exists?(pig.lib_directory)).to be_false
 
         end
@@ -79,30 +79,30 @@ module Mortar::Local
 
       it "does install if none has been done before" do
         pig = Mortar::Local::Pig.new
-        pig09 = Mortar::PigVersion::Pig09.new
+        pig012 = Mortar::PigVersion::Pig012.new
 
-        mock(pig).should_do_pig_install?(pig09).returns(true)
+        mock(pig).should_do_pig_install?(pig012).returns(true)
         mock(pig).should_do_lib_install?.returns(true)
 
-        mock(pig).install_pig(pig09, nil)
+        mock(pig).install_pig(pig012, nil)
         mock(pig).install_lib
         capture_stdout do
-          pig.install_or_update(pig09)
+          pig.install_or_update(pig012)
         end
       end
 
       it "does install if one was done before but there is an update" do
         pig = Mortar::Local::Pig.new
-        pig09 = Mortar::PigVersion::Pig09.new
+        pig012 = Mortar::PigVersion::Pig012.new
 
-        mock(pig).should_do_pig_install?(pig09).returns(false)
-        mock(pig).should_do_pig_update?(pig09, nil).returns(true)
+        mock(pig).should_do_pig_install?(pig012).returns(false)
+        mock(pig).should_do_pig_update?(pig012, nil).returns(true)
         mock(pig).should_do_lib_install?.returns(false)
         mock(pig).should_do_lib_update?.returns(true)
-        mock(pig).install_pig(pig09)
+        mock(pig).install_pig(pig012)
         mock(pig).install_lib
         capture_stdout do
-          pig.install_or_update(pig09)
+          pig.install_or_update(pig012)
         end
       end
 
@@ -208,7 +208,7 @@ module Mortar::Local
         mock(pig).run_pig_command.with_any_args.returns(true)
         mock(pig).show_illustrate_output_browser.with_any_args
         stub(pig).make_pig_param_file.returns('param.file')
-        pig.illustrate_alias(script, 'my_alias', false, false, "0.9", [])
+        pig.illustrate_alias(script, 'my_alias', false, false, "0.12", [])
       end
 
       it "displays text results if illustrate was successful with no_browser" do
@@ -218,7 +218,7 @@ module Mortar::Local
         stub(pig).run_pig_command.with_any_args.returns(true)
         mock(pig).display.with_any_args
         stub(pig).make_pig_param_file.returns('param.file')
-        pig.illustrate_alias(script, 'my_alias', false, true, "0.9", [])
+        pig.illustrate_alias(script, 'my_alias', false, true, "0.12", [])
       end
 
       it "skips results if illustrate was unsuccessful" do
@@ -228,7 +228,7 @@ module Mortar::Local
         mock(pig).run_pig_command.with_any_args.returns(false)
         mock(pig).show_illustrate_output_browser.with_any_args.never
         stub(pig).make_pig_param_file.returns('param.file')
-        pig.illustrate_alias(script, 'my_alias', false, false, "0.9", [])
+        pig.illustrate_alias(script, 'my_alias', false, false, "0.12", [])
       end
 
       it "does not require login credentials for illustration" do
@@ -238,7 +238,7 @@ module Mortar::Local
         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_browser.with_any_args
-        pig.illustrate_alias(script, 'my_alias', false, false, "0.9", [])
+        pig.illustrate_alias(script, 'my_alias', false, false, "0.12", [])
       end
 
     end
@@ -263,15 +263,14 @@ module Mortar::Local
       it "Uses default pig" do
         pig = Mortar::Local::Pig.new
         tpc = pig.template_params_classpath
-        expect(tpc.include?("pig-0.9")).to be_true
-        expect(tpc.include?("pig-0.12")).to be_false
+        expect(tpc.include?("pig-0.12")).to be_true
+        expect(tpc.include?("pig-0.12-Hadoop-2")).to be_false
       end
 
-      it "Works with 0.12 pig" do
+      it "Works with 0.12-Hadoop-2 pig" do
         pig = Mortar::Local::Pig.new
-        tpc = pig.template_params_classpath(Mortar::PigVersion::Pig012.new)
-        expect(tpc.include?("pig-0.12")).to be_true
-        expect(tpc.include?("pig-0.9")).to be_false
+        tpc = pig.template_params_classpath(Mortar::PigVersion::Pig012Hadoop2.new)
+        expect(tpc.include?("pig-0.12-Hadoop-2")).to be_true
       end
     end