vanagon 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a9286e3d7f89a5d145e4a5745cbb4d08ac9276
-  data.tar.gz: 6e1cf377bd79799c726e583bd8401d81fc8e1475
+  metadata.gz: 0c9f345fa7806fdbe0b1cf43676acd3549f10ff7
+  data.tar.gz: d8e6a4740b1a1e914d7b788b745caea008823204
 SHA512:
-  metadata.gz: 594d72e7506ae70075e34a690981f144b4d332204ceeee433462aaa82ec9611baf12f3e516d9283598532d4bc150b097b1d2fd2491f3d566feddb024cfb1e0bc
-  data.tar.gz: f2387a452a90af391f7cff1a5e498bb2322cc4ce8729b6fa26c6c43166173a0dd44285814bb1a2ab0009ec8d5b3b720e1b7dc7167a9f8707c2725689d3669fc1
+  metadata.gz: 69d1ff1c24e3c71daf49454fa9a3bcdaf5faeb4caf611c4859106828e0e4e91f18337bd41500a0a9a56693f48f7ccff49fedd585678210fc8ebe6d43768ca15a
+  data.tar.gz: 1dd4036ebfa52ec377234567a91c9e838e01e63a262b56d480646b89b0562296cd8e3ca9d64783565b0e1f13c940636c2e276da7b1561eb348aa4f7784c02fac

data/bin/render

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
+
+optparse = Vanagon::OptParse.new(
+  "#{File.basename(__FILE__)} <project-name> <platform-name> [options]",
+  [:workdir, :configdir, :engine]
+)
+options = optparse.parse! ARGV
+
+project = ARGV[0]
+platforms = ARGV[1]
+targets = ARGV[2]
+
+if project.nil? or platforms.nil?
+  warn "project and platform are both required arguments."
+  puts optparse
+  exit 1
+end
+
+platform_list = platforms.split(',')
+target_list = []
+
+platform_list.zip(target_list).each do |pair|
+  platform, target = pair
+  artifact = Vanagon::Driver.new(platform, project, options.merge({ :target => target }))
+  artifact.render
+end

data/lib/vanagon/driver.rb

@@ -13,9 +13,10 @@ class Vanagon
     attr_accessor :platform, :project, :target, :workdir, :verbose, :preserve
     attr_accessor :timeout, :retry_count
 
-    def initialize(platform, project, options = { :configdir => nil, :target => nil, :engine => nil, :components => nil, :skipcheck => false, :verbose => false, :preserve => false, :only_build => nil }) # rubocop:disable Metrics/AbcSize
+    def initialize(platform, project, options = { workdir: nil, configdir: nil, target: nil, engine: nil, components: nil, skipcheck: false, verbose: false, preserve: false, only_build: nil }) # rubocop:disable Metrics/AbcSize
       @verbose = options[:verbose]
       @preserve = options[:preserve]
+      @workdir = options[:workdir] || Dir.mktmpdir
 
       @@configdir = options[:configdir] || File.join(Dir.pwd, "configs")
       components = options[:components] || []
@@ -111,7 +112,7 @@ class Vanagon
       if @project.version.nil? or @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."
       end
-      @workdir = Dir.mktmpdir
+
       @engine.startup(@workdir)
 
       puts "Target is #{@engine.target}"
@@ -135,6 +136,17 @@ class Vanagon
       end
     end
 
+    def render
+      # Simple sanity check for the project
+      if @project.version.nil? or @project.version.empty?
+        raise Vanagon::Error, "Project requires a version set, all is lost."
+      end
+
+      puts "rendering Makefile"
+      retry_task { @project.fetch_sources(@workdir) }
+      @project.make_makefile(@workdir)
+    end
+
     def prepare(workdir = nil) # rubocop:disable Metrics/AbcSize
       @workdir = workdir ? FileUtils.mkdir_p(workdir).first : Dir.mktmpdir
       @engine.startup(@workdir)

data/lib/vanagon/platform.rb

@@ -2,16 +2,102 @@ require 'vanagon/platform/dsl'
 
 class Vanagon
   class Platform
