nib 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58aa2c29124f701d6f0d76db5e8cfec85169ee60
-  data.tar.gz: d06840ca704e8393ecf568e70a4481cdd1825533
+  metadata.gz: 0ae5c7c0fd0074c8bc59abecde13d264c9193b75
+  data.tar.gz: 333886e4de7e6097560e04d17101be5df9eafc03
 SHA512:
-  metadata.gz: a0be8162ffe8fc2825159adefbdaaea649b5dd50dcdac87d8302c585d7489a6402185a8a657ddfeca42ca62962dcba7e5bc1f7c4e635eb97b3394c3459af9e51
-  data.tar.gz: 48a132d231c1ce401cdaf5e9c39dbee414cb5c4d91d895403e9fb1376cae551e961fedcbad9298e2a5b6ee888eaa9420130bf8e571e1ca1fd20b413e6e099f92
+  metadata.gz: ebdc8d550836d01e26a6462c258d73d9e888b7789dd737df13dbd9e1021e1f7364cf847a44bd3d4b9e1ead7098461d42205851bab95ed05d2b3cec04a6320348
+  data.tar.gz: 317dc1f2302bbcf859b4f15b20b28340ca32c766750ec4bdb84ca6a9f250f0f2572809a192e4389b4a37da3b3e7629c9f50d899172a536d9c2a06e62739914af

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bin/nib

@@ -47,7 +47,7 @@ on_error do |exception|
   case exception
   when GLI::UnknownCommand
     # delegate unknown commands over to `docker-compose`
-    exec("docker-compose #{ARGV.join(' ')}")
+    exec("docker-compose -f #{Nib::History::Compose.new.path} #{ARGV.join(' ')}")
 
     false
   else

data/lib/nib/command.rb

@@ -29,6 +29,7 @@ module Nib::Command
         #{alternate_compose_file} \
         run \
         --rm \
+        #{entrypoint} \
         #{options} \
         #{service} \
         #{command}
@@ -36,4 +37,6 @@ module Nib::Command
   end
 
   def alternate_compose_file; end
+
+  def entrypoint; end
 end

data/lib/nib/history.rb

@@ -17,19 +17,23 @@ module Nib::History
     end
   end
 
-  def command
-    return if self.class.history_requires_command? && @command.to_s.empty?
-
+  def wrap(executable)
     <<-COMMAND
       /bin/sh -c \"
         export HISTFILE=#{PATH}/shell_history
         cp #{irbrc.container_path} /root/.irbrc 2>/dev/null
         cp #{pryrc.container_path} /root/.pryrc 2>/dev/null
-        #{super}
+        #{executable}
       \"
     COMMAND
   end
 
+  def command
+    return if self.class.history_requires_command? && @command.to_s.empty?
+
+    wrap(super)
+  end
+
   def alternate_compose_file
     "-f #{Compose.new.path}"
   end

data/lib/nib/shell.rb

@@ -4,14 +4,16 @@ class Nib::Shell
 
   private
 
-  def command
+  def entrypoint
     conditions = %i(zsh bash ash).map do |shell|
       "elif hash #{shell} 2>/dev/null ; then #{shell};"
     end
 
-    conditions                                         # default conditions
+    executable = conditions                            # default conditions
       .unshift('if [ -f bin/shell ]; then bin/shell;') # prepend bin/shell
       .push('else sh; fi')                             # add else clause (`sh`)
       .join("\n")
+
+    "--entrypoint='#{wrap(executable)}'"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nib
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - John Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli