dce 1.0.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 410c6336ffcf9712522df3b800a4863b9fe1f848
-  data.tar.gz: f52bd91ed2dd453a42154bfd7f486aba3bda6da5
+SHA256:
+  metadata.gz: ade08fae6e838cf29b366a060d826eaad54d843d383326556bea190935f893f1
+  data.tar.gz: eb6edf4a9ee854980e5570a8dde1c3e9dfb98cc967ef27061a0abddf5e30b4d2
 SHA512:
-  metadata.gz: 82027542b4cca252c83556da7cc7306e06fa6e7a0178295abbf26ff08b80a601d9f10a7fd7b229c03a5b47b7bcbda580765d6181bb34c2c278aa57db5f19bf49
-  data.tar.gz: 2712fc499dff43367ba902f7a4cde5418c31012e9989c6964d9baedaa51879bc0b4bb97f12c83ddb3bdd9f09748df96525c2996a4fc248e1419d9be30b951a39
+  metadata.gz: a9a0c16b156794011fb66081ab145c6c02e067f2c2668dcf1071f9a704c9203c92b3ea327ee4336b9a323e17e551f1404f50ad68e0ee7646442bbe08462aaeb1
+  data.tar.gz: 1b6c4fa0b5c17dcfa297036d5b743f1c46c00ec1affbd543419c1b638da4c88b91db0833512e839a85e6cd7ed760f02480f560f005977e7c658028dbf9898c49

data/lib/dce.rb

@@ -0,0 +1,151 @@
+# Wishlist:
+# Option to delete .dce_container.
+# Option for using run instead of exec?
+
+class DCE
+  # Run the command
+  def run
+    parse_args
+
+    @conf_file = File.join(File.dirname(docker_compose_file), '.dce_container')
+    config_container = nil
+    if File.exists? @conf_file
+      config_container = File.read @conf_file
+    end
+
+    if @list_containers
+      STDOUT.puts(get_containers.join(', '))
+      exit
+    end
+
+    if @query
+      if config_container
+        STDOUT.puts(config_container)
+        exit
+      else
+        abort "No container saved."
+      end
+    end
+
+    if !@container
+      @container = config_container ? config_container : query_container
+    end
+
+    if @container != config_container
+      File.write(@conf_file, @container)
+    end
+
+    # If no command given, open a shell.
+    if (@command.strip.empty?)
+      @command = "if [ -e /usr/bin/fish ]; then /usr/bin/fish; elif [ -e /bin/bash ]; then /bin/bash; else /bin/sh; fi"
+    end
+
+    args = '-i'
+    args += 't' if STDIN.tty?
+    container_id = %x{docker-compose ps -q #{@container}}.chomp
+
+    abort("Container #{@container} not created.") if container_id.empty?
+
+    command = "docker exec #{args} #{container_id} sh -c '#{@command}'"
+    STDERR.puts "Exec'ing: " + command if @verbose
+    exec command unless @dry_run
+  end
+
+  # Return path to the docker-compose.yml file
+  # Will exit with an error if not found
+  def docker_compose_file
+    unless @compose_file
+      dir = Dir.pwd()
+      while dir != "/"
+        file = Dir.glob('docker-compose.{yml,yaml}', base: dir).first
+        if file
+          @compose_file = File.join(dir, file)
+          break
+        end
+        dir = File.dirname(dir)
+      end
+
+      if !@compose_file
+        abort "No docker-compose.yml file found."
+      end
+    end
+
+    return @compose_file
+  end
+
+  # Parse command line arguments
+  def parse_args
+    # Not using a proper option parse library, as it will get confused
+    # by options for the command given. We use a simple parser.
+    while /^-/ =~ ARGV[0]
+      option = ARGV.shift
+      case option
+      when '-c', '--container'
+        @container = ARGV.shift
+        if !get_containers.include? @container
+          abort "Unknown container #{@container}"
+        end
+      when '-v', '--verbose'
+        @verbose = true
+      when '-n', '--dry-run'
+        @verbose = true
+        @dry_run = true
+      when '-?', '--print-service'
+        @query = true
+      when '-l', '--list-containers'
+        @list_containers = true
+      when '-h', '--help'
+        STDERR.puts <<-HEREDOC
+Usage: #{File.basename($0)} [OPTIONS]... COMMAND
+Runs COMMAND in docker-compose container.
+
+On first run, asks for the service container to use and saves it to .dce_container next
+to the docker-compose.yml file.
+
+If no command given, opens a shell.
+
+Options:
+  -c, --container SERVICE     use the container of the specified service
+                              replaces the selected container in the .dce_container
+  -v, --verbose               print exec'ed command
+  -n, --dry-run               only print exec'ed command, don't run
+  -?, --print-service         print the service saved
+  -l, --list-containers       print the containers available
+  -h, --help                  print this help and exit
+
+        HEREDOC
+        exit
+      else
+        abort "Unknown option #{option}"
+      end
+    end
+
+    @command = ARGV.join(' ')
+  end
+
+  # Ask the user to select a container
+  # The options are taken from the docker-compose.yml file
+  def query_container
+    containers = get_containers
+    STDERR.puts "Please select container [#{containers.join(', ')}]"
+    choice = STDIN.gets.strip
+    exit if choice.empty?
+    if !containers.include?(choice)
+      abort "Illegal choice."
+    end
+    choice
+  end
+
+  # Read containers from docker-compose.yml
+  def get_containers
+    # Older Psychs took whether to allow YAML aliases as a fourth
+    # argument, while newer has a keyword argument. Try both to be
+    # compatible with as many versions as possible.
+    begin
+      content = YAML::safe_load(File.read(docker_compose_file), aliases: true)
+    rescue ArgumentError
+      content = YAML::safe_load(File.read(docker_compose_file), [], [], true)
+    end
+    content.has_key?('version') ? content['services'].keys : content.keys
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dce
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Thomas Fini Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies: []
 description: Run shell commands in docker.
 email: xen@xen.dk
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/dce
+- lib/dce.rb
 homepage: https://github.com/xendk/dce
 licenses:
 - GPL-3.0
@@ -37,8 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: DCE