vanagon 0.35.1 → 0.37.0

data/lib/vanagon/platform/rpm.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build an rpm package of
       # @return [Array] list of commands required to build an rpm package for the given project from a tarball
-      def generate_package(project) # rubocop:disable Metrics/AbcSize
+      def generate_package(project)
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         target_source_output_dir = project.repo ? source_output_dir(project.repo) : source_output_dir
         if project.source_artifacts
@@ -61,7 +61,7 @@ class Vanagon
         defines << %(--define 'dist .#{dist}')
       end
 
-      def add_repository(definition) # rubocop:disable Metrics/AbcSize
+      def add_repository(definition)
         definition = URI.parse(definition)
 
         commands = ["rpm -q curl > /dev/null || yum -y install curl"]

data/lib/vanagon/platform/solaris_10.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a solaris package of
       # @return [Array] list of commands required to build a solaris package for the given project from a tarball
-      def generate_package(project) # rubocop:disable Metrics/AbcSize
+      def generate_package(project) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         name_and_version = "#{project.name}-#{project.version}"
         pkg_name = package_name(project)
@@ -18,9 +18,9 @@ class Vanagon
         # required more string manipulation anyway. the string should be formatted like so:
         #         && ($$3 ~ /directory\/regex.*/ || $$3 ~ /another\/directory\/regex.*/)
         # for as many iterations as there are directries in the package
