pkgforge 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680cf8233d0ccef1d6a2d0f79bf148c75f4ff25a
-  data.tar.gz: 88eff8a04038bb9f077e2694e548871b338f6802
+  metadata.gz: b21c69d4ef88eef662adcf73fe465abcb5375fb1
+  data.tar.gz: f137c4f34eac57d1ba3cd7fdf78aa5569b7e82ff
 SHA512:
-  metadata.gz: 020b66ea47869edfc7e651cad2f953d1a829f75cc0ade111402c8a0ea23dcef64d977f6673bf67b4f04a15e5b7465ee6795515f3f05574fe4d9285dccde32267
-  data.tar.gz: 42d5a7bf1794d4527e53298bf4e92429bbc9c7e78198561f9c84fcabbd3fbc9114b5b4af7866a10b3c54fc135d8eb4ab0eeab67591cf1e1e92060be7ab329d36
+  metadata.gz: ce7c74a38ff9737cb630d931767efb406eeddb23f5f30ed453b7b9ba9178249836eb805c7d012433151b4d9bcb92ec3730f7da87b0e3671937e02198961bace8
+  data.tar.gz: 7ed8a2132ace89ab3f416bca7a4f2211a5a117de63cb2423ecd153d3a50aaf90cfb4811d8ccb8eede719795031402b86ec3b494ad4391f80381d3c6264110725

data/bin/pkgforge

@@ -21,6 +21,7 @@ def run_on_file(options)
   end
 end
 
+# rubocop:disable Metrics/BlockLength
 Mercenary.program(:pkgforge) do |p|
   p.version PkgForge::VERSION
   p.description 'DSL engine for building Arch packages'

data/lib/pkgforge/components/package.rb

@@ -4,15 +4,39 @@ module PkgForge
   ##
   # Add upload methods to Forge
   class Forge
+    attr_writer :package
+
+    Contract None => HashOf[Symbol => Any]
+    def package
+      @package ||= { type: 'tarball' }
+    end
+
     Contract None => nil
     def package!
       add_license!
-      make_tarball!
-      copy_tarball!
+      type_method = "#{package[:type]}_prepare_package"
+      return send(type_method) if respond_to?(type_method, true)
+      raise("Unknown package type: #{package[:type]}")
     end
 
     private
 
+    Contract None => nil
+    def file_prepare_package
+      raise('File package type requires "path" setting') unless package[:path]
+      @upload_path = File.join(tmpdir(:release), package[:path])
+      @upload_name = package[:name] || name
+      nil
+    end
+
+    Contract None => nil
+    def tarball_prepare_package
+      @upload_path = tmpfile(:tarball)
+      @upload_name = "#{name}.tar.gz"
+      make_tarball!
+      copy_tarball!
+    end
+
     Contract None => nil
     def make_tarball!
       Dir.chdir(tmpdir(:release)) do
@@ -35,4 +59,16 @@ module PkgForge
       nil
     end
   end
+
+  module DSL
+    ##
+    # Add package methods to Forge DSL
+    class Forge
+      Contract HashOf[Symbol => Any] => nil
+      def package(params)
+        @forge.package = params
+        nil
+      end
+    end
+  end
 end

data/lib/pkgforge/components/upload.rb

@@ -20,8 +20,8 @@ module PkgForge
         'targit',
         '--authfile', '.github',
         '--create',
-        '--name', "#{name}.tar.gz",
-        "#{org}/#{name}", version, tmpfile(:tarball)
+        '--name', @upload_name,
+        "#{org}/#{name}", version, @upload_path
       ]
       nil
     end

data/lib/pkgforge/version.rb

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

data/pkgforge.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mercenary', '~> 0.3.4'
   s.add_dependency 'contracts', '~> 0.14.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.43.0'
+  s.add_development_dependency 'rubocop', '~> 0.44.1'
   s.add_development_dependency 'rake', '~> 11.3.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.44.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.44.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement