dip 5.0.0 → 7.1.0

data/lib/dip/commands/ssh.rb

@@ -1,50 +1,58 @@
 # frozen_string_literal: true
 
 require "shellwords"
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
     module SSH
       class Up < Dip::Command
-        def initialize(key:, volume:, interactive:)
+        def initialize(key:, volume:, interactive:, user: nil)
           @key = key
           @volume = volume
           @interactive = interactive
+          @user = user
         end
 
         def execute
-          subshell("docker", "volume create --name ssh_data".shellsplit, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "volume create --name ssh_data", out: File::NULL, err: File::NULL)
 
-          subshell("docker", "run --detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent".shellsplit)
+          exec_subprocess(
+            "docker",
+            "run #{user_args}--detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent"
+          )
 
           key = Dip.env.interpolate(@key)
-          subshell("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}".shellsplit)
+          exec_subprocess("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}")
         end
 
         private
 
+        def user_args
+          "-u #{@user} " if @user
+        end
+
         def container_args
-          result = %w(--rm)
+          result = %w[--rm]
           volume = Dip.env.interpolate(@volume)
           result << "--volume ssh_data:/ssh"
           result << "--volume #{volume}:#{volume}"
           result << "--interactive --tty" if @interactive
-          result.join(' ')
+          result.join(" ")
         end
       end
 
       class Down < Dip::Command
         def execute
-          subshell("docker", "stop ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "volume rm ssh_data".shellsplit, panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "stop ssh-agent", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "rm -v ssh-agent", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "volume rm ssh_data", panic: false, out: File::NULL, err: File::NULL)
         end
       end
 
       class Status < Dip::Command
         def execute
-          subshell("docker", "inspect --format '{{.State.Status}}' ssh-agent".shellsplit)
+          exec_subprocess("docker", "inspect --format '{{.State.Status}}' ssh-agent")
         end
       end
     end

data/lib/dip/config.rb

@@ -13,6 +13,15 @@ module Dip
   class Config
     DEFAULT_PATH = "dip.yml"
 
+    CONFIG_DEFAULTS = {
+      environment: {},
+      compose: {},
+      interation: {},
+      provision: []
+    }.freeze
+
+    ConfigKeyMissingError = Class.new(ArgumentError)
+
     class ConfigFinder
       attr_reader :file_path
 
@@ -20,10 +29,10 @@ module Dip
         @override = override
 
         @file_path = if ENV["DIP_FILE"]
-                       Pathname.new(prepared_name(ENV["DIP_FILE"]))
-                     else
-                       find(Pathname.new(work_dir))
-                     end
+          Pathname.new(prepared_name(ENV["DIP_FILE"]))
+        else
+          find(Pathname.new(work_dir))
+        end
       end
 
       def exist?
@@ -78,7 +87,7 @@ module Dip
 
     %i[environment compose interaction provision].each do |key|
       define_method(key) do
-        config[key]
+        config[key] || (raise config_missing_error(key))
       end
     end
 
@@ -106,7 +115,12 @@ module Dip
       override_finder = ConfigFinder.new(work_dir, override: true)
       config.deep_merge!(self.class.load_yaml(override_finder.file_path)) if override_finder.exist?
 
-      @config = config
+      @config = CONFIG_DEFAULTS.merge(config)
+    end
+
+    def config_missing_error(config_key)
+      msg = "config for %<key>s is not defined in %<path>s" % {key: config_key, path: finder.file_path}
+      ConfigKeyMissingError.new(msg)
     end
   end
 end

data/lib/dip/environment.rb

@@ -4,7 +4,7 @@ require "pathname"
 
 module Dip
   class Environment
-    VAR_REGEX = /\$[\{]?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)[\}]?/.freeze
+    VAR_REGEX = /\$\{?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)\}?/.freeze
     SPECIAL_VARS = %i[os work_dir_rel_path].freeze
 
     attr_reader :vars
@@ -26,8 +26,8 @@ module Dip
       vars.fetch(name) { ENV[name] }
     end
 
-    def fetch(name)
-      vars.fetch(name) { ENV.fetch(name) { yield } }
+    def fetch(name, &block)
+      vars.fetch(name) { ENV.fetch(name, &block) }
     end
 
     def []=(key, value)
@@ -35,18 +35,18 @@ module Dip
     end
 
     def interpolate(value)
-      value.gsub(VAR_REGEX) do
+      value.gsub(VAR_REGEX) do |match|
         var_name = Regexp.last_match[:var_name]
 
         if special_vars.key?(var_name)
           fetch(var_name) { send(special_vars[var_name]) }
         else
-          self[var_name]
+          fetch(var_name) { match }
         end
       end
     end
 
-    alias replace interpolate
+    alias_method :replace, :interpolate
 
     private
 

data/lib/dip/ext/hash.rb

@@ -24,7 +24,7 @@ module ActiveSupportHashHelpers
       merge!(other_hash) do |key, this_val, other_val|
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
           this_val.deep_merge(other_val, &block)
-        elsif block_given?
+        elsif block
           block.call(key, this_val, other_val)
         else
           other_val

data/lib/dip/interaction_tree.rb

@@ -58,9 +58,10 @@ module Dip
     def build_command(entry)
       {
         description: entry[:description],
-        service: entry.fetch(:service),
-        command: entry[:command],
-        default_args: prepare_default_args(entry[:default_args]),
+        service: entry[:service],
+        command: entry[:command].to_s.strip,
+        shell: entry.fetch(:shell, true),
+        default_args: entry[:default_args].to_s.strip,
         environment: entry[:environment] || {},
         compose: {
           method: entry.dig(:compose, :method) || entry[:compose_method] || "run",
@@ -76,19 +77,6 @@ module Dip
       entry[:description] ||= nil
     end
 
-    def prepare_default_args(args)
-      return [] if args.nil?
-
-      case args
-      when Array
-        args
-      when String
-        args.shellsplit
-      else
-        raise ArgumentError, "Unknown type for default_args: #{args.inspect}"
-      end
-    end
-
     def compose_run_options(value)
       return [] unless value
 

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,19 +87,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -176,15 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem CLI tool for better interacting docker-compose files.