mortar 0.15.50 → 0.15.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a8ee5564bbe5faf702b582def600ab3badd60c3b9f6a087cbc5c40b94f5024
-  data.tar.gz: 0bdd5f921ed0aa097f0dece050ab08e015f3b39f44bd9c9a772051dbe773b51c
+  metadata.gz: 319b7fb7753bf9b969875b28eabd5d9b18291b84786bd028c328a821c91bfda4
+  data.tar.gz: 85981667afc34d06737eb2f433ee09cae0630b4d9f12548853f7ca0e4d641efc
 SHA512:
-  metadata.gz: 05d20d721c5f66913bb300f665fc84fd8c25fd7d57a6c25897bbe05992ad7ab5339c1f6d869d5008d2e993c97fde19ffb28a0a792643a2be626f448d4d32f89f
-  data.tar.gz: 2b5ec37db2ab094c3faa80e4bfc2fe260ff3d7fb540ee1a7ad0fc6c5fc145f1c3b8d45c8fc7b35c83dc9455cdc86b4edae1bea1f42842ed7b6ed4e9788f1c2b9
+  metadata.gz: 358cbddf9062fe62f66471a7feca97665510d7f76af797cfc1c8a36b3ca54476febcc6a6e69f0d663ee86b1d59ca79331213edd646047d797a5fa0bc24bebfff
+  data.tar.gz: b0fe29187f701b2c9100c41d6c5577abf2507096b5026d738da1a4d825bba6c900ca5bb42e1d0df40f0373f6ac45295e27cf9eeff92003e33afbea137cee9417

data/lib/mortar/command/luigi.rb

@@ -27,7 +27,6 @@ class Mortar::Command::Luigi < Mortar::Command::Base
   #
   # Run a luigi pipeline.
   #
-  # -P, --project PROJECTNAME   # Use a project that is not checked out in the current directory.  Runs code from project's master branch in GitHub rather than snapshotting local code.
   # -B, --branch BRANCHNAME     # Used with --project to specify a non-master branch
   #
   # Examples:
@@ -35,6 +34,9 @@ class Mortar::Command::Luigi < Mortar::Command::Base
   #    Run the nightly_rollup luigiscript:
   #        $ mortar luigi luigiscripts/nightly_rollup.py
   #
+  #    Run the nightly_rollup luigiscript from master branch:
+  #        $ mortar luigi -B master luigiscripts/nightly_rollup.py
+  #
   #    Run the nightly_rollup luigiscript with two parameters:
   #        $ mortar luigi luigiscripts/nightly_rollup.py --data-date 2012-02-01 --my-param myval
   #
@@ -43,26 +45,15 @@ class Mortar::Command::Luigi < Mortar::Command::Base
     unless script_name
       error("Usage: mortar luigi SCRIPT\nMust specify SCRIPT.")
     end
-    
-    if options[:project]
-      project_name = options[:project]
-      if File.extname(script_name) == ".py"
-        script_name = File.basename(script_name, ".*")
-      end
-    else
-      project_name = project.name
-      script = validate_luigiscript!(script_name)
-      script_name = script.name
-    end
+
+    project_name = project.name
+    script = validate_luigiscript!(script_name)
+    script_name = script.name
 
     parameters = luigi_parameters()
 
-    if options[:project]
-      if options[:branch]
-        git_ref = options[:branch]
-      else
-        git_ref = "master"
-      end
+    if options[:branch]
+      git_ref = options[:branch]
     else
       git_ref = sync_code_with_cloud()
     end

data/lib/mortar/command/spark.rb

@@ -31,7 +31,6 @@ class Mortar::Command::Spark < Mortar::Command::Base
   # -s, --clustersize NUMNODES  # Run job with NUMNODES nodes (optional; must be >= 2 if provided)
   # -t, --clustertags A,B,C     # Run job on an existing cluster with specified tags
   # -3, --spot                  # Use spot instances for this cluster (Default: true)
-  # -P, --project PROJECTNAME   # Use a project that is not checked out in the current directory.  Runs code from project's master branch in GitHub rather than snapshotting local code.
   # -B, --branch BRANCHNAME     # Used with --project to specify a non-master branch
   #
   # Examples:
@@ -39,6 +38,9 @@ class Mortar::Command::Spark < Mortar::Command::Base
   #    Run a spark job:
   #        $ mortar spark com.datadog.some.Job
   #
+  #    Run a spark job from master branch:
+  #        $ mortar spark -B master com.datadog.some.Job
+  #
   #    Run a spark job with some arguments:
   #        $ mortar spark com.datadog.some.Job --env prod s3://your-bucket/input s3://your-bucket/output 100
   #
@@ -48,20 +50,12 @@ class Mortar::Command::Spark < Mortar::Command::Base
       error("Usage: mortar spark CLASS_NAME\nMust specify CLASS_NAME.")
     end
 
-    if options[:project]
-      project_name = options[:project]
-    else
-      project_name = project.name
-    end
+    project_name = project.name
 
     script_arguments = spark_script_arguments()
 
-    if options[:project]
-      if options[:branch]
-        git_ref = options[:branch]
-      else
-        git_ref = "master"
-      end
+    if options[:branch]
+      git_ref = options[:branch]
     else
       git_ref = sync_code_with_cloud()
     end

data/lib/mortar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.50
+  version: 0.15.51
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc