docker-env 1.3.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eb048673013e7f2bd08c48fd3a1f1e2b535c7dc8
-  data.tar.gz: b50f1bec7b96b727b1166a37b0ab0c9a080ddeeb
+SHA256:
+  metadata.gz: 49cc173315bbedee1d56df6586b8b643225e1e6749be840474ef21aa926e1206
+  data.tar.gz: 4235d13a8d3555027db37d4b9eea1a994826bd3b1776b243d9f65132f1fff797
 SHA512:
-  metadata.gz: 3e323b83144cdd4bba4c22fdb7aeec62f0c376cc32bd7bcf5bd11f7d2fac90758b462365c0f5aee70e6f22ab34075d2c296e92999b118eb096deca9112f0acf2
-  data.tar.gz: 5c825a0d1e18596d8f205b1d136159a62e69521ccc6febae05d8644df79861a52f0b2bc021fd630d79e20f36c375c7ddb9b51dc9c62a6804a2e4d6a22ea803e1
+  metadata.gz: 4683c6f9b8826e1940e23561d19ddcb1ec38d87e832c33bc9a84c1839df1889b9608c0158c88cef53a3539485c2e7f7a921856be6f14f25a445f62ef23a45143
+  data.tar.gz: 85503e832d3f91c7339451a278bdd0c955dc2249e483e85431c10f6ee7fea3a91d52a7b871dee39aa994843aab507e9c5eefa0266da6dbbee405a79ff82e996a

data/VERSION

@@ -1 +1 @@
-1.3.0
+2.1.0

data/bin/docker-env

@@ -7,8 +7,8 @@ include GLI::App
 DIR = File.expand_path(
   '~/Library/Containers/com.docker.docker/Data/com.docker.driver.amd64-linux'
 ).freeze
-NAME    = 'Docker.qcow2'.freeze
-SYMLINK = "#{DIR}/#{NAME}".freeze
+QNAME    = 'Docker.qcow2'.freeze
+RNAME    = 'Docker.raw'.freeze
 
 program_desc 'Manage docker for mac qcow images'
 version Version.current(File.dirname(__FILE__))
@@ -21,12 +21,28 @@ switch %i[v verbose], desc: 'be more verbose'
 switch %i[k kill], desc: 'quit docker if it is running'
 switch %i[r restart], desc: 'stop and start docker around command'
 
+def symlink
+  n = File.join(DIR, QNAME);
+  return n if File.exist?(n)
+
+  return File.join(DIR, RNAME);
+end
+
 def name(f, options)
-  options[:verbose] ? f : f.sub(/^.+Docker\.qcow2\./, '')
+  options[:verbose] ? f : f.sub(/^.+Docker\.(qcow2|raw)\./, '')
+end
+
+def readlink
+  if !File.symlink?(symlink)
+    $stderr.puts "Image not symlink, try init!"
+    exit 1
+  end
+
+  File.readlink(symlink)
 end
 
 def current(options)
-  name(File.readlink(SYMLINK), options)
+  name(readlink, options)
 end
 
 def tell_docker(what, options)
@@ -61,60 +77,73 @@ post do |global_options, _command, _options, _args|
   tell_docker('open', global_options) if global_options[:restart]
 end
 
-desc 'setup by moving Docker.qcow2 to "image_name" and linking back'
+desc 'setup by moving Docker.{qcow2,raw} to "image_name" and linking back (FORCES RESTART)'
 arg 'image_name'
 command :init do |c|
   c.action do |global_options, _options, args|
+    global_options[:restart] = true
     running?(global_options)
-    if File.symlink?(SYMLINK)
+    if File.symlink?(symlink)
       $stderr.puts "Already setup. Current is: #{current(global_options)}"
       exit 1
     end
 
-    file = "#{SYMLINK}.#{args[0]}"
-    File.rename(SYMLINK, file)
-    File.symlink(file, SYMLINK)
+    link = symlink
+    file = "#{symlink}.#{args[0]}"
 
+    $stderr.puts "Moving #{link} -> #{file}" if global_options[:verbose]
+
+    File.rename(link, file)
+    File.symlink(file, link)
+
+    $stderr.puts "Linking #{file} -> #{link} and restarting" if global_options[:verbose]
     puts 'Current is now: ' + current(global_options)
   end
 end
 
-desc 'list available qcow images (.../Docker.qcow2.{name})'
+desc 'Print path to disk imae directory'
+command [:dir, :directory] do |c|
+  c.action { puts DIR }
+end
+
+desc 'list available disk images (.../Docker.(qcow2|raw).{name})'
 command [:list, :ls] do |c|
   c.action do |global_options, _options, _args|
     cur = current(global_options)
-    puts Dir.glob("#{SYMLINK}.*").map { |f|
+    # only list images of base type...
+    ext = File.extname(symlink)
+    puts Dir.glob("#{DIR}/Docker#{ext}.*").map { |f|
       img = name(f, global_options)
       sprintf '%-2s%s', img == cur ? '*' : '', img
     }
   end
 end
 
-desc 'create new qcow "image"'
+desc 'create new disk "image" (FORCES RESTART)'
 long_desc <<EOF
 Removes current link so that the next time docker starts, it will create a
     new empty image file. The (slightly long) steps to follow:
 
-        1. Stop Docker.app
-        2. Run this command (`docker-env new`)
-        3. Restart Docker.app
-        4. Stop Docker.app
-        5. Run `docker-env init {name}` to name the new image and
+        1. Run this command (`docker-env new`)
+        2. Wait for docker to fully restart
+        3. Run `docker-env init {name}` to name the new image and
            create the symlink
 EOF
 command :new do |c|
   c.action do |global_options, _options, _args|
+    global_options[:restart] = true
     running?(global_options)
-    if File.exist?(SYMLINK) || !File.symlink?(SYMLINK)
+    if File.exist?(symlink) && !File.symlink?(symlink)
       $stderr.puts "Please use '--force' to force delete current image!"
       exit 1
     end
 
+    $stderr.puts "Removing #{symlink} and restarting" if global_options[:verbose]
+
     begin
-      File.unlink(SYMLINK)
+      File.unlink(symlink)
     rescue Errno::ENOENT # rubocop:disable Lint/HandleExceptions
     end
-    help(['new'])
   end
 end
 
@@ -122,16 +151,17 @@ desc 'Delete "image"'
 arg 'image'
 command :rm do |c|
   c.action do |_global_options, _options, args|
-    file = "#{SYMLINK}.#{args[0]}"
+    file = "#{symlink}.#{args[0]}"
     unless File.exist?(file)
       $stderr.puts "Image #{args[0]} doesnt exist!"
       exit 1
     end
-    if File.readlink(SYMLINK) == file
+    if readlink == file
       $stderr.puts "Can't delete currently linked image"
       exit 1
     end
 
+    $stderr.puts "Removing #{file} to ${link}" if global_options[:verbose]
     File.unlink(file)
   end
 end
@@ -141,14 +171,18 @@ arg 'image'
 command :use do |c|
   c.action do |global_options, _options, args|
     running?(global_options)
-    file = "#{SYMLINK}.#{args[0]}"
+    ext = args[0]
+    file = Dir.glob("#{DIR}/Docker.*.#{ext}")[0]
     File.exist?(file) or raise "Image #{file} does not exist"
 
     begin
-      File.unlink(SYMLINK)
+      File.unlink(symlink)
     rescue Errno::ENOENT # rubocop:disable Lint/HandleExceptions
     end
-    File.symlink(file, SYMLINK)
+
+        $stderr.puts "Linking #{file} to #{symlink}" if global_options[:verbose]
+
+    File.symlink(file, symlink)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-env
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A tool to switch docker for mac environments