pkgforge 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba97469eb9557bba0397186050b38efbaedb7128
-  data.tar.gz: 42e2bda14d8590f5dde4c376c860fa3baaccc7e3
+  metadata.gz: 0b34c7a3460db065b8c5e94e081a834c9a041880
+  data.tar.gz: 3c0cedc6cdc960c04ec54f69687c31a8299d95a2
 SHA512:
-  metadata.gz: e27d93da301f01552748751a2c289039fe88bfe4c9a132b7b501406af2f3da86234d0e28fb45b66b114f10422e4b9ab30a1079575dd5031ece2f80f473b5b7cc
-  data.tar.gz: 3ff03d25d3e0b5ab08aa5ce409902d7ab0d57dbb5c2244eecb2cb0f5c405394d86d29cf039d3eea47d635b40529a4adbac439a6d0621ccf2069fd43ee452d960
+  metadata.gz: 63328dcf32afb5fb5eba434129d52068c2ada3922de743ed41d27242cd739c9e0d108997d2569a75157be9378a297ae785db84482eaf788ea382d5bd06b6045f
+  data.tar.gz: 0b403664b317fd60cbb08ddcc416143c6ca8e5d646e1fae85a68648513ed5809ebabfa911f690943b6f4a29b3dc9a1894796c130363962493655056acc70c77f

data/lib/pkgforge.rb

@@ -8,6 +8,7 @@ require 'pkgforge/forge'
 require 'pkgforge/forgedsl'
 require 'pkgforge/builddsl'
 require 'pkgforge/testdsl'
+require 'pkgforge/versiondsl'
 
 ##
 # DSL engine for compiling Arch packages

data/lib/pkgforge/builddsl.rb

@@ -22,9 +22,13 @@ module PkgForge
 
     Contract None => nil
     def configure
-      flag_strings = @forge.flags.map { |k, v| "--#{k}=#{v}" }
+      flag_strings = @forge.configure_flags.map do |flag, value|
+        "--#{flag}#{'=' if value}#{value}"
+      end
       env = {
-        'CC' => 'musl-gcc'
+        'CC' => 'musl-gcc',
+        'CFLAGS' => @forge.cflags,
+        'LIBS' => @forge.libs
       }
       run ['./configure'] + flag_strings, env
     end

data/lib/pkgforge/forge.rb

@@ -15,8 +15,9 @@ module PkgForge
     include PkgForge::Prepare
     include PkgForge::Push
 
-    attr_accessor :name, :org, :deps, :flags, :version_block, :patches,
-                  :build_block, :test_block, :license
+    attr_accessor :name, :org, :deps, :configure_flags, :version_block,
+                  :patches, :build_block, :test_block, :license, :cflags,
+                  :libs
 
     Contract Maybe[HashOf[Symbol => Any]] => nil
     def initialize(params = {})
@@ -25,8 +26,8 @@ module PkgForge
       @deps = {}
       @flags = {}
       @patches = []
-      @build_block = proc { fail('No build block provided') }
-      @test_block = proc { fail('No test block provided') }
+      @build_block = proc { raise('No build block provided') }
+      @test_block = proc { raise('No test block provided') }
       nil
     end
 

data/lib/pkgforge/forgedsl.rb

@@ -33,12 +33,12 @@ module PkgForge
     end
 
     Contract HashOf[Symbol => String] => nil
-    def flags(value)
-      @forge.flags = value
+    def configure_flags(value)
+      @forge.configure_flags = value
       nil
     end
 
-    Contract Func[None => String] => nil
+    Contract Func[None => Maybe[String]] => nil
     def version(&block)
       @forge.version_block = block
       nil
@@ -73,5 +73,19 @@ module PkgForge
     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) } }.join(' ')
+      @forge.cflags = value
+      nil
+    end
+
+    Contract Maybe[String] => nil
+    def libs(value = nil)
+      value ||= @forge.deps.map { |x, _| '-l' + x }.join(' ')
+      @forge.libs = value
+    end
   end
 end

data/lib/pkgforge/helpers.rb

@@ -55,7 +55,9 @@ module PkgForge
 
     Contract None => String
     def version
-      @version ||= Dir.chdir(tmpdir(:build)) { version_block.call }
+      @version ||= Dir.chdir(tmpdir(:build)) do
+        VersionDSL.new(self).instance_eval(&version_block)
+      end
     end
 
     Contract None => Num

data/lib/pkgforge/version.rb

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

data/lib/pkgforge/versiondsl.rb

@@ -0,0 +1,23 @@
+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

data/pkgforge.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 11.2.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.5.0'
-  s.add_development_dependency 'fuubar', '~> 2.1.0'
+  s.add_development_dependency 'fuubar', '~> 2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 description: DSL engine for building Arch packages
 email: me@lesaker.org
 executables:
@@ -135,6 +135,7 @@ files:
 - lib/pkgforge/push.rb
 - lib/pkgforge/testdsl.rb
 - lib/pkgforge/version.rb
+- lib/pkgforge/versiondsl.rb
 - pkgforge.gemspec
 - spec/pkgforge_spec.rb
 - spec/spec_helper.rb