mortar 0.11.1 → 0.12.0

data/spec/mortar/command/validate_spec.rb

@@ -71,7 +71,7 @@ STDERR
           validate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
           parameters = ["name"=>"key", "value"=>"value" ]
           
-          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(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.9", :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
@@ -101,7 +101,7 @@ STDOUT
           column_number = 32
           error_type = 'PigError'
           
-          mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(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.9", :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,
@@ -135,7 +135,7 @@ STDERR
         validate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
         parameters = ["name"=>"key", "value"=>"value" ]
         
-        mock(Mortar::Auth.api).post_validate("myproject", "my_script", is_a(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", :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
@@ -144,7 +144,7 @@ STDERR
         mock(@git).sync_embedded_project.with_any_args.times(1) { "somewhere_over_the_rainbow" }
 
         write_file(File.join(p.pigscripts_path, "my_script.pig"))
-        stderr, stdout = execute("validate my_script --polling_interval 0.05 -p key=value", p, @git)
+        stderr, stdout = execute("validate my_script --polling_interval 0.05 -p key=value -g 0.12", p, @git)
       end
     end
   end

data/spec/mortar/local/controller_spec.rb

@@ -66,18 +66,41 @@ module Mortar::Local
 
     end
 
+    context("install_and_configure") do
+      it "supplied default pig version" do
+        ctrl = Mortar::Local::Controller.new
+
+        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::Pig09))
+        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
+        mock(ctrl).ensure_local_install_dirs_in_gitignore
+        ctrl.install_and_configure
+      end
+    end
+
     context("run") do
 
       it "checks for aws keys, checks depenendency installation, runs script" do
         c = Mortar::Local::Controller.new
         mock(c).require_aws_keys
-        mock(c).install_and_configure
+        mock(c).install_and_configure("0.9")
         test_script = "foobar-script"
         the_parameters = []
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).run_script(test_script, the_parameters)
+          mock(p).run_script(test_script, "0.9", the_parameters)
         end
-        c.run(test_script, the_parameters)
+        c.run(test_script, "0.9", the_parameters)
       end
 
     end
@@ -86,15 +109,15 @@ module Mortar::Local
       it "checks for aws keys, checks depenendency installation, runs the illustrate process" do
         c = Mortar::Local::Controller.new
         mock(c).require_aws_keys
-        mock(c).install_and_configure
+        mock(c).install_and_configure("0.9")
         test_script = "foobar-script"
         script_alias = "some_alias"
         prune = false
         the_parameters = []
         any_instance_of(Mortar::Local::Pig) do |p|
-          mock(p).illustrate_alias(test_script, script_alias, prune, the_parameters)
+          mock(p).illustrate_alias(test_script, script_alias, prune, "0.9", the_parameters)
         end
-        c.illustrate(test_script, script_alias, the_parameters, prune)
+        c.illustrate(test_script, script_alias, "0.9", the_parameters, prune)
       end
     end
 

data/spec/mortar/local/pig_spec.rb

@@ -34,17 +34,19 @@ module Mortar::Local
         # chmods bin/pig, removes tgz, and notes the installation
         FakeFS do
           pig = Mortar::Local::Pig.new
-          local_pig_archive = File.join(pig.local_install_directory, Mortar::Local::Pig::PIG_TGZ_NAME)
-          mock(pig).download_file(pig.pig_archive_url, local_pig_archive) do
+          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) 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("pig-0.9")
+          mock(pig).note_install(pig09.name)
+          mock(pig).command(pig09)
           begin
             previous_stdout, $stdout = $stdout, StringIO.new
-            pig.install_pig
+            pig.install_pig(pig09)
           ensure
             $stdout = previous_stdout
           end
@@ -58,15 +60,17 @@ module Mortar::Local
 
       it "does nothing if existing install and no update available" do
         pig = Mortar::Local::Pig.new
-        mock(pig).should_do_pig_install?.returns(false)
-        mock(pig).should_do_pig_update?.returns(false)
+        pig09 = Mortar::PigVersion::Pig09.new
+
+        mock(pig).should_do_pig_install?(pig09).returns(false)
+        mock(pig).should_do_pig_update?(pig09).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
-          expect(File.exists?(pig.pig_directory)).to be_false
+          pig.install_or_update(pig09)
+          expect(File.exists?(pig.pig_directory(pig09))).to be_false
           expect(File.exists?(pig.lib_directory)).to be_false
 
         end
