pkgforge 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f425f94459cf26692a4b0777fd948c0b5df4374
-  data.tar.gz: 7c13454851dbba27203e436b16f70191d0d764f7
+  metadata.gz: a4782dd26cfa45ffb7b41bc538771b5ae18fe576
+  data.tar.gz: 417fb732daf2e61d5f9cd9672d739316adea4828
 SHA512:
-  metadata.gz: 2d36da18b2d7683e39e02346d45a1eddc947c56f67717e99af3ae278afe0ab554909631d25ccbed2ea586617f3794b65418ae932ba55af312e02efea22c04b94
-  data.tar.gz: b72637cbbab74905f0e2cee9a37bf94d15988de832a90e3271a3dd89ee16b5f3bdaee9928194f9d231e01bdfe44af106a776be4893500fa410e1e5196b7ae02d
+  metadata.gz: 6e3720027ed7a34e9abdda4f4e62b5cabc51c8bbb45bd31768fb0dea89698343ff935ac4429b19e16197134f34060ea4be13b3d44f20970eac8731a422aea608
+  data.tar.gz: 0f74d2a6f6694a9d9ef157f2ec9b4e34f78b922329bb35cf34473335c93b5f82cdc5389c9f31f6319d0a4d6df231c7f61503f621ee728a53508a6f5d6fcf61fc

data/lib/pkgforge/components/cleanup.rb

@@ -6,9 +6,9 @@ module PkgForge
   class Forge
     Contract None => nil
     def cleanup!
-      @tmpdirs ||= {}
-      @tmpfiles ||= {}
-      paths = [@tmpfiles.values, @tmpdirs.values].flatten
+      state[:tmpdirs] ||= {}
+      state[:tmpfiles] ||= {}
+      paths = state.values_at(:tmpdirs, :tmpfiles).flatten
       puts "Cleaning up tmp paths: #{paths}"
       FileUtils.rm_rf paths
       nil

data/lib/pkgforge/components/dirs.rb

@@ -17,14 +17,14 @@ module PkgForge
 
     Contract Symbol => String
     def tmpdir(id)
-      @tmpdirs ||= {}
-      @tmpdirs[id] ||= Dir.mktmpdir(id.to_s)
+      state[:tmpdirs] ||= {}
+      state[:tmpdirs][id] ||= Dir.mktmpdir(id.to_s)
     end
 
     Contract Symbol => String
     def tmpfile(id)
-      @tmpfiles ||= {}
-      @tmpfiles[id] ||= Tempfile.create(id.to_s).path
+      state[:tmpfiles] ||= {}
+      state[:tmpfiles][id] ||= Tempfile.create(id.to_s).path
     end
   end
 

data/lib/pkgforge/components/package.rb

@@ -32,16 +32,19 @@ module PkgForge
 
     Contract None => nil
     def file_prepare_package
-      raise('File package type requires "path" setting') unless package[:path]
-      @upload_path = File.join(tmpdir(:release), package[:path])
-      @upload_name = package[:name] || name
-      expose_artifact @upload_name, @upload_path
+      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))
     end
 
     Contract None => nil
     def tarball_prepare_package
-      @upload_path = tmpfile(:tarball)
-      @upload_name = "#{name}.tar.gz"
+      state[:upload_path] = tmpfile(:tarball)
+      state[:upload_name] = "#{name}.tar.gz"
       make_tarball!
       expose_artifact "#{name}-#{git_hash}.tar.gz", tmpfile(:tarball)
     end

data/lib/pkgforge/components/state.rb

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

data/lib/pkgforge/components/upload.rb

@@ -20,8 +20,8 @@ module PkgForge
         'targit',
         '--authfile', '.github',
         '--create',
-        '--name', @upload_name,
-        "#{org}/#{name}", version, @upload_path
+        '--name', state[:upload_name],
+        "#{org}/#{name}", version, state[:upload_path]
       ]
       nil
     end

data/lib/pkgforge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Les Aker