Merge branch 'subdir-cookbooks-git'

lib/chef-dk/policyfile/cookbook_locks.rb

@@ -279,14 +279,15 @@ def initialize(name, storage_config)
 
         @identifier_updated = false
         @version_updated = false
+        @cookbook_in_git_repo = nil
       end
 
       def cookbook_path
         File.expand_path(source, relative_paths_root)
       end
 
       def scm_profiler
-        if File.exist?(File.join(cookbook_path, ".git"))
+        if cookbook_in_git_repo?
           CookbookProfiler::Git.new(cookbook_path)
         else
           CookbookProfiler::NullSCM.new(cookbook_path)
@@ -373,6 +374,23 @@ def assert_required_keys_valid!(lock_data)
         end
       end
 
+      def cookbook_in_git_repo?
+        return @cookbook_in_git_repo unless @cookbook_in_git_repo.nil?
+
+        @cookbook_in_git_repo = false
+
+        dot_git = Pathname.new(".git")
+        Pathname.new(cookbook_path).ascend do |parent_dir|
+          possbile_git_dir = parent_dir + dot_git
+          if possbile_git_dir.exist?
+            @cookbook_in_git_repo = true
+            break
+          end
+        end
+
+        @cookbook_in_git_repo
+      end
+
     end
   end
 end

spec/unit/policyfile/cookbook_locks_spec.rb

@@ -244,6 +244,64 @@
 
   end
 
+  describe "selecting an SCM profiler" do
+
+    let(:cookbook_source_relpath) { "nginx" }
+
+    let(:cookbook_source_path) do
+      path = File.join(tempdir, cookbook_source_relpath)
+      FileUtils.mkdir_p(path)
+      path
+    end
+
+    before do
+      cookbook_lock.source = cookbook_source_path
+    end
+
+    after do
+      clear_tempdir
+    end
+
+    context "when the cookbook is in a git-repo" do
+
+      before do
+        FileUtils.mkdir_p(git_dir_path)
+      end
+
+      context "when the cookbook is a self-contained git repo" do
+
+        let(:git_dir_path) { File.join(cookbook_source_path, ".git") }
+
+        it "selects the git profiler" do
+          expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::Git)
+        end
+
+      end
+
+      context "when the cookbook is a subdirectory of a git repo" do
+
+        let(:cookbook_source_relpath) { "cookbook_repo/nginx" }
+
+        let(:git_dir_path) { File.join(tempdir, "cookbook_repo/.git") }
+
+        it "selects the git profiler" do
+          expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::Git)
+        end
+
+      end
+
+    end
+
+    context "when the cookbook is not in a git repo" do
+
+      it "selects the null profiler" do
+        expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::NullSCM)
+      end
+
+    end
+
+  end
+
   context "when loading data from a serialized form" do
 
     let(:previous_lock_data) do