dce 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade08fae6e838cf29b366a060d826eaad54d843d383326556bea190935f893f1
-  data.tar.gz: eb6edf4a9ee854980e5570a8dde1c3e9dfb98cc967ef27061a0abddf5e30b4d2
+  metadata.gz: d03f0fd181904c307a001e0dff290f8299fd843076ad1e23159cbf2b03cff224
+  data.tar.gz: 53d7c24d9de56443eda9b3f7c61fcaed6205514cb6e49bdc438fcb3353d5e48e
 SHA512:
-  metadata.gz: a9a0c16b156794011fb66081ab145c6c02e067f2c2668dcf1071f9a704c9203c92b3ea327ee4336b9a323e17e551f1404f50ad68e0ee7646442bbe08462aaeb1
-  data.tar.gz: 1b6c4fa0b5c17dcfa297036d5b743f1c46c00ec1affbd543419c1b638da4c88b91db0833512e839a85e6cd7ed760f02480f560f005977e7c658028dbf9898c49
+  metadata.gz: 062ef9d7e3aaa341f8d606b54c3cdf7719a530592d230e842e37a7ca8c2b260bdc78f0beaebe9bbdb6d5556479b33a1b1f62858079270964f1ae386c6c4cd48c
+  data.tar.gz: bc816bf39032f13c06646fd77f086926d93d49d39a27524721498efa375b226a449f03af65fab8a11a9b4fe265a5b201b144051a747e91454a824b5e7ce1e5a7

data/bin/dce

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require 'yaml'
 if ENV['COVERAGE']
   require 'simplecov'
 
   # Redefine exec to save coverage first.
   module Kernel
-    alias_method :exec_real, :exec
+    alias exec_real exec
 
     def exec(command)
       SimpleCov.result
@@ -15,12 +17,13 @@ if ENV['COVERAGE']
   end
 
   SimpleCov.at_exit do
+    # Merge results with coverage from other processes, but suppresses
+    # formatting and output.
     SimpleCov.result
   end
 end
 
-# Possibly not the right way to load file.
-require_relative '../lib/dce.rb'
+require_relative '../lib/dce'
 
 app = DCE.new
 app.run

data/lib/dce.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 # Wishlist:
 # Option to delete .dce_container.
 # Option for using run instead of exec?
 
+# The dce commmand class.
 class DCE
   # Run the command
   def run
@@ -9,45 +12,38 @@ class DCE
 
     @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
+    config_container = File.read(@conf_file) if File.exist? @conf_file
 
     if @list_containers
-      STDOUT.puts(get_containers.join(', '))
+      $stdout.puts(containers.join(', '))
       exit
     end
 
     if @query
       if config_container
-        STDOUT.puts(config_container)
+        $stdout.puts(config_container)
         exit
       else
-        abort "No container saved."
+        abort 'No container saved.'
       end
     end
 
-    if !@container
-      @container = config_container ? config_container : query_container
-    end
+    @container ||= config_container || query_container
 
-    if @container != config_container
-      File.write(@conf_file, @container)
-    end
+    File.write(@conf_file, @container) if @container != config_container
 
     # 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"
+    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
+    container_id = `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
+    tty = $stdin.tty? ? 't' : ''
+    command = "docker exec -i#{tty} #{container_id} sh -c '#{@command}'"
+    warn "Exec'ing: #{command}" if @verbose
     exec command unless @dry_run
   end
 
@@ -55,8 +51,8 @@ class DCE
   # Will exit with an error if not found
   def docker_compose_file
     unless @compose_file
-      dir = Dir.pwd()
-      while dir != "/"
+      dir = Dir.pwd
+      while dir != '/'
         file = Dir.glob('docker-compose.{yml,yaml}', base: dir).first
         if file
           @compose_file = File.join(dir, file)
@@ -65,12 +61,10 @@ class DCE
         dir = File.dirname(dir)
       end
 
-      if !@compose_file
-        abort "No docker-compose.yml file found."
-      end
+      abort 'No docker-compose.yml file found.' unless @compose_file
     end
 
-    return @compose_file
+    @compose_file
   end
 
   # Parse command line arguments
@@ -82,9 +76,7 @@ class DCE
       case option
       when '-c', '--container'
         @container = ARGV.shift
-        if !get_containers.include? @container
-          abort "Unknown container #{@container}"
-        end
+        abort "Unknown container #{@container}" unless containers.include? @container
       when '-v', '--verbose'
         @verbose = true
       when '-n', '--dry-run'
@@ -95,23 +87,23 @@ class DCE
       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.
+        warn <<~HEREDOC
+          Usage: #{File.basename($PROGRAM_NAME)} [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.
+          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.
+          If no command given, opens a shell.
 
-Options:
-  -c, --container SERVICE     use the container of the specified service
+          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
+            -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
@@ -126,26 +118,28 @@ Options:
   # 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
+    warn "Please select container [#{containers.join(', ')}]"
+    choice = $stdin.gets.strip
     exit if choice.empty?
-    if !containers.include?(choice)
-      abort "Illegal choice."
-    end
+
+    abort 'Illegal choice.' unless containers.include?(choice)
     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)
+  def containers
+    unless @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
+      @containers = content.key?('services') ? content['services'].keys : content.keys
     end
-    content.has_key?('version') ? content['services'].keys : content.keys
+
+    @containers
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dce
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Thomas Fini Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Run shell commands in docker.
 email: xen@xen.dk
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: DCE