vanagon 0.7.1 → 0.8.0

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -1,33 +1,41 @@
 require 'vanagon/component/source/git'
 
 describe "Vanagon::Component::Source::Git" do
-  let (:url) { 'git://github.com/puppetlabs/facter' }
-  let (:ref) { '2.2.0' }
-  let (:workdir) { "/tmp" }
+  let(:klass) { Vanagon::Component::Source::Git }
+  let(:url) { 'git://github.com/puppetlabs/facter' }
+  let(:ref_tag) { 'refs/tags/2.2.0' }
+  let(:bad_sha) { 'FEEDBEEF' }
+  let(:workdir) { ENV["TMPDIR"] || "/tmp" }
+
+  after(:each) { %x(rm -rf #{workdir}/facter) }
+
+  describe "#initialize" do
+    it "raises error on initialization with an invalid repo" do
+      # this test has a spelling error for the git repo
+      # * this is on purpose *
+      expect { klass.new("#{url}l.git", ref: ref_tag, workdir: workdir) }
+        .to raise_error Vanagon::InvalidRepo
+    end
+  end
 
   describe "#dirname" do
-    after(:each) { %x(rm -rf #{workdir}/facter) }
     it "returns the name of the repo" do
-      git_source = Vanagon::Component::Source::Git.new(url, ref, workdir)
-      expect(git_source.dirname).to eq('facter')
+      git_source = klass.new(url, ref: ref_tag, workdir: workdir)
+      expect(git_source.dirname)
+        .to eq('facter')
     end
 
     it "returns the name of the repo and strips .git" do
-      git_source = Vanagon::Component::Source::Git.new("#{url}.git", ref, workdir)
-      expect(git_source.dirname).to eq('facter')
+      git_source = klass.new("#{url}.git", ref: ref_tag, workdir: workdir)
+      expect(git_source.dirname)
+        .to eq('facter')
     end
   end
 
   describe "#fetch" do
-    after(:each) { %x(rm -rf #{workdir}/facter) }
-    it "raises error on clone failure" do
-      #this test has a spelling error for the git repo        V      this is on purpose
-      git_source = Vanagon::Component::Source::Git.new("#{url}l.git", ref, workdir)
-      expect { git_source.fetch }.to raise_error(RuntimeError, "git clone #{url}l.git failed")
-    end
-    it "raises error on checkout failure" do
-      git_source = Vanagon::Component::Source::Git.new("#{url}", "999.9.9", workdir)
-      expect { git_source.fetch }.to raise_error(RuntimeError, "git checkout 999.9.9 failed")
+    it "raises an error on checkout failure with a bad SHA" do
+      expect { klass.new("#{url}", ref: bad_sha, workdir: workdir).fetch }
+        .to raise_error Vanagon::CheckoutFailed
     end
   end
 end

data/spec/lib/vanagon/component/source/http_spec.rb

@@ -14,39 +14,17 @@ describe "Vanagon::Component::Source::Http" do
 
   describe "#dirname" do
     it "returns the name of the tarball, minus extension for archives" do
-      http_source = Vanagon::Component::Source::Http.new(tar_url, md5sum, workdir)
+      http_source = Vanagon::Component::Source::Http.new(tar_url, sum: md5sum, workdir: workdir)
       expect(http_source).to receive(:download).and_return(tar_filename)
       http_source.fetch
       expect(http_source.dirname).to eq(tar_dirname)
     end
 
     it "returns the current directory for non-archive files" do
-      http_source = Vanagon::Component::Source::Http.new(plaintext_url, md5sum, workdir)
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: md5sum, workdir: workdir)
       expect(http_source).to receive(:download).and_return(plaintext_filename)
       http_source.fetch
       expect(http_source.dirname).to eq(plaintext_dirname)
     end
   end
-
-  describe "#get_extension" do
-    it "returns the extension for valid extensions" do
-      Vanagon::Component::Source::Http::ARCHIVE_EXTENSIONS.each do |ext|
-        filename = "#{file_base}#{ext}"
-        url = File.join(base_url, filename)
-        http_source = Vanagon::Component::Source::Http.new(url, md5sum, workdir)
-        expect(http_source).to receive(:download).and_return(filename)
-        http_source.fetch
-        expect(http_source.get_extension).to eq(ext)
-      end
-    end
-
-    it "is able to download non archive extensions" do
-      ["gpg.txt", "foo.service", "configi.json", "config.repo.txt", "noextensionfile"].each do |filename|
-        url = File.join(base_url, filename)
-        http_source = Vanagon::Component::Source::Http.new(url, md5sum, workdir)
-        expect(http_source).to receive(:download).and_return(filename)
-        http_source.fetch
-      end
-    end
-  end
 end

data/spec/lib/vanagon/component/source/{localsource_spec.rb → local_spec.rb}

@@ -8,7 +8,7 @@ describe "Vanagon::Component::Source::File" do
 
   describe "#fetch" do
     it "puts the source file in to the workdir" do
-      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir: workdir)
       file.fetch
       expect(File).to exist("#{workdir}/fake_file.txt")
     end
@@ -16,26 +16,26 @@ describe "Vanagon::Component::Source::File" do
 
   describe "#dirname" do
     it "returns the name of the tarball, minus extension for archives" do
-      file = Vanagon::Component::Source::Local.new(tar_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(tar_filename, workdir: workdir)
       file.fetch
       expect(file.dirname).to eq("fake_dir")
     end
 
     it "returns the current directory for non-archive files" do
-      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir: workdir)
       file.fetch
       expect(file.dirname).to eq("./")
     end
   end
 
-  describe "#get_extension" do
+  describe "#extension" do
     it "returns the extension for valid extensions" do
-      Vanagon::Component::Source::Local::ARCHIVE_EXTENSIONS.each do |ext|
+      Vanagon::Component::Source::Local.archive_extensions.each do |ext|
         filename = "#{file_base}#{ext}"
-        file = Vanagon::Component::Source::Local.new(filename, workdir)
+        file = Vanagon::Component::Source::Local.new(filename, workdir: workdir)
         file.fetch
-        expect(file.get_extension).to eq(ext)
+        expect(file.extension).to eq(ext)
       end
     end
   end
-end
+end

data/spec/lib/vanagon/component/source_spec.rb

@@ -1,99 +1,182 @@
 require 'vanagon/component/source'
 
 describe "Vanagon::Component::Source" do
-  before(:each) do
-    Vanagon::Component::Source.class_variable_set(:@@rewrite_rule, {})
-  end
-
-  describe "self.source" do
-    let (:unrecognized_scheme) { "abcd://things" }
-    let (:invalid_scheme) { "abcd|things" }
-    let (:public_git) { "git://github.com/abcd/things" }
-    let (:private_git) { "git@github.com:abcd/things" }
-    let (:http_url) { "http://abcd/things" }
-    let (:https_url) { "https://abcd/things" }
-    let (:file_url) { "file://things" }
-
-    let (:ref) { "1.2.3" }
-    let (:sum) { "abcd1234" }
-    let (:workdir) { "/tmp" }
-
-    it "fails on unrecognized uri schemes" do
-      expect { Vanagon::Component::Source.source(unrecognized_scheme, {}, workdir) }.to raise_error(RuntimeError)
-    end
-
-    it "fails on invalid uris" do
-      expect { Vanagon::Component::Source.source(invalid_scheme, {}, workdir) }.to raise_error(RuntimeError)
-    end
-
-    it "returns an object of the correct type for git@ urls" do
-      expect(Vanagon::Component::Source.source(private_git, {:ref => ref }, workdir).class).to equal(Vanagon::Component::Source::Git)
-    end
-
-    it "returns an object of the correct type for git:// urls" do
-      expect(Vanagon::Component::Source.source(public_git, {:ref => ref }, workdir).class).to equal(Vanagon::Component::Source::Git)
-    end
-
-    it "returns an object of the correct type for http:// urls" do
-      expect(Vanagon::Component::Source.source(http_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::Http)
-    end
-
-    it "returns an object of the correct type for https:// urls" do
-      expect(Vanagon::Component::Source.source(https_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::Http)
-    end
-
-    it "returns an object of the correct type for file:// urls" do
-      expect(Vanagon::Component::Source.source(file_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::Local)
-    end
-
-    it "applies any rewrite rules before defining an http Source" do
-      Vanagon::Component::Source.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net')
-      expect(Vanagon::Component::Source.source('http://things.and.stuff/foo.tar.gz', {:sum => sum }, workdir).url).to eq('http://buildsources.delivery.puppetlabs.net/foo.tar.gz')
-    end
-
-    it "applies any rewrite rules before defining an http Source" do
-      Vanagon::Component::Source.register_rewrite_rule('git', Proc.new {|url| url.gsub('a', 'e') })
-      expect(Vanagon::Component::Source.source('git://things.and.stuff/foo-bar.git', {:ref => ref }, workdir).url).to eq('git://things.end.stuff/foo-ber.git')
+  let(:klass) { Vanagon::Component::Source }
+  before(:each) { klass.rewrite_rules.clear }
+
+  describe ".source" do
+    let(:unrecognized_uri) { "abcd://things" }
+    let(:unrecognized_scheme) { "abcd" }
+    let(:invalid_scheme) { "abcd|things" }
+
+    let(:public_git) { "git://github.com/abcd/things" }
+    let(:private_git) { "git@github.com:abcd/things" }
+    let(:http_git) { "http://github.com/abcd/things" }
+    let(:https_git) { "https://github.com/abcd/things" }
+
+    let(:http_url) { "http://abcd/things" }
+    let(:https_url) { "https://abcd/things" }
+
+    let(:file_url) { "file://things" }
+
+    let(:ref) { "cafebeef" }
+    let(:sum) { "abcd1234" }
+    let(:workdir) { "/tmp" }
+
+    let(:original_git_url) { "git://things.and.stuff/foo-bar.git" }
+    let(:rewritten_git_url) { "git://things.end.stuff/foo-ber.git" }
+
+    let(:original_http_url) { "http://things.and.stuff/foo.tar.gz" }
+    let(:rewritten_http_url) { "http://buildsources.delivery.puppetlabs.net/foo.tar.gz" }
+
+    it "fails on unrecognized URI schemes" do
+      expect { klass.source(unrecognized_uri, workdir: workdir) }
+        .to raise_error(Vanagon::Error)
+    end
+
+    it "fails on invalid URIs" do
+      expect { klass.source(invalid_scheme, workdir: workdir) }
+        .to raise_error(URI::InvalidURIError)
+    end
+
+    context "takes a Git repo" do
+      before do
+        allow_any_instance_of(Vanagon::Component::Source::Git)
+          .to receive(:valid_remote?)
+          .and_return(true)
+
+        allow(Vanagon::Component::Source::Git)
+          .to receive(:valid_remote?)
+          .and_return(true)
+      end
+
+      it "returns a Git object for git@ triplet repositories" do
+        expect(klass.source(private_git, ref: ref, workdir: workdir).class)
+          .to eq Vanagon::Component::Source::Git
+      end
+
+      it "returns a Git object for git:// repositories" do
+        expect(klass.source(public_git, ref: ref, workdir: workdir).class)
+          .to eq Vanagon::Component::Source::Git
+      end
+
+      it "returns a Git object for http:// repositories" do
+        expect(klass.source(http_git, ref: ref, workdir: workdir).class)
+          .to eq Vanagon::Component::Source::Git
+      end
+
+      it "returns a Git object for https:// repositories" do
+        expect(klass.source(https_git, ref: ref, workdir: workdir).class)
+          .to eq Vanagon::Component::Source::Git
+      end
+
+      it "rewrites git:// URLs" do
+        proc_rule = Proc.new { |url| url.gsub('a', 'e') }
+        klass.register_rewrite_rule('git', proc_rule)
+        # Vanagon::Component::Source::Git#url returns a URI object
+        # so to check its value, we cast it to a simple string. It's
+        # hacky for sure, but seems less diagreeable than mangling the
+        # return value in the class itself.
+        expect(klass.source(original_git_url, ref: ref, workdir: workdir).url.to_s)
+        .to eq rewritten_git_url
+      end
+    end
+
+    context "takes a HTTP/HTTPS file" do
+      before do
+        allow_any_instance_of(Vanagon::Component::Source::Http)
+          .to receive(:valid_url?)
+          .and_return(true)
+
+        allow(Vanagon::Component::Source::Http)
+          .to receive(:valid_url?)
+          .and_return(true)
+      end
+
+      it "returns an object of the correct type for http:// URLS" do
+        expect(klass.source(http_url, sum: sum, workdir: workdir).class)
+          .to equal(Vanagon::Component::Source::Http)
+      end
+
+      it "returns an object of the correct type for https:// URLS" do
+        expect(klass.source(https_url, sum: sum, workdir: workdir).class)
+          .to equal(Vanagon::Component::Source::Http)
+      end
+
+      before do
+        klass.register_rewrite_rule 'http',
+          'http://buildsources.delivery.puppetlabs.net'
+      end
+      it "applies rewrite rules to HTTP URLs" do
+        expect(klass.source(original_http_url, sum: sum, workdir: workdir).url)
+          .to eq(rewritten_http_url)
+      end
+    end
+
+    context "takes a local file" do
+      before do
+        allow_any_instance_of(Vanagon::Component::Source::Local)
+          .to receive(:valid_file?)
+          .and_return(true)
+
+        allow(Vanagon::Component::Source::Local)
+          .to receive(:valid_file?)
+          .and_return(true)
+      end
+
+      it "returns an object of the correct type for file:// URLS" do
+        expect(klass.source(file_url, sum: sum, workdir: workdir).class)
+          .to eq Vanagon::Component::Source::Local
+      end
     end
   end
 
-  describe "self.rewrite" do
+  describe ".rewrite" do
     let(:simple_rule) { Proc.new {|url| url.gsub('a', 'e') } }
     let(:complex_rule) do
-      Proc.new { |url|
+      Proc.new do |url|
         match = url.match(/github.com\/(.*)$/)
         "git://github.delivery.puppetlabs.net/#{match[1].gsub('/', '-')}" if match
-      }
+      end
     end
 
     it 'replaces the first section of a url with a string if string is given' do
-      Vanagon::Component::Source.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net')
-      expect(Vanagon::Component::Source.rewrite('http://things.and.stuff/foo.tar.gz', 'http')).to eq('http://buildsources.delivery.puppetlabs.net/foo.tar.gz')
+      klass.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net')
+
+      expect(klass.rewrite('http://things.and.stuff/foo.tar.gz', 'http'))
+        .to eq('http://buildsources.delivery.puppetlabs.net/foo.tar.gz')
     end
 
     it 'applies the rule to the url if a proc is given as the rule' do
-      Vanagon::Component::Source.register_rewrite_rule('http', simple_rule)
-      expect(Vanagon::Component::Source.rewrite('http://things.and.stuff/foo.tar.gz', 'http')).to eq('http://things.end.stuff/foo.ter.gz')
+      klass.register_rewrite_rule('http', simple_rule)
+
+      expect(klass.rewrite('http://things.and.stuff/foo.tar.gz', 'http'))
+        .to eq('http://things.end.stuff/foo.ter.gz')
     end
 
     it 'applies the rule to the url if a proc is given as the rule' do
-      Vanagon::Component::Source.register_rewrite_rule('git', complex_rule)
-      expect(Vanagon::Component::Source.rewrite('git://github.com/puppetlabs/facter', 'git')).to eq('git://github.delivery.puppetlabs.net/puppetlabs-facter')
+      klass.register_rewrite_rule('git', complex_rule)
+
+      expect(klass.rewrite('git://github.com/puppetlabs/facter', 'git'))
+        .to eq('git://github.delivery.puppetlabs.net/puppetlabs-facter')
     end
   end
 
-  describe "self.register_rewrite_rule" do
+  describe ".register_rewrite_rule" do
     it 'only accepts Proc and String as rule types' do
-      expect{Vanagon::Component::Source.register_rewrite_rule('http', 5)}.to raise_error(Vanagon::Error)
+      expect { klass.register_rewrite_rule('http', 5) }
+        .to raise_error(Vanagon::Error)
     end
 
     it 'rejects invalid protocols' do
-      expect{Vanagon::Component::Source.register_rewrite_rule('gopher', 'abcd')}.to raise_error(Vanagon::Error)
+      expect { klass.register_rewrite_rule('gopher', 'abcd') }
+        .to raise_error Vanagon::Error
     end
 
+    before { klass.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net') }
     it 'registers the rule for the given protocol' do
-      Vanagon::Component::Source.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net')
-      expect(Vanagon::Component::Source.class_variable_get(:@@rewrite_rule)).to eq({'http' => 'http://buildsources.delivery.puppetlabs.net'})
+      expect(klass.rewrite_rules)
+        .to eq({'http' => 'http://buildsources.delivery.puppetlabs.net'})
     end
   end
 end

data/spec/lib/vanagon/platform_spec.rb

@@ -4,31 +4,42 @@ describe "Vanagon::Platform" do
   let(:platforms) do
     [
       {
-        :name                   => "debian-6-i386",
-        :os_name                => "debian",
-        :os_version             => "6",
-        :architecture           => "i386",
-        :output_dir             => "debian/6/i386",
-        :output_dir_with_target => "debian/6/thing/i386",
-        :block                  => %Q[ platform "debian-6-i386" do |plat| end ],
+        :name                    => "debian-6-i386",
+        :os_name                 => "debian",
+        :os_version              => "6",
+        :architecture            => "i386",
+        :output_dir              => "deb/lucid/",
+        :output_dir_with_target  => "deb/lucid/thing",
+        :output_dir_empty_string => "deb/lucid/",
+        :block                   => %Q[
+          platform "debian-6-i386" do |plat|
+            plat.codename "lucid"
+          end ],
       },
       {
-        :name                   => "el-5-i386",
-        :os_name                => "el",
-        :os_version             => "5",
-        :architecture           => "i386",
-        :output_dir             => "el/5/i386",
-        :output_dir_with_target => "el/5/thing/i386",
-        :block                  => %Q[ platform "el-5-i386" do |plat| end ],
+        :name                    => "el-5-i386",
+        :os_name                 => "el",
+        :os_version              => "5",
+        :architecture            => "i386",
+        :output_dir              => "el/5/products/i386",
+        :output_dir_with_target  => "el/5/thing/i386",
+        :output_dir_empty_string => "el/5/i386",
+        :block                   => %Q[ platform "el-5-i386" do |plat| end ],
       },
       {
-        :name                   => "debian-6-i386",
-        :os_name                => "debian",
-        :os_version             => "6",
-        :architecture           => "i386",
-        :output_dir             => "updated/output",
-        :output_dir_with_target => "updated/output",
-        :block                  => %Q[ platform "debian-6-i386" do |plat| plat.output_dir "updated/output" end ],
+        :name                    => "debian-6-i386",
+        :os_name                 => "debian",
+        :os_version              => "6",
+        :codename                => "lucid",
+        :architecture            => "i386",
+        :output_dir              => "updated/output",
+        :output_dir_with_target  => "updated/output",
+        :output_dir_empty_string => "updated/output",
+        :block                   => %Q[
+          platform "debian-6-i386" do |plat|
+            plat.codename "lucid"
+            plat.output_dir "updated/output"
+          end ],
       },
     ]
   end
@@ -67,6 +78,14 @@ describe "Vanagon::Platform" do
         expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
       end
     end
+
+    it "does the right thing with empty strings" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.output_dir('')).to eq(plat[:output_dir_empty_string])
+      end
+    end
   end
 
   describe "#architecture" do