pkgforge 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a20dd80b7950e7fd7aaadd1792f16bf8b9948a
-  data.tar.gz: 69d06b93a5a07c5b870b1df7cd246fcd742a5ba1
+  metadata.gz: 27cf9f7d1e11c4519e788c2a59bfec80aed2d6b4
+  data.tar.gz: da25788a1fd72c98f52a0f1db294e72d392c7240
 SHA512:
-  metadata.gz: 51ba6eaaf84f93ad7516b74039ced0b9a735f6674371a68df0698c5d578d8ac37a2ae7ece37a88b01edf947198f1cbf28d67b26166812fe01ac77a1ec60079b4
-  data.tar.gz: a6c43cb54472fb5e620ae85154a8879d4cb89fd8c5a25168e6f9e9a6bb927920dba47220bd892434c0fc40f3ef30c7fac1bad9ef8cee49c9e5a28ab8135d9d01
+  metadata.gz: a80a991db6e26c3deb1ad5eab626507a03debe43a8d459207bebc2b06cc954b1175fa991c12b7b057701872f0ea07a7c0490960c5b7b0a4766e869603368ac8a
+  data.tar.gz: 95dc69956034ca3c38d69c433ede695cd11e857a787f6f3a5d0edfdfe9579e0412f8e669fb6605f333b46c15a7c75df3a268a31033565d0f63dd42fb158bc32e

data/.prospectus

@@ -6,6 +6,6 @@ item do
 
   actual do
     gemnasium
-    slug 'akerl/archpackager'
+    slug 'akerl/pkgforge'
   end
 end

data/bin/pkgforge

@@ -5,22 +5,49 @@ require 'mercenary'
 
 FILE_NAME = '.pkgforge'.freeze
 
+def add_common_opts(cmd)
+  # rubocop:disable Metrics/LineLength
+  cmd.option :directory, '-d DIR', '--directory DIR', 'Change to directory before loading'
+  # rubocop:enable Metrics/LineLength
+end
+
+def run_on_file(options)
+  options[:directory] ||= '.'
+  Dir.chdir(options[:directory]) do
+    raise("No #{FILE_NAME} file") unless File.exist? FILE_NAME
+    forge = PkgForge.load_from_file
+    yield forge
+  end
+end
+
 Mercenary.program(:pkgforge) do |p|
   p.version PkgForge::VERSION
   p.description 'DSL engine for building Arch packages'
-  p.syntax 'pkgforge [options]'
+  p.syntax 'pkgforge <subcommand> [options]'
 
-  # rubocop:disable Metrics/LineLength
-  p.option :directory, '-d DIR', '--directory DIR', 'Change to directory before loading'
-  # rubocop:enable Metrics/LineLength
+  p.command(:build) do |c|
+    c.syntax 'build [options]'
+    c.description 'Build the package'
+    add_common_opts(c)
+
+    c.action do |_, options|
+      run_on_file(options) do |forge|
+        forge.build!
+        forge.test!
+        forge.push!
+      end
+    end
+  end
+
+  p.command(:info) do |c|
+    c.syntax 'info [options]'
+    c.description 'Print package info'
+    add_common_opts(c)
 
-  p.action do |_, options|
-    options[:directory] ||= '.'
-    Dir.chdir(options[:directory]) do
-      raise("No #{FILE_NAME} file") unless File.exist? FILE_NAME
-      forge = PkgForge.load_from_file
-      forge.build!
-      forge.push!
+    c.action do |_, options|
+      run_on_file(options) do |forge|
+        puts "name: #{forge.name}"
+      end
     end
   end
 end

data/lib/pkgforge.rb

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

data/lib/pkgforge/forge.rb

@@ -16,7 +16,7 @@ module PkgForge
     include PkgForge::Push
 
     attr_accessor :name, :org, :deps, :flags, :version_block, :patches,
-                  :build_block, :license
+                  :build_block, :test_block, :license
 
     Contract Maybe[HashOf[Symbol => Any]] => nil
     def initialize(params = {})
@@ -25,6 +25,8 @@ module PkgForge
       @deps = {}
       @flags = {}
       @patches = []
+      @build_block = proc { fail('No build block provided') }
+      @test_block = proc { fail('No test block provided') }
       nil
     end
 
@@ -35,12 +37,18 @@ module PkgForge
       prepare_deps!
       builder = BuildDSL.new(self)
       builder.instance_eval(&build_block)
-      add_license!
-      make_tarball!
+    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!
       bump_revision!
       update_repo!
       upload_artifact!

data/lib/pkgforge/forgedsl.rb

@@ -57,6 +57,12 @@ module PkgForge
       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

data/lib/pkgforge/testdsl.rb

@@ -0,0 +1,23 @@
+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(*args)
+      @forge.run(*args)
+    end
+  end
+end

data/lib/pkgforge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -133,6 +133,7 @@ files:
 - lib/pkgforge/helpers.rb
 - lib/pkgforge/prepare.rb
 - lib/pkgforge/push.rb
+- lib/pkgforge/testdsl.rb
 - lib/pkgforge/version.rb
 - pkgforge.gemspec
 - spec/pkgforge_spec.rb