dce 0.0.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63433f17a92dff67527d1fa36c7f0098bd8a572
-  data.tar.gz: e35543115353f30be2f5985c73cb588e10e2c0c6
+  metadata.gz: fbf00e5fba8316d9b49e3ddec96306f03a04d6aa
+  data.tar.gz: a4226ca5bbca2c08333a9dc62c1abeb03f091709
 SHA512:
-  metadata.gz: 3d9cef81059cebb0f360b421ba212cf779ef31ee6e2d7bcf03af8c6772e8b4070dea2289a69e0f57979155ef773eb8aac7f71f0fc18fc3485f1ca333a5f2cee6
-  data.tar.gz: 464c3fb73e8c1725fdfe44b6748783fdeba2b88276f14e52863ebe737617f77c8b56b9473c38702e8f297cf4dd5408ff9c5205de0e7de3fc8dbc925be03d7cf8
+  metadata.gz: 3019a466710734d02250d5e0694caaa81fef083db39f70ae6621a671cdfa9ef6236e5f45575ec1a4a6538bd28ed64e430ef8cca9426571fdaa6c2d3219862cbf
+  data.tar.gz: 36529e899d0fcf4ecaa0dc587e3e6c49c39588ec56f5d7cb0729c0b623edf5e10158cb910a36868c5d1bfa0f8fb5146d8deb4e1bc7f12bb4409d63cd603aa8c3

data/bin/dce

@@ -1,145 +1,26 @@
 #!/usr/bin/env ruby
 
-# Wishlist:
-# Option to delete .dce_container.
-# Option for using run instead of exec?
-
 require 'yaml'
+if ENV['COVERAGE']
+  require 'simplecov'
 
-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 @query
-      if config_container
-        STDOUT.puts(config_container)
-        exit
-      else
-        STDERR.puts("No container saved.")
-        exit!
-      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
-    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 = File.join(dir, 'docker-compose.yml')
-        if FileTest.exists?(file)
-          @compose_file = file
-          break;
-        end
-        dir = File.dirname(dir)
-      end
+  # Redefine exec to save coverage first.
+  module Kernel
+    alias_method :exec_real, :exec
 
-      if !@compose_file
-        STDERR.puts "No docker-compose.yml file found."
-        exit!
-      end
+    def exec(command)
+      SimpleCov.result
+      exec_real command
     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
-          STDERR.puts "Unknown container #{@container}"
-          exit!
-        end
-      when '-v', '--verbose'
-        @verbose = true
-      when '-n', '--dry-run'
-        @verbose = true
-        @dry_run = true
-      when '-?', '--print-service'
-        @query = 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
-  -h, --help                  print this help and exit
-
-        HEREDOC
-        exit
-      else
-        STDERR.puts "Unknown option #{option}"
-        exit!
-      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)
-      STDERR.puts "Illegal choice."
-      exit!
-    end
-    choice
-  end
-
-  # Read containers from docker-compose.yml
-  def get_containers
-    content = YAML::load(File.read(docker_compose_file))
-    content.has_key?('version') ? content['services'].keys : content.keys
+  SimpleCov.at_exit do
+    SimpleCov.result
   end
 end
 
+# Possibly not the right way to load file.
+require_relative '../lib/dce.rb'
+
 app = DCE.new
 app.run

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dce
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Thomas Fini Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies: []
-description: 'Run shell commands in docker '
+description: Run shell commands in docker.
 email: xen@xen.dk
 executables:
 - dce
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: DCE