-    attr_accessor :make, :servicedir, :defaultdir, :provisioning, :num_cores
-    attr_accessor :tar, :build_dependencies, :name, :vmpooler_template
-    attr_accessor :abs_resource_name, :cflags, :ldflags, :settings
-    attr_accessor :servicetype, :patch, :architecture, :codename, :os_name
-    attr_accessor :os_version, :docker_image, :ssh_port, :rpmbuild, :install
-    attr_accessor :platform_triple, :target_user, :package_type, :find, :sort
-    attr_accessor :build_hosts, :copy, :cross_compiled, :aws_ami
-    attr_accessor :aws_user_data, :aws_shutdown_behavior, :aws_key_name
-    attr_accessor :aws_region, :aws_key, :aws_instance_type, :aws_vpc_id
-    attr_accessor :aws_subnet_id, :output_dir
+    # Basic generic information related to a given instance of Platform.
+    # e.g. The name we call it, the platform triplet (name-version-arch), etc.
+    attr_accessor :name
+    attr_accessor :platform_triple
+    attr_accessor :architecture
+    attr_accessor :os_name
+    attr_accessor :os_version
+    attr_accessor :codename # this is Debian/Ubuntu specific
+
+    # The name of the sort of package type that a given platform expects,
+    # e.g. msi, rpm,
+    attr_accessor :package_type
+
+    # The name of the sort of init system that a given platform uses
+    attr_accessor :servicetype
+    # Where does a given platform expect to find init scripts/service files?
+    # e.g. /etc/init.d, /usr/lib/systemd/system
+    attr_accessor :servicedir
+    # Where does a given platform's init system expect to find
+    # something resembling 'defaults' files. Most likely to apply
+    # to Linux systems that use SysV-ish, upstart, or systemd init systems.
+    attr_accessor :defaultdir
+
+    # Each of these holds the path or name of the command in question,
+    # e.g. `copy = "/usr/local/bin/gcp"`, or `copy = "cp"
+    attr_accessor :copy
+    attr_accessor :find
+    attr_accessor :install
+    attr_accessor :make
+    attr_accessor :patch
+    attr_accessor :rpmbuild # This is RedHat/EL/Fedora/SLES specific
+    attr_accessor :sort
+    attr_accessor :tar
+
+    # Hold a string containing the values that a given platform
+    # should use when a Makefile is run - resolves to the CFLAGS
+    # and LDFLAGS variables. Should also be extended to support
+    # CXXFLAGS and CPPFLAGS ASAP.
+    attr_accessor :cflags
+    attr_accessor :ldflags
+
+    # Stores an Array of OpenStructs, each representing a complete
+    # command to be run to install external the needed toolchains
+    # and build dependencies for a given target platform.
+    attr_accessor :build_dependencies
+
+    # Stores the local path where retrieved artifacts will be saved.
+    attr_accessor :output_dir
+
+    # Username to use when connecting to a build target
+    attr_accessor :target_user
+
+    # Stores an Array of Strings, which will be passed
+    # in as a shell script as part of the provisioning step
+    # for a given build target
+    attr_accessor :provisioning
+
+    # Determines if a platform should be treated as
+    # cross-compiled or natively compiled.
+    attr_accessor :cross_compiled
+
+    # A string, containing the script that will be executed on
+    # the remote build target to determine how many CPU cores
+    # are available on that platform. Vanagon will use that count
+    # to determine how many build threads should be initialized
+    # for compilations.
+    attr_accessor :num_cores
+
+    # Generic engine
+    attr_accessor :ssh_port
+
+    # Hardware engine specific
+    attr_accessor :build_hosts
+
+    # Always-Be-Scheduling engine specific
+    attr_accessor :abs_resource_name
+
+    # VMpooler engine specific
+    attr_accessor :vmpooler_template
+
+    # Docker engine specific
+    attr_accessor :docker_image
+
+    # AWS engine specific
+    attr_accessor :aws_ami
+    attr_accessor :aws_user_data
+    attr_accessor :aws_shutdown_behavior
+    attr_accessor :aws_key_name
+    attr_accessor :aws_region
+    attr_accessor :aws_key
+    attr_accessor :aws_instance_type
+    attr_accessor :aws_vpc_id
+    attr_accessor :aws_subnet_id
+
+    # Freeform Hash of leftover settings
+    attr_accessor :settings
 
     # 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
@@ -221,11 +307,22 @@ class Vanagon
       return !!@name.match(/^cisco-wrlinux-.*$/)
     end
 
-    # Utility matcher to determine is the platform is an osx variety
+    # Utility matcher to determine if the platform is an osx variety
     #
+    # @deprecated Please use is_macos? instead
     # @return [true, false] true if it is an osx variety, false otherwise
     def is_osx?
-      return !!@name.match(/^osx-.*$/)
+      warn "is_osx? is a deprecated method, please use #is_macos? instead."
+      is_macos?
+    end
+
+    # Utility matcher to determine if the platform is a macos or osx variety
+    # is_osx is a deprecated method that calls is_macos
+    # We still match for osx currently but this will change
+    #
+    # @return [true, false] true if it is a macos or osx variety, false otherwise
+    def is_macos?
+      !!(@name =~ /^macos-.*$/ || @name =~ /^osx-.*$/)
     end
 
     # Utility matcher to determine is the platform is a solaris variety

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -59,6 +59,7 @@ executables:
 - build
 - inspect
 - ship
+- render
 - repo
 - devkit
 - build_host_info
@@ -71,6 +72,7 @@ files:
 - bin/build_host_info
 - bin/devkit
 - bin/inspect
+- bin/render
 - bin/repo
 - bin/ship
 - lib/git/basic_submodules.rb
@@ -233,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.