mortar 0.15.47 → 0.15.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7a981fb03efa2e8eca07f34e215b5a46a9bf297
-  data.tar.gz: 515d42fa8b43d9033e05bbddaea2d1090a27b583
+SHA256:
+  metadata.gz: df7144cd0787fbc7bf15d5506271c61db16f9bc903094c4bfbc5176bc6f1c094
+  data.tar.gz: 11be2d17acefd3d8954551b755e06db9f0c18523a813b7d09a0a7f39b943e5db
 SHA512:
-  metadata.gz: 4940e4462c82f588dfcf1f90d4b12c7db48bdd87d1e69cda97c1ea8f28eab8b82995aef9f45a3c8f1a8b9004c176fe9717cb7e50df3f0cf10dc18043710b331e
-  data.tar.gz: 77ef37837fc0e9596fb4e73ba18b1aea3141868119a19c31dc898ec88efc2a10b8808e3b708032f43beacfefda7929e4ca5d24f5735866dedf7df0ee15c53806
+  metadata.gz: b9b279c857d9a1d150541dd3b7a0505d3a7c1d28782c318ad3810ccc376102c06fb60db5797508c64501e6b5778e53e50c660d3bce44098b5143ca0ce867beed
+  data.tar.gz: 26ccbb82a30aa177086b14567cafba034df1e3fb4664b7b783bdb456ffd79751e76d764b73a60900fafc27cdaea0216a8747f4298fd3c437dcc8757301f49f19

data/README.md

@@ -16,7 +16,7 @@ The Mortar Development Framework lets you develop Mortar Hadoop jobs directly on
 
 ## Installation
 
-    gem install mortar
+    sudo gem install mortar --bindir /usr/local/bin
 
 # Development
 
@@ -26,6 +26,10 @@ To develop on the gem, install the bundle, and then use bundle exec to run morta
     bundle install
     bundle exec mortar <command> <args>
 
+If you want to run the modified `mortar` from a different directory (e.g. from `dd-analytics`), you need to do it like this:
+
+    BUNDLE_GEMFILE="/path/to/mortar/Gemfile" bundle exec mortar
+
 # Tests
 
 You can run all the RSpec tests with rake:

data/lib/mortar/command/base.rb

@@ -596,7 +596,7 @@ protected
   end
 
   def default_git_organization
-    "mortarcode"
+    "DataDog"
   end
 
   def polling_interval

data/lib/mortar/command/spark.rb

@@ -109,10 +109,9 @@ class Mortar::Command::Spark < Mortar::Command::Base
 
     response = action("Requesting job execution") do
       cluster_id = options[:clusterid]
-      api.post_spark_job_on_jobserver(project_name, class_name, git_ref, cluster_id,
-        :script_arguments => script_arguments,
-        :clustersize => options[:clustersize]
-      ).body
+      args = { script_arguments: script_arguments }
+      args[:clustersize] = options[:clustersize] if options[:clustersize]
+      api.post_spark_job_on_jobserver(project_name, class_name, git_ref, cluster_id, **args).body
     end
     
     display("job_id: #{response['job_id']}")

data/lib/mortar/version.rb

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

data/spec/mortar/auth_spec.rb

@@ -165,12 +165,12 @@ module Mortar
 
     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
+      expect(@cli.has_credentials).to be_truthy
     end
 
     it "is false if the user is not logged in" do
      @cli.logout
-      expect(@cli.has_credentials).to be_false
+      expect(@cli.has_credentials).to be_falsy
     end
 
     it "uses path from env when specified" do

data/spec/mortar/command/generate_spec.rb

@@ -30,17 +30,17 @@ describe Mortar::Command::Generate do
   describe "generate:project" do
     it "creates new project" do
       stderr, stdout = execute("generate:project Test")
-      File.exists?("Test").should be_true
-      File.exists?("Test/macros").should be_true
-      File.exists?("Test/pigscripts").should be_true
-      File.exists?("Test/udfs").should be_true
-      File.exists?("Test/README.md").should be_true
-      File.exists?("Test/Gemfile").should be_false
-      File.exists?("Test/macros/.gitkeep").should be_true
-      File.exists?("Test/pigscripts/Test.pig").should be_true
-      File.exists?("Test/udfs/python/Test.py").should be_true
-      File.exists?("Test/luigiscripts/README").should be_true
-      File.exists?("Test/sparkscripts/README").should be_true
+      File.exists?("Test").should be_truthy
+      File.exists?("Test/macros").should be_truthy
+      File.exists?("Test/pigscripts").should be_truthy
+      File.exists?("Test/udfs").should be_truthy
+      File.exists?("Test/README.md").should be_truthy
+      File.exists?("Test/Gemfile").should be_falsy
+      File.exists?("Test/macros/.gitkeep").should be_truthy
+      File.exists?("Test/pigscripts/Test.pig").should be_truthy
+      File.exists?("Test/udfs/python/Test.py").should be_truthy
+      File.exists?("Test/luigiscripts/README").should be_truthy
+      File.exists?("Test/sparkscripts/README").should be_truthy
 
       File.read("Test/pigscripts/Test.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
     end
@@ -62,7 +62,7 @@ STDERR
       rescue => e
         e.message.should == 'Bad Copy'
       end
-      File.exists?("Test").should be_false
+      File.exists?("Test").should be_falsy
     end
 
     it 'does not remove pre-existing project directory when generate:project fails' do
@@ -75,7 +75,7 @@ STDERR
       rescue => e
         e.message.should == 'Bad Copy'
       end
-      File.exists?("Test").should be_true
+      File.exists?("Test").should be_truthy
     end
   end
 
@@ -83,7 +83,7 @@ STDERR
     it "Generate a new pigscript in a project" do
       with_blank_project do |p| 
         stderr, stdout = execute("generate:pigscript Oink", p)
-        File.exists?(File.join(p.root_path, "pigscripts/Oink.pig")).should be_true
+        File.exists?(File.join(p.root_path, "pigscripts/Oink.pig")).should be_truthy
         File.read("pigscripts/Oink.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
       end
     end
@@ -103,7 +103,7 @@ STDERR
     it "Generate a new controlscript in a project" do
       with_blank_project do |p| 
         stderr, stdout = execute("generate:controlscript Oink", p)
-        File.exists?(File.join(p.root_path, "controlscripts/Oink.py")).should be_true
+        File.exists?(File.join(p.root_path, "controlscripts/Oink.py")).should be_truthy
         File.read("controlscripts/Oink.py").each_line { |line| line.match(/<%.*%>/).should be_nil }
       end
     end
@@ -123,7 +123,7 @@ STDERR
     it "Generate a new python udf in a project" do
       with_blank_project do |p| 
         stderr, stdout = execute("generate:python_udf slither", p)
-        File.exists?(File.join(p.root_path, "udfs/python/slither.py")).should be_true
+        File.exists?(File.join(p.root_path, "udfs/python/slither.py")).should be_truthy
         File.read("udfs/python/slither.py").each_line { |line| line.match(/<%.*%>/).should be_nil }
       end
     end
@@ -143,7 +143,7 @@ STDERR
     it "Generate a new macro in a project" do
       with_blank_project do |p| 
         stderr, stdout = execute("generate:macro big_mac", p)
-        File.exists?(File.join(p.root_path, "macros/big_mac.pig")).should be_true
+        File.exists?(File.join(p.root_path, "macros/big_mac.pig")).should be_truthy
         File.read("macros/big_mac.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
       end
     end

data/spec/mortar/command/local_spec.rb

@@ -152,10 +152,10 @@ PARAMS
         end
         stderr, stdout = execute("generate:project Test")
         stderr, stdout = execute("local:characterize -f test.params --project_root Test")
-        File.exists?("Test/pigscripts/characterize.pig").should be_false
-        File.exists?("Test/macros/characterize_macro.pig").should be_false
-        File.exists?("Test/udfs/jython/top_5_tuple.py").should be_false
-        File.exists?("Test/controlscripts/lib/characterize_control.py").should be_false
+        File.exists?("Test/pigscripts/characterize.pig").should be_falsy
+        File.exists?("Test/macros/characterize_macro.pig").should be_falsy
+        File.exists?("Test/udfs/jython/top_5_tuple.py").should be_falsy
+        File.exists?("Test/controlscripts/lib/characterize_control.py").should be_falsy
         File.delete("test.params")
       end
 

data/spec/mortar/command/projects_spec.rb

@@ -139,25 +139,25 @@ STDOUT
         mock(@git).push_master
 
         stderr, stdout = execute("projects:create #{project_name}", nil, @git)
-        Dir.pwd.end_with?("some_new_project").should be_true
-        File.exists?("macros").should be_true
-        File.exists?("pigscripts").should be_true
-        File.exists?("udfs").should be_true
-        File.exists?("project.properties").should be_true
-        File.exists?("project.manifest").should be_true
-        File.exists?("requirements.txt").should be_true
-        File.exists?("README.md").should be_true
-        File.exists?("Gemfile").should be_false
-        File.exists?("macros/.gitkeep").should be_true
-        File.exists?("pigscripts/some_new_project.pig").should be_true
-        File.exists?("udfs/python/some_new_project.py").should be_true
-        File.exists?("luigiscripts/README").should be_true
-        File.exists?("luigiscripts/some_new_project_luigi.py").should be_true
-        File.exists?("luigiscripts/client.cfg.template").should be_true
-        File.exists?("sparkscripts/README").should be_true
-        File.exists?("sparkscripts/some_new_project_pi.py").should be_true
-        File.exists?("lib/README").should be_true
-        File.exists?("params/README").should be_true
+        Dir.pwd.end_with?("some_new_project").should be_truthy
+        File.exists?("macros").should be_truthy
+        File.exists?("pigscripts").should be_truthy
+        File.exists?("udfs").should be_truthy
+        File.exists?("project.properties").should be_truthy
+        File.exists?("project.manifest").should be_truthy
+        File.exists?("requirements.txt").should be_truthy
+        File.exists?("README.md").should be_truthy
+        File.exists?("Gemfile").should be_falsy
+        File.exists?("macros/.gitkeep").should be_truthy
+        File.exists?("pigscripts/some_new_project.pig").should be_truthy
+        File.exists?("udfs/python/some_new_project.py").should be_truthy
+        File.exists?("luigiscripts/README").should be_truthy
+        File.exists?("luigiscripts/some_new_project_luigi.py").should be_truthy
+        File.exists?("luigiscripts/client.cfg.template").should be_truthy
+        File.exists?("sparkscripts/README").should be_truthy
+        File.exists?("sparkscripts/some_new_project_pi.py").should be_truthy
+        File.exists?("lib/README").should be_truthy
+        File.exists?("params/README").should be_truthy
 
         File.read("pigscripts/some_new_project.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
         File.read("luigiscripts/some_new_project_luigi.py").each_line { |line| line.match(/<%.*%>/).should be_nil }
@@ -225,16 +225,16 @@ STDOUT
         mock(@git).sync_embedded_project.with_any_args.times(1) { true }
 
         stderr, stdout = execute("projects:create #{project_name} --embedded", nil, @git)
-        Dir.pwd.end_with?("some_new_project").should be_true
-        File.exists?(".mortar-project-remote").should be_true
-        File.exists?("macros").should be_true
-        File.exists?("pigscripts").should be_true
-        File.exists?("udfs").should be_true
-        File.exists?("README.md").should be_true
-        File.exists?("Gemfile").should be_false
-        File.exists?("macros/.gitkeep").should be_true
-        File.exists?("pigscripts/some_new_project.pig").should be_true
-        File.exists?("udfs/python/some_new_project.py").should be_true
+        Dir.pwd.end_with?("some_new_project").should be_truthy
+        File.exists?(".mortar-project-remote").should be_truthy
+        File.exists?("macros").should be_truthy
+        File.exists?("pigscripts").should be_truthy
+        File.exists?("udfs").should be_truthy
+        File.exists?("README.md").should be_truthy
+        File.exists?("Gemfile").should be_falsy
+        File.exists?("macros/.gitkeep").should be_truthy
+        File.exists?("pigscripts/some_new_project.pig").should be_truthy
+        File.exists?("udfs/python/some_new_project.py").should be_truthy
 
         File.read("pigscripts/some_new_project.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
       end

data/spec/mortar/git_spec.rb

@@ -29,36 +29,36 @@ module Mortar
     context "has_git?" do
       it "returns false with no git installed" do
         mock(@git).run_cmd("git --version").returns(["-bash: git: command not found",-1])
-        @git.has_git?.should be_false
+        @git.has_git?.should be_falsy
       end
 
       it "returns false with unsupported git version" do
         mock(@git).run_cmd("git --version").returns(["git version 1.7.6",0])
-        @git.has_git?.should be_false
+        @git.has_git?.should be_falsy
       end
 
       it "returns true with supported git version 2.0.0" do
         mock(@git).run_cmd("git --version").returns(["git version 2.0.0", 0])
-        @git.has_git?.should be_true
+        @git.has_git?.should be_truthy
       end
 
       it "returns true with supported git version 1.8.0" do
         mock(@git).run_cmd("git --version").returns(["git version 1.8.0", 0])
-        @git.has_git?.should be_true 
+        @git.has_git?.should be_truthy 
       end
 
       it "returns false with unsupported git version" do
-        @git.has_git?.should be_true
+        @git.has_git?.should be_truthy
       end
 
       it "returns true with supported version with params" do
         mock(@git).run_cmd("git --version").returns(["git version 1.8.0", 0])
-        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_true
+        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_truthy
       end
 
       it "returns false with unsupported version with params" do
         mock(@git).run_cmd("git --version").returns(["git version 1.7.12", 0])
-        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_false
+        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_falsy
       end
 
     end
@@ -67,13 +67,13 @@ module Mortar
       
       it "finds no commits on a blank project" do
         with_blank_project do |p|
-          @git.has_commits?.should be_false
+          @git.has_commits?.should be_falsy
         end
       end
       
       it "finds commits when a project has them" do
         with_git_initialized_project do |p|
-          @git.has_commits?.should be_true
+          @git.has_commits?.should be_truthy
         end
       end
     end
@@ -81,7 +81,7 @@ module Mortar
     context "git-rev" do
       it "looks up a revision" do
         with_git_initialized_project do |p|
-          @git.git_ref("master").nil?.should be_false
+          @git.git_ref("master").nil?.should be_falsy
         end
       end
     end
@@ -117,9 +117,9 @@ module Mortar
     context "working directory" do
       it "finds clean and dirty working directories" do
         with_git_initialized_project do |p|
-          @git.is_clean_working_directory?.should be_true
+          @git.is_clean_working_directory?.should be_truthy
           write_file(File.join(p.root_path, "new_file.txt"))
-          @git.is_clean_working_directory?.should be_false
+          @git.is_clean_working_directory?.should be_falsy
         end
       end
     end
@@ -131,9 +131,9 @@ module Mortar
           write_file(File.join(p.root_path, "tmp", "ignored_file.txt"), "some text")
           write_file(File.join(p.root_path, "included_file.txt"), "some text")
           untracked_files = @git.untracked_files
-          untracked_files.include?(".gitignore").should be_true
-          untracked_files.include?("included_file.txt").should be_true
-          untracked_files.include?("tmp/ignored_file.txt").should be_false
+          untracked_files.include?(".gitignore").should be_truthy
+          untracked_files.include?("included_file.txt").should be_truthy
+          untracked_files.include?("tmp/ignored_file.txt").should be_falsy
         end
       end
     end
@@ -160,7 +160,7 @@ MANIFEST0
           write_file(manifest_path, manifest_without_gitignore)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?(".gitignore").should be_false
+          project_manifest_before.include?(".gitignore").should be_falsy
 
           @git.ensure_gitignore_in_project_manifest()
 
@@ -198,7 +198,7 @@ MANIFEST1
           write_file(manifest_path, manifest_without_gitignore)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?(".gitignore").should be_false
+          project_manifest_before.include?(".gitignore").should be_falsy
 
           @git.ensure_gitignore_in_project_manifest()
 
@@ -233,7 +233,7 @@ MANIFEST0
           write_file(manifest_path, manifest_without_luigiscripts)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?("luigiscripts").should be_false
+          project_manifest_before.include?("luigiscripts").should be_falsy
 
           @git.ensure_luigiscripts_in_project_manifest()
 
@@ -267,7 +267,7 @@ MANIFEST1
           write_file(manifest_path, manifest_without_luigiscripts)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?("luigiscripts").should be_false
+          project_manifest_before.include?("luigiscripts").should be_falsy
 
           @git.ensure_luigiscripts_in_project_manifest()
 
@@ -300,7 +300,7 @@ MANIFEST0
           write_file(manifest_path, manifest_without_sparkscripts)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?("sparkscripts").should be_false
+          project_manifest_before.include?("sparkscripts").should be_falsy
 
           @git.ensure_sparkscripts_in_project_manifest()
 
@@ -334,7 +334,7 @@ MANIFEST1
           write_file(manifest_path, manifest_without_sparkscripts)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?("sparkscripts").should be_false
+          project_manifest_before.include?("sparkscripts").should be_falsy
 
           @git.ensure_sparkscripts_in_project_manifest()
 
@@ -369,7 +369,7 @@ MANIFEST2
           write_file(manifest_path, manifest_without_luigiscripts)
 
           project_manifest_before = File.open(manifest_path, "r").read
-          project_manifest_before.include?("luigiscripts").should be_false
+          project_manifest_before.include?("luigiscripts").should be_falsy
 
           @git.ensure_luigiscripts_in_project_manifest()
 
@@ -389,7 +389,7 @@ MANIFEST2AFTER
       context "did_stash_changes" do
         it "finds that no changes were stashed" do
           with_git_initialized_project do |p|
-            @git.did_stash_changes?("No local changes to save").should be_false
+            @git.did_stash_changes?("No local changes to save").should be_falsy
           end
         end
         
@@ -398,36 +398,36 @@ MANIFEST2AFTER
 Saved working directory and index state On master: myproject
 HEAD is now at f3d74e8 Add an example
 STASH
-          @git.did_stash_changes?(stash_message).should be_true
+          @git.did_stash_changes?(stash_message).should be_truthy
         end
       end
       
       context "stash_working_dir" do
         it "does not error on a clean working directory" do
           with_git_initialized_project do |p|
-            @git.stash_working_dir("my_description").should be_false
+            @git.stash_working_dir("my_description").should be_falsy
           end
         end
         
         it "stashes an added file" do
           with_git_initialized_project do |p|
             git_add_file(@git, p)
-            @git.is_clean_working_directory?.should be_false
+            @git.is_clean_working_directory?.should be_falsy
             
             # stash
-            @git.stash_working_dir("my_description").should be_true
-            @git.is_clean_working_directory?.should be_true
+            @git.stash_working_dir("my_description").should be_truthy
+            @git.is_clean_working_directory?.should be_truthy
           end
         end
         
         it "stashes an untracked file" do
           with_git_initialized_project do |p|
             git_create_untracked_file(p)
-            @git.is_clean_working_directory?.should be_false
+            @git.is_clean_working_directory?.should be_falsy
             
             # stash
-            @git.stash_working_dir("my_description").should be_true
-            @git.is_clean_working_directory?.should be_true
+            @git.stash_working_dir("my_description").should be_truthy
+            @git.is_clean_working_directory?.should be_truthy
           end
         end
       end
@@ -460,10 +460,10 @@ STASH
           new_branch_name = "new_branch_to_delete"
           @git.current_branch.should == "master"
           @git.git("checkout -b #{new_branch_name}")
-          @git.branches.include?(new_branch_name).should be_true
+          @git.branches.include?(new_branch_name).should be_truthy
           @git.git("checkout master")
           @git.branch_delete(new_branch_name)
-          @git.branches.include?(new_branch_name).should be_false
+          @git.branches.include?(new_branch_name).should be_falsy
           @git.current_branch.should == "master"
         end
       end
@@ -473,7 +473,7 @@ STASH
       it "handles when no remotes are defined" do
         with_git_initialized_project do |p|
           @git.git("remote rm mortar")
-          @git.remotes("mortarcode").empty?.should be_true
+          @git.remotes("mortarcode").empty?.should be_truthy
         end
       end
       
@@ -504,17 +504,17 @@ STASH
       it "detects conflicts" do
         with_git_initialized_project do |p|
           
-          @git.is_clean_working_directory?.should be_true
-          @git.has_conflicts?.should be_false
+          @git.is_clean_working_directory?.should be_truthy
+          @git.has_conflicts?.should be_falsy
           git_create_conflict(@git, p)
-          @git.is_clean_working_directory?.should be_false
-          @git.has_conflicts?.should be_true
+          @git.is_clean_working_directory?.should be_falsy
+          @git.has_conflicts?.should be_truthy
         end
       end
       
       it "detects no conflicts" do
         with_git_initialized_project do |p|
-          @git.has_conflicts?.should be_false
+          @git.has_conflicts?.should be_falsy
         end
       end
     end
@@ -594,7 +594,7 @@ STASH
           
           @git.sync_embedded_project(p, "master", "mortarcode-dev")
 
-          File.directory?(mirror_dir).should be_true
+          File.directory?(mirror_dir).should be_truthy
           FileUtils.rm_rf(mirror_dir)
         end
       end
@@ -622,7 +622,7 @@ STASH
           
           @git.sync_embedded_project(p, "master", "mortarcode-dev")
 
-          File.directory?(mirror_dir).should be_true
+          File.directory?(mirror_dir).should be_truthy
           FileUtils.rm_rf(mirror_dir)
         end
       end
@@ -649,7 +649,7 @@ STASH
           
           @git.sync_embedded_project(p, "master", "mortarcode-dev")
 
-          File.directory?(mirror_dir).should be_true
+          File.directory?(mirror_dir).should be_truthy
           FileUtils.rm_rf(mirror_dir)
         end
       end
@@ -677,7 +677,7 @@ STASH
 
           @git.sync_embedded_project(p, "bob-the-builder-base", "mortarcode-dev")
 
-          File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_true
+          File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_truthy
           FileUtils.rm_rf(mirror_dir)
         end
       end
@@ -706,7 +706,7 @@ STASH
 
           @git.sync_embedded_project(p, "bob-the-builder-base", "mortarcode-dev")
 
-          File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_false
+          File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_falsy
           FileUtils.rm_rf(mirror_dir)
         end
       end
@@ -715,7 +715,7 @@ STASH
     context "checking updates for forked projects" do
       it "skips non forked projects" do
         with_git_initialized_project do |p|
-          @git.is_fork_repo_updated("mortarcode-dev").should be_false
+          @git.is_fork_repo_updated("mortarcode-dev").should be_falsy
         end
       end
 
@@ -725,12 +725,12 @@ STASH
           new_commit_hash = "ANewCommitHash"
           mock(@git).get_latest_hash(@git.fork_base_remote_name) {new_commit_hash}
           
-          @git.is_fork_repo_updated("mortarcode-dev").should be_true
-          File.exists?(@git.mortar_fork_meta_file).should be_true
+          @git.is_fork_repo_updated("mortarcode-dev").should be_truthy
+          File.exists?(@git.mortar_fork_meta_file).should be_truthy
           File.open(@git.mortar_fork_meta_file, "r") do |f|
             file_contents = f.read()
             file_contents.strip
-            file_contents.eql?(new_commit_hash).should be_true
+            file_contents.eql?(new_commit_hash).should be_truthy
           end
         end
       end
@@ -743,9 +743,9 @@ STASH
           File.open(@git.mortar_fork_meta_file, "wb") do |f|
             f.write(new_commit_hash)
           end
-          File.exists?(@git.mortar_fork_meta_file).should be_true
+          File.exists?(@git.mortar_fork_meta_file).should be_truthy
           
-          @git.is_fork_repo_updated("mortarcode-dev").should be_false
+          @git.is_fork_repo_updated("mortarcode-dev").should be_falsy
         end
       end
 
@@ -755,7 +755,7 @@ STASH
           current_latest_hash = @git.get_latest_hash("")
           mock(@git).get_latest_hash(@git.fork_base_remote_name) {current_latest_hash}
           
-          @git.is_fork_repo_updated("mortarcode-dev").should be_false
+          @git.is_fork_repo_updated("mortarcode-dev").should be_falsy
         end
       end
     end 
@@ -788,15 +788,15 @@ STASH
         new_tmp_dir = @git.safe_copy(pathlist)
 
         Dir.chdir(new_tmp_dir)
-        File.exists?(root_file).should be_true
-        File.exists?(root_dir_file).should be_true
-        File.exists?(non_root_dir_file).should be_true
-        File.exists?(dir_file).should be_true
+        File.exists?(root_file).should be_truthy
+        File.exists?(root_dir_file).should be_truthy
+        File.exists?(non_root_dir_file).should be_truthy
+        File.exists?(dir_file).should be_truthy
 
-        File.exists?(ex_root_file).should be_false
-        File.exists?(ex_root_dir_file).should be_false
-        File.exists?(ex_dir_file).should be_false
-        File.exists?(ex_non_root_dir_file).should be_false
+        File.exists?(ex_root_file).should be_falsy
+        File.exists?(ex_root_dir_file).should be_falsy
+        File.exists?(ex_dir_file).should be_falsy
+        File.exists?(ex_non_root_dir_file).should be_falsy
       end
     end
 
@@ -807,9 +807,9 @@ STASH
     context "clone" do
       it "clones repo successfully" do
         with_no_git_directory do
-          File.directory?("rollup").should be_false
+          File.directory?("rollup").should be_falsy
           @git.clone("git@github.com:mortarcode-dev/4fbbd83cce875be8a4000000_rollup", "rollup")
-          File.directory?("rollup").should be_true
+          File.directory?("rollup").should be_truthy
           Dir.chdir("rollup")
           lambda { @git.git("--version") }.should_not raise_error
         end

data/spec/mortar/helpers_spec.rb

@@ -73,7 +73,7 @@ OUT
         filepath = File.join(Dir.tmpdir, "my_new_dir", "my_new_file.txt")
         data = "foo\nbar"
         write_to_file(data, filepath)
-        File.exists?(filepath).should be_true
+        File.exists?(filepath).should be_truthy
         infile = File.open(filepath, "r")
         infile.read.should == data
         infile.close()
@@ -85,9 +85,9 @@ OUT
       it "does not have an existing directory" do
         FakeFS do
           dir_name = "./foo-bar-dir"
-          expect(File.directory?(dir_name)).to be_false
+          expect(File.directory?(dir_name)).to be_falsy
           ensure_dir_exists(dir_name)
-          expect(File.directory?(dir_name)).to be_true
+          expect(File.directory?(dir_name)).to be_truthy
         end
       end
 
@@ -95,9 +95,9 @@ OUT
         FakeFS do
           dir_name = "./foo-bar-dir"
           FileUtils.mkdir_p(dir_name)
-          expect(File.directory?(dir_name)).to be_true
+          expect(File.directory?(dir_name)).to be_truthy
           ensure_dir_exists(dir_name)
-          expect(File.directory?(dir_name)).to be_true
+          expect(File.directory?(dir_name)).to be_truthy
         end
       end
 

data/spec/mortar/local/installutil_spec.rb

@@ -99,7 +99,7 @@ module Mortar::Local
         FakeFS do
           FileUtils.mkdir_p(File.dirname(install_file_path))
           @installutil.note_install("foo")
-          expect(File.exists?(install_file_path)).to be_true
+          expect(File.exists?(install_file_path)).to be_truthy
         end
       end
 
@@ -110,19 +110,19 @@ module Mortar::Local
       it "is if remote file is newer" do
         stub(@installutil).install_date.returns(1)
         stub(@installutil).url_date.returns(2)
-        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_true
+        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_truthy
       end
 
       it "is if remote file last-modfied is unavailable" do
         stub(@installutil).install_date.returns(1)
         stub(@installutil).url_date.returns(nil)
-        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_false
+        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_falsy
       end
 
       it "is not if remote file is older" do
         stub(@installutil).install_date.returns(2)
         stub(@installutil).url_date.returns(1)
-        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_false
+        expect(@installutil.is_newer_version('foo', 'http://bar')).to be_falsy
       end
 
       it "if no version is present" do
@@ -130,7 +130,7 @@ module Mortar::Local
         stub(@installutil).url_date.returns(1)
         FakeFS do
           FileUtils.rm_rf(File.dirname(install_file_path), :force => true)
-          expect(@installutil.is_newer_version('foo', 'http://bar')).to be_true
+          expect(@installutil.is_newer_version('foo', 'http://bar')).to be_truthy
         end
       end
 
@@ -180,7 +180,7 @@ module Mortar::Local
         FakeFS do
           FileUtils.mkdir_p(local_install_directory)
           @installutil.download_file('http://foo/bar', expected_file_path)
-          expect(File.exists?(expected_file_path)).to be_true
+          expect(File.exists?(expected_file_path)).to be_truthy
         end
       end
 

data/spec/mortar/local/jython_spec.rb

@@ -32,9 +32,9 @@ module Mortar::Local
         mock(jython).install
         FakeFS do
           FileUtils.mkdir_p(install_dir)
-          expect(File.directory?(install_dir)).to be_true
+          expect(File.directory?(install_dir)).to be_truthy
           jython.update
-          expect(File.directory?(install_dir)).to be_false
+          expect(File.directory?(install_dir)).to be_falsy
         end
       end
 
@@ -48,7 +48,7 @@ module Mortar::Local
         mock(jython).jython_directory.returns(install_dir)
         FakeFS do
           FileUtils.mkdir_p(install_dir)
-          expect(jython.should_install).to be_false
+          expect(jython.should_install).to be_falsy
         end
       end
 
@@ -58,7 +58,7 @@ module Mortar::Local
         mock(jython).jython_directory.returns(install_dir)
         FakeFS do
           FileUtils.rm_rf(install_dir, :force => true)
-          expect(jython.should_install).to be_true
+          expect(jython.should_install).to be_truthy
         end
       end
 

data/spec/mortar/local/pig_spec.rb

@@ -51,7 +51,7 @@ module Mortar::Local
           ensure
             $stdout = previous_stdout
           end
-          expect(File.exists?(local_pig_archive)).to be_false
+          expect(File.exists?(local_pig_archive)).to be_falsy
         end
       end
 
@@ -71,8 +71,8 @@ module Mortar::Local
           FileUtils.mkdir_p(File.dirname(pig.local_install_directory))
           FileUtils.rm_rf(pig.local_install_directory, :force => true)
           pig.install_or_update(pig012Hadoop2)
-          expect(File.exists?(pig.pig_directory(pig012Hadoop2))).to be_false
-          expect(File.exists?(pig.lib_directory)).to be_false
+          expect(File.exists?(pig.pig_directory(pig012Hadoop2))).to be_falsy
+          expect(File.exists?(pig.lib_directory)).to be_falsy
 
         end
       end
@@ -156,7 +156,7 @@ module Mortar::Local
           ensure
             $stdout = previous_stdout
           end
-          expect(File.exists?(output_path)).to be_true
+          expect(File.exists?(output_path)).to be_truthy
         end
       end
 
@@ -251,9 +251,9 @@ module Mortar::Local
         FakeFS do
           FileUtils.mkdir_p(pig.local_log_dir)
           FileUtils.touch(marker_file)
-          expect(File.exists?(marker_file)).to be_true
+          expect(File.exists?(marker_file)).to be_truthy
           pig.reset_local_logs
-          expect(File.exists?(marker_file)).to be_false
+          expect(File.exists?(marker_file)).to be_falsy
         end
 
       end
@@ -263,13 +263,13 @@ module Mortar::Local
       it "Uses default pig" do
         pig = Mortar::Local::Pig.new
         tpc = pig.template_params_classpath
-        expect(tpc.include?("pig-0.12")).to be_true
+        expect(tpc.include?("pig-0.12")).to be_truthy
       end
 
       it "Works with 0.12-Hadoop-2.7.3 pig" do
         pig = Mortar::Local::Pig.new
         tpc = pig.template_params_classpath(Mortar::PigVersion::Pig012Hadoop273.new)
-        expect(tpc.include?("pig-0.12")).to be_true
+        expect(tpc.include?("pig-0.12")).to be_truthy
       end
     end
 

data/spec/mortar/local/python_spec.rb

@@ -104,7 +104,7 @@ module Mortar::Local
             python.install_python_dependencies
           end
           dir_to_be_created = "#{python.local_install_directory}/#{python.mortar_packages_dir}"
-          expect(File.exists?(dir_to_be_created)).to be_true
+          expect(File.exists?(dir_to_be_created)).to be_truthy
         end
       end
 
@@ -123,7 +123,7 @@ module Mortar::Local
           FileUtils.mkdir_p "#{python.local_install_directory}/#{python.mortar_packages_dir}"
           python.install_mortar_python_package "pip"
           dir_to_be_created = "#{python.local_install_directory}/#{python.mortar_packages_dir}/pip"
-          expect(File.exists?(dir_to_be_created)).to be_true
+          expect(File.exists?(dir_to_be_created)).to be_truthy
         end
       end
 

data/spec/mortar/plugin_spec.rb

@@ -52,7 +52,7 @@ MESSAGE
         FileUtils.mkdir_p(plugin_folder)
         `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
         Plugin.new(plugin_folder).install
-        File.directory?("#{@sandbox}/mortar_plugin").should be_true
+        File.directory?("#{@sandbox}/mortar_plugin").should be_truthy
         File.read("#{@sandbox}/mortar_plugin/README").should == "test\n"
       end
 
@@ -63,7 +63,7 @@ MESSAGE
         `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
         Plugin.new(plugin_folder).install
         Plugin.new(plugin_folder).install
-        File.directory?("#{@sandbox}/mortar_plugin").should be_true
+        File.directory?("#{@sandbox}/mortar_plugin").should be_truthy
         File.read("#{@sandbox}/mortar_plugin/README").should == "test\n"
       end
 
@@ -79,7 +79,7 @@ MESSAGE
 
         it "updates existing copies" do
           Plugin.new('mortar_plugin').update
-          File.directory?("#{@sandbox}/mortar_plugin").should be_true
+          File.directory?("#{@sandbox}/mortar_plugin").should be_truthy
           File.read("#{@sandbox}/mortar_plugin/README").should == "updated\n"
         end
 
@@ -108,7 +108,7 @@ MESSAGE
         FileUtils.mkdir_p(@sandbox + '/plugin')
         File.open(@sandbox + '/plugin/init.rb', 'w') { |f| f.write "LoadedInit = true" }
         Plugin.load!
-        LoadedInit.should be_true
+        LoadedInit.should be_truthy
       end
 
       describe "installing plugins with dependencies", :broken => true do
@@ -130,13 +130,13 @@ EOS
           }
           `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
           Plugin.new(plugin_folder).install
-          File.directory?("#{@sandbox}/mortar_plugin").should be_true
-          File.directory?("#{@sandbox}/mortar_plugin/bundle").should be_true
-          File.exist?("#{@sandbox}/mortar_plugin/Gemfile").should be_true
+          File.directory?("#{@sandbox}/mortar_plugin").should be_truthy
+          File.directory?("#{@sandbox}/mortar_plugin/bundle").should be_truthy
+          File.exist?("#{@sandbox}/mortar_plugin/Gemfile").should be_truthy
           File.read("#{@sandbox}/mortar_plugin/README").should == "test\n"
 
           Plugin.load!
-          PluginTest.should be_true
+          PluginTest.should be_truthy
         end
 
         it "should fail to install plugin with bad dependencies" do
@@ -154,7 +154,7 @@ EOS
           File.open(plugin_folder + '/Gemfile', 'w') { |f| f.write "non_existent_command" }
           `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
           lambda { Plugin.new(plugin_folder).install }.should raise_error Mortar::Plugin::ErrorInstallingDependencies 
-          File.exists?("#{Plugin.directory}/plugin_install.log").should be_true
+          File.exists?("#{Plugin.directory}/plugin_install.log").should be_truthy
         end
 
         it "should clean plugin if bundler isn't installed" do
@@ -165,7 +165,7 @@ EOS
           File.open(plugin_folder + '/Gemfile', 'w') { |f| f.write "# dummy content" }
           `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
           lambda { Plugin.new(plugin_folder).install }.should raise_error BundlerNotInstalledError 
-          File.exist?("#{@sandbox}/mortar_plugin").should be_false
+          File.exist?("#{@sandbox}/mortar_plugin").should be_falsy
         end
       end
 
@@ -195,7 +195,7 @@ EOS
             Plugin.load!
           end
           stderr.should include('some_non_existant_file (LoadError)')
-          LoadedPlugin2.should be_true
+          LoadedPlugin2.should be_truthy
         end
       end
     end

data/spec/mortar/project_spec.rb

@@ -24,7 +24,7 @@ module Mortar
         with_blank_project do |p|
           # create it
           tmp_path_0 = p.tmp_path
-          File.directory?(tmp_path_0).should be_true
+          File.directory?(tmp_path_0).should be_truthy
           
           # reuse it
           p.tmp_path.should == tmp_path_0
@@ -54,7 +54,7 @@ module Mortar
       
       it "finds no pigscripts in an empty dir" do
         with_blank_project do |p|
-          p.pigscripts.none?.should be_true
+          p.pigscripts.none?.should be_truthy
         end
       end
       
@@ -65,7 +65,7 @@ module Mortar
           p.pigscripts.my_script.name.should == "my_script"
           p.pigscripts.my_script.path.should == pigscript_path
           p.pigscripts.my_script.executable_path.end_with?("pigscripts/my_script.pig")
-          p.pigscripts.my_script.rel_path.end_with?('pigscripts').should be_true 
+          p.pigscripts.my_script.rel_path.end_with?('pigscripts').should be_truthy 
         end
       end
 
@@ -75,7 +75,7 @@ module Mortar
           write_file pigscript_path
           p.pigscripts.my_script.name.should == "my_script"
           p.pigscripts.my_script.path.should == pigscript_path
-          p.pigscripts.my_script.rel_path.end_with?("pigscripts/subdir").should be_true
+          p.pigscripts.my_script.rel_path.end_with?("pigscripts/subdir").should be_truthy
         end
       end
 

data/spec/spec_helper.rb

@@ -346,16 +346,16 @@ def create_and_validate_git_snapshot(git)
   snapshot_branch.should_not == "master"
   git.current_branch.should == "master"
   git.status.should == initial_status
-  git.has_conflicts?.should be_false
+  git.has_conflicts?.should be_falsy
 
   # ensure snapshot is in a temp directory
-  File.exists?(snapshot_dir).should be_true
+  File.exists?(snapshot_dir).should be_truthy
 
   curdir = Dir.pwd
   Dir.chdir(snapshot_dir)
   
   # ensure the snapshot branch exists
-  git.git("branch").include?(snapshot_branch).should be_true
+  git.git("branch").include?(snapshot_branch).should be_truthy
 
   snapshotted_paths = Dir.glob("**/*")
   snapshotted_paths.should include("pigscripts")
@@ -393,7 +393,7 @@ end
 
 RSpec.configure do |config|
   config.mock_with :rr
-  config.color_enabled = true
+  config.color = true
   config.filter_run_excluding :broken => true
   config.include DisplayMessageMatcher
   config.before { Mortar::Helpers.error_with_failure = false }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.47
+  version: 0.15.48
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 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
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mortar-api-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.16
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -70,126 +70,126 @@ dependencies:
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.28'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
   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: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Client library and command-line tool to interact with the Mortar service.
@@ -352,17 +352,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to interact with the Mortar service.