pkgforge 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db24a133a9a688a92dfbc9017cba8cdde98123bc2b7bb88d94352bc3ed4b0a8
-  data.tar.gz: d75cd94be6a0ea2014da074c92958f6dbd044a02f9c7dd823b124cff3ea2a938
+  metadata.gz: 3a46943190b3aa875e389d9ce5732e5c4976403a8941df0ad0f0e7c02624b074
+  data.tar.gz: 32c019a9e8494e3f39a5655ad07b77695f2678ee48e1d05e9189bbe586143b26
 SHA512:
-  metadata.gz: 2d2147a2fd21bc1fb1453acdc2de4df6cac77bf2e9046cd18ebe9c2f7653b52278268ac14017f835723c51578cfb3fe7411b4d10b91853bbc1c6a5b99f6810eb
-  data.tar.gz: 4969fbe5fa550a486fb1854b14e49c78f2c6bfc5ae43620fb5d88e5092024aad9f43157de3a1ee0290a4318f2b3e6e5739ad37dbd287daae18b6cbedff0bd5e9
+  metadata.gz: 767547559d88d2f051d65c2f386c77842e6cdd9e7cae2952dd4315741a462f231e767d56a42626a8afd97f08ca80feaf8376550b0bb6964efd4c4487bf8d79b9
+  data.tar.gz: 8ee83d04bd3bebed48430a2d78b0b9ed56287b16bc1f68e6b726cff74558606243df7320c92af4c41b258bddc763d9cd0ff7fa4a6bd39da49f241d83ddbeb8b5

data/.circle-ruby

@@ -1,4 +1,3 @@
 2.5.1
 2.4.4
 2.3.7
-2.2.10

data/.prospectus

@@ -1,11 +1,11 @@
 my_slug = 'akerl/pkgforge'
 
-Prospectus.extra_dep('file', 'prospectus_circleci')
+Prospectus.extra_dep('file', 'prospectus_travis')
 Prospectus.extra_dep('file', 'prospectus_gems')
 
 item do
   noop
 
   extend ProspectusGems::Gemspec.new
-  extend ProspectusCircleci::Build.new(my_slug)
+  extend ProspectusTravis::Build.new(my_slug)
 end

data/.travis.yml

@@ -0,0 +1,10 @@
+dist: trusty
+install:
+- for i in $(cat .circle-ruby) ; do rvm install $i || exit 1 ; done
+- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done
+script:
+- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done
+notifications:
+  email: false
+  slack:
+    secure: hiSpJYwTPJUSw9aS2AG28isKW8Sel209yOVRRwr5U0LV5XLsiMCIHjc8sUPliTIcHNEZgBkoBdVe9cEMpcIwV5oeHWJi/tPt0dMISJ5P8K1mG0i2ULk5Up7vOUDN0WctL8CzhiGCcMr/H1lk3VbHKsxgcozIitnocCIwZuswJqNwu2XpkRw5xxVIMAK9tIZGfH+XMwFZcLghQsAF55fHyKYUVVI5n7PMLVbiDY8u9cVlZKL4qa3dBuus903f/zPGSJXbLcPqnVbuyOlIewxSNaPDX7YjIAdgkNk4IE+gCO82FnNpkWqVdtGT8Nx0PLOkt5FICl7aBFjIanFV1NnMo7qVXj0XNRdIoMBqx5T3WKp9k1EaYnaZwDax1zEDamyUSikwc0BPjnW1gZX5Hv6bQAVMWoXIZz9xJVd1Opv2sH1v534e+eCdcqHBv5sIFbYofeN3KvBEfdFBE4YHorT0u/rtBOBoNBVwrstjvNs3W9CbGqgubH2JUtCky2W+4mXwpmndXTYG8DZkMZ7YCqlQYgJLyPuLdxUjSz6IdMVaz/g8c5/d71jlJuiBl+VX6vFMmtec0/e9ivwH5RhkcsYrGw6dkKh3qymmdoHgc65K5dOLluNvZf/AQyInVXZAivKb2ppIW1t9pjaWN2wX6hEP7Vb8516OwJYzuGHUJFrBpUY=

data/README.md

@@ -2,8 +2,7 @@ pkgforge
 =========
 
 [![Gem Version](https://img.shields.io/gem/v/pkgforge.svg)](https://rubygems.org/gems/pkgforge)
-[![Dependency Status](https://img.shields.io/gemnasium/akerl/pkgforge.svg)](https://gemnasium.com/akerl/pkgforge)
-[![Build Status](https://img.shields.io/circleci/project/akerl/pkgforge/master.svg)](https://circleci.com/gh/akerl/pkgforge)
+[![Build Status](https://img.shields.io/travis/com/akerl/pkgforge.svg)](https://travis-ci.com/akerl/pkgforge)
 [![Coverage Status](https://img.shields.io/codecov/c/github/akerl/pkgforge.svg)](https://codecov.io/github/akerl/pkgforge)
 [![Code Quality](https://img.shields.io/codacy/fb7636f572b04067801ac9024ed71228.svg)](https://www.codacy.com/app/akerl/pkgforge)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)

data/lib/pkgforge/components/build.rb

@@ -17,7 +17,7 @@ module PkgForge
       patch_source!
       prepare_deps!
       builder = PkgForge::DSL::Build.new(self)
-      builder.instance_eval(&build_block)
+      Dir.chdir(tmpdir(:build)) { builder.instance_eval(&build_block) }
       nil
     end
   end

data/lib/pkgforge/components/deps.rb

@@ -70,7 +70,7 @@ module PkgForge
 
     Contract String, String => nil
     def extract_file(file, dir)
-      run_local "tar -x -C #{dir} -f #{file}"
+      run "tar -x -C #{dir} -f #{file}"
     end
 
     Contract None => nil

data/lib/pkgforge/components/package.rb

@@ -23,6 +23,11 @@ module PkgForge
 
     private
 
+    Contract None => nil
+    def noop_prepare_package
+      nil
+    end
+
     Contract None => nil
     def file_prepare_package
       artifacts = package[:artifacts] || [package[:artifact]].compact
@@ -47,7 +52,7 @@ module PkgForge
     Contract None => nil
     def make_tarball!
       Dir.chdir(tmpdir(:release)) do
-        run_local "tar -czvf #{tmpfile(:tarball)} *"
+        run "tar -czvf #{tmpfile(:tarball)} *"
       end
       nil
     end

data/lib/pkgforge/components/patch.rb

@@ -11,7 +11,7 @@ module PkgForge
 
     Contract String => nil
     def run_patch(file)
-      run_local "patch -d #{tmpdir(:build)} -p1 < patches/#{file}"
+      run "patch -d #{tmpdir(:build)} -p1 < patches/#{file}"
     end
 
     private

data/lib/pkgforge/components/run.rb

@@ -3,17 +3,7 @@ module PkgForge
   # Add run methods to Forge
   class Forge
     Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
-    def run(*args)
-      Dir.chdir(tmpdir(:build)) do
-        run_local(*args)
-      end
-      nil
-    end
-
-    private
-
-    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
-    def run_local(cmd, env = {})
+    def run(cmd, env = {})
       puts "Running command in #{Dir.pwd}: #{cmd}"
       puts "Using env: #{env}" unless env.empty?
       res = system env, *cmd

data/lib/pkgforge/components/source.rb

@@ -23,8 +23,8 @@ module PkgForge
 
     Contract None => nil
     def git_prepare_source
-      run_local 'git submodule update --init --recursive'
-      run_local "git clone --recursive '#{source[:path]}' #{tmpdir(:build)}"
+      run 'git submodule update --init --recursive'
+      run "git clone --recursive '#{source[:path]}' #{tmpdir(:build)}"
     end
 
     Contract None => nil

data/lib/pkgforge/components/test.rb

@@ -14,7 +14,7 @@ module PkgForge
     Contract None => nil
     def test!
       tester = PkgForge::DSL::Test.new(self)
-      tester.instance_eval(&test_block)
+      Dir.chdir(tmpdir(:release)) { tester.instance_eval(&test_block) }
       nil
     end
 
@@ -24,9 +24,7 @@ module PkgForge
       cmd.prepend('/usr/bin/env ') if cmd.is_a? String
       env['PATH'] ||= './usr/bin'
       lib_override do
-        Dir.chdir(tmpdir(:release)) do
-          run_local(cmd, env)
-        end
+        run(cmd, env)
       end
     end
 

data/lib/pkgforge/components/upload.rb

@@ -43,7 +43,7 @@ module PkgForge
         args += ['--name', artifact[:name]]
         args += ['--endpoint', endpoint] if endpoint
         args += ["#{org}/#{name}", version, artifact[:source]]
-        run_local args
+        run args
       end
       nil
     end

data/lib/pkgforge/version.rb

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

data/pkgforge.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'fuubar', '~> 2.3.0'
-  s.add_development_dependency 'goodcop', '~> 0.5.0'
+  s.add_development_dependency 'goodcop', '~> 0.6.0'
   s.add_development_dependency 'rake', '~> 12.3.0'
-  s.add_development_dependency 'rspec', '~> 3.7.0'
-  s.add_development_dependency 'rubocop', '~> 0.57.1'
+  s.add_development_dependency 'rspec', '~> 3.8.0'
+  s.add_development_dependency 'rubocop', '~> 0.59.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.59.0
 description: DSL engine for building Arch packages
 email: me@lesaker.org
 executables:
@@ -148,12 +148,12 @@ files:
 - ".prospectus"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/pkgforge
-- circle.yml
 - lib/pkgforge.rb
 - lib/pkgforge/base.rb
 - lib/pkgforge/components/build.rb

data/circle.yml

@@ -1,7 +0,0 @@
-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:
-  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done'