vanagon 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd91238696bb5b6eded5bff5caaa11367bdb9a72
-  data.tar.gz: 2b06dab33a59ae1230dadfa8a7173a76f0ae6779
+  metadata.gz: 0e69b827c87e42df5740b868926ede94d03ffe23
+  data.tar.gz: 48063c4f0fff9db3c8c40b8eaf55930d930ff516
 SHA512:
-  metadata.gz: 69e00da92f02f69ff0033d860c8f4a597963eafe1a23d207d2db12467090c5ac2cb90e02a28687d21a82cdd6fcaec206b017ab8c24e04398d49bda85837c7991
-  data.tar.gz: ca04ff31f4265f13886605a00402b86955b13468dd42e17284c8020670a971ab1bd8673d2a8255fdef5aaa99799f8fc0c2faeca03dcccb02289c49c042c1c56f
+  metadata.gz: ba1e2146ea55742e934e53b59807042e569a048d9a8f215f7ee3acbeb9026772659d836cefb0ffb15924c13085c2a676cfe25b3d41200c92826d34cda7b46b70
+  data.tar.gz: dc76822ffe4ea4bcf888ead30e16de669ea021211a6b0fe9d11bbda772f2f35887947a4e3e932f994ffd97e0ec8d62bc00eded1fe02362c852bf5cb0fc2566b1

data/lib/vanagon/component/source/http.rb

@@ -30,7 +30,7 @@ class Vanagon
         # Download the source from the url specified. Sets the full path to the
         # file as @file and the @extension for the file as a side effect.
         def fetch
-          @file = download
+          @file = download(@url)
           @extension = get_extension
         end
 
@@ -46,26 +46,30 @@ class Vanagon
         end
 
         # Downloads the file from @url into the @workdir
-        #
+        # @param target_url [String, URI, Addressable::URI] url of an http source to retrieve with GET
         # @raise [RuntimeError, Vanagon::Error] an exception is raised if the URI scheme cannot be handled
-        def download
-          uri = URI.parse(@url)
-          target_file = File.basename(uri.path)
-          puts "Downloading file '#{target_file}' from url '#{@url}'"
-          case uri.scheme
-          when 'http', 'https'
-            Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-              request = Net::HTTP::Get.new(uri)
+        def download(target_url, target_file = nil)
+          uri = URI.parse(target_url.to_s)
+          target_file ||= File.basename(uri.path)
 
-              http.request request do |response|
-                unless response.is_a? Net::HTTPSuccess
-                  fail "Error: #{response.code.to_s}. Unable to get source from #{@url}"
-                end
+          puts "Downloading file '#{target_file}' from url '#{target_url}'"
+
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+            http.request(Net::HTTP::Get.new(uri)) do |response|
+              case response
+              when Net::HTTPRedirection
+                # By parsing the location header, we get either an absolute
+                # URI or a URI with a relative `path`. Adding it to `uri`
+                # should correctly update the relative `path` or overwrite
+                # the entire URI if it's absolute.
+                location = URI.parse(response.header['location'])
+                download(uri + location, target_file)
+              when Net::HTTPSuccess
                 open(File.join(@workdir, target_file), 'w') do |io|
-                  response.read_body do |chunk|
-                    io.write(chunk)
-                  end
+                  response.read_body { |chunk| io.write(chunk) }
                 end
+              else
+                fail "Error: #{response.code.to_s}. Unable to get source from #{target_url}"
               end
             end
           end

data/lib/vanagon/driver.rb

@@ -27,17 +27,27 @@ class Vanagon
       @project.settings[:skipcheck] = options[:skipcheck]
       loginit('vanagon_hosts.log')
 
-      # If a target has been given, we don't want to make any assumptions about how to tear it down.
-      engine = 'base' if target
-      # Hardware has explicit teardown to unlock the node
-      engine = 'hardware' if @platform.build_hosts
-      require "vanagon/engine/#{engine}"
-      @engine = Object.const_get("Vanagon::Engine::#{engine.capitalize}").new(@platform, target)
-
+      load_engine(engine, @platform, target)
     rescue LoadError => e
       raise Vanagon::Error.wrap(e, "Could not load the desired engine '#{engine}'")
     end
 
+    def load_engine(engine_type, platform, target)
+      if platform.build_hosts
+        engine_type = 'hardware'
+      elsif target
+        engine_type = 'base'
+      end
+      load_engine_object(engine_type, platform, target)
+    end
+
+    def load_engine_object(engine_type, platform, target)
+      require "vanagon/engine/#{engine_type}"
+      @engine = Object::const_get("Vanagon::Engine::#{engine_type.capitalize}").new(platform, target)
+    rescue
+      fail "No such engine '#{engine_type.capitalize}'"
+    end
+
     def cleanup_workdir
       FileUtils.rm_rf(@workdir)
     end

data/lib/vanagon/platform.rb

@@ -6,7 +6,7 @@ class Vanagon
     attr_accessor :build_dependencies, :name, :vmpooler_template, :cflags, :ldflags, :settings
     attr_accessor :servicetype, :patch, :architecture, :codename, :os_name, :os_version
     attr_accessor :docker_image, :ssh_port, :rpmbuild, :install, :platform_triple
-    attr_accessor :target_user, :package_type, :find, :sort, :build_hosts, :copy
+    attr_accessor :target_user, :package_type, :find, :sort, :build_hosts, :copy, :cross_compiled
 
     # Platform names currently contain some information about the platform. Fields
     # within the name are delimited by the '-' character, and this regex can be used to
@@ -105,6 +105,7 @@ class Vanagon
       @find ||= "find"
       @sort ||= "sort"
       @copy ||= "cp"
+      @cross_compiled ||= false
     end
 
     # This allows instance variables to be accessed using the hash lookup syntax
@@ -239,5 +240,21 @@ class Vanagon
     def is_linux?
       return (!is_windows? && !is_unix?)
     end
+
+    # Utility matcher to determine if the platform is a cross-compiled variety
+    #
+    # @return [true, false] true if it is a cross-compiled variety, false otherwise
+    def is_cross_compiled?
+      return @cross_compiled
+    end
+
+    # Utility matcher to determine if the platform is a cross-compiled Linux variety.
+    # Many of the customizations needed to cross-compile for Linux are similar, so it's
+    # useful to group them together vs. other cross-compiled OSes.
+    #
+    # @return [true, false] true if it is a cross-compiled Linux variety, false otherwise
+    def is_cross_compiled_linux?
+      return (is_cross_compiled? && is_linux?)
+    end
   end
 end

data/lib/vanagon/platform/dsl.rb

@@ -121,6 +121,13 @@ class Vanagon
         @platform.copy = copy_cmd
       end
 
+      # Set the cross_compiled flag for the platform
+      #
+      # @param cxx_flag [Boolean] True if this is a cross-compiled platform
+      def cross_compiled(cxx_flag)
+        @platform.cross_compiled = cxx_flag
+      end
+
       # Set the path to rpmbuild for the platform
       #
       # @param rpmbuild_cmd [String] Full path to rpmbuild with arguments to be used by default

data/lib/vanagon/project/dsl.rb

@@ -85,6 +85,13 @@ class Vanagon
         @project.homepage = page
       end
 
+      # Sets the timeout for the project retry logic
+      #
+      # @param page [Integer] timeout in seconds
+      def timeout(to)
+        @project.timeout = to
+      end
+
       # Sets the run time requirements for the project. Mainly for use in packaging.
       #
       # @param req [String] of requirements of the project

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.