dip 7.6.0 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077560a05e3c58c34f61f81e80a941a6bb8a88da7b8acc59cb1e8c254985467e
-  data.tar.gz: 8d7b121d08fb87b68bf375b8651cc60f2e27307267f813ea87faf2eee6f88870
+  metadata.gz: 88f631de08ccd575c2e65930de249fbbba598e0948e8335fd9bbb4adf8a455c8
+  data.tar.gz: 0d906d4a243285684469524e85a8d494f12a13de58065e1ecf8eaccc6ef85903
 SHA512:
-  metadata.gz: 1a00861123026227700fcb92e3ef1fa47f702efcfdd2bbce83363aeca5bedf7d2c669428f5837828c53edcb76975958334689657f2d52df7f8dee3e3991d0a08
-  data.tar.gz: f2bd7865a209166096b5b9f553da6031ec7192c889f8e6e357a230fd2f9dd9c67259501f358dffde25657370a3f7cf8d628156cbad7d9524ea9505c10ff7c724
+  metadata.gz: 51aa9e654715ee7836b9d143760dc028e9f06f811e0804decffc48fffcef4816e78c1f302f2d9af3462faad53a53efa755112804e116278372f447192572a06b
+  data.tar.gz: 12521190b37c170b54abaa319c3ad877999c9471f3936a7d732b2bbaeb776b922c28a8ab7d2ccc13322f73294419156f1d6156ccc35c2e1ac5709ac55d0bc8f2

data/README.md

@@ -80,7 +80,7 @@ Also, you can check out examples at the top.
 
 ```yml
 # Required minimum dip version
-version: '7.5'
+version: '7.7'
 
 environment:
   COMPOSE_EXT: development
@@ -222,6 +222,27 @@ dip run bash -c pwd
 
 returned is `/app/sub-project-dir`.
 
+#### $DIP_CURRENT_USER
+
+Exposes the current user ID (UID). It is useful when you need to run a container with the same user as the host machine. For example:
+
+```yml
+# dip.yml (1)
+environment:
+  UID: ${DIP_CURRENT_USER}
+```
+
+```yml
+# docker-compose.yml (2)
+services:
+  app:
+    image: ruby
+    user: ${UID:-1000}
+```
+
+The container will run using the same user ID as your host machine.
+
+
 ### dip run
 
 Run commands defined within the `interaction` section of dip.yml

data/lib/dip/cli/console.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/console"
 
 module Dip

data/lib/dip/cli/dns.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/dns"
 
 module Dip

data/lib/dip/cli/nginx.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/nginx"
 
 module Dip

data/lib/dip/cli/ssh.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/ssh"
 
 module Dip

data/lib/dip/cli.rb

@@ -28,7 +28,7 @@ module Dip
           argv.unshift("run")
         end
 
-        super Dip::RunVars.call(argv, ENV)
+        super(Dip::RunVars.call(argv, ENV))
       end
     end
 

data/lib/dip/command.rb

@@ -11,7 +11,7 @@ module Dip
     class ProgramRunner
       def self.call(cmdline, env: {}, **options)
         if cmdline.is_a?(Array)
-          ::Kernel.exec(env, cmdline[0], *cmdline[1..-1], **options)
+          ::Kernel.exec(env, cmdline[0], *cmdline[1..], **options)
         else
           ::Kernel.exec(env, cmdline, **options)
         end

data/lib/dip/environment.rb

@@ -5,7 +5,7 @@ require "pathname"
 module Dip
   class Environment
     VAR_REGEX = /\$\{?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)\}?/.freeze
-    SPECIAL_VARS = %i[os work_dir_rel_path].freeze
+    SPECIAL_VARS = %i[os work_dir_rel_path current_user].freeze
 
     attr_reader :vars
 
@@ -63,5 +63,9 @@ module Dip
     def find_work_dir_rel_path
       @find_work_dir_rel_path ||= Pathname.getwd.relative_path_from(Dip.config.file_path.parent).to_s
     end
+
+    def find_current_user
+      @find_current_user ||= Process.uid
+    end
   end
 end

data/lib/dip/interaction_tree.rb

@@ -45,11 +45,11 @@ module Dip
       cmd = build_command(entry)
 
       tree[name] = cmd
+      base_cmd = entry.select { |k, _| k != :subcommands }
 
       entry[:subcommands]&.each do |sub_name, sub_entry|
         sub_command_defaults!(sub_entry)
-
-        expand("#{name} #{sub_name}", entry.deep_merge(sub_entry), tree: tree)
+        expand("#{name} #{sub_name}", base_cmd.deep_merge(sub_entry), tree: tree)
       end
 
       tree

data/lib/dip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dip
-  VERSION = "7.6.0"
+  VERSION = "7.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 7.8.0
 platform: ruby
 authors:
 - bibendi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -210,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="