pkgforge 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca053ae9faf8703044efb96aa5af946b834cc0a
-  data.tar.gz: 79fbafd6cfff400c531ac02017bf5e905f120aef
+  metadata.gz: db7f41b90da9053a2afaa72620879e7edc44f860
+  data.tar.gz: 6bdddd3a26207ef02fa8ae5836886b9d5dffd022
 SHA512:
-  metadata.gz: c84d652a7053e84fcee047d3807a2540dd9ad44221ca4539f902ad30253fb49292e8da091167ad0b5a296e69e3de27d267c26709365288ff60460a9672985b87
-  data.tar.gz: 9201e5291269fa244432e799b5a616e21acac36dffadb8441dc7462d3048dcfff977effe4d85b32ac2efe19ccb17798286fd96bd33347503de732092be1807f5
+  metadata.gz: 7896cebed55fb4301058c26801cce22c4a606b9b5fac57ec33fbc24920157cc6b213baf05f5cd2acef385811214584618be3a012bb5f24ffe6875b1d92aee38d
+  data.tar.gz: b7212896f57b374944d7bfb1e1b216b31d16c8fddbc8eff65a8fd135c6f934079a4183473cb26ca9d3a88687b357fb81f97d3978fe9ff8b9d1dd5184e2f0d4b4

data/lib/pkgforge.rb

@@ -1,14 +1,19 @@
 require 'contracts'
 
+require 'pkgforge/base'
 require 'pkgforge/version'
-require 'pkgforge/helpers'
-require 'pkgforge/prepare'
-require 'pkgforge/push'
-require 'pkgforge/forge'
-require 'pkgforge/forgedsl'
-require 'pkgforge/builddsl'
-require 'pkgforge/testdsl'
-require 'pkgforge/versiondsl'
+require 'pkgforge/components/build'
+require 'pkgforge/components/cflags'
+require 'pkgforge/components/configure'
+require 'pkgforge/components/deps'
+require 'pkgforge/components/dirs'
+require 'pkgforge/components/metadata'
+require 'pkgforge/components/patch'
+require 'pkgforge/components/run'
+require 'pkgforge/components/source'
+require 'pkgforge/components/test'
+require 'pkgforge/components/upload'
+require 'pkgforge/components/version'
 
 ##
 # DSL engine for compiling Arch packages
@@ -31,7 +36,7 @@ module PkgForge
     def load_from_file(params = {})
       file = params[:file] || DEFAULT_FILE
       forge = Forge.new(params)
-      dsl = ForgeDSL.new(forge, params)
+      dsl = DSL::Forge.new(forge)
       dsl.instance_eval(File.read(file), file)
       forge
     end

data/lib/pkgforge/base.rb

@@ -0,0 +1,43 @@
+require 'contracts'
+
+module PkgForge
+  ##
+  # Starter Forge object
+  class Forge
+    include Contracts::Core
+    include Contracts::Builtin
+
+    Contract Maybe[HashOf[Symbol => Any]] => nil
+    def initialize(params = {})
+      @options = params
+      nil
+    end
+  end
+
+  ##
+  # Base engine structure
+  class Base
+    include Contracts::Core
+    include Contracts::Builtin
+
+    Contract PkgForge::Forge => nil
+    def initialize(forge)
+      @forge = forge
+      nil
+    end
+  end
+
+  module DSL
+    class Forge < PkgForge::Base
+    end
+
+    class Build < PkgForge::Base
+    end
+
+    class Test < PkgForge::Base
+    end
+
+    class Version < PkgForge::Base
+    end
+  end
+end

data/lib/pkgforge/components/build.rb

