pkgforge 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b32223a258b463fd3224483698ae93666cb4c62f
-  data.tar.gz: a51cba2c1d23ae850272180e979a1bb9579e9de6
+  metadata.gz: 3474d4ccac1d2bfecd1de96fedf6cae21b5fb43f
+  data.tar.gz: 65a3c719b1f44a9bade4d7e44bffb79f48404904
 SHA512:
-  metadata.gz: 33af822ddf80adce9ca11271c6a011fbd1e05703501380e093842edfc04baab3083569b78bd6ee852005ac0a96a3c25076444a89c67f21a622fd23f7361a67dd
-  data.tar.gz: 9d338f307ac0d6b2202977c3af3d959ffe40b0b44259bbcafe1581c41be9475b5b5422544959f663c77618c73784f5f21b70b06fdb16fcac8df0369c3e32a06b
+  metadata.gz: 6eff41349e20da6169bcd29177391ec29c1ffb536a0fcf98b5c4625edc0f8da0187a9311c0fec4dedce0ba8c80e342f23c2595f3a64b3131a5654367e93fb6e9
+  data.tar.gz: 2be4289e4d53a8abe039a6ea3961611699076e1aba042492177f76a65d4e112f1e6bd5d1f0d254cd27d1da5e460f5fc64373cd7ac5d2fe34d78f08ff25b47d47

data/.circle-ruby

@@ -1,4 +1,4 @@
-2.4.0
+2.4.1
 2.3.3
 2.2.6
 2.1.10

data/lib/pkgforge/components/package.rb

@@ -15,38 +15,33 @@ module PkgForge
     def package!
       add_license!
       type_method = "#{package[:type]}_prepare_package"
-      return send(type_method) if respond_to?(type_method, true)
-      raise("Unknown package type: #{package[:type]}")
+      method_found = respond_to?(type_method, true)
+      raise("Unknown package type: #{package[:type]}") unless method_found
+      send(type_method)
+      expose_artifacts!
     end
 
     private
 
-    Contract String, String => nil
-    def expose_artifact(artifact_name, artifact_source)
-      FileUtils.mkdir_p 'pkg'
-      dest = File.join('pkg', artifact_name)
-      FileUtils.cp artifact_source, dest
-      FileUtils.chmod 0o0644, dest
-      nil
-    end
-
     Contract None => nil
     def file_prepare_package
-      path = package[:path]
-      raise('File package type requires "path" setting') unless path
-      state.merge!(
-        upload_path: File.join(tmpdir(:release), path),
-        upload_name: package[:name] || name
-      )
-      expose_artifact(*state.values_at(:upload_name, :upload_path))
+      artifacts = package[:artifacts] || [package[:artifact]].compact
+      raise('File package type requires artifacts list') if artifacts.empty?
+      artifacts.each do |x|
+        x[:source] = File.join(tmpdir(:release), x[:source])
+        add_artifact(x)
+      end
+      nil
     end
 
     Contract None => nil
     def tarball_prepare_package
-      state[:upload_path] = tmpfile(:tarball)
-      state[:upload_name] = "#{name}.tar.gz"
+      add_artifact(
+        source: tmpfile(:tarball),
+        name: "#{name}.tar.gz",
+        long_name: "#{name}-#{git_hash}.tar.gz"
+      )
       make_tarball!
-      expose_artifact "#{name}-#{git_hash}.tar.gz", tmpfile(:tarball)
     end
 
     Contract None => nil

data/lib/pkgforge/components/upload.rb

@@ -4,25 +4,43 @@ module PkgForge
   class Forge
     Contract None => nil
     def push!
-      upload_artifact!
+      upload_artifacts!
     end
 
     private
 
+    Contract HashOf[Symbol => String] => nil
+    def add_artifact(params)
+      state[:artifacts] ||= []
+      state[:artifacts] << params
+      nil
+    end
+
+    Contract None => nil
+    def expose_artifacts!
+      FileUtils.mkdir_p 'pkg'
+      return unless state[:artifacts]
+      state[:artifacts].each do |artifact|
+        dest = File.join('pkg', artifact[:long_name] || artifact[:name])
+        FileUtils.cp artifact[:source], dest
+        FileUtils.chmod 0o0644, dest
+      end
+      nil
+    end
+
     Contract None => String
     def version
       @version ||= `git describe --abbrev=0 --tags`.rstrip
     end
 
     Contract None => nil
-    def upload_artifact!
-      run_local [
-        'targit',
-        '--authfile', '.github',
-        '--create',
-        '--name', state[:upload_name],
-        "#{org}/#{name}", version, state[:upload_path]
-      ]
+    def upload_artifacts!
+      return unless state[:artifacts]
+      state[:artifacts].each do |artifact|
+        run_local ['targit', '--authfile', '.github', '--create',
+                   '--name', artifact[:name],
+                   "#{org}/#{name}", version, artifact[:source]]
+      end
       nil
     end
   end

data/lib/pkgforge/version.rb

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

data/pkgforge.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'contracts', '~> 0.14.0'
   s.add_dependency 'cymbal', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.47.0'
+  s.add_development_dependency 'rubocop', '~> 0.48.0'
   s.add_development_dependency 'rake', '~> 12.0.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.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement