pkgforge 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12c89a952f77c7e3dfaa4ff2a034a3b808678680
-  data.tar.gz: 71bcadc9a159de749499945549bcdc94c8243b03
+  metadata.gz: 428a82a9cfa731a5feb65f5bf908c18467c06586
+  data.tar.gz: a555b15ee6fa07d23aaa2ef365e30f6a84baa7f6
 SHA512:
-  metadata.gz: c111fb536a77e7952c944c64d302cd8607adb665e2fb4db8c69f7cfec08bbbcfffb26d266527a50fa0d531965f8c07b2315063afe91c91df19538b00a8a6176d
-  data.tar.gz: eaa977128fd846a5d34bbca9da554c7073d3c62d83cfd83141e3b4420e2d74e57ae4b1daab24ab8604cff5c34e1298e5b995ba76beae20b67dc1c526f7c96753
+  metadata.gz: 881dab36446d83e905fa3fd0a7e0fe55782b80ff9d44f72d885699d78d0dddbc9fcef96f0d3889e9f3cb07d012768c01ff1eff6fe189529f3e9ba19a0dab2e10
+  data.tar.gz: f4299848fab16b2ae0a9a5f291537ab48d32653aa93460580906a0ebe41b6e674c0d2ed0d2b35d400299302ed26de7446cbfc5b5e6f76900e6f652a14939cb9d

data/.rubocop.yml

@@ -1,2 +1,4 @@
 Encoding:
     Enabled: false
+Style/FormatString:
+    EnforcedStyle: percent

data/circle.yml

@@ -1,5 +1,6 @@
 dependencies:
   override:
+  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i gem update --system --no-doc || exit 1 ; done'
   - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done'
 test:
   override:

data/lib/pkgforge/components/deps.rb

@@ -6,7 +6,7 @@ module PkgForge
   class Forge
     attr_writer :deps, :remove_linker_archives, :remove_pkgconfig_files
 
-    Contract None => HashOf[Symbol => String]
+    Contract None => HashOf[Symbol => Or[String, Hash]]
     def deps
       @deps ||= {}
     end
@@ -32,14 +32,46 @@ module PkgForge
 
     Contract None => nil
     def download_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)}"
+      deps.each do |dep_name, dep_hash|
+        dep_hash = build_dep_hash(dep_hash)
+        file = tmpfile(dep_name)
+        dir = tmpdir(dep_name)
+        download_file(dep_name, file, dep_hash[:version])
+        verify_file(file, dep_hash[:checksum])
+        extract_file(file, dir)
       end
       nil
     end
 
+    Contract String => Hash
+    def build_dep_hash(dep_version)
+      { version: dep_version }
+    end
+
+    Contract Hash => Hash
+    def build_dep_hash(dep_hash) # rubocop:disable Lint/DuplicateMethods
+      dep_hash
+    end
+
+    Contract Symbol, String, String => nil
+    def download_file(dep_name, file, dep_version)
+      url = "https://github.com/#{org}/#{dep_name}/releases/download/#{dep_version}/#{dep_name}.tar.gz" # rubocop:disable Metrics/LineLength
+      open(file, 'wb') { |fh| fh << open(url, 'rb').read }
+      nil
+    end
+
+    Contract String, String => nil
+    def verify_file(file, expected)
+      actual = Digest::SHA256.file(file).hexdigest
+      return if actual == expected
+      raise "Checksum fail for #{file}: #{actual} (actual) != #{expected} (expected)" # rubocop:disable Metrics/LineLength
+    end
+
+    Contract String, String => nil
+    def extract_file(file, dir)
+      run_local "tar -x -C #{dir} -f #{file}"
+    end
+
     Contract None => nil
     def remove_linker_archives!
       deps.keys.each do |dep_name|
@@ -61,7 +93,7 @@ module PkgForge
     ##
     # Add dep methods to Forge DSL
     class Forge
-      Contract HashOf[Symbol => String] => nil
+      Contract HashOf[Symbol => Or[String, Hash]] => nil
       def deps(value)
         @forge.deps = value
         nil

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.13.4'.freeze
+  VERSION = '0.14.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.46.0'
+  s.add_development_dependency 'rubocop', '~> 0.47.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.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: DSL engine for building Arch packages