prick 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed99dbfdf6e89642b4e8fdddf976efa58b1c8b75d9169fa460bd8190805cc63
-  data.tar.gz: 97fec32bbd130043b2c782f133ab5af30e9bcc5c42d4c83a26311f486786d671
+  metadata.gz: c38cab1d940acbbaf8c36dadfddd5ce8a003e45fd881c0af033ee16b9b1bcb9b
+  data.tar.gz: c9c67dd1b746adf191a2193c536a7c2a97a962f5a7b70c371ecf42bb60621cec
 SHA512:
-  metadata.gz: 35859b1f387d1bf8ccb04a37a853d509e8038102f9521a7b4b35884db5d2682e5a06bd3dda9f4aff704a105603d9df17a43d2d1bbfa66f39ba751584b73b7cb9
-  data.tar.gz: cc7dfb26f5c10b1489d82f5be5c824e7d7d118de29d9ceae6b424e26506701650da57ed800107ce8ad10ea0bda3e1d29934000170702b285ae3d7a3a8123426f
+  metadata.gz: 7f81c8872d37f1b2f772c013c3fd1dad4f5936552aa8a6fa32b1b594d6da5ed20e06725590fd2a5317a8c9cda41b591845c6a68ec7ab4c2b82842b3fd2599c9c
+  data.tar.gz: 17c08c190070820e63facc09a7411c8f90b43f7994a8a5eefc04baa2c7f0a9647ec562ce000d0677289d922f56c5eae410f68d0b323e8f177df122c1167b9fec

data/lib/prick/environment.rb

@@ -75,8 +75,8 @@ module Prick
 
     forward_to :effective_variables, :key?, :[], :[]=, :to_h, :empty?, :size, :each, :map
 
-    def bash() = "build_#{name}"
-    def super_bash() = (has_super? ? "build_#{name}_super" : nil)
+    def bash() = "build_#{name}" # FIXME build has been out-commented
+    def super_bash() = (has_super? ? "build_#{name}_super" : nil) # FIXME same
     def bash_environment
       effective_variables.map { |ident, value|
         ["PRICK_ENVIRONMENT_#{ident.upcase}", value]
@@ -89,9 +89,9 @@ module Prick
       puts "#{name}:"
       indent {
         self.each { |ident,val| 
-          if ident == :build
-            puts "super: #{super_environment&.name || 'false'}"
-          end
+#         if ident == :build
+#           puts "super: #{super_environment&.name || 'false'}"
+#         end
           assigner = assigners[ident]&.name || name
           assigner_str = (assigner != name ? " (#{assigner})" : "")
           if types[ident] == "TEXT"
@@ -146,7 +146,9 @@ module Prick
 
     end
 
+    # FIXME build has been out-commented
     def bash_command(environment = nil)
+      raise "Not available right now"
       constrain environment, String, nil
       if environment
         env = self[environment] or raise "Unknown environment: '#{environment}'"
@@ -247,7 +249,7 @@ module Prick
             when "STRING"
               ; # nop
             when "LIST"
-              value = value.split
+              value = value&.split || []
             when "TEXT"
               value = value.chomp
             when nil
@@ -321,7 +323,8 @@ module Prick
 
           # Ignore if variable is assigned in the current environment and not the
           # special :build attribute
-          next if env.assignments.key?(ident) && ident != :build
+#         next if env.assignments.key?(ident) && ident != :build
+          next if env.assignments.key?(ident)
 
           # Pool of ancestors. When an environment assigns a value, all ancestors
           # of the environment are removed from the pool. If any remaining environment
@@ -340,9 +343,9 @@ module Prick
             if ancestor.assignments.key?(ident)
               # Remove all ancestors that are inherited by the assigning environment
               pool -= ancestor.ancestors
-              if ident == :build
-                env.super_environment = ancestor #if ident == :build
-              end
+#             if ident == :build
+#               env.super_environment = ancestor #if ident == :build
+#             end
               break
             end
           end
@@ -353,11 +356,11 @@ module Prick
           while ancestor = queue.shift
             next if !pool.include?(ancestor)
             if ancestor.assign?(ident)
-              if ident == :build && env.assign?(:build)
-                env.super_environment = nil
-              else
+#             if ident == :build && env.assign?(:build)
+#               env.super_environment = nil
+#             else
                 raise ArgumentError, "Ambigious definition of '#{ident}' in #{ancestor.name} environment"
-              end
+#             end
             end
           end
         end

data/lib/prick/local/fmt.rb

@@ -83,7 +83,7 @@ module Fmt
             lines << line.join(" ")
           end
           print lines.first
-          for line in lines[1..]
+          for line in lines[1..] || []
             puts
             print "#{' ' * index}#{line}"
           end

data/lib/prick/state.rb

@@ -195,8 +195,8 @@ module Prick
           "PRICK_ENVIRONMENT" =>  Prick.state.environment&.to_s, # may be the empty string
         })
 
-        # PRICK_ENVIRONMENT_* variables
-        if !Prick.state.environment.nil?
+        # PRICK_ENVIRONMENT_* variables. Only defined if the environment is known
+        if !Prick.state.environment.nil? && environments.key?(environment)
           hash.merge! environments[environment].bash_environment
         end
       end

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.32.0"
+  VERSION = "0.33.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic