docker-env 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2236ba069cbf37b173d7c7bc7c9bc35edec96c61
-  data.tar.gz: e704b52d70738ee3fbb6aa81c77088a2a453f60d
+  metadata.gz: 2f33b10f7bf7f70865735af1a5c528de04a581ff
+  data.tar.gz: 024670f80640a4a0dd8a46fb2e259cc406f8f60f
 SHA512:
-  metadata.gz: e01e16356664b5ffbcb3ffc5a032b71ec3e5af17e43b81719c018971b7de7f1033da8e9a606d7ed0a927a662b1b073f30ff93608d7842219ae9ba2445adf3f3e
-  data.tar.gz: 8af770816efb333a0b3366375414bb0d81f2836ec9c833a12754a8c2c19ad62ddac66fc15d5c6f1df05372c41d2a0e41b25576b7b99d19443a6349f49812f038
+  metadata.gz: f34ea507fef861db30f108dc7b9e6ad605db38334eb99e58a1ff92c3402034812a6c35cf27d09759578bee8145205973e9a0d1025f4fb57d04a020593e0eae48
+  data.tar.gz: b86aff6d07962278789af3eac68a2c7522dd18688884a7cf620391ca402924bed3e7faf71b7388dd8c18c9edb399543d0663cdd8fab641f0e95a77f51a1e9bcb

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/docker-env

@@ -18,24 +18,50 @@ arguments :strict
 wrap_help_text :verbatim
 
 switch [:v, :verbose], desc: 'be more verbose'
+switch [:k, :kill], desc: 'quit docker if it is running'
+switch [:r, :restart], desc: 'stop and start docker around command'
 
 def current(options)
   f = File.readlink(SYMLINK)
   options[:verbose] ? f : f.split('.').last
 end
 
-def running?
-  return unless `ps ax` =~ %r[/[D]ocker.app]
+def tell_docker(what, options)
+  cmd = %[osascript -e 'tell application "Docker" to #{what}']
+  $stderr.puts cmd if options[:verbose]
+  system(cmd)
+end
+
+def check_running
+  `ps ax` =~ %r[/[D]ocker.app]
+end
+
+def running?(options)
+  active = check_running
+  tell_docker('quit', options) if active && (options[:kill] || options[:restart])
+
+  # wait for docker to quit
+  while check_running do
+    $stderr.putc '.' if options[:verbose]
+    sleep 1
+  end
+  $stderr.puts ''
+
+  return active unless check_running
 
   $stderr.puts 'Please quit Docker.app before using this script!'
   exit 1
 end
 
+post do |global_options, _command, _options, _args|
+  tell_docker('activate', global_options) if global_options[:restart]
+end
+
 desc 'setup by moving Docker.qcow2 to "image_name" and linking back'
 arg 'image_name'
 command :init do |c|
   c.action do |global_options, _options, args|
-    running?
+    running?(global_options)
     if File.symlink?(SYMLINK)
       $stderr.puts "Already setup. Current is: #{current(global_options)}"
       exit 1
@@ -73,8 +99,8 @@ Removes current link so that the next time docker starts, it will create a
            create the symlink
 EOF
 command :new do |c|
-  c.action do |_global_options, _options, _args|
-    running?
+  c.action do |global_options, _options, _args|
+    running?(global_options)
     if File.exist?(SYMLINK) || !File.symlink?(SYMLINK)
       $stderr.puts "Please use '--force' to force delete current image!"
       exit 1
@@ -109,8 +135,8 @@ end
 desc 'Link to "image"'
 arg 'image'
 command :use do |c|
-  c.action do |_global_options, _options, args|
-    running?
+  c.action do |global_options, _options, args|
+    running?(global_options)
     file = "#{SYMLINK}.#{args[0]}"
     File.exist?(file) or raise "Image #{file} does not exist"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-env
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake