dip 7.0.0 → 7.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dip/command.rb +2 -1
  3. data/lib/dip/commands/dns.rb +9 -9
  4. data/lib/dip/commands/nginx.rb +4 -4
  5. data/lib/dip/commands/ssh.rb +8 -8
  6. data/lib/dip/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5df0e0954a241e561cfe313fc0f6a8000644e8ebe102a954ba721e81752046a6
4
- data.tar.gz: 89c96af17e4dc28d2d0953deb411075e662eb7815193517634b08242d9a31761
3
+ metadata.gz: f6effe7d3575e71e95f9e4ec3d61fe016cf55691c1adaa96a0e75ab1e04e894f
4
+ data.tar.gz: 7f4f7ca8bded48c8b7abb7979148b9deb77d8f2e2b15493c8cc8831a4600c49f
5
5
  SHA512:
6
- metadata.gz: 6730c668a3850de7625f819045787dd901546868df56ecde7264796736b567e66a3ef96a7db7b7855585f6b6a47ba0b241e0ce7b07177692cf0df783a35bc313
7
- data.tar.gz: d32638715384461a37cb62ed6f2f0f41b6b3ea3618e9b7dd006d3d57b88325f3c37ac9faa5e82727fda56297473153b59736c97f162d326e8ffb3d1020519d45
6
+ metadata.gz: 8a2d4acb5cac37f00a2dcb3132ca034fb9b8121c1d2d0b816a4b37a565b631afdc12b73a2701cd115389d56efb60d4241fe55253e5b59c122dce364b174b8a06
7
+ data.tar.gz: ca168782f5af0500f4352631dd56237543b3c685b8b3d40819c240b58ec62c075ee01e5fd211c506855875e8c32e33c4afaf0df1f3131bbef2c98aa126fff518
data/lib/dip/command.rb CHANGED
@@ -24,8 +24,9 @@ module Dip
24
24
  class << self
25
25
  def shell(cmd, argv = [], subshell: false, **options)
26
26
  cmd = Dip.env.interpolate(cmd)
27
+ argv = [argv] if argv.is_a?(String)
27
28
  argv = argv.map { |arg| Dip.env.interpolate(arg) }
28
- cmdline = [cmd, *argv].compact.join(" ")
29
+ cmdline = [cmd, *argv].compact.join(" ").strip
29
30
 
30
31
  puts [Dip.env.vars, cmdline].inspect if Dip.debug?
31
32
 
data/lib/dip/commands/dns.rb CHANGED
@@ -17,8 +17,8 @@ module Dip
17
17
  end
18
18
 
19
19
  def execute
20
- subshell("docker", "network create #{@net}".shellsplit, panic: false, err: File::NULL)
21
- subshell("docker", "run #{container_args} #{@image} --domain=#{@domain}".shellsplit)
20
+ subshell("docker", "network create #{@net}", panic: false, err: File::NULL)
21
+ subshell("docker", "run #{container_args} #{@image} --domain=#{@domain}")
22
22
  end
23
23
 
24
24
  private
@@ -40,8 +40,8 @@ module Dip
40
40
  end
41
41
 
42
42
  def execute
43
- subshell("docker", "stop #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
44
- subshell("docker", "rm -v #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
43
+ subshell("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
44
+ subshell("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
45
45
  end
46
46
  end
47
47
 
@@ -52,11 +52,11 @@ module Dip
52
52
  end
53
53
 
54
54
  def execute(**options)
55
- subshell("docker",
56
- "inspect " \
57
- "--format '{{ .NetworkSettings.Networks.#{@net}.IPAddress }}' " \
58
- "#{@name}".shellsplit,
59
- **options)
55
+ subshell(
56
+ "docker",
57
+ "inspect --format '{{ .NetworkSettings.Networks.#{@net}.IPAddress }}' #{@name}",
58
+ **options
59
+ )
60
60
  end
61
61
  end
62
62
  end
data/lib/dip/commands/nginx.rb CHANGED
@@ -18,8 +18,8 @@ module Dip
18
18
  end
19
19
 
20
20
  def execute
21
- subshell("docker", "network create #{@net}".shellsplit, panic: false, err: File::NULL)
22
- subshell("docker", "run #{container_args} #{@image}".shellsplit)
21
+ subshell("docker", "network create #{@net}", panic: false, err: File::NULL)
22
+ subshell("docker", "run #{container_args} #{@image}")
23
23
  end
24
24
 
25
25
  private
@@ -43,8 +43,8 @@ module Dip
43
43
  end
44
44
 
45
45
  def execute
46
- subshell("docker", "stop #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
47
- subshell("docker", "rm -v #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
46
+ subshell("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
47
+ subshell("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
48
48
  end
49
49
  end
50
50
  end
data/lib/dip/commands/ssh.rb CHANGED
@@ -15,21 +15,21 @@ module Dip
15
15
  end
16
16
 
17
17
  def execute
18
- subshell("docker", "volume create --name ssh_data".shellsplit, out: File::NULL, err: File::NULL)
18
+ subshell("docker", "volume create --name ssh_data", out: File::NULL, err: File::NULL)
19
19
 
20
20
  subshell(
21
21
  "docker",
22
- "run #{user_args} --detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent".shellsplit
22
+ "run #{user_args}--detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent"
23
23
  )
24
24
 
25
25
  key = Dip.env.interpolate(@key)
26
- subshell("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}".shellsplit)
26
+ subshell("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}")
27
27
  end
28
28
 
29
29
  private
30
30
 
31
31
  def user_args
32
- "-u #{@user}" if @user
32
+ "-u #{@user} " if @user
33
33
  end
34
34
 
35
35
  def container_args
@@ -44,15 +44,15 @@ module Dip
44
44
 
45
45
  class Down < Dip::Command
46
46
  def execute
47
- subshell("docker", "stop ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
48
- subshell("docker", "rm -v ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
49
- subshell("docker", "volume rm ssh_data".shellsplit, panic: false, out: File::NULL, err: File::NULL)
47
+ subshell("docker", "stop ssh-agent", panic: false, out: File::NULL, err: File::NULL)
48
+ subshell("docker", "rm -v ssh-agent", panic: false, out: File::NULL, err: File::NULL)
49
+ subshell("docker", "volume rm ssh_data", panic: false, out: File::NULL, err: File::NULL)
50
50
  end
51
51
  end
52
52
 
53
53
  class Status < Dip::Command
54
54
  def execute
55
- subshell("docker", "inspect --format '{{.State.Status}}' ssh-agent".shellsplit)
55
+ subshell("docker", "inspect --format '{{.State.Status}}' ssh-agent")
56
56
  end
57
57
  end
58
58
  end
data/lib/dip/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Dip
4
- VERSION = "7.0.0"
4
+ VERSION = "7.0.1"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dip
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.0
4
+ version: 7.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - bibendi
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-31 00:00:00.000000000 Z
11
+ date: 2021-04-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor