bosh-workspace 0.9.0.rc4 → 0.9.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a974316196c63756eb13d118715adee4cb23a54
-  data.tar.gz: f683bafb845d0d1f6fe837f0c99d3d9508c9d445
+  metadata.gz: 3c7b969ed0420ed359c4b818cc406ba9da51da12
+  data.tar.gz: e18975e40f8822effa0e4a38116779dd38831d3a
 SHA512:
-  metadata.gz: 94646d03fe1942ca890a41f1e43487d6f7fedcecb6fb16605f48d6fd34abbc78d3771bf6d5cc9750066ca5a4cbd6804d25d9bb736a7b7e4d111a47c7a2168df9
-  data.tar.gz: d88d409fdc34da7cc2b8bcf3112f89fd9e0a7871512e33a7f6f8f85f512b678a263dcd51051032bc2bdac9c437b835483d54fae58d3c703c942bc5ab8eeb2c6d
+  metadata.gz: 3a962465f8afd6ec0d9165db2e6b2907208709b014ddd21051e82f62c3084ec0e963b5696ca56d343578521c82aa41873abf08daaf8af621174111178ae7faca
+  data.tar.gz: d0564bb1504d5492a362a1cf548aa746afa80db5d4ee2080edef5d8db47bb84b5299a3749e3520e8868f3334b58120c8c21b0858e8d638b61ce131cbde505cad

data/lib/bosh/cli/commands/deployment_patch.rb

@@ -3,7 +3,7 @@ require "bosh/workspace"
 module Bosh::Cli::Command
   class DeploymentPatch < Base
     include Bosh::Workspace::ProjectDeploymentHelper
-    include Bosh::Workspace::GitCredenialsHelper
+    include Bosh::Workspace::GitCredentialsHelper
 
     usage "create deployment patch"
     desc "Extract patch from the current directory and optionally writes to file"

data/lib/bosh/cli/commands/prepare.rb

@@ -5,7 +5,7 @@ module Bosh::Cli::Command
     include Bosh::Cli::Validation
     include Bosh::Workspace
     include ProjectDeploymentHelper
-    include GitCredenialsHelper
+    include GitCredentialsHelper
     include ReleaseHelper
     include StemcellHelper
 
@@ -30,6 +30,10 @@ module Bosh::Cli::Command
         say "Fetching release '#{release.name.make_green}' to satisfy template references"
         fetch_or_clone_repo(release.repo_dir, release.git_url)
         release.update_repo
+        release.required_submodules.each do |submodule|
+          fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
+          release.update_submodule(submodule)
+        end
         msg = "Version '#{release.version.to_s.make_green}'"
         msg = "Ref '#{release.ref.make_green}'" if release.ref
         say "#{msg} has been checkout into:"
@@ -54,7 +58,7 @@ module Bosh::Cli::Command
         say "Skipping upload"
       else
         say "Uploading '#{release.name_version.make_green}'"
-        release_upload(release.manifest_file, release.repo_dir)
+        release_upload(release.manifest_file, release.release_dir)
       end
     end
 

data/lib/bosh/workspace/helpers/git_credentials_helper.rb

@@ -1,9 +1,9 @@
 module Bosh::Workspace
-  module GitCredenialsHelper
+  module GitCredentialsHelper
     REFSPEC = ['HEAD:refs/remotes/origin/HEAD']
 
     def fetch_or_clone_repo(dir, url)
-      repo = File.exist?(dir) ? open_repo(dir) : init_repo(dir, url)
+      repo = File.exist?(File.join(dir, '.git')) ? open_repo(dir) : init_repo(dir, url)
       fetch_and_checkout(repo)
     end
 
@@ -24,7 +24,7 @@ module Bosh::Workspace
       return {} if check_connection(repo, url)
       validate_url_protocol_support!(url)
 
-      options = { credentials: require_credetials_for(url) }
+      options = { credentials: require_credentials_for(url) }
       unless check_connection(repo, url, options)
         say "Using credentials from: #{git_credentials_file}"
         err "Invalid credentials for: #{url}"
@@ -51,7 +51,7 @@ module Bosh::Workspace
       @git_credentials ||= Credentials.new(git_credentials_file)
     end
 
-    def require_credetials_for(url)
+    def require_credentials_for(url)
       unless File.exist? git_credentials_file
         say("Authentication is required for: #{url}".make_red)
         err("Credentials file does not exist: #{git_credentials_file}".make_red)

data/lib/bosh/workspace/release.rb

@@ -15,6 +15,21 @@ module Bosh::Workspace
       repo.checkout ref || release[:commit], strategy: :force
     end
 
+    def update_submodule(submodule)
+      submodule.repository.checkout submodule.head_oid, strategy: :force
+    end
+
+    def required_submodules
+      required = []
+      symlink_templates.each do |template|
+        submodule = submodule_for(template)
+        if submodule
+          required.push(submodule)
+        end
+      end
+      required
+    end
+
     def manifest_file
       File.join(repo_dir, manifest)
     end
@@ -35,6 +50,10 @@ module Bosh::Workspace
       @ref && repo.lookup(@ref).oid
     end
 
+    def release_dir
+      @path ? File.join(@repo_dir, @path) : @repo_dir
+    end
+
     private
 
     def repo
@@ -42,7 +61,8 @@ module Bosh::Workspace
     end
 
     def new_style_repo
-      dir = File.join(repo_dir, "releases", @name)
+      base = @path ? File.join(@path, 'releases') : 'releases'
+      dir = File.join(repo_dir, base, @name)
       File.directory?(dir) && !File.symlink?(dir)
     end
 
@@ -61,6 +81,7 @@ module Bosh::Workspace
       @final_releases ||= begin
         final_releases = {}
         releases_tree.walk_blobs(:preorder) do |_, entry|
+          next if entry[:filemode] == 40960 # Skip symlinks
           path = File.join(releases_dir, entry[:name])
           blame = Rugged::Blame.new(repo, path)[0]
           time = blame[:final_signature][:time]
@@ -85,5 +106,38 @@ module Bosh::Workspace
       end
       release
     end
+
+    def templates_dir
+      File.join(repo.workdir, "templates")
+    end
+
+    def symlink_target(file)
+      if File.readlink(file).start_with?("/")
+        return File.readlink(file)
+      else
+        return File.expand_path(File.join(File.dirname(file), File.readlink(file)))
+      end
+    end
+
+    def submodule_for(file)
+      repo.submodules.each do |submodule|
+        if file.start_with?(File.join(repo.workdir, submodule.path))
+          return submodule
+        end
+      end
+      false
+    end
+
+    def symlink_templates
+      templates = []
+      if FileTest.exists?(templates_dir)
+        Find.find(templates_dir) do |file|
+          if FileTest.symlink?(file)
+            templates.push(symlink_target(file))
+          end
+        end
+      end
+      templates
+    end
   end
 end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.0.rc4"
+    VERSION = "0.9.0.rc5"
   end
 end

data/spec/commands/prepare_spec.rb

