pkgforge 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2ee305fa6105b96babf437853f50abb8301692
-  data.tar.gz: 7e95aaffd4ed6a56f4ca463bfd48a5fadf67ae02
+  metadata.gz: 0f425f94459cf26692a4b0777fd948c0b5df4374
+  data.tar.gz: 7c13454851dbba27203e436b16f70191d0d764f7
 SHA512:
-  metadata.gz: 75aceeb92338482b6bd1c623e88d7370f1ef80ff3684379a1e4632cbacd6bb6d91193cedcdf75ea6f4eaae2b485603ec14e7f8a1605a698062f8c208b70c2ab4
-  data.tar.gz: 9cc26ed202f2ac58781c8928e1a93106cc57780e719d77e4cb401c567b5a3de25313f24a493f48cd85c23358ccc5c5babd2076b47acdf0ed32fae562b7c4612f
+  metadata.gz: 2d36da18b2d7683e39e02346d45a1eddc947c56f67717e99af3ae278afe0ab554909631d25ccbed2ea586617f3794b65418ae932ba55af312e02efea22c04b94
+  data.tar.gz: b72637cbbab74905f0e2cee9a37bf94d15988de832a90e3271a3dd89ee16b5f3bdaee9928194f9d231e01bdfe44af106a776be4893500fa410e1e5196b7ae02d

data/.circle-ruby

@@ -1,3 +1,4 @@
-2.3.1
-2.2.5
+2.4.0
+2.3.3
+2.2.6
 2.1.10

data/bin/pkgforge

@@ -9,10 +9,11 @@ def add_common_opts(cmd)
   # rubocop:disable Metrics/LineLength
   cmd.option :directory, '-d DIR', '--directory DIR', 'Change to directory before loading'
   cmd.option :skipcleanup, '-s', '--skipcleanup', 'Skip cleanup of tmpdirs and tmpfiles'
+  cmd.option :statefile, '--statefile FILE', 'State file to re-use build directories'
   # rubocop:enable Metrics/LineLength
 end
 
-def run_on_file(options)
+def get_file(options)
   options[:directory] ||= '.'
   Dir.chdir(options[:directory]) do
     raise("No #{FILE_NAME} file") unless File.exist? FILE_NAME
@@ -21,6 +22,31 @@ def run_on_file(options)
   end
 end
 
+def run(forge, skipcleanup, release = false, build = true)
+  if build
+    forge.build!
+    forge.test!
+    forge.package!
+  end
+  forge.push! if release
+ensure
+  forge.cleanup! unless skipcleanup
+end
+
+def run_with_state(forge, options, release = false)
+  statefile = options[:statefile]
+  forge.load_state!(statefile) if release
+  run(forge, options[:skipcleanup] || !release, release, !release)
+  forge.write_state!(statefile) unless release
+end
+
+def run_with_options(options, release = false)
+  get_file(options) do |forge|
+    return run(forge, options[:skipcleanup], release) unless options[:statefile]
+    run_with_state(forge, options, release)
+  end
+end
+
 # rubocop:disable Metrics/BlockLength
 Mercenary.program(:pkgforge) do |p|
   p.version PkgForge::VERSION
@@ -33,15 +59,7 @@ Mercenary.program(:pkgforge) do |p|
     add_common_opts(c)
 
     c.action do |_, options|
-      run_on_file(options) do |forge|
-        begin
-          forge.build!
-          forge.test!
-          forge.package!
-        ensure
-          forge.cleanup! unless options[:skipcleanup]
-        end
-      end
+      run_with_options(options)
     end
   end
 
@@ -51,16 +69,7 @@ Mercenary.program(:pkgforge) do |p|
     add_common_opts(c)
 
     c.action do |_, options|
-      run_on_file(options) do |forge|
-        begin
-          forge.build!
-          forge.test!
-          forge.package!
-          forge.push!
-        ensure
-          forge.cleanup! unless options[:skipcleanup]
-        end
-      end
+      run_with_options(options, true)
     end
   end
 
@@ -70,7 +79,7 @@ Mercenary.program(:pkgforge) do |p|
     add_common_opts(c)
 
     c.action do |_, options|
-      run_on_file(options) do |forge|
+      get_file(options) do |forge|
         puts "name: #{forge.name}"
       end
     end

data/lib/pkgforge.rb

@@ -15,6 +15,8 @@ require 'pkgforge/components/source'
 require 'pkgforge/components/test'
 require 'pkgforge/components/upload'
 require 'pkgforge/components/cleanup'
+require 'pkgforge/components/state'
+
 ##
 # DSL engine for compiling Arch packages
 module PkgForge

data/lib/pkgforge/components/build.rb

@@ -63,6 +63,17 @@ module PkgForge
         nil
       end
 
+      Contract String, Maybe[String] => nil
+      def cp(src, dest = nil)
+        dest ||= src
+        dest = File.join(releasedir, dest)
+        src = File.join(tmpdir(:build), src)
+        dest_dir = File.dirname dest
+        FileUtils.mkdir_p dest_dir
+        FileUtils.cp_r src, dest
+        nil
+      end
+
       Contract None => HashOf[String => String]
       def default_env
         {

data/lib/pkgforge/components/state.rb

@@ -0,0 +1,25 @@
+require 'json'
+
+module PkgForge
+  ##
+  # Add state methods to Forge
+  class Forge
+    Contract String => nil
+    def load_state!(statefile)
+      state = JSON.parse(File.read(statefile))
+      @tmpfiles = state[:tmpfiles]
+      @tmpdirs = state[:tmpdirs]
+    end
+
+    Contract String => nil
+    def write_state!(statefile)
+      File.open(statefile, 'w') do |fh|
+        fh << {
+          tmpfiles: @tmpfiles,
+          tmpdirs: @tmpdirs
+        }.to_json
+      end
+      nil
+    end
+  end
+end

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.12.5'.freeze
+  VERSION = '0.13.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.44.1'
-  s.add_development_dependency 'rake', '~> 11.3.0'
+  s.add_development_dependency 'rubocop', '~> 0.46.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'
   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.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - lib/pkgforge/components/patch.rb
 - lib/pkgforge/components/run.rb
 - lib/pkgforge/components/source.rb
+- lib/pkgforge/components/state.rb
 - lib/pkgforge/components/test.rb
 - lib/pkgforge/components/upload.rb
 - lib/pkgforge/version.rb
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: DSL engine for building Arch packages