pkgforge 0.6.10 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1829683ca2a057c1fdd45002f7d49b55fe9d39
-  data.tar.gz: d13c26d90f5f89ca5302dd20fbbe07e70ab24c66
+  metadata.gz: f32952353111209493b746f90c6c69dce861e07f
+  data.tar.gz: 9fe19fe8872c2182227125e96fc0200d9e8f43e3
 SHA512:
-  metadata.gz: 847d7fe5db0f9ec4bc6e519fad777324b7763b2c0d189158e3cba596beeed2cf9920a9b68a747d9b2d0305cdc1df8ddd099fb73c640e3d39f9cbb5500ee16a21
-  data.tar.gz: 319f474200e7190e43949249b800e8f14f45f5904888f8d74468bd7b45f6592546b896aa5e1267f6b68597b70d6e0743946a26b61a3794d1e4e2c4f5b6c3ad68
+  metadata.gz: 02301c9c25723c44f689885bdda19429a98ac909f23496728d966ed69ecc9b6ad83b931f9084050b16c730e8ead9cbe724d4469ff1d73531ddbeeb6bfaee814b
+  data.tar.gz: 4d27434c950e746a1e45259d2928b8b22825a21b90e7950ec799b4fa4479368d53efe230322813df8caf3a9b8700d7334100b3d0514c86b857c86d6ee9971514

data/bin/pkgforge

@@ -35,6 +35,7 @@ Mercenary.program(:pkgforge) do |p|
         forge.build!
         forge.test!
         forge.package!
+        forge.cleanup!
       end
     end
   end
@@ -49,6 +50,7 @@ Mercenary.program(:pkgforge) do |p|
         forge.build!
         forge.test!
         forge.package!
+        forge.cleanup!
         forge.push!
       end
     end

data/lib/pkgforge/components/cleanup.rb

@@ -0,0 +1,16 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add cleanup methods to Forge
+  class Forge
+    Contract None => nil
+    def cleanup!
+      @tmpdirs ||= {}
+      @tmpfiles ||= {}
+      paths = [@tmpfiles.values, @tmpdirs.values].flatten
+      puts "Cleaning up tmp paths: #{paths}"
+      FileUtils.rm_r paths
+    end
+  end
+end

data/lib/pkgforge/components/source.rb

@@ -9,7 +9,7 @@ module PkgForge
 
     Contract None => HashOf[Symbol => Any]
     def source
-      @source ||= { type: 'git' }
+      @source ||= { type: 'git', path: 'upstream' }
     end
 
     private
@@ -23,13 +23,16 @@ module PkgForge
 
     Contract None => nil
     def git_prepare_source
-      dest = tmpdir(:build)
-      dest_git = File.join(dest, '.git')
+      run_local 'git submodule update --init --recursive'
+      FileUtils.cp_r "#{source[:path]}/.", tmpdir(:build)
+      git_fix_submodule unless source[:path] == '.'
+    end
+
+    Contract None => nil
+    def git_fix_submodule
+      dest_git = File.join(tmpdir(:build), '.git')
       dest_git_config = File.join(dest_git, 'config')
-      run_local 'git submodule update --init'
-      FileUtils.cp_r 'upstream/.', dest
-      FileUtils.rm_r dest_git
-      FileUtils.cp_r '.git/modules/upstream', dest_git
+      FileUtils.cp_r ".git/modules/#{source[:path]}", dest_git
       new_config = File.readlines(dest_git_config).grep_v(/worktree =/).join
       File.open(dest_git_config, 'w') { |fh| fh << new_config }
       nil

data/lib/pkgforge/version.rb

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

data/pkgforge.gemspec

@@ -20,8 +20,8 @@ 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.42.0'
-  s.add_development_dependency 'rake', '~> 11.2.0'
+  s.add_development_dependency 'rubocop', '~> 0.43.0'
+  s.add_development_dependency 'rake', '~> 11.3.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.5.0'
   s.add_development_dependency 'fuubar', '~> 2.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.8.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.43.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.43.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 11.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/pkgforge/base.rb
 - lib/pkgforge/components/build.rb
 - lib/pkgforge/components/cflags.rb
+- lib/pkgforge/components/cleanup.rb
 - lib/pkgforge/components/configure.rb
 - lib/pkgforge/components/deps.rb
 - lib/pkgforge/components/dirs.rb