-        pkgdirs = project.get_root_directories.map { |dir| dir.sub(/^\//, "").gsub(/([\/\.])+/, '\\\\\1') + '.*' }
+        pkgdirs = project.get_root_directories.map { |dir| "#{dir.sub(/^\//, '').gsub(/([\/.])+/, '\\\\\1')}.*" }
         explicit_search_string = pkgdirs.map do |dir_regex|
-          " $$3 ~ /" + dir_regex + "/ "
+          " $$3 ~ /#{dir_regex}/ "
         end.join("||")
 
         # Here we maintain backward compatibility with older vanagon versions
@@ -108,7 +108,7 @@ class Vanagon
       #
       # @param user [Vanagon::Common::User] the user to create
       # @return [String] the commands required to add a user to the system
-      def add_user(user) # rubocop:disable Metrics/AbcSize
+      def add_user(user)
         # NB: system users aren't supported on solaris 10
         # Solaris 10 also doesn't support long flags
         cmd_args = ["'#{user.name}'"]

data/lib/vanagon/platform/windows.rb

@@ -108,13 +108,13 @@ class Vanagon
           dest_pathname_fragment = src_pathname.relative_path_from(vanagon_path)
           target_dir = File.join(destination, dest_pathname_fragment.to_s)
           # Create the target directory if necessary.
-          FileUtils.mkdir_p(target_dir) unless File.exists?(target_dir)
+          FileUtils.mkdir_p(target_dir)
           # Skip the file copy if either target file or ERB equivalent exists.
           # This means that any files already in place in the work directory as a
           # result of being copied from the project specific area will not be
           # overritten.
-          next if File.exists?(Pathname.new(target_dir) + File.basename(file))
-          next if File.exists?(Pathname.new(target_dir) + File.basename(file, ".erb"))
+          next if File.exist?(Pathname.new(target_dir) + File.basename(file))
+          next if File.exist?(Pathname.new(target_dir) + File.basename(file, ".erb"))
           FileUtils.cp(file, target_dir, :verbose => verbose)
         end
       end
@@ -228,7 +228,7 @@ class Vanagon
           # cygpath conversion is necessary as candle is unable to handle posix path specs
           # the preprocessor variables AppDataSourcePath and ApplicationSourcePath are required due to the -var input to the heat
           # runs listed above.
-          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name \'*.wxs\'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} #{candle_preprocessor} $$(cygpath -aw $$wix_file) || exit 1; done",
+          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name '*.wxs'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} #{candle_preprocessor} $$(cygpath -aw $$wix_file) || exit 1; done",
           # run all wix objects through light to produce the msi
           # the -b flag simply points light to where the SourceDir location is
           # -loc is required for the UI localization it points to the actual localization .wxl
@@ -317,7 +317,7 @@ class Vanagon
 
         if definition.scheme =~ /^(http|ftp|file)/
           if File.extname(definition.path) == '.ps1'
-            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString(\"#{definition}\"))')
+            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString("#{definition}"))')
           else
             commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.tr('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
           end
@@ -438,7 +438,7 @@ class Vanagon
       #
       # @param [string] version, the original version number
       def wix_product_version(version)
-        version.split("\.").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join("\.")
+        version.split(".").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join(".")
       end
 
       # Constructor. Sets up some defaults for the windows platform and calls the parent constructor

data/lib/vanagon/platform.rb

@@ -150,7 +150,7 @@ class Vanagon
     # @param config_directory [String] the path to the platform config file
     # @return [Vanagon::Platform] the platform as specified in the platform config
     # @raise if the instance_eval on Platform fails, the exception is reraised
-    def self.load_platform(platform_name, config_directory) # rubocop:disable Metrics/AbcSize
+    def self.load_platform(platform_name, config_directory)
       platform_name = File.basename(platform_name, '.rb')
       platform_file_name = "#{platform_name}.rb"
       platform_path = File.join(config_directory, platform_file_name)
@@ -235,7 +235,7 @@ class Vanagon
     #
     # @param name [String] name of the platform
     # @return [Vanagon::Platform] the platform with the given name
-    def initialize(name) # rubocop:disable Metrics/AbcSize
+    def initialize(name) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
       @name = name
       @settings = {}
       @os_name = os_name

data/lib/vanagon/project.rb

@@ -590,7 +590,7 @@ class Vanagon
     # for the project
     #
     # @return [Array] all the files and directories that should be included in the tarball
-    def get_tarball_files # rubocop:disable Metrics/AbcSize
+    def get_tarball_files
       # It is very important that 'file-list' remains the first element in this
       # array, lest the tar command be malformed and the package creation fail
       files = ['file-list']
@@ -779,7 +779,7 @@ class Vanagon
     # set in the project definition.
     #
     # @param [Vanagon::Platform] the platform to publish settings for
-    def publish_yaml_settings(platform) # rubocop:disable Metrics/AbcSize
+    def publish_yaml_settings(platform)
       return unless yaml_settings
       raise(Vanagon::Error, "You must specify a project version") unless version
 
@@ -831,33 +831,61 @@ class Vanagon
     # @param settings_uri [String] A URI to a yaml settings file
     # @param settings_sha1_uri [String] A URI to a sha1sum file for the yaml settings file
     # @raise [Vanagon::Error] when the settings file can't be found
-    def load_yaml_settings(settings_uri, settings_sha1_uri = nil) # rubocop:disable Metrics/AbcSize
+    def load_yaml_settings(settings_uri, settings_sha1_uri = nil)
+      source_type = yaml_settings_source_type(settings_uri, settings_sha1_uri)
+
+      Dir.mktmpdir do |working_directory|
+        source = Vanagon::Component::Source.source(
+          settings_uri,
+          workdir: working_directory,
+          sum: settings_sha1_uri,
+          sum_type: 'sha1'
+        )
+        source.fetch
+        source.verify
+
+        yaml_path = if source_type == :http
+                      File.join(working_directory, source.file)
+                    else
+                      source.file
+                    end
+
+        @settings.merge!(yaml_safe_load_shim(yaml_path))
+      end
+    end
+
+    # Get the source_type of the settings_uri. Complain if we don't like stuff about it.
+    def yaml_settings_source_type(settings_uri, settings_sha1_uri)
       source_type = Vanagon::Component::Source.determine_source_type(settings_uri)
 
       if %i[unknown git].include?(source_type)
-        message = "Can't inherit settings from '#{settings_uri}'. Only http and file URIs are valid."
+        message = "Can't inherit settings from '#{settings_uri}'. " \
+                  "Only http and file URIs are valid."
         if settings_uri =~ /^file/
-          message = "Tried to load YAML settings from '#{settings_uri}', but the file doesn't exist."
+          message = "Tried to load YAML settings from '#{settings_uri}', " \
+                    "but the file doesn't exist."
         end
         raise Vanagon::Error, message
       end
 
       if (source_type == :http) && !settings_sha1_uri
-        raise Vanagon::Error, "You must provide a sha1sum URI for the YAML file when inheriting YAML settings over http"
+        raise Vanagon::Error, 'The sha1sum URI for the YAML file must be provided ' \
+                              'when inheriting YAML settings over http'
       end
 
-      Dir.mktmpdir do |working_directory|
-        source = Vanagon::Component::Source.source(settings_uri,
-                                                   workdir: working_directory,
-                                                   sum: settings_sha1_uri,
-                                                   sum_type: 'sha1')
-        source.fetch
-        source.verify
-        yaml_path = source.file
-        if source_type == :http
-          yaml_path = File.join(working_directory, source.file)
-        end
-        @settings.merge!(YAML.safe_load(File.read(yaml_path), [Symbol]))
+      source_type
+    end
+
+    # YAML.safe_load introduced an incompatible change in Ruby 3.1.0
+    # Shim that until no longer relevant.
+    def yaml_safe_load_shim(yaml_path)
+      new_safe_load_version = Gem::Version.new('3.1.0')
+      this_version = Gem::Version.new(RUBY_VERSION)
+
+      if this_version >= new_safe_load_version
+        YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol])
+      else
+        YAML.safe_load(File.read(yaml_path), [Symbol])
       end
     end
 

