bosh_cli 0.18 → 0.19

data/spec/unit/job_rename_spec.rb

@@ -0,0 +1,195 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require "spec_helper"
+
+describe Bosh::Cli::Command::Base do
+
+  describe Bosh::Cli::Command::JobRename do
+    it "should rename the job" do
+      mock_director = mock(Object)
+      mock_director.should_receive(:rename_job).and_return([:done, ""])
+      Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
+
+      job_rename = Bosh::Cli::Command::JobRename.new
+      job_rename.stub(:auth_required)
+      job_rename.stub(:prepare_deployment_manifest).and_return(old_manifest_yaml)
+      job_rename.stub(:sanity_check_job_rename)
+      job_rename.rename("old_name", "new_name")
+    end
+
+    it "should raise exception on additional changes to manifest" do
+      mock_director = mock(Object)
+      mock_director.stub(:get_deployment) { { "manifest" => old_manifest_yaml } }
+      Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
+
+      job_rename = Bosh::Cli::Command::JobRename.new
+
+      lambda {
+        job_rename.sanity_check_job_rename(new_extra_changes_manifest, "old_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliExit, /cannot have any other changes/)
+    end
+
+    it "should raise exception if new manifest removed some properties" do
+      mock_director = mock(Object)
+      mock_director.stub(:get_deployment) { { "manifest" => old_manifest_yaml } }
+      Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
+
+      job_rename = Bosh::Cli::Command::JobRename.new
+
+      lambda {
+        job_rename.sanity_check_job_rename(new_manifest_with_some_deletions, "old_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliExit, /cannot have any other changes/)
+    end
+
+    it "should raise exception if deployment is not updated with new job name" do
+      job_rename = Bosh::Cli::Command::JobRename.new
+
+      lambda {
+        job_rename.sanity_check_job_rename(new_missing_new_job, "old_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliExit, /include the new job/)
+    end
+
+    it "should raise exception if old job name does not exist in manifest" do
+      mock_director = mock(Object)
+      mock_director.stub(:get_deployment) { { "manifest" => old_manifest_yaml } }
+      Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
+
+      job_rename = Bosh::Cli::Command::JobRename.new
+
+      lambda {
+        job_rename.sanity_check_job_rename(new_extra_changes_manifest, "non_existent_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliExit, /non existent job/)
+    end
+
+    it "should raise exception if 2 jobs are changed in manifest" do
+      mock_director = mock(Object)
+      mock_director.stub(:get_deployment) { { "manifest" => old_manifest_yaml } }
+      Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
+
+      job_rename = Bosh::Cli::Command::JobRename.new
+
+      lambda {
+        job_rename.sanity_check_job_rename(new_extra_job_rename_manifest, "old_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliExit, /Cannot rename more than one job/)
+    end
+
+    def old_manifest_yaml
+      <<-eos
+      ---
+      name: test
+      resource_pools:
+      - name: rp
+      networks:
+      - name: default
+      jobs:
+      - name: job1
+        template: xyz
+        networks:
+        - name: default
+      - name: old_job
+        template: xyz
+        networks:
+        - name: default
+      eos
+    end
+
+    def new_manifest_with_some_deletions
+      <<-eos
+      ---
+      name: test
+      resource_pools:
+      - name: rp
+      networks:
+      - name: default
+      jobs:
+      - name: job1
+        networks:
+        - name: default
+      - name: new_job
+        template: xyz
+        networks:
+        - name: default
+      eos
+    end
+
+    def new_manifest_yaml
+      <<-eos
+      ---
+      name: test
+      networks:
+      - name: default
+      resource_pools:
+      - name: rp
+      jobs:
+      - name: job1
+        template: xyz
+        networks:
+        - name: default
+      - name: new_job
+        template: xyz
+        networks:
+        - name: default
+      eos
+    end
+
+    def new_extra_changes_manifest
+      <<-eos
+      ---
+      name: test
+      networks:
+      - name: default
+      resource_pools:
+      - name: rp
+      jobs:
+      - name: job1
+        template: xyz
+        networks:
+        - name: default
+      - name: new_job
+        template: changed_templated_causing_failure
+        networks:
+        - name: default
+      eos
+    end
+
+    def new_extra_job_rename_manifest
+      <<-eos
+      ---
+      name: test
+      networks:
+      - name: default
+      resource_pools:
+      - name: rp
+      jobs:
+      - name: new_job1
+        template: xyz
+        networks:
+        - name: default
+      - name: new_job
+        template: changed_templated_causing_failure
+        networks:
+        - name: default
+      eos
+    end
+
+    def new_missing_new_job
+      <<-eos
+      ---
+      name: test
+      networks:
+      - name: default
+      resource_pools:
+      - name: rp
+      jobs:
+      - name: job1
+        template: xyz
+        networks:
+        - name: default
+      - name: old_job
+        template: xyz
+        networks:
+        - name: default
+      eos
+    end
+  end
+end

data/spec/unit/package_builder_spec.rb

@@ -6,55 +6,41 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
   before(:each) do
     @release_dir = Dir.mktmpdir
-    @src_dir = FileUtils.mkdir(File.join(@release_dir, "src"))
-    @blobs_dir = FileUtils.mkdir(File.join(@release_dir, "blobs"))
-  end
-
-  after(:each) do
-    FileUtils.rm_rf(@src_dir)
-    FileUtils.rm_rf(@blobs_dir)
-  end
-
-  def source_path(filename)
-    File.join(@release_dir, "src", filename)
-  end
-
-  def add_sources(*files)
-    files.each do |file|
-      path = source_path(file)
-      FileUtils.mkdir_p(File.dirname(path))
-      FileUtils.touch(path)
-    end
-  end
-
-  def remove_sources(*files)
-    files.each do |file|
-      FileUtils.rm(source_path(file))
+    FileUtils.mkdir(File.join(@release_dir, "src"))
+    FileUtils.mkdir(File.join(@release_dir, "blobs"))
+    FileUtils.mkdir(File.join(@release_dir, "src_alt"))
+  end
+
+  def add_file(dir, path, contents = nil)
+    full_path = File.join(@release_dir, dir, path)
+    FileUtils.mkdir_p(File.dirname(full_path))
+    if contents
+      File.open(full_path, "w") { |f| f.write(contents) }
+    else
+      FileUtils.touch(full_path)
     end
   end
 
-  def blob_path(filename)
-    File.join(@release_dir, "blobs", filename)
+  def remove_file(dir, path)
+    FileUtils.rm(File.join(@release_dir, dir, path))
   end
 
-  def add_blobs(*files)
-    files.each do |file|
-      path = blob_path(file)
-      FileUtils.mkdir_p(File.dirname(path))
-      FileUtils.touch(path)
-    end
+  def add_files(dir, names)
+    names.each { |name| add_file(dir, name) }
   end
 
-  def remove_blobs(*files)
-    files.each do |file|
-      FileUtils.rm(blob_path(file))
-    end
+  def remove_files(dir, names)
+    names.each { |name| remove_file(dir, name) }
   end
 
   def make_builder(name, files, dependencies = [], sources_dir = nil)
     blobstore = mock("blobstore")
-    spec = { "name" => name, "files" => files,
-             "dependencies" => dependencies }
+    spec = {
+      "name" => name,
+      "files" => files,
+      "dependencies" => dependencies
+    }
+
     Bosh::Cli::PackageBuilder.new(spec, @release_dir,
                                   false, blobstore, sources_dir)
   end
@@ -81,13 +67,12 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
   it "whines on metadata file having the same name as one of package files" do
     lambda {
-      builder = make_builder("aa", ["*.rb", "packaging"])
-      add_sources("1.rb", "packaging")
-      builder.source_files.include?("packaging").should be_true
+      builder = make_builder("aa", %w(*.rb packaging))
+
+      add_files("src", %w(1.rb packaging))
 
-      File.open("#{@release_dir}/packages/aa/packaging", "w") do |f|
-        f.puts("make install")
-      end
+      builder.glob_matches.size.should == 2
+      add_file("packages", "aa/packaging", "make install")
 
       builder.copy_files
     }.should raise_error(Bosh::Cli::InvalidPackage,
@@ -96,8 +81,8 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   end
 
   it "whines on globs not yielding any file names" do
-    add_sources("lib/1.rb", "lib/2.rb", "baz")
-    builder = make_builder("foo", ["lib/*.rb", "baz", "bar"])
+    add_files("src",  %w(lib/1.rb lib/2.rb baz))
+    builder = make_builder("foo", %w(lib/*.rb baz bar))
 
     lambda {
       builder.build
@@ -108,8 +93,8 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
   it "has no way to calculate checksum for not yet generated package" do
     lambda {
-      builder = make_builder("aa", ["*.rb", "packaging"])
-      add_sources("1.rb", "packaging")
+      builder = make_builder("aa", %w(*.rb packaging))
+      add_files("src", %w(1.rb packaging))
       builder.checksum
     }.should raise_error(RuntimeError,
                          "cannot read checksum for not yet " +
@@ -117,112 +102,101 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   end
 
   it "has a checksum for a generated package" do
-    builder = make_builder("aa", ["*.rb"])
-    add_sources("1.rb", "2.rb")
+    builder = make_builder("aa", %w(*.rb))
+    add_files("src", %w(1.rb 2.rb))
     builder.build
     builder.checksum.should =~ /[0-9a-f]+/
   end
 
   it "is created with name and globs" do
-    builder = make_builder("aa", ["1", "*/*"])
+    builder = make_builder("aa", %w(1 */*))
     builder.name.should  == "aa"
-    builder.globs.should == ["1", "*/*"]
+    builder.globs.should == %w(1 */*)
   end
 
   it "resolves globs and generates fingerprint" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
 
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
-    builder.source_files.should == ["lib/1.rb", "lib/2.rb",
-                                    "README.2", "README.md"].sort
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    builder.glob_matches.size.should == 4
     builder.fingerprint.should == "397a99ccd267ebc9bcc632b746db2cd5b29db050"
   end
 
   it "has stable fingerprint" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
+    builder = make_builder("A", %w(lib/*.rb README.*))
     s1 = builder.fingerprint
 
     builder.reload.fingerprint.should == s1
   end
 
   it "changes fingerprint when new file that matches glob is added" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
 
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
+    builder = make_builder("A", %w(lib/*.rb README.*))
     s1 = builder.fingerprint
-    add_sources("lib/3.rb")
+    add_files("src", %w(lib/3.rb))
     builder.reload.fingerprint.should_not == s1
 
-    remove_sources("lib/3.rb")
+    remove_files("src", %w(lib/3.rb))
     builder.reload.fingerprint.should == s1
   end
 
   it "changes fingerprint when one of the matched files changes" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
-    File.open("#{@release_dir}/src/lib/1.rb", "w") { |f| f.write("1") }
+    add_files("src", %w(lib/2.rb lib/README.txt README.2 README.md))
+    add_file("src", "lib/1.rb", "1")
 
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
+    builder = make_builder("A", %w(lib/*.rb README.*))
     s1 = builder.fingerprint
 
-    File.open("#{@release_dir}/src/lib/1.rb", "w+") { |f| f.write("2") }
-
+    add_file("src", "lib/1.rb", "2")
     builder.reload.fingerprint.should_not == s1
 
-    File.open("#{@release_dir}/src/lib/1.rb", "w") { |f| f.write("1") }
+    add_file("src", "lib/1.rb", "1")
     builder.reload.fingerprint.should == s1
   end
 
   it "changes fingerprint when empty directory added/removed" do
-    add_sources("lib/1.rb", "lib/2.rb", "baz")
-    builder = make_builder("foo", ["lib/*.rb", "baz", "bar/*"])
-    FileUtils.mkdir_p(@release_dir + "/src/bar/zb")
+    add_files("src", %w(lib/1.rb lib/2.rb baz))
+    builder = make_builder("foo", %w(lib/*.rb baz bar/*))
+    FileUtils.mkdir_p(File.join(@release_dir, "src", "bar", "zb"))
 
     s1 = builder.fingerprint
 
-    FileUtils.mkdir_p(@release_dir + "/src/bar/zb2")
+    FileUtils.mkdir_p(File.join(@release_dir, "src", "bar", "zb2"))
     s2 = builder.reload.fingerprint
     s2.should_not == s1
 
-    builder.reload.fingerprint.should == s2
-    FileUtils.rm_rf(@release_dir + "/src/bar/zb2")
+    FileUtils.rm_rf(File.join(@release_dir, "src", "bar", "zb2"))
     builder.reload.fingerprint.should == s1
   end
 
   it "doesn't change fingerprint when files that doesn't match glob is added" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
-
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
+    builder = make_builder("A", %w(lib/*.rb README.*))
     s1 = builder.fingerprint
-    add_sources("lib/a.out")
+
+    add_file("src", "lib/a.out")
     builder.reload.fingerprint.should == s1
   end
 
   it "changes fingerprint when dependencies change" do
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
 
-    builder1 = make_builder("A", ["lib/*.rb", "README.*"], ["foo", "bar"])
+    builder1 = make_builder("A", %w(lib/*.rb README.*), %w(foo bar))
     s1 = builder1.fingerprint
-    builder2 = make_builder("A", ["lib/*.rb", "README.*"], ["bar", "foo"])
+    builder2 = make_builder("A", %w(lib/*.rb README.*), %w(bar foo))
     s2 = builder2.fingerprint
+    s1.should == s2 # Order doesn't matter
 
-    s1.should == s2
-    builder3 = make_builder("A", ["lib/*.rb", "README.*"],
-                            ["bar", "foo", "baz"])
+    builder3 = make_builder("A", %w(lib/*.rb README.*), %w(bar foo baz))
     s3 = builder3.fingerprint
-    s3.should_not == s1
+    s3.should_not == s1 # Set does matter
   end
 
   it "copies files to build directory" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb", "foo/lib/2.rb",
-                "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
 
     builder = make_builder("bar", globs)
     builder.copy_files.should == 5
@@ -234,18 +208,14 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   end
 
   it "generates tarball" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb", "foo/lib/2.rb",
-                "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
-
-    builder = make_builder("bar", globs)
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    builder = make_builder("bar", %w(foo/**/* baz))
     builder.generate_tarball.should be_true
   end
 
   it "can point to either dev or a final version of a package" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb", "foo/lib/2.rb",
-                "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
 
     fingerprint = "86e8d5f5530a89659f588f5884fe8c13e639d94b"
 
@@ -276,9 +246,8 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   end
 
   it "creates a new version tarball" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb",
-                "foo/lib/2.rb", "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
     builder = make_builder("bar", globs)
 
     File.exists?(@release_dir + "/.dev_builds/packages/bar/0.1-dev.tgz").
@@ -296,7 +265,7 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     File.exists?(@release_dir + "/.dev_builds/packages/bar/0.2-dev.tgz").
         should be_false
 
-    add_sources("foo/3.rb")
+    add_file("src", "foo/3.rb")
     builder = make_builder("bar", globs)
     builder.build
 
@@ -305,7 +274,7 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     File.exists?(@release_dir + "/.dev_builds/packages/bar/0.2-dev.tgz").
         should be_true
 
-    remove_sources("foo/3.rb")
+    remove_file("src", "foo/3.rb")
     builder = make_builder("bar", globs)
     builder.build
     builder.version.should == "0.1-dev"
@@ -320,17 +289,13 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
         should be_false
 
     # Now add packaging
-    File.open("#{@release_dir}/packages/bar/packaging", "w") do |f|
-      f.puts("make install")
-    end
+    add_file("packages", "bar/packaging", "make install")
     builder = make_builder("bar", globs)
     builder.build
     builder.version.should == "0.3-dev"
 
     # Add prepackaging
-    File.open("#{@release_dir}/packages/bar/pre_packaging", "w") do |f|
-      f.puts("exit 0")
-    end
+    add_file("packages", "bar/pre_packaging", "exit 0")
     builder = make_builder("bar", globs)
     builder.build
 
@@ -348,14 +313,11 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   end
 
   it "stops if pre_packaging fails" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb", "foo/lib/2.rb",
-                "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
 
     builder = make_builder("bar", globs)
-    File.open("#{@release_dir}/packages/bar/pre_packaging", "w") do |f|
-      f.puts("rake db:migrate")
-    end
+    add_file("packages", "bar/pre_packaging", "exit 1")
 
     lambda {
       builder.build
@@ -363,10 +325,23 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
                          "`bar' pre-packaging failed")
   end
 
+  it "prevents building final version with src alt" do
+    spec = {
+      "name" => "bar",
+      "files" => "foo/**/*"
+    }
+
+    lambda {
+      Bosh::Cli::PackageBuilder.new(spec, @release_dir,
+                                    true, mock("blobstore"))
+    }.should raise_error(/Please remove `src_alt' first/)
+  end
+
   it "bumps major dev version in sync with final version" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb", "foo/lib/2.rb",
-                "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    FileUtils.rm_rf(File.join(@release_dir, "src_alt"))
+
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
     builder = make_builder("bar", globs)
     builder.build
 
@@ -379,19 +354,17 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
                                                   @release_dir,
                                                   true, blobstore)
     final_builder.build
-
     final_builder.version.should == 1
 
-    add_sources("foo/foo15.rb")
+    add_file("src", "foo/foo15.rb")
     builder2 = make_builder("bar", globs)
     builder2.build
     builder2.version.should == "1.1-dev"
   end
 
   it "uses the appropriate final version for bumping a dev version" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb",
-                "foo/lib/2.rb", "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
     builder = make_builder("bar", globs)
     final_builds_dir = File.join(@release_dir,
                                  ".final_builds", "packages", "bar")
@@ -400,17 +373,17 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     final_index = Bosh::Cli::VersionsIndex.new(final_builds_dir)
     final_index.add_version("deadbeef", { "version" => 34 }, "payload")
 
-    add_sources("foo/foo14.rb")
+    add_file("src", "foo/foo14.rb")
     builder.reload.build
     builder.version.should == "34.1-dev"
 
     final_index.add_version("deadbeef2", { "version" => 37 }, "payload")
 
-    add_sources("foo/foo15.rb")
+    add_file("src", "foo/foo15.rb")
     builder.reload.build
     builder.version.should == "37.1-dev"
 
-    add_sources("foo/foo16.rb")
+    add_file("src", "foo/foo16.rb")
     builder.reload.build
     builder.version.should == "37.2-dev"
 
@@ -418,22 +391,23 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     final_index = Bosh::Cli::VersionsIndex.new(final_builds_dir)
     final_index.add_version("deadbeef3", { "version" => 34 }, "payload")
 
-    add_sources("foo/foo17.rb")
+    add_file("src", "foo/foo17.rb")
     builder.reload.build
     builder.version.should == "34.2-dev"
   end
 
   it "whines on attempt to create final build if not matched " +
      "by existing final or dev build" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb",
-                "foo/lib/2.rb", "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    FileUtils.rm_rf(File.join(@release_dir, "src_alt"))
+
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
 
     blobstore = mock("blobstore")
     blobstore.should_receive(:create).and_return("object_id")
 
     final_builder = Bosh::Cli::PackageBuilder.new(
-        { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
+      { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
     lambda {
       final_builder.build
     }.should raise_error(Bosh::Cli::CliExit)
@@ -448,43 +422,39 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     final_builder2.build
     final_builder2.version.should == 1
 
-    add_sources("foo/foo15.rb")
+    add_file("src", "foo/foo15.rb")
     final_builder3 = Bosh::Cli::PackageBuilder.new(
-        { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
+      { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
     lambda {
       final_builder3.build
     }.should raise_error(Bosh::Cli::CliExit)
   end
 
   it "includes dotfiles in a fingerprint" do
-    add_sources("lib/1.rb", "lib/2.rb",
-                "lib/README.txt", "README.2", "README.md")
-
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
-    builder.source_files.should == ["lib/1.rb", "lib/2.rb",
-                                    "README.2", "README.md"].sort
+    add_files("src", %w(lib/1.rb lib/2.rb lib/README.txt README.2 README.md))
 
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    builder.glob_matches.size.should == 4
     builder.fingerprint.should == "397a99ccd267ebc9bcc632b746db2cd5b29db050"
 
-    add_sources("lib/.zb.rb")
+    add_file("src", "lib/.zb.rb")
     builder.reload
 
-    builder.source_files.should == ["lib/.zb.rb", "lib/1.rb",
-                                    "lib/2.rb", "README.2", "README.md"].sort
+    builder.glob_matches.size.should == 5
     builder.fingerprint.should == "351b3bb8dc430e58a3264bcfb5c9c19c06ece4af"
 
-    remove_sources("lib/.zb.rb")
+    remove_file("src", "lib/.zb.rb")
     builder.reload
 
-    builder.source_files.should == ["lib/1.rb", "lib/2.rb",
-                                    "README.2", "README.md"].sort
+    builder.glob_matches.size.should == 4
     builder.fingerprint.should == "397a99ccd267ebc9bcc632b746db2cd5b29db050"
   end
 
   it "supports dry run" do
-    add_sources("foo/foo.rb", "foo/lib/1.rb",
-                "foo/lib/2.rb", "foo/README", "baz")
-    globs = ["foo/**/*", "baz"]
+    FileUtils.rm_rf(File.join(@release_dir, "src_alt"))
+
+    add_files("src", %w(foo/foo.rb foo/lib/1.rb foo/lib/2.rb foo/README baz))
+    globs = %w(foo/**/* baz)
     builder = make_builder("bar", globs)
     builder.dry_run = true
     builder.build
@@ -502,14 +472,14 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     blobstore = mock("blobstore")
     blobstore.should_not_receive(:create)
     final_builder = Bosh::Cli::PackageBuilder.new(
-        { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
+      { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
     final_builder.dry_run = true
     final_builder.build
 
     # Hasn't been promoted b/c of dry run
     final_builder.version.should == "0.1-dev"
 
-    add_sources("foo/foo15.rb")
+    add_file("src", "foo/foo15.rb")
     builder2 = make_builder("bar", globs)
     builder2.dry_run = true
     builder2.build
@@ -520,48 +490,80 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
         should be_false
   end
 
-  it "resolves files using blob" do
-    add_blobs("lib/1.rb", "lib/2.rb", "lib/README.txt", "README.2", "README.md")
+  it "uses blobs directory to look up files as well" do
+    add_files("src", %w(lib/1.rb lib/2.rb))
+    add_files("blobs", %w(lib/README.txt README.2 README.md))
 
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
-    builder.blob_files.should == ["lib/1.rb", "lib/2.rb",
-                                  "README.2", "README.md"].sort
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    builder.glob_matches.size.should == 4
     builder.fingerprint.should == "397a99ccd267ebc9bcc632b746db2cd5b29db050"
   end
 
-  it "resolves files using both blob and source" do
-    add_sources("lib/1.rb", "lib/2.rb")
-    add_blobs("lib/README.txt", "README.2", "README.md")
+  it "moving files to blobs directory doesn't change fingerprint" do
+    add_file("src", "README.txt", "README contents")
+    add_file("src", "README.md", "README contents 2")
+    add_file("src", "lib/1.rb", "puts 'Hello world'")
+    add_file("src", "lib/2.rb", "puts 'Bye world'")
+
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    s1 = builder.fingerprint
 
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
+    FileUtils.mkdir_p(File.join(@release_dir, "blobs", "lib"))
 
-    builder.source_files.should == ["lib/1.rb", "lib/2.rb"].sort
-    builder.blob_files.should == ["README.2", "README.md"].sort
-    builder.files.should == ["lib/1.rb", "lib/2.rb",
-                             "README.2", "README.md"].sort
-    builder.fingerprint.should == "397a99ccd267ebc9bcc632b746db2cd5b29db050"
+    FileUtils.mv(File.join(@release_dir, "src", "lib", "1.rb"),
+                 File.join(@release_dir, "blobs", "lib", "1.rb"))
+
+    s2 = builder.reload.fingerprint
+    s2.should == s1
   end
 
-  it "should keep same fingerprint moving packages " +
-     "from source_dir to blob_dir" do
+  it "supports alternative src directory" do
+    add_file("src", "README.txt", "README contents")
+    add_file("src", "lib/1.rb", "puts 'Hello world'")
+
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    s1 = builder.fingerprint
+
+    add_file("src_alt", "README.txt", "README contents")
+    add_file("src_alt", "lib/1.rb", "puts 'Hello world'")
+
+    remove_files("src", %w(README.txt lib/1.rb))
+    builder.reload.fingerprint.should == s1
+  end
+
+  it "doesn't allow glob to match files under more than one source directory" do
+    add_file("src", "README.txt", "README contents")
+    add_file("src", "lib/1.rb", "puts 'Hello world'")
+
+    builder = make_builder("A", %w(lib/*.rb README.*))
+    lambda {
+      builder.fingerprint
+    }.should_not raise_error
+
+    add_file("src_alt", "README.txt", "README contents")
+    remove_files("src", %w(README.txt lib/1.rb))
+
+    lambda {
+      builder.reload.fingerprint
+    }.should raise_error("`A' has a glob that resolves to " +
+                           "an empty file list: lib/*.rb")
+  end
+
+  it "doesn't include the same path twice" do
+    add_file("src", "test/foo/README.txt", "README contents")
+    add_file("src", "test/foo/NOTICE.txt", "NOTICE contents")
+
+    fp1 = make_builder("A", %w(test/**/*)).fingerprint
+
+    remove_file("src", "test/foo/NOTICE.txt")
+    add_file("blobs", "test/foo/NOTICE.txt", "NOTICE contents")
 
-    # compute fingerprint when all the files are 'blob'
-    add_blobs("lib/1.rb", "lib/2.rb", "lib/README.txt",
-              "README.2", "README.md")
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
-    blob_fingerprint = builder.fingerprint
-    remove_blobs("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                 "README.2", "README.md")
+    File.directory?(File.join(@release_dir, "src", "test", "foo")).
+      should be_true
 
-    # compute fingerprint when all the files are in 'source'
-    add_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                "README.2", "README.md")
-    builder = make_builder("A", ["lib/*.rb", "README.*"])
-    blob_sources = builder.fingerprint
-    remove_sources("lib/1.rb", "lib/2.rb", "lib/README.txt",
-                   "README.2", "README.md")
+    fp2 = make_builder("A", %w(test/**/*)).fingerprint
 
-    builder.fingerprint.should == blob_fingerprint
+    fp1.should == fp2
   end
 
-end
+end