mortar 0.7.3 → 0.7.4

data/lib/mortar/auth.rb

@@ -98,6 +98,10 @@ class Mortar::Auth
       api.post_login(user, password).body["api_key"]
     end
 
+    def has_credentials
+      (nil != read_credentials)
+    end
+
     def get_credentials    # :nodoc:
       @credentials ||= (read_credentials || ask_for_and_save_credentials)
     end

data/lib/mortar/command/auth.rb

@@ -66,7 +66,9 @@ class Mortar::Command::Auth < Mortar::Command::Base
   def whoami
     validate_arguments!
 
-    display Mortar::Auth.user
+    if Mortar::Auth.has_credentials
+      display Mortar::Auth.user
+    end
   end
 
 end

data/lib/mortar/command/local.rb

@@ -22,7 +22,7 @@ require "mortar/command/base"
 class Mortar::Command::Local < Mortar::Command::Base
 
 
-  # configure
+  # local:configure
   #
   # Install dependencies for running this pig project locally, other
   # commands will also perform this step automatically.
@@ -54,9 +54,9 @@ class Mortar::Command::Local < Mortar::Command::Base
     ctrl.run(script, pig_parameters)
   end
 
-  # illustrate [PIGSCRIPT] [ALIAS]
+  # local:illustrate [PIGSCRIPT] [ALIAS]
   #
-  # Locallay illustrate the effects and output of a pigscript.
+  # Locally illustrate the effects and output of a pigscript.
   #
   # -s, --skippruning           # Don't try to reduce the illustrate results to the smallest size possible.
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
@@ -84,4 +84,26 @@ class Mortar::Command::Local < Mortar::Command::Base
   end
 
 
+  # local:validate SCRIPT
+  #
+  # Run a job on your local machine
+  #
+  # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
+  # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
+  #
+  #Examples:
+  #
+  #    Check the pig syntax of the generate_regression_model_coefficients script locally.
+  #        $ mortar local:validate generate_regression_model_coefficients
+  def validate
+    script_name = shift_argument
+    unless script_name
+      error("Usage: mortar local:validate SCRIPT\nMust specify SCRIPT.")
+    end
+    validate_arguments!
+    script = validate_script!(script_name)
+    ctrl = Mortar::Local::Controller.new
+    ctrl.validate(script, pig_parameters)
+  end
+
 end

data/lib/mortar/local/controller.rb

@@ -122,4 +122,10 @@ EOF
     pig.illustrate_alias(pig_script, pig_alias, skip_pruning, pig_parameters)
   end
 
+  def validate(pig_script, pig_parameters)
+    install_and_configure
+    pig = Mortar::Local::Pig.new()
+    pig.validate_script(pig_script, pig_parameters)
+  end
+
 end

data/lib/mortar/local/pig.rb

@@ -123,6 +123,11 @@ class Mortar::Local::Pig
     note_install("pig")
   end
 
+  def validate_script(pig_script, pig_parameters)
+    run_pig_command(" -check #{pig_script.path}", pig_parameters)
+  end
+
+
   # run the pig script with user supplied pig parameters
   def run_script(pig_script, pig_parameters)
     run_pig_command(" -f #{pig_script.path}", pig_parameters, true)
@@ -284,11 +289,14 @@ class Mortar::Local::Pig
     opts = {}
     opts['fs.s3n.awsAccessKeyId'] = ENV['AWS_ACCESS_KEY']
     opts['fs.s3n.awsSecretAccessKey'] = ENV['AWS_SECRET_KEY']
+    opts['fs.s3.awsAccessKeyId'] = ENV['AWS_ACCESS_KEY']
+    opts['fs.s3.awsSecretAccessKey'] = ENV['AWS_SECRET_KEY']
     opts['pig.events.logformat'] = PIG_LOG_FORMAT
     opts['pig.logfile'] = local_pig_logfile
     opts['python.verbose'] = 'error'
     opts['jython.output'] = true
     opts['python.home'] = jython_directory
+    opts['python.path'] = local_install_directory + "/../controlscripts"
     opts['python.cachedir'] = jython_cache_directory
     return opts
   end

data/lib/mortar/version.rb

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

data/spec/mortar/auth_spec.rb

@@ -160,5 +160,15 @@ module Mortar
       @cli.user_s3_safe.should == 'myemail-dontspam-somedomain-com'
     end
 
+    it "is true if the user is currently logged in" do
+      # login (aka writing the auth file) is done in setup
+      expect(@cli.has_credentials).to be_true
+    end
+
+    it "is false if the user is not logged in" do
+     @cli.logout
+      expect(@cli.has_credentials).to be_false
+    end
+
   end
 end

data/spec/mortar/command/auth_spec.rb

@@ -35,12 +35,21 @@ STDOUT
     
   describe "auth:whoami" do
     it "displays the user's email address" do
-      mock(Mortar::Auth).user {"sam@mortardata.com"}
+      mock(Mortar::Auth).has_credentials.returns(true)
+      mock(Mortar::Auth).get_credentials {["sam@mortardata.com", nil]}
       stderr, stdout = execute("auth:whoami")
       stderr.should == ""
       stdout.should == <<-STDOUT
 sam@mortardata.com
 STDOUT
     end
+
+    it "displays nothing if not logged in" do
+      mock(Mortar::Auth).has_credentials.returns(false)
+      stderr, stdout = execute("auth:whoami")
+      stderr.should == ""
+      stdout.should == ""
+    end
+
   end
 end

data/spec/mortar/command/local_spec.rb

@@ -150,6 +150,28 @@ STDERR
     # configure
     end
 
+    context "local:validate" do
+
+      it "Runs pig with the -check command option" 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 #{script_name}", p)
+          stderr.should == ""
+        end
+      end
+
+    end
+
   end
 end
 

metadata

@@ -1,164 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.7.4
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 3
-  version: 0.7.3
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mortar-api-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &71949150 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: netrc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *71949150
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: &71948490 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *71948490
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &71983980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *71983980
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &71982970 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 15
-        version: "0.15"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *71982970
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &71981360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *71981360
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: &71980140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *71980140
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &71978220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *71978220
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &71977800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *71977800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &71977380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *71977380
 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
@@ -249,38 +207,26 @@ 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 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-