data/lib/vanagon/utilities.rb

@@ -77,8 +77,7 @@ class Vanagon
         end
       end
 
-      response = http.request(request)
-      response
+      http.request(request)
     rescue Errno::ETIMEDOUT, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
       EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
       Net::ProtocolError => e
@@ -159,7 +158,7 @@ class Vanagon
     # @param timeout [Integer] number of seconds to run the block before timing out
     # @return [true] If the block succeeds, true is returned
     # @raise [Vanagon::Error] if the block fails after the retries are exhausted, an error is raised
-    def retry_with_timeout(tries = 5, timeout = 1, &blk) # rubocop:disable Metrics/AbcSize
+    def retry_with_timeout(tries = 5, timeout = 1, &blk)
       error = nil
       tries.to_i.times do
         Timeout::timeout(timeout.to_i) do
@@ -279,7 +278,7 @@ class Vanagon
     end
 
     def clean_environment(&block)
-      return Bundler.with_clean_env { yield } if defined?(Bundler)
+      return Bundler.with_clean_env(&block) if defined?(Bundler)
       yield
     end
     private :clean_environment

data/lib/vanagon.rb

@@ -10,7 +10,3 @@ $:.unshift(LIBDIR) unless
 
 require 'vanagon/cli'
 require 'vanagon/driver'
-
-# The main entry point is {Vanagon::Driver}.
-class Vanagon
-end

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

@@ -1,7 +1,6 @@
 require 'vanagon/component/source/git'
 
 describe "Vanagon::Component::Source::Git" do
-  # before(:all) blocks are run once before all of the examples in a group
   before :all do
     @klass = Vanagon::Component::Source::Git
     # This repo will not be cloned over the network
@@ -12,106 +11,136 @@ describe "Vanagon::Component::Source::Git" do
     @workdir = nil
   end
 
-  # before(:each) blocks are run before each example
-  before :each do
-    allow(Vanagon::Component::Source::Git)
-      .to receive(:valid_remote?)
-            .and_return(true)
-
-    allow(File).to receive(:realpath).and_return(@workdir)
-  end
-
-  describe "#initialize" do
-    it "raises error on initialization with an invalid repo" do
-      # Ensure initializing a repo fails without calling over the network
-      allow(Vanagon::Component::Source::Git)
-        .to receive(:valid_remote?)
-              .and_return(false)
-
-      expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
-        .to raise_error(Vanagon::InvalidRepo)
+  context 'with a github https: URI' do
+    let(:github_archive_uri) do
+      'https://github.com/2ndQuadrant/pglogical/archive/a_file_name.tar.gz'
     end
-
-    it "uses the realpath of the workdir if we're in a symlinked dir" do
-      expect(File).to receive(:realpath).and_return("/tmp/bar")
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(git_source.workdir)
-        .to eq('/tmp/bar')
+    let(:github_tarball_uri) do
+      'https://github.com/Baeldung/kotlin-tutorials/tarball/main'
     end
-
-    it "with no clone options should be empty" do
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(git_source.clone_options)
-          .to be {}
+    let(:github_zipball_uri) do
+      'https://github.com/Baeldung/kotlin-tutorials/zipball/master'
+    end
+    let(:github_repo_uri) do
+      'https://github.com/cameronmcnz/rock-paper-scissors'
+    end
+    let(:github_repo_dotgit_uri) do
+      'https://github.com/cameronmcnz/rock-paper-scissors.git'
     end
 
-    it "add clone options depth and branch" do
-      expected_clone_options = {:branch => "bar", :depth => 50 }
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
-      expect(git_source.clone_options)
-          .to  be(expected_clone_options)
+    it "flags github archive uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_archive_uri)).to be false
     end
-  end
 
-  describe "#clone" do
-    before :each do
-      clone = double(Git::Base)
-      @file_path = "/tmp/foo"
-      allow(::Git).to receive(:clone).and_return(clone)
-      expect(File).to receive(:realpath).and_return(@file_path)
+    it "flags github tarball uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_tarball_uri)).to be false
     end
 
-    it "repository" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
-      git_source.clone
+    it "flags git zipball uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_zipball_uri)).to be false
     end
 
-    it "a particular branch with a depth" do
-      expected_clone_options = {:branch => "foo", :depth => 50 }
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
-      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
-      git_source.clone
+    it "identifies git generic uris as valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_repo_uri)).to be true
     end
 
-    it 'uses a custom dirname' do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
-      expect(::Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
-      git_source.clone
+    it "identifies .git repo uris as valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_repo_dotgit_uri)).to be true
     end
   end
 
-  describe "#dirname" do
-    it "returns the name of the repo" do
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: @workdir)
-      expect(git_source.dirname)
-        .to eq('puppet-agent')
+  context 'with other non-github URIs' do
+    before :each do
+      allow(Vanagon::Component::Source::Git).to receive(:valid_remote?).and_return(true)
+      allow(File).to receive(:realpath).and_return(@workdir)
     end
 
-    it "returns the name of the repo and strips .git" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir)
-      expect(git_source.dirname)
-        .to eq('facter')
+    describe "#initialize" do
+      it "raises error on initialization with an invalid repo" do
+        # Ensure initializing a repo fails without calling over the network
+        allow(Vanagon::Component::Source::Git).to receive(:valid_remote?).and_return(false)
+
+        expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
+          .to raise_error(Vanagon::InvalidRepo)
+      end
+
+      it "uses the realpath of the workdir if we're in a symlinked dir" do
+        expect(File).to receive(:realpath).and_return("/tmp/bar")
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(git_source.workdir).to eq('/tmp/bar')
+      end
+
+      it "with no clone options should be empty" do
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(git_source.clone_options).to be {}
+      end
+
+      it "add clone options depth and branch" do
+        expected_clone_options = {branch: 'bar', depth: 50 }
+        git_source = @klass.new(@local_url, ref: @ref_tag,
+                                workdir: "/tmp/foo", clone_options: expected_clone_options)
+        expect(git_source.clone_options).to  be(expected_clone_options)
+      end
     end
 
-    it "returns @dirname if is set" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
-      expect(git_source.dirname)
-          .to eq('facter-ng')
+    describe "#clone" do
+      before :each do
+        clone = double(Git::Base)
+        @file_path = "/tmp/foo"
+        allow(Git).to receive(:clone).and_return(clone)
+        expect(File).to receive(:realpath).and_return(@file_path)
+      end
+
+      it "repository" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
+        git_source.clone
+      end
+
+      it "a particular branch with a depth" do
+        expected_clone_options = {:branch => "foo", :depth => 50 }
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo",
+                                clone_options: expected_clone_options)
+        expect(Git)
+          .to receive(:clone)
+          .with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
+        git_source.clone
+      end
+
+      it 'uses a custom dirname' do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
+        expect(Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
+        git_source.clone
+      end
     end
-  end
 
-  describe "#ref" do
-    it "returns a default value of HEAD when no explicit Git reference is provided" do
-      git_source = @klass.new(@url, workdir: @workdir)
-      expect(git_source.ref)
-        .to eq('HEAD')
+    describe "#dirname" do
+      it "returns the name of the repo" do
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: @workdir)
+        expect(git_source.dirname).to eq('puppet-agent')
+      end
+
+      it "returns the name of the repo and strips .git" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir)
+        expect(git_source.dirname).to eq('facter')
+      end
+
+      it "returns @dirname if is set" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
+        expect(git_source.dirname).to eq('facter-ng')
+      end
     end
 
