hashipack 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311a36bbbef8a863eae884262dd63a7b79c68180d6a821c48cb4e3b8bed99dc4
-  data.tar.gz: 87e7183bac5438aa5abbfd1bbbde7dc746ee9db768b51e267d4a4bc0b5d0c033
+  metadata.gz: 0a97072d2fd6b4702a2fce358d21b149551cc190b4fc782231c59bab036c9b68
+  data.tar.gz: e765c7c6cf65fcb219e52527dcf530c430dda4d3337a352431f957ae8986f2cb
 SHA512:
-  metadata.gz: d3f54b86369790c15741868f482a93d64cc93ba72ee580a9ed0c7d665f15e4ba3d6eb4431595830674f398385429ed591c1204227dacddc751e8c36b8bd1ed2e
-  data.tar.gz: 2090cecc2116f9446653b0f7af73b496cb64427c5f956d1a4a8697f06c3bc3d5fdfce2a99d660040b39776186b9f0bcbfbcfca657e7e44537a6c81909e862583
+  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

@@ -0,0 +1,38 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "Ruby",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/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": "packer init spec/docker.pkr.hcl",
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"shardulm94.trailing-spaces"
+			],
+			"settings": {
+        "rubyLsp.rubyVersionManager": {
+					"identifier": "none"
+				},
+        "editor.formatOnSaveMode": "file"
+      }
+		}
+	}
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hashipack (0.1.3)
+    hashipack (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.2)
-    rexml (3.2.6)
+    rexml (3.3.6)
+      strscan
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -64,6 +65,7 @@ GEM
     standard-performance (1.2.1)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.19.1)
+    strscan (3.1.0)
     unicode-display_width (2.5.0)
 
 PLATFORMS
@@ -76,4 +78,4 @@ DEPENDENCIES
   standard (~> 1.3)
 
 BUNDLED WITH
-   2.4.10
+   2.5.11

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/message.rb

@@ -13,6 +13,8 @@ module Hashipack
     end
 
     def initialize(line)
+      line = line.force_encoding('UTF-8')
+      line = line.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
       @parts = line.split(",")
     end
 

data/lib/hashipack/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashipack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Lukas_Skywalker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies: []
 description: None.
 email:
@@ -17,6 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - ".rspec"
 - ".standard.yml"
 - CHANGELOG.md
@@ -52,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for Hashicorps Packer