mortar 0.15.30 → 0.15.31

data/lib/mortar/git.rb

@@ -203,6 +203,7 @@ module Mortar
       def ensure_valid_mortar_project_manifest()
         if File.exists? project_manifest_name
           ensure_luigiscripts_in_project_manifest()
+          ensure_gitignore_in_project_manifest()
           add_newline_to_file(project_manifest_name)
         else
           create_mortar_project_manifest('.')
@@ -221,6 +222,17 @@ module Mortar
         end
       end
 
+      # Ensure that the .gitignore file is included
+      # in every project manifest to prevent syncing
+      # ignored files.
+      #
+      def ensure_gitignore_in_project_manifest
+        gitignore_path = ".gitignore"
+        if File.exists? gitignore_path
+          add_entry_to_mortar_project_manifest(project_manifest_name, gitignore_path)
+        end
+      end
+
       #
       # Create a project manifest file
       #
@@ -237,6 +249,11 @@ module Mortar
           if File.directory? "#{path}/luigiscripts"
             manifest.puts "luigiscripts"
           end
+
+          if File.exists? "#{path}/.gitignore"
+            manifest.puts ".gitignore"
+          end
+
         end
       end
     

data/lib/mortar/templates/project/project.manifest

@@ -10,4 +10,5 @@ lib
 luigiscripts
 macros
 pigscripts
-udfs
+udfs
+.gitignore

data/lib/mortar/version.rb

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

data/spec/mortar/git_spec.rb

@@ -139,6 +139,77 @@ module Mortar
     end
     
     context "project manifest" do
+      it "adds .gitignore if the file exists and manifest does not have it" do
+        with_git_initialized_project do |p|
+          # ensure gitignore exists
+          gitignore_path = File.join(p.root_path, ".gitignore")
+          unless File.exists? gitignore_path
+            write_file(gitignore_path, "luigiscripts/client.cfg\n")
+          end
+
+          # remove it from manifest
+          manifest_without_gitignore = <<-MANIFEST0
+lib
+macros
+pigscripts
+udfs
+luigiscripts
+MANIFEST0
+          manifest_path = File.join(p.root_path, "project.manifest")
+          write_file(manifest_path, manifest_without_gitignore)
+
+          project_manifest_before = File.open(manifest_path, "r").read
+          project_manifest_before.include?(".gitignore").should be_false
+
+          @git.ensure_gitignore_in_project_manifest()
+
+          project_manifest_after = File.open(manifest_path, "r").read
+          project_manifest_after.should == <<-MANIFEST0AFTER
+lib
+macros
+pigscripts
+udfs
+luigiscripts
+.gitignore
+MANIFEST0AFTER
+        end
+      end
+
+      it "does not add .gitignore if the file does not exist" do
+        with_git_initialized_project do |p|
+          # ensure gitignore path does not exist
+          gitignore_path = File.join(p.root_path, ".gitignore")
+          if File.exists? gitignore_path
+            FileUtils.rm_rf(gitignore_path)
+          end
+
+          # remove it from manifest
+          manifest_without_gitignore = <<-MANIFEST1
+lib
+macros
+pigscripts
+udfs
+luigiscripts
+MANIFEST1
+          manifest_path = File.join(p.root_path, "project.manifest")
+          write_file(manifest_path, manifest_without_gitignore)
+
+          project_manifest_before = File.open(manifest_path, "r").read
+          project_manifest_before.include?(".gitignore").should be_false
+
+          @git.ensure_gitignore_in_project_manifest()
+
+          project_manifest_after = File.open(manifest_path, "r").read
+          project_manifest_after.should == <<-MANIFEST1AFTER
+lib
+macros
+pigscripts
+udfs
+luigiscripts
+MANIFEST1AFTER
+        end
+      end
+
       it "adds luigiscripts if the directory exists and manifest does not have it" do
         with_git_initialized_project do |p|
           # ensure luigiscripts path exists

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 15
-  - 30
-  version: 0.15.30
+  - 31
+  version: 0.15.31
 platform: ruby
 authors: 
 - Mortar Data