@@ -74,26 +78,30 @@ module Mortar::Local
 
       it "does install if none has been done before" do
         pig = Mortar::Local::Pig.new
-        mock(pig).should_do_pig_install?.returns(true)
+        pig09 = Mortar::PigVersion::Pig09.new
+
+        mock(pig).should_do_pig_install?(pig09).returns(true)
         mock(pig).should_do_lib_install?.returns(true)
 
-        mock(pig).install_pig
+        mock(pig).install_pig(pig09)
         mock(pig).install_lib
         capture_stdout do
-          pig.install_or_update
+          pig.install_or_update(pig09)
         end
       end
 
       it "does install if one was done before but there is an update" do
         pig = Mortar::Local::Pig.new
-        mock(pig).should_do_pig_install?.returns(false)
-        mock(pig).should_do_pig_update?.returns(true)
+        pig09 = Mortar::PigVersion::Pig09.new
+
+        mock(pig).should_do_pig_install?(pig09).returns(false)
+        mock(pig).should_do_pig_update?(pig09).returns(true)
         mock(pig).should_do_lib_install?.returns(false)
         mock(pig).should_do_lib_update?.returns(true)
-        mock(pig).install_pig
+        mock(pig).install_pig(pig09)
         mock(pig).install_lib
         capture_stdout do
-          pig.install_or_update
+          pig.install_or_update(pig09)
         end
       end
 
@@ -195,7 +203,7 @@ module Mortar::Local
         mock(pig).run_pig_command.with_any_args.returns(true)
         mock(pig).show_illustrate_output.with_any_args
         stub(pig).make_pig_param_file.returns('param.file')
-        pig.illustrate_alias(script, 'my_alias', false, [])
+        pig.illustrate_alias(script, 'my_alias', false, "0.9", [])
       end
 
       it "skips results if illustrate was unsuccessful" do
@@ -205,7 +213,7 @@ module Mortar::Local
         mock(pig).run_pig_command.with_any_args.returns(false)
         mock(pig).show_illustrate_output.with_any_args.never
         stub(pig).make_pig_param_file.returns('param.file')
-        pig.illustrate_alias(script, 'my_alias', false, [])
+        pig.illustrate_alias(script, 'my_alias', false, "0.9", [])
       end
 
       it "does not require login credentials for illustration" do
@@ -215,7 +223,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.with_any_args
-        pig.illustrate_alias(script, 'my_alias', false, [])
+        pig.illustrate_alias(script, 'my_alias', false, "0.9", [])
       end
 
     end
@@ -236,6 +244,22 @@ module Mortar::Local
       end
     end
 
+    context "template_params_classpath" do
+      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
+      end
+
+      it "Works with 0.12 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
+      end
+    end
+
 
   end
 end

data/spec/spec_helper.rb

@@ -38,7 +38,11 @@ require "fakefs/safe"
 require 'tmpdir'
 
 def execute(command_line, project=nil, git=nil)
+  stderr, stdout, command = execute_and_return_command(command_line, project, git)  
+  [stderr, stdout]
+end
 
+def execute_and_return_command(command_line, project=nil, git=nil)
   args = command_line.split(" ")
   command = args.shift
 
@@ -69,6 +73,7 @@ def execute(command_line, project=nil, git=nil)
   $stderr = captured_stderr = StringIO.new
   $stdout = captured_stdout = StringIO.new
 
+
   begin
     object.send(method)
   rescue SystemExit
@@ -77,7 +82,7 @@ def execute(command_line, project=nil, git=nil)
     Mortar::Command.current_command = nil
   end
 
-  [captured_stderr.string, captured_stdout.string]
+  [captured_stderr.string, captured_stdout.string, object]
 end
 
 def any_instance_of(klass, &block)

metadata

@@ -1,162 +1,196 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.11.1
+version: !ruby/object:Gem::Version 
+  hash: 47
+  prerelease: 
+  segments: 
+  - 0
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: mortar-api-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.3
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mortar-api-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: netrc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: netrc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: excon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !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
-    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: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    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
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: gem-release
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 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
@@ -202,6 +236,7 @@ files:
 - lib/mortar/local/jython.rb
 - lib/mortar/local/pig.rb
 - lib/mortar/local/python.rb
+- lib/mortar/pigversion.rb
 - lib/mortar/plugin.rb
 - lib/mortar/project.rb
 - lib/mortar/templates/characterize/README.md
@@ -279,25 +314,38 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
+