@@ -0,0 +1,72 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add build methods to Forge
+  class Forge
+    attr_writer :build_block
+
+    Contract None => Proc
+    def build_block
+      @build_block ||= proc { raise 'No build block provided' }
+    end
+
+    Contract None => nil
+    def build!
+      prepare_source!
+      patch_source!
+      prepare_deps!
+      builder = PkgForge::DSL::Build.new(self)
+      builder.instance_eval(&build_block)
+    end
+  end
+
+  module DSL
+    ##
+    # Add build method to Forge DSL
+    class Forge
+      Contract Func[None => nil] => nil
+      def build(&block)
+        @forge.build_block = block
+        nil
+      end
+    end
+
+    ##
+    # Add build methods to Build DSL
+    class Build
+      Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+      def run(*args)
+        @forge.run(*args)
+      end
+
+      Contract None => nil
+      def configure
+        env = {
+          'CC' => 'musl-gcc',
+          'CFLAGS' => @forge.cflags.join(' '),
+          'LIBS' => @forge.libs.join(' ')
+        }
+        run ['./configure'] + configure_flag_strings, env
+      end
+
+      Contract None => nil
+      def make
+        run 'make'
+      end
+
+      Contract None => nil
+      def install
+        run "make DESTDIR=#{@forge.releasedir} install"
+      end
+
+      Contract Or[String, ArrayOf[String]] => nil
+      def rm(paths)
+        paths = [paths] if paths.is_a? String
+        paths.map { |x| File.join(@forge.releasedir, x) }
+        FileUtils.rm_r paths
+        nil
+      end
+    end
+  end
+end

data/lib/pkgforge/components/cflags.rb

@@ -0,0 +1,57 @@
+module PkgForge
+  ##
+  # Add cflag options to Forge
+  class Forge
+    attr_writer :cflags, :libs
+
+    Contract None => ArrayOf[String]
+    def cflags
+      @cflags ||= []
+    end
+
+    Contract None => ArrayOf[String]
+    def libs
+      @libs ||= []
+    end
+  end
+
+  module DSL
+    ##
+    # Add cflag options to Forge DSL
+    class Forge
+      Contract Maybe[String] => nil
+      def cflags(value = nil)
+        default = '-I%{dep}/usr/include -L%{dep}/usr/lib'
+        value ||= @forge.deps.map { |x, _| default % { dep: dep(x) }.split }
+        @forge.cflags += value.flatten
+        nil
+      end
+
+      Contract Maybe[String] => nil
+      def libs(value = nil)
+        value ||= @forge.deps.map { |x, _| '-l' + x }
+        @forge.libs += value
+        nil
+      end
+
+      # Shamelessly sourced from:
+      # https://blog.mayflower.de/5800-Hardening-Compiler-Flags-for-NixOS.html
+      ALL_HARDEN_OPTS = {
+        format: %w(-Wformat -Wformat-security -Werror=format-security),
+        stackprotector: %w(-fstack-protector-strong --param ssp-buffer-size=4),
+        fortify: %w(-O2 -D_FORTIFY_SOURCE=2),
+        pic: '-fPIC',
+        strictoverflow: '-fno-strict-overflow',
+        relro: '-z=relro',
+        bindnow: '-z=bindnow',
+        pie: %w(-fPIE -pie)
+      }.freeze
+
+      Contract Maybe[Array[String]] => nil
+      def harden(list = [])
+        harden_opts = ALL_HARDEN_OPTS.reject { |k, _| list.include? k.to_s }
+        @forge.cflags += harden_opts.flatten
+      end
+    end
+  end
+end

data/lib/pkgforge/components/configure.rb

@@ -0,0 +1,35 @@
+module PkgForge
+  ##
+  # Add configure flag options to Forge
+  class Forge
+    attr_writer :configure_flags
+
+    Contract None => HashOf[Symbol => Maybe[String]]
+    def configure_flags
+      @configure_flags ||= {}
+    end
+  end
+
+  module DSL
+    ##
+    # Add configure flag options to Forge DSL
+    class Forge
+      Contract HashOf[Symbol => Maybe[String]] => nil
+      def configure_flags(value)
+        @forge.configure_flags = value
+        nil
+      end
+    end
+
+    ##
+    # Add configure flag options to Build DSL
+    class Build
+      Contract None => ArrayOf[String]
+      def configure_flag_strings
+        @forge.configure_flags.map do |flag, value|
+          "--#{flag}#{'=' if value}#{value}"
+        end
+      end
+    end
+  end
+end

data/lib/pkgforge/components/deps.rb

@@ -0,0 +1,38 @@
+require 'open-uri'
+
+module PkgForge
+  ##
+  # Add dep methods to Forge
+  class Forge
+    attr_writer :deps
+
+    Contract None => HashOf[Symbol => String]
+    def deps
+      @deps ||= {}
+    end
+
+    private
+
+    Contract None => nil
+    def prepare_deps!
+      deps.each do |dep_name, dep_version|
+        url = "https://github.com/#{org}/#{dep_name}/releases/download/#{dep_version}/#{dep_name}.tar.gz" # rubocop:disable Metrics/LineLength
+        open(tmpfile(dep_name), 'wb') { |fh| fh << open(url, 'rb').read }
+        run_local "tar -x -C #{tmpdir(dep_name)} -f #{tmpfile(dep_name)}"
+      end
+      nil
+    end
+  end
+
+  module DSL
+    ##
+    # Add dep methods to Forge DSL
+    class Forge
+      Contract HashOf[Symbol => String] => nil
+      def deps(value)
+        @forge.deps = value
+        nil
+      end
+    end
+  end
+end

data/lib/pkgforge/components/dirs.rb

@@ -0,0 +1,41 @@
+require 'tmpdir'
+require 'tempfile'
+
+module PkgForge
+  ##
+  # Add dir methods to Forge
+  class Forge
+    Contract String => String
+    def dep(package)
+      tmpdir(package.to_sym)
+    end
+
+    Contract None => String
+    def releasedir
+      tmpdir(:release)
+    end
+
+    Contract Symbol => String
+    def tmpdir(id)
+      @tmpdirs ||= {}
+      @tmpdirs[id] ||= Dir.mktmpdir(id.to_s)
+    end
+
+    Contract Symbol => String
+    def tmpfile(id)
+      @tmpfiles ||= {}
+      @tmpfiles[id] ||= Tempfile.create(id.to_s).path
+    end
+  end
+
+  module DSL
+    ##
+    # Add dir methods to Forge DSL
+    class Forge
+      Contract String => String
+      def dep(dep_name)
+        @forge.dep(dep_name)
+      end
+    end
+  end
+end

data/lib/pkgforge/components/metadata.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add metadata methods to Forge
+  class Forge
+    attr_writer :name, :org, :license
+
+    Contract None => String
+    def name
+      @name || raise('No name provided')
+    end
+
+    Contract None => String
+    def org
+      @org || raise('No org provided')
+    end
+
+    Contract None => String
+    def license
+      @license ||= 'LICENSE'
+    end
+
+    Contract None => nil
+    def add_license!
+      src_file = File.join(tmpdir(:build), license)
+      dest_dir = File.join(
+        tmpdir(:release), 'usr', 'share', 'licenses', name
+      )
+      dest_file = File.join(dest_dir, 'LICENSE')
+      FileUtils.mkdir_p dest_dir
+      FileUtils.cp src_file, dest_file
+      nil
+    end
+  end
+
+  module DSL
+    ##
+    # Add metadata methods to Forge DSL
+    class Forge
+      Contract String => nil
+      def name(value)
+        @forge.name = value
+        nil
+      end
+
+      Contract String => nil
+      def org(value)
+        @forge.org = value
+        nil
+      end
+
+      Contract String => nil
+      def license(file)
+        @forge.license = file
+        nil
+      end
+    end
+  end
+end

data/lib/pkgforge/components/patch.rb

@@ -0,0 +1,34 @@
+module PkgForge
+  ##
+  # Add patch methods to Forge
+  class Forge
+    attr_writer :patches
+
+    Contract None => ArrayOf[String]
+    def patches
+      @patches ||= []
+    end
+
+    private
+
+    Contract None => nil
+    def patch_source!
+      patches.each do |patch|
+        run_local "patch -d #{tmpdir(:build)} -p1 < patches/#{patch}"
+      end
+      nil
+    end
+  end
+
+  module DSL
+    ##
+    # Add patch methods to Forge DSL
+    class Forge
+      Contract String => nil
+      def patch(file)
+        @forge.patches << file
+        nil
+      end
+    end
+  end
+end

data/lib/pkgforge/components/run.rb

@@ -0,0 +1,31 @@
+module PkgForge
+  ##
+  # Add run methods to Forge
+  class Forge
+    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+    def run(cmd, env = {})
+      Dir.chdir(tmpdir(:build)) do
+        run_local(cmd, env)
+      end
+      nil
+    end
+
+    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+    def test_run(cmd, env = {})
+      Dir.chdir(tmpdir(:release)) do
+        run_local(cmd, env)
+      end
+    end
+
+    private
+
+    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+    def run_local(cmd, env = {})
+      puts "Running command in #{Dir.pwd}: #{cmd}"
+      puts "Using env: #{env}" unless env.empty?
+      res = system env, *cmd
+      raise('Command failed!') unless res
+      nil
+    end
+  end
+end

data/lib/pkgforge/components/source.rb

@@ -0,0 +1,23 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add source methods to Forge
+  class Forge
+    private
+
+    Contract None => nil
+    def prepare_source!
+      dest = tmpdir(:build)
+      dest_git = File.join(dest, '.git')
+      dest_git_config = File.join(dest_git, 'config')
+      run_local 'git submodule update --init'
+      FileUtils.cp_r 'upstream/.', dest
+      FileUtils.rm_r dest_git
+      FileUtils.cp_r '.git/modules/upstream', dest_git
+      new_config = File.readlines(dest_git_config).grep_v(/worktree =/).join
+      File.open(dest_git_config, 'w') { |fh| fh << new_config }
+      nil
+    end
+  end
+end

data/lib/pkgforge/components/test.rb

@@ -0,0 +1,44 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add test methods to Forge
+  class Forge
+    attr_writer :test_block
+
+    Contract None => Proc
+    def test_block
+      @test_block ||= proc { raise 'No test block provided' }
+    end
+
+    Contract None => nil
+    def test!
+      tester = PkgForge::DSL::Test.new(self)
+      tester.instance_eval(&test_block)
+    end
+  end
+
+  module DSL
+    ##
+    # Add test methods to Forge DSL
+    class Forge
+      Contract Func[None => nil] => nil
+      def test(&block)
+        @forge.test_block = block
+        nil
+      end
+    end
+
+    ##
+    # Add test methods to Test DSL
+    class Test
+      Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+      def run(cmd, env = {})
+        cmd.unshift('/usr/bin/env') if cmd.is_a? Array
+        cmd << ';' if cmd.is_a? String
+        env['PATH'] ||= './usr/bin'
+        @forge.test_run(cmd, env)
+      end
+    end
+  end
+end

data/lib/pkgforge/{push.rb → components/upload.rb}

@@ -1,12 +1,25 @@
 module PkgForge
   ##
-  # Helpers for pushing
-  module Push
-    include Contracts::Core
-    include Contracts::Builtin
+  # Add upload methods to Forge
+  class Forge
+    Contract None => nil
+    def push!
+      add_license!
+      make_tarball!
+      update_repo!
+      upload_artifact!
+    end
 
     private
 
+    Contract None => nil
+    def make_tarball!
+      Dir.chdir(tmpdir(:release)) do
+        run_local "tar -czvf #{tmpfile(:tarball)} *"
+      end
+      nil
+    end
+
     Contract None => nil
     def update_repo!
       run_local "git tag -f '#{full_version}'"

data/lib/pkgforge/components/version.rb

@@ -0,0 +1,52 @@
+module PkgForge
+  ##
+  # Add version methods to Forge
+  class Forge
+    attr_writer :version_block
+
+    Contract None => Proc
+    def version_block
+      @version_block ||= proc { raise 'No version block provided' }
+    end
+
+    Contract None => String
+    def version
+      @version ||= Dir.chdir(tmpdir(:build)) do
+        PkgForge::DSL::Version.new(self).instance_eval(&version_block)
+      end
+    end
+
+    Contract None => Num
+    def revision
+      @revision ||= `git describe --abbrev=0 --tags`.split('-').last.to_i + 1
+    end
+
+    Contract None => String
+    def full_version
+      "#{version}-#{revision}"
+    end
+  end
+
+  module DSL
+    ##
+    # Add version methods to Forge DSL
+    class Forge
+      Contract Func[None => Maybe[String]] => nil
+      def version(&block)
+        @forge.version_block = block
+        nil
+      end
+    end
+
+    ##
+    # Add version methods to Version DSL
+    class Version
+      Contract Maybe[Regexp], Maybe[String] => String
+      def git_tag(regex = nil, replace = '\1')
+        tag = `git describe --tags`.rstrip
+        tag.gsub!(regex, replace) if regex
+        tag
+      end
+    end
+  end
+end

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -127,15 +127,20 @@ files:
 - bin/pkgforge
 - circle.yml
 - lib/pkgforge.rb
-- lib/pkgforge/builddsl.rb
-- lib/pkgforge/forge.rb
-- lib/pkgforge/forgedsl.rb
-- lib/pkgforge/helpers.rb
-- lib/pkgforge/prepare.rb
-- lib/pkgforge/push.rb
-- lib/pkgforge/testdsl.rb
+- lib/pkgforge/base.rb
+- lib/pkgforge/components/build.rb
+- lib/pkgforge/components/cflags.rb
+- lib/pkgforge/components/configure.rb
+- lib/pkgforge/components/deps.rb
+- lib/pkgforge/components/dirs.rb
+- lib/pkgforge/components/metadata.rb
+- lib/pkgforge/components/patch.rb
+- lib/pkgforge/components/run.rb
+- lib/pkgforge/components/source.rb
+- lib/pkgforge/components/test.rb
+- lib/pkgforge/components/upload.rb
+- lib/pkgforge/components/version.rb
 - lib/pkgforge/version.rb
-- lib/pkgforge/versiondsl.rb
 - pkgforge.gemspec
 - spec/pkgforge_spec.rb
 - spec/spec_helper.rb

data/lib/pkgforge/builddsl.rb

@@ -1,55 +0,0 @@
-require 'fileutils'
-
-module PkgForge
-  ##
-  # Builder engine
-  class BuildDSL
-    include Contracts::Core
-    include Contracts::Builtin
-
-    Contract PkgForge::Forge => nil
-    def initialize(forge)
-      @forge = forge
-      nil
-    end
-
-    private
-
-    Contract Or[String, Array], Or[Hash[String => String], {}, nil] => nil
-    def run(*args)
-      @forge.run(*args)
-    end
-
-    Contract None => nil
-    def configure
-      flag_strings = @forge.configure_flags.map do |flag, value|
-        "--#{flag}#{'=' if value}#{value}"
-      end
-      env = {
-        'CC' => 'musl-gcc',
-        'CFLAGS' => @forge.all_cflags,
-        'LDFLAGS' => @forge.all_cflags,
-        'LIBS' => @forge.libs
-      }
-      run ['./configure'] + flag_strings, env
-    end
-
-    Contract None => nil
-    def make
-      run 'make'
-    end
-
-    Contract None => nil
-    def install
-      run "make DESTDIR=#{@forge.releasedir} install"
-    end
-
-    Contract Or[String, Array[String]] => nil
-    def rm(paths)
-      paths = [paths] if paths.is_a? String
-      paths.map { |x| File.join(@forge.releasedir, x) }
-      FileUtils.rm_r paths
-      nil
-    end
-  end
-end

data/lib/pkgforge/forge.rb

@@ -1,57 +0,0 @@
-require 'tmpdir'
-require 'tempfile'
-require 'fileutils'
-require 'open-uri'
-
-##
-# Declare actual Forge with package-building
-module PkgForge
-  ##
-  # Real Forge object
-  class Forge
-    include Contracts::Core
-    include Contracts::Builtin
-    include PkgForge::Helpers
-    include PkgForge::Prepare
-    include PkgForge::Push
-
-    attr_accessor :name, :org, :deps, :configure_flags, :version_block,
-                  :patches, :build_block, :test_block, :license, :cflags,
-                  :libs, :harden_flags
-
-    Contract Maybe[HashOf[Symbol => Any]] => nil
-    def initialize(params = {})
-      @options = params
-      @license = 'LICENSE'
-      @deps = {}
-      @flags = {}
-      @patches = []
-      @build_block = proc { raise('No build block provided') }
-      @test_block = proc { raise('No test block provided') }
-      nil
-    end
-
-    Contract None => nil
-    def build!
-      prepare_source!
-      patch_source!
-      prepare_deps!
-      builder = BuildDSL.new(self)
-      builder.instance_eval(&build_block)
-    end
-
-    Contract None => nil
-    def test!
-      tester = TestDSL.new(self)
-      tester.instance_eval(&test_block)
-    end
-
-    Contract None => nil
-    def push!
-      add_license!
-      make_tarball!
-      update_repo!
-      upload_artifact!
-    end
-  end
-end

data/lib/pkgforge/forgedsl.rb

@@ -1,110 +0,0 @@
-##
-# Declare DSL for Forge objects
-module PkgForge
-  ##
-  # DSL for generating a Forge
-  class ForgeDSL
-    include Contracts::Core
-    include Contracts::Builtin
-
-    Contract Forge, Maybe[Hash] => nil
-    def initialize(forge, params = {})
-      @forge = forge
-      @options = params
-      nil
-    end
-
-    Contract String => nil
-    def name(value)
-      @forge.name = value
-      nil
-    end
-
-    Contract String => nil
-    def org(value)
-      @forge.org = value
-      nil
-    end
-
-    Contract HashOf[Symbol => String] => nil
-    def deps(value)
-      @forge.deps = value
-      nil
-    end
-
-    Contract HashOf[Symbol => String] => nil
-    def configure_flags(value)
-      @forge.configure_flags = value
-      nil
-    end
-
-    Contract Func[None => Maybe[String]] => nil
-    def version(&block)
-      @forge.version_block = block
-      nil
-    end
-
-    Contract String => nil
-    def patch(file)
-      @forge.patches ||= []
-      @forge.patches << file
-      nil
-    end
-
-    Contract Func[None => nil] => nil
-    def build(&block)
-      @forge.build_block = block
-      nil
-    end
-
-    Contract Func[None => nil] => nil
-    def test(&block)
-      @forge.test_block = block
-      nil
-    end
-
-    Contract String => nil
-    def license(file)
-      @forge.license = file
-      nil
-    end
-
-    Contract String => String
-    def dep(dep_name)
-      @forge.dep(dep_name)
-    end
-
-    Contract Maybe[String] => nil
-    def cflags(value = nil)
-      default = '-I%{dep}/usr/include -L%{dep}/usr/lib'
-      value ||= @forge.deps.map { |x, _| default % { dep: dep(x) }.split }
-      @forge.cflags = value.flatten
-      nil
-    end
-
-    Contract Maybe[String] => nil
-    def libs(value = nil)
-      value ||= @forge.deps.map { |x, _| '-l' + x }
-      @forge.libs = value
-      nil
-    end
-
-    # hamelessly sourced from:
-    # https://blog.mayflower.de/5800-Hardening-Compiler-Flags-for-NixOS.html
-    HARDEN_OPTS = {
-      format: %w(-Wformat -Wformat-security -Werror=format-security),
-      stackprotector: %w(-fstack-protector-strong --param ssp-buffer-size=4),
-      fortify: %w(-O2 -D_FORTIFY_SOURCE=2),
-      pic: '-fPIC',
-      strictoverflow: '-fno-strict-overflow',
-      relro: '-z=relro',
-      bindnow: '-z=bindnow',
-      pie: %w(-fPIE -pie)
-    }.freeze
-
-    Contract Maybe[Array[String]] => nil
-    def harden(list = [])
-      @forge.harden_flags = HARDEN_OPTS.reject { |k, _| list.include? k.to_s }
-    end
-  end
-end

data/lib/pkgforge/helpers.rb

@@ -1,78 +0,0 @@
-module PkgForge
-  ##
-  # Helper functions for building packages
-  module Helpers
-    include Contracts::Core
-    include Contracts::Builtin
-
-    Contract String => String
-    def dep(package)
-      tmpdir(package.to_sym)
-    end
-
-    Contract None => String
-    def releasedir
-      tmpdir(:release)
-    end
-
-    Contract Or[String, Array], Or[Hash[String => String], {}, nil] => nil
-    def run(cmd, env = {})
-      Dir.chdir(tmpdir(:build)) do
-        run_local(cmd, env)
-      end
-      nil
-    end
-
-    Contract Or[String, Array], Or[Hash[String => String], {}, nil] => nil
-    def test_run(cmd, env = {})
-      Dir.chdir(tmpdir(:release)) do
-        run_local(cmd, env)
-      end
-    end
-
-    Contract None => Array[String]
-    def all_cflags
-      cflags + harden_flags
-    end
-
-    private
-
-    Contract Symbol => String
-    def tmpdir(id)
-      @tmpdirs ||= {}
-      @tmpdirs[id] ||= Dir.mktmpdir(id.to_s)
-    end
-
-    Contract Symbol => String
-    def tmpfile(id)
-      @tmpfiles ||= {}
-      @tmpfiles[id] ||= Tempfile.create(id.to_s).path
-    end
-
-    Contract Or[String, Array], Or[Hash[String => String], {}, nil] => nil
-    def run_local(cmd, env = {})
-      puts "Running command in #{Dir.pwd}: #{cmd}"
-      puts "Using env: #{env}" unless env.empty?
-      res = system env, *cmd
-      raise('Command failed!') unless res
-      nil
-    end
-
-    Contract None => String
-    def version
-      @version ||= Dir.chdir(tmpdir(:build)) do
-        VersionDSL.new(self).instance_eval(&version_block)
-      end
-    end
-
-    Contract None => Num
-    def revision
-      @revision ||= `git describe --abbrev=0 --tags`.split('-').last.to_i + 1
-    end
-
-    Contract None => String
-    def full_version
-      "#{version}-#{revision}"
-    end
-  end
-end

data/lib/pkgforge/prepare.rb

@@ -1,62 +0,0 @@
-module PkgForge
-  ##
-  # Preparation methods
-  module Prepare
-    include Contracts::Core
-    include Contracts::Builtin
-
-    private
-
-    Contract None => nil
-    def prepare_source!
-      dest = tmpdir(:build)
-      dest_git = File.join(dest, '.git')
-      dest_git_config = File.join(dest_git, 'config')
-      run_local 'git submodule update --init'
-      FileUtils.cp_r 'upstream/.', dest
-      FileUtils.rm_r dest_git
-      FileUtils.cp_r '.git/modules/upstream', dest_git
-      new_config = File.readlines(dest_git_config).grep_v(/worktree =/).join
-      File.open(dest_git_config, 'w') { |fh| fh << new_config }
-      nil
-    end
-
-    Contract None => nil
-    def patch_source!
-      patches.each do |patch|
-        run_local "patch -d #{tmpdir(:build)} -p1 < patches/#{patch}"
-      end
-      nil
-    end
-
-    Contract None => nil
-    def prepare_deps!
-      deps.each do |dep_name, dep_version|
-        url = "https://github.com/#{org}/#{dep_name}/releases/download/#{dep_version}/#{dep_name}.tar.gz" # rubocop:disable Metrics/LineLength
-        open(tmpfile(dep_name), 'wb') { |fh| fh << open(url, 'rb').read }
-        run_local "tar -x -C #{tmpdir(dep_name)} -f #{tmpfile(dep_name)}"
-      end
-      nil
-    end
-
-    Contract None => nil
-    def add_license!
-      src_file = File.join(tmpdir(:build), license)
-      dest_dir = File.join(
-        tmpdir(:release), 'usr', 'share', 'licenses', name
-      )
-      dest_file = File.join(dest_dir, 'LICENSE')
-      FileUtils.mkdir_p dest_dir
-      FileUtils.cp src_file, dest_file
-      nil
-    end
-
-    Contract None => nil
-    def make_tarball!
-      Dir.chdir(tmpdir(:release)) do
-        run_local "tar -czvf #{tmpfile(:tarball)} *"
-      end
-      nil
-    end
-  end
-end

data/lib/pkgforge/testdsl.rb

@@ -1,26 +0,0 @@
-require 'fileutils'
-
-module PkgForge
-  ##
-  # Test engine
-  class TestDSL
-    include Contracts::Core
-    include Contracts::Builtin
-
-    Contract PkgForge::Forge => nil
-    def initialize(forge)
-      @forge = forge
-      nil
-    end
-
-    private
-
-    Contract Or[String, Array], Or[Hash[String => String], {}, nil] => nil
-    def run(cmd, env = {})
-      cmd.unshift('/usr/bin/env') if cmd.is_a? Array
-      cmd << ';' if cmd.is_a? String
-      env['PATH'] ||= './usr/bin'
-      @forge.test_run(cmd, env)
-    end
-  end
-end

data/lib/pkgforge/versiondsl.rb

@@ -1,23 +0,0 @@
-module PkgForge
-  ##
-  # Version engine
-  class VersionDSL
-    include Contracts::Core
-    include Contracts::Builtin
-
-    Contract PkgForge::Forge => nil
-    def initialize(forge)
-      @forge = forge
-      nil
-    end
-
-    private
-
-    Contract Maybe[Regexp], Maybe[String] => String
-    def git_tag(regex = nil, replace = '\1')
-      tag = `git describe --tags`.rstrip
-      tag.gsub!(regex, replace) if regex
-      tag
-    end
-  end
-end