@@ -6,7 +6,8 @@ describe Bosh::Cli::Command::Prepare do
     let(:release) do
       instance_double("Bosh::Workspace::Release",
         name: "foo", version: "1", repo_dir: ".releases/foo", git_url: "/.git",
-        name_version: "foo/1", manifest_file: "releases/foo-1.yml")
+        release_dir: '.releases/foo/sub', name_version: "foo/1",
+        manifest_file: "releases/foo-1.yml")
     end
     let(:stemcell) do
       instance_double("Bosh::Workspace::Stemcell",
@@ -25,12 +26,16 @@ describe Bosh::Cli::Command::Prepare do
 
     describe "prepare_release(s/_repos)" do
       let(:releases) { [release] }
+      let(:subrepos) { [] }
       let(:stemcells) { [] }
       let(:ref) { nil }
 
-      context "releasewith git " do
+      context "release with git " do
         before do
+          allow(release).to receive(:required_submodules).and_return(subrepos)
+
           expect(release).to receive(:update_repo)
+          expect(release).to_not receive(:update_submodule)
           expect(release).to receive(:ref).and_return(ref)
           expect(command).to receive(:release_uploaded?)
           .with(release.name, release.version).and_return(release_uploaded)
@@ -54,7 +59,7 @@ describe Bosh::Cli::Command::Prepare do
             it "does upload the release" do
               expect(release).to receive(:ref).and_return(ref)
               expect(command).to receive(:release_upload)
-                .with(release.manifest_file, release.repo_dir)
+                .with(release.manifest_file, release.release_dir)
               command.prepare
             end
           end

data/spec/helpers/git_credentials_helper_spec.rb

@@ -1,7 +1,7 @@
 module Bosh::Workspace
-  describe GitCredenialsHelper do
-    class GitCredenialsHelperTester
-      include Bosh::Workspace::GitCredenialsHelper
+  describe GitCredentialsHelper do
+    class GitCredentialsHelperTester
+      include Bosh::Workspace::GitCredentialsHelper
 
       attr_reader :work_dir
 
@@ -20,7 +20,7 @@ module Bosh::Workspace
 
     before do
       allow(Rugged::Repository).to receive(:new).with(dir).and_return(repo)
-      allow(File).to receive(:exist?).with(dir).and_return(dir_exist)
+      allow(File).to receive(:exist?).with(File.join(dir, '.git')).and_return(dir_exist)
       allow(repo).to receive_message_chain("remotes.[]").and_return(remote)
       allow(repo).to receive_message_chain("remotes.create_anonymous")
         .with(url).and_return(remote)
@@ -42,7 +42,7 @@ module Bosh::Workspace
 
     describe "fetch_repo" do
       subject do
-        GitCredenialsHelperTester.new(work_dir).fetch_repo(dir)
+        GitCredentialsHelperTester.new(work_dir).fetch_repo(dir)
       end
 
       context "with existing repo" do
@@ -55,7 +55,7 @@ module Bosh::Workspace
 
     describe "fetch_or_clone_repo" do
       subject do
-        GitCredenialsHelperTester.new(work_dir).fetch_or_clone_repo(dir, url)
+        GitCredentialsHelperTester.new(work_dir).fetch_or_clone_repo(dir, url)
       end
 
       context "with existing repo" do

data/spec/release_spec.rb

@@ -1,5 +1,5 @@
 describe Bosh::Workspace::Release do
-  include Bosh::Workspace::GitCredenialsHelper
+  include Bosh::Workspace::GitCredentialsHelper
   let(:name) { "foo" }
   let(:release) { load_release(release_data) }
   let(:version) { "3" }
@@ -48,6 +48,7 @@ describe Bosh::Workspace::Release do
       its(:name) { should eq name }
       its(:git_url) { should eq repo }
       its(:repo_dir) { should match(/\/#{name}$/) }
+      its(:release_dir) { should match(/\/#{name}$/) }
       its(:manifest) { should match "releases/#{name}/#{name}-#{version}.yml$" }
       its(:name_version) { should eq "#{name}/#{version}" }
       its(:version) { should eq version }
@@ -57,6 +58,88 @@ describe Bosh::Workspace::Release do
     end
   end
 
+  context "given a release with submodule templates" do
+    let(:repo) { extracted_asset_dir("supermodule", "supermodule-boshrelease-repo.zip") }
+    let(:subrepo) { extracted_asset_dir("submodule-boshrelease", "submodule-boshrelease-repo.zip") }
+    let(:name) { "supermodule" }
+
+    describe "#update_repo" do
+      subject { Rugged::Repository.new(File.join(releases_dir, name)) }
+      context "with templates in submodules" do
+        before do
+          system("rm -rf #{releases_dir}")
+          allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
+
+          release = load_release("name" => name, "version" => 1, "git" => repo)
+          release.update_repo
+          release.required_submodules.each do |submodule|
+            fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
+            release.update_submodule(submodule)
+          end
+        end
+
+        it "clones + checks out required submodules" do
+          expect(subject.submodules["src/submodule"].workdir_oid)
+            .to eq "2244c436777f7c305fb81a8a6e29079c92a2ab9d"
+        end
+        it "doesn't clone/checkout extraneous submodules" do
+          expect(subject.submodules["src/other"].workdir_oid).to eq nil
+        end
+      end
+      context "with templates in submodules" do
+        before do
+          system("rm -rf #{releases_dir}")
+          allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
+
+          release = load_release("name" => name, "version" => 2, "git" => repo)
+          release.update_repo
+          release.required_submodules.each do |submodule|
+            fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
+            release.update_submodule(submodule)
+          end
+        end
+
+        it "clones + checks out required submodules" do
+          expect(subject.submodules["src/submodule"].workdir_oid)
+            .to eq "95eed8c967af969d659a766b0551a75a729a7b65"
+        end
+        it "doesn't clone/checkout extraneous submodules" do
+          expect(subject.submodules["src/other"].workdir_oid).to eq nil
+        end
+      end
+
+      context "from v1 to v2" do
+        before do
+          system("rm -rf #{releases_dir}")
+          allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
+        end
+
+        it "updates the submodules appropriately" do
+          release = load_release("name" => name, "version" => 1, "git" => repo)
+          release.update_repo
+          release.required_submodules.each do |submodule|
+            fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
+            release.update_submodule(submodule)
+          end
+          expect(subject.submodules["src/submodule"].workdir_oid)
+            .to eq "2244c436777f7c305fb81a8a6e29079c92a2ab9d"
+          expect(subject.submodules["src/other"].workdir_oid).to eq nil
+
+          # Now move to v2 on existing repo
+          release = load_release("name" => name, "version" => 2, "git" => repo)
+          release.update_repo
+          release.required_submodules.each do |submodule|
+            fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
+            release.update_submodule(submodule)
+          end
+          expect(subject.submodules["src/submodule"].workdir_oid)
+            .to eq "95eed8c967af969d659a766b0551a75a729a7b65"
+          expect(subject.submodules["src/other"].workdir_oid).to eq nil
+        end
+      end
+    end
+  end
+
   context "given a release with deprecated structure within 'releases' folder" do
     let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
 
@@ -69,7 +152,7 @@ describe Bosh::Workspace::Release do
         let(:version) { "latest" }
 
         it "checks out repo" do
-          expect(subject).to match(/foo-11.yml/)
+          expect(subject).to match(/foo-12.yml/)
         end
 
         it "does not include templates from master" do
@@ -78,7 +161,7 @@ describe Bosh::Workspace::Release do
       end
 
       context "specific version" do
-        let(:version) { "11" }
+        let(:version) { "12" }
         before { release.update_repo }
 
         it "checks out repo" do
@@ -121,7 +204,7 @@ describe Bosh::Workspace::Release do
       end
 
       context "non existing version " do
-        let(:version) { "12" }
+        let(:version) { "13" }
 
         it "raises an error" do
           expect { release.update_repo }.
@@ -198,7 +281,7 @@ describe Bosh::Workspace::Release do
       end
 
       context "non existing version " do
-        let(:version) { "12" }
+        let(:version) { "13" }
 
         it "raises an error" do
           expect { release.version }.
@@ -251,6 +334,7 @@ describe Bosh::Workspace::Release do
       its(:name) { should eq name }
       its(:git_url) { should eq repo }
       its(:repo_dir) { should match(/\/#{name}$/) }
+      its(:release_dir) { should match(/\/#{name}$/) }
       its(:manifest_file) { should match(/\/#{name}-#{version}.yml$/) }
       its(:manifest) { should match "releases/#{name}-#{version}.yml$" }
       its(:name_version) { should eq "#{name}/#{version}" }
@@ -286,6 +370,7 @@ describe Bosh::Workspace::Release do
       its(:name) { should eq name }
       its(:git_url) { should eq repo }
       its(:repo_dir) { should match(/\/#{name}$/) }
+      its(:release_dir) { should match(/\/#{name}\/release$/) }
       its(:manifest) { should match "release/releases/#{name}-#{version}.yml$" }
       its(:name_version) { should eq "#{name}/#{version}" }
       its(:version) { should eq version }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc4
+  version: 0.9.0.rc5
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -227,6 +227,8 @@ files:
 - spec/assets/manifests-repo/deployments/bar.yml
 - spec/assets/manifests-repo/deployments/foo.yml
 - spec/assets/manifests-repo/templates/foo/bar.yml
+- spec/assets/submodule-boshrelease-repo.zip
+- spec/assets/supermodule-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb
@@ -275,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Manage your bosh workspace
@@ -296,6 +298,8 @@ test_files:
 - spec/assets/manifests-repo/deployments/bar.yml
 - spec/assets/manifests-repo/deployments/foo.yml
 - spec/assets/manifests-repo/templates/foo/bar.yml
+- spec/assets/submodule-boshrelease-repo.zip
+- spec/assets/supermodule-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb