hashipack 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad7a4163d44985247790a4318629ceef091c75741cb92dd222d9cc34841ea45
-  data.tar.gz: 612a8f92ff96680ec3e92c48ef1e9c5183203811191d8367f146533db2c52f5b
+  metadata.gz: 0a97072d2fd6b4702a2fce358d21b149551cc190b4fc782231c59bab036c9b68
+  data.tar.gz: e765c7c6cf65fcb219e52527dcf530c430dda4d3337a352431f957ae8986f2cb
 SHA512:
-  metadata.gz: 6d89c910f7daac9f11748ecd0fd6d8e8dc847a84806059373371e37aa5ca1e0f1eba9a334904bd0f44b483f18494758e3ec2bd980c86e2e5d3b74d23ae06e422
-  data.tar.gz: 2b947c3a9fe0508320f3bc6c64ab571d9b2f1df9ceeef1fd982460927c439912b787ea92d84ca2160175fdb9c256386fb537a2e342e008825062da22114a9e7c
+  metadata.gz: bea07df2852be1ae4066c0bba8ae70b013212391db6bb1f840b6596557a889e6bb5e6a0ff57979a7c43085c8539dc625cb529fba67ddac9a860fd2a81421324a
+  data.tar.gz: c5880b968204a7682afa8f8f82f7172e6ec5c6a0ae1515aab55ffa26efdf970f217b5f163f2c54a41e66852d75188b2100daf6b256a3e93ee4ce64cf4817bb3a

data/.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+
+# Install packages needed to build gems
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+RUN sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y packer

data/.devcontainer/devcontainer.json

@@ -3,16 +3,20 @@
 {
 	"name": "Ruby",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
+	"features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "ruby --version",
+	"postCreateCommand": "packer init spec/docker.pkr.hcl",
 
 	// Configure tool-specific properties.
 	"customizations": {

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hashipack (0.1.4)
+    hashipack (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.2)
-    rexml (3.3.3)
+    rexml (3.3.6)
       strscan
     rspec (3.12.0)
       rspec-core (~> 3.12.0)

data/lib/hashipack/client.rb

@@ -1,8 +1,10 @@
 require 'tempfile'
+require 'open3'
 
 module Hashipack
   class Client
-    def build(filename, on_output: lambda {}, on_progress: lambda {}, estimated_duration: 300)
+    def build(path, on_output: lambda {}, on_progress: lambda {}, estimated_duration: 300)
+      directory, filename = File.split(path)
       command = "packer -machine-readable build #{filename}"
 
       initial_timestamp = 99999999999
@@ -10,27 +12,35 @@ module Hashipack
 
       artifacts = []
 
-      IO.popen(command).each do |line|
-        message = Message.parse(line)
+      Open3.popen3(command, chdir: directory) do |stdin, stdout, stderr, wait_thr|
+        stdout.each do |line|
+          message = Message.parse(line)
 
-        if message.type == :ui
-          initial_timestamp = message.timestamp if message.timestamp < initial_timestamp
+          if message.type == :ui
+            initial_timestamp = message.timestamp if message.timestamp < initial_timestamp
 
-          if message.timestamp > last_timestamp
-            last_timestamp = message.timestamp
-            running_duration = message.timestamp - initial_timestamp
-            progress = running_duration / estimated_duration.to_f
-            on_progress.call(progress)
-          end
+            if message.timestamp > last_timestamp
+              last_timestamp = message.timestamp
+              running_duration = message.timestamp - initial_timestamp
+              progress = running_duration / estimated_duration.to_f
+              on_progress.call(progress)
+            end
+
+            on_output.call(message.text)
 
-          on_output.call(message.text)
+          elsif message.type == :artifact
 
-        elsif message.type == :artifact
+            artifacts[message.number] ||= Artifact.new
+            artifacts[message.number].append_info(message.key, message.value)
 
-          artifacts[message.number] ||= Artifact.new
-          artifacts[message.number].append_info(message.key, message.value)
+          end
+        end
 
+        stderr.each do |line|
+          puts "Error: #{line}"
         end
+      
+        puts "Exit status: #{wait_thr.value}"
       end
 
       artifacts

data/lib/hashipack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hashipack
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashipack
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Lukas_Skywalker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies: []
 description: None.
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
 - ".devcontainer/devcontainer.json"
 - ".rspec"
 - ".standard.yml"