-    it "returns a default value of HEAD when Git reference is nil" do
-      git_source = @klass.new(@url, ref: nil, workdir: @workdir)
-      expect(git_source.ref)
-        .to eq('HEAD')
+    describe "#ref" do
+      it "returns a default value of HEAD when no explicit Git reference is provided" do
+        git_source = @klass.new(@url, workdir: @workdir)
+        expect(git_source.ref).to eq('HEAD')
+      end
+
+      it "returns a default value of HEAD when Git reference is nil" do
+        git_source = @klass.new(@url, ref: nil, workdir: @workdir)
+        expect(git_source.ref).to eq('HEAD')
+      end
     end
   end
 end

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

@@ -36,7 +36,7 @@ describe "Vanagon::Component::Source" do
         .to raise_error(URI::InvalidURIError)
     end
 
-    context "takes a Git repo" do
+    context "with a Git repo" do
       before do
         allow_any_instance_of(Vanagon::Component::Source::Git)
           .to receive(:valid_remote?)
@@ -64,12 +64,16 @@ describe "Vanagon::Component::Source" do
 
       it "returns a Git object for git:http:// repositories" do
         component_source = klass.source(git_prefixed_http, ref: ref, workdir: workdir)
-        expect(component_source.url.to_s).to eq 'http://github.com/abcd/things'
         expect(component_source.class).to eq Vanagon::Component::Source::Git
       end
+
+      it "returns a Git url for git:http:// repositories" do
+        component_source = klass.source(git_prefixed_http, ref: ref, workdir: workdir)
+        expect(component_source.url.to_s).to eq 'http://github.com/abcd/things'
+      end
     end
 
-    context "takes a HTTP/HTTPS file" do
+    context "with a HTTP/HTTPS file" do
       before do
         allow(Vanagon::Component::Source::Http)
           .to receive(:valid_url?)
@@ -96,7 +100,7 @@ describe "Vanagon::Component::Source" do
       end
     end
 
-    context "takes a local file" do
+    context "with a local file" do
       before do
         allow_any_instance_of(Vanagon::Component::Source::Local)
           .to receive(:valid_file?)
@@ -113,4 +117,74 @@ describe "Vanagon::Component::Source" do
       end
     end
   end
+
+  describe "#determine_source_type" do
+    context 'with a github https: URI' do
+
+      let(:github_archive_uri) do
+        'https://github.com/2ndQuadrant/pglogical/archive/a_file_name.tar.gz'
+      end
+      let(:github_tarball_uri) do
+        'https://github.com/Baeldung/kotlin-tutorials/tarball/main'
+      end
+      let(:github_zipball_uri) do
+        'https://github.com/Baeldung/kotlin-tutorials/zipball/master'
+      end
+      let(:github_repo_uri) do
+        'https://github.com/cameronmcnz/rock-paper-scissors'
+      end
+      let(:github_repo_dotgit_uri) do
+        'https://github.com/cameronmcnz/rock-paper-scissors.git'
+      end
+
+      it "identifies github archive uris" do
+        stub_request(:head, github_archive_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_archive_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github tarball uris" do
+        stub_request(:head, github_tarball_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_tarball_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github zipball uris" do
+        stub_request(:head, github_zipball_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_zipball_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github generic repo uris" do
+        expect(Vanagon::Component::Source.determine_source_type(github_repo_uri))
+          .to eq(:git)
+      end
+
+      it "identifies github .git repo uris" do
+        expect(Vanagon::Component::Source.determine_source_type(github_repo_dotgit_uri))
+          .to eq(:git)
+      end
+    end
+  end
 end