containers 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693d21d25089049c59a5c47070a22ae26416d248bff32641c98f6dcce47cb9d8
-  data.tar.gz: 3815ca80c36f79de060019e99006674718377cba79048893af0da7eea03088e1
+  metadata.gz: 5f3784b3013279542f697c744a5eea116d5272f09c1641d86d5b643d973b88d3
+  data.tar.gz: 70d25bfc0859a02f22032b8b5ef6bb8ac79458d4ee6eb0a57a32f7369676932d
 SHA512:
-  metadata.gz: cbbd93da6bda8bcf772dcf5679048bf4282bc0a3d2b9a3c6d0251e4f9a154d9e415a78b7ef6abfa689502eacd3fe5571c8ce5997404c2220e60721aa3f6da391
-  data.tar.gz: 66a9a386d8e52f19814a43a014fdcdbf8ea8c33c1a305f7048bfbc5a84a5b57696173690fd67ce1c6333575b8c56bd26a236b1e810f96297b26cbee5d78b20fb
+  metadata.gz: 6df7ceec75fd5654ec0cc6ea146781b116c61b6a415b723f2c799b863bcb91090dcd3c43df42323d3b1e76fcfd2cbe1eb940b0352feca65c2188fd345feab71f
+  data.tar.gz: 8ce7cb11bd0c47fdcb4e094c002c38e4a4ca9faef00256786765de4afdc330fbbead793af55eb01bb3f844f7888a97ee76a421dfaa8fd8cc0c0449ecf6fa46f0

data/exe/ctrs

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "containers"
+
+Containers::CLI.start(ARGV)

data/lib/containers/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "pry-byebug"
 require "thor"
+require "awesome_print"
 require "rainbow"
 require "active_support/all"
 require_relative "concerns/commandable"
@@ -20,8 +20,39 @@ module Containers
 
     protected
 
+    def container_name(service_name)
+      service_name ||= docker_default_service
+      return nil unless service_name
+      "#{app_name}-#{service_name}"
+    end
+
+    def service_name(container_name)
+      return nil unless container_name
+      container_name.sub(/\A#{app_name}-/, "")
+    end
+
+    def service_names
+      `containers list -s`.split("\n").reject do |line|
+        line.nil? || line.empty? || line.include?(Containers::Commandable::PREFIX)
+      end
+    end
+
     def container_names
-      `containers list -f`.split("\n")
+      `containers list`.split("\n").reject do |line|
+        line.nil? || line.empty? || line.include?(Containers::Commandable::PREFIX)
+      end
+    end
+
+    def requested_container_names
+      return options[:container].compact if options[:container]
+      return requested_service_names.map { |name| container_name name }.compact if options[:service]
+      container_names
+    end
+
+    def requested_service_names
+      return options[:service].compact if options[:service]
+      return requested_container_names(options).map { |name| service_name name }.compact if options[:container]
+      service_names
     end
   end
 end

data/lib/containers/commands/attach.rb

@@ -2,8 +2,10 @@
 
 class Containers::CLI < Thor
   desc "attach", "Attaches to a running container"
-  method_option :container, type: :string, aliases: "-c", required: true, desc: "The short name for the container"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
   def attach(*args)
-    execute_command "docker attach #{project_name}-#{options[:container]} #{args.join " "}"
+    container = options[:container] || container_name(options[:service])
+    execute_command "docker attach #{container} #{args.join " "}"
   end
 end

data/lib/containers/commands/bash.rb

@@ -2,8 +2,10 @@
 
 class Containers::CLI < Thor
   desc "bash", "Starts a bash shell"
-  method_option :container, type: :string, aliases: "-c", default: "shell", desc: "The short name for the container"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
   def bash(*args)
-    execute_command "containers exec -c #{options[:container]} bash #{args.join " "}"
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers exec -c #{container} bash #{args.join " "}"
   end
 end

data/lib/containers/commands/bin.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "bin", "Runs executables in the ./bin directory"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
+  def bin(*args)
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers exec -c #{container} bin/#{args.join " "}"
+  end
+end

data/lib/containers/commands/config/print.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "config:print", "Prints the configuration for the current directory"
+  def config_print(*args)
+    awesome_print configuration
+  end
+
+  map "config:print" => :config_print
+  map "config" => :config_print
+end

data/lib/containers/commands/down.rb

@@ -3,6 +3,6 @@
 class Containers::CLI < Thor
   desc "down", "Tears down the environment defined in docker-compose.yml"
   def down(*args)
-    execute_command "docker compose down #{args.join " "}"
+    execute_command "docker compose #{docker_compose_files.map { |f| "-f #{f}" }.join " "} down #{args.join " "}"
   end
 end

data/lib/containers/commands/exec.rb

@@ -2,9 +2,13 @@
 
 class Containers::CLI < Thor
   desc "exec", "Executes a command in a container"
-  method_option :container, type: :string, aliases: "-c", default: "shell", desc: "The short name for the container"
+  long_desc "Also aliased as `x` for convenience"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
   def exec(*args)
-    options[:container] = "shell" if options[:container].to_s.strip == ""
-    execute_command "docker exec -it #{project_name}-#{options[:container]} #{args.join " "}"
+    container = options[:container] || container_name(options[:service])
+    execute_command "docker exec -it #{container} #{args.join " "}"
   end
+
+  map "x" => :exec
 end

data/lib/containers/commands/inspect.rb

@@ -2,8 +2,10 @@
 
 class Containers::CLI < Thor
   desc "inspect", "Inspects a container"
-  method_option :container, type: :string, aliases: "-c", required: true, desc: "The short name for the container"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
   def inspect(*args)
-    execute_command "docker inspect #{args.join " "} #{project_name}-#{options[:container]}"
+    container = options[:container] || container_name(options[:service])
+    execute_command "docker inspect #{args.join " "} #{container}"
   end
 end

data/lib/containers/commands/list.rb

@@ -2,16 +2,17 @@
 
 class Containers::CLI < Thor
   desc "list", "Lists all containers for this project"
+  long_desc "Also aliased as `ls` for convenience"
   method_option :detailed, type: :boolean, aliases: "-d", desc: "List detailed container information"
   method_option :service, type: :boolean, aliases: "-s", desc: "List container service names"
   def list(*args)
-    return execute_command "docker ps -a | grep #{project_name}" if options[:detailed]
+    return execute_command "docker ps -a | grep #{app_name}" if options[:detailed]
 
     if options[:service]
-      command = "containers list -f"
-      puts_command "#{command} | #{Rainbow("(strip project name)").green.faint}"
+      command = "containers list"
+      puts_command "#{command} | #{Rainbow("(strip app_name)").green.faint}"
       list = `#{command}`.split("\n").reject { |item| item.strip == "" || item.include?(PREFIX) }
-      puts list.map { |item| item.gsub(/\A#{project_name}-|\s/, "") }.sort.join("\n")
+      puts list.map { |item| item.gsub(/\A#{app_name}-|\s/, "") }.sort.join("\n")
       return
     end
 
@@ -20,4 +21,6 @@ class Containers::CLI < Thor
     list = `#{command}`.split("\n").reject { |item| item.strip == "" || item.include?(PREFIX) }
     puts list.map { |item| item.split(" ").last.strip }.sort.join("\n")
   end
+
+  map "ls" => :list
 end

data/lib/containers/commands/rails/rails.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "rails", "Runs the Rails command"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
+  def rails(*args)
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers bundle -c #{container} exec rails #{args.join " "}"
+  end
+end

data/lib/containers/commands/restart.rb

@@ -2,9 +2,11 @@
 
 class Containers::CLI < Thor
   desc "restart", "Restarts container(s)"
-  method_option :container, type: :array, aliases: "-c", desc: "A list of container short names"
+  method_option :container, type: :array, aliases: "-c", desc: "A list of container names (space delimited)"
+  method_option :service, type: :array, aliases: "-s", desc: "A list of service names (space delimited)"
   def restart(*args)
-    containers = options[:container] || container_names
-    containers.each { |c| execute_command "docker restart #{args.join " "} #{c}", replace_current_process: false }
+    requested_container_names.each do |container_name|
+      execute_command "docker restart #{args.join " "} #{container_name}", replace_current_process: false
+    end
   end
 end

data/lib/containers/commands/ruby/bundle.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "bundle", "Runs the bundle command"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
+  def bundle(*args)
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers exec -c #{container} bundle #{args.join " "}"
+  end
+end

data/lib/containers/commands/ruby/rake.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "rake", "Runs ruby's rake command"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
+  def rake(*args)
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers exec -c #{container} rake #{args.join " "}"
+  end
+end

data/lib/containers/commands/start.rb

@@ -2,9 +2,11 @@
 
 class Containers::CLI < Thor
   desc "start", "Starts container(s)"
-  method_option :container, type: :string, aliases: "-c", desc: "The short name for the container"
+  method_option :container, type: :array, aliases: "-c", desc: "A list of container names (space delimited)"
+  method_option :service, type: :array, aliases: "-s", desc: "A list of service names (space delimited)"
   def start(*args)
-    return execute_command "docker start #{args.join " "} #{project_name}-#{options[:container]}" if options[:container]
-    container_names.each { |c| execute_command "docker start #{args.join " "} #{c}", replace_current_process: false }
+    requested_container_names.each do |container_name|
+      execute_command "docker start #{args.join " "} #{container_name}", replace_current_process: false
+    end
   end
 end

data/lib/containers/commands/stop.rb

@@ -2,9 +2,11 @@
 
 class Containers::CLI < Thor
   desc "stop", "Stops container(s)"
-  method_option :container, type: :string, aliases: "-c", desc: "The short name for the container"
+  method_option :container, type: :array, aliases: "-c", desc: "A list of container names (space delimited)"
+  method_option :service, type: :array, aliases: "-s", desc: "A list of service names (space delimited)"
   def stop(*args)
-    return execute_command "docker stop #{args.join " "} #{project_name}-#{options[:container]}" if options[:container]
-    container_names.each { |c| execute_command "docker stop #{args.join " "} #{c}", replace_current_process: false }
+    requested_container_names.each do |container_name|
+      execute_command "docker stop #{args.join " "} #{container_name}", replace_current_process: false
+    end
   end
 end

data/lib/containers/commands/tail.rb

@@ -2,9 +2,14 @@
 
 class Containers::CLI < Thor
   desc "tail", "Tails container logs"
-  method_option :container, type: :array, aliases: "-c", required: true, desc: "The short name for the container (also supports a list of names)"
+  long_desc "Also aliased as `logs` and `log` for convenience"
+  method_option :container, type: :array, aliases: "-c", desc: "A list of container names (space delimited)"
+  method_option :service, type: :array, aliases: "-s", desc: "A list of service names (space delimited)"
   def tail(*args)
     args << "--since 5m" unless args.include?("--since")
-    execute_command "docker compose logs #{args.join " "} -f #{options[:container].join " "}"
+    execute_command "docker compose #{docker_compose_files.map { |f| "-f #{f}" }.join " "} logs #{args.join " "} -f #{requested_service_names.join " "}"
   end
+
+  map "logs" => :tail
+  map "log" => :tail
 end

data/lib/containers/commands/up.rb

@@ -3,6 +3,6 @@
 class Containers::CLI < Thor
   desc "up", "Brings up the environment defined in docker-compose.yml"
   def up(*args)
-    execute_command "docker compose up -d #{args.join " "}"
+    execute_command "docker compose #{docker_compose_files.map { |f| "-f #{f}" }.join " "} up -d #{args.join " "}"
   end
 end

data/lib/containers/commands/yarn/yarn.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Containers::CLI < Thor
+  desc "yarn", "Runs the yarn command"
+  method_option :container, type: :string, aliases: "-c", desc: "The container name"
+  method_option :service, type: :string, aliases: "-s", desc: "The service name"
+  def yarn(*args)
+    container = options[:container] || container_name(options[:service])
+    execute_command "containers exec -c #{container} yarn #{args.join " "}"
+  end
+end

data/lib/containers/concerns/configurable.rb

@@ -3,27 +3,52 @@
 module Containers::Configurable
   extend ActiveSupport::Concern
 
+  def self.gitname
+    email = begin
+      `git config --get user.email`.strip
+    rescue
+      nil
+    end
+    email&.split("@")&.first || "example"
+  end
+
   DEFAULT_CONFIGURATION = {
-    "organization_name" => "example-organization",
-    "project_name" => File.basename(Dir.pwd).parameterize,
-    "app_directory" => ".",
-    "docker_directory" => "."
+    "organization" => {
+      "name" => gitname
+    },
+    "app" => {
+      "name" => File.basename(Dir.pwd).parameterize,
+      "directory" => "."
+    },
+    "docker" => {
+      "directory" => ".",
+      "default_service" => nil,
+      "compose_files" => ["docker-compose.yml"]
+    }
   }.freeze
 
   def organization_name
-    configuration["organization_name"]
+    configuration["organization"]["name"]
   end
 
-  def project_name
-    configuration["project_name"]
+  def app_name
+    configuration["app"]["name"]
   end
 
   def app_directory
-    configuration["app_directory"]
+    configuration["app"]["directory"]
   end
 
   def docker_directory
-    configuration["docker_directory"]
+    configuration["docker"]["directory"]
+  end
+
+  def docker_default_service
+    configuration["docker"]["default_service"]
+  end
+
+  def docker_compose_files
+    configuration["docker"]["compose_files"]
   end
 
   def configuration

data/lib/containers/generator/cli.rb

@@ -15,29 +15,29 @@ module Containers::Generator
       Pathname.new(__dir__).join "templates/#{template_name}.erb"
     end
 
-    def raw_template(template_name)
+    def template_string(template_name)
       File.read template_path(template_name)
     end
 
-    def erb_template(template_name)
-      ERB.new raw_template(template_name)
+    def template(template_name)
+      ERB.new template_string(template_name), trim_mode: "-"
     end
 
     def render_template(template_name, vars = {})
       view = Struct.new(*vars.keys).new(*vars.values).instance_eval { binding }
-      erb_template(template_name).result view
+      template(template_name).result view
     end
 
     def render_external_template(template, vars = {})
       view = Struct.new(*vars.keys).new(*vars.values).instance_eval { binding }
 
-      raw_template = if template.start_with?("http")
+      template_string = if template.start_with?("http")
         Net::HTTP.get URI.parse(template)
       else
         File.read template
       end
 
-      ERB.new(raw_template).result view
+      ERB.new(template_string).result view
     end
   end
 end

data/lib/containers/generator/commands/compose.rb

@@ -11,19 +11,25 @@ class Containers::Generator::CLI < Thor
   def compose
     FileUtils.mkdir_p docker_directory
     path = File.expand_path("#{docker_directory}/docker-compose.yml")
+    exists = File.exist?(path)
+    original = File.read(path) if exists
 
-    continue = if File.exist?(path)
-      ask("#{Rainbow("docker-compose.yml already exists").red} Overwrite?", default: "Y").to_s.upcase == "Y"
+    continue = if exists
+      ask("#{Rainbow("docker-compose.yml already exists").red} Overwrite?", default: "n").to_s.upcase == "Y"
     else
       true
     end
 
     return unless continue
 
+    FileUtils.rm_f path
+
     vars = {
-      organization_name: ask("What is the organization name? (lowercase, dasherized)", default: organization_name).to_s,
-      project_name: ask("What is the project name? (lowercase, dasherized)", default: project_name).to_s,
-      app_directory: File.expand_path(ask("What is the application directory? ", default: app_directory).to_s)
+      organization: {name: ask("What is the organization name?", default: organization_name).to_s},
+      app: {
+        name: ask("What is the app name?", default: app_name).to_s.parameterize,
+        directory: File.expand_path(ask("What is the path to the app directory? ", default: app_directory).to_s)
+      }
     }
 
     contents = if options[:template]
@@ -35,5 +41,11 @@ class Containers::Generator::CLI < Thor
     puts_command Rainbow("(Create #{path})").green.faint
     File.write path, contents
     puts Rainbow("docker-compose.yml created successfully").green.bright
+  rescue => error
+    puts Rainbow("Unexpected error! #{error.message}").red.bright
+    if exists && original
+      puts Rainbow("Restoring the original file.").green.faint
+      File.write path, original
+    end
   end
 end

data/lib/containers/generator/commands/config.rb

@@ -8,22 +8,36 @@ class Containers::Generator::CLI < Thor
   desc "config", "Creates a .containers.yml config file for the project"
   def config
     path = File.expand_path(".containers.yml")
+    exists = File.exist?(path)
+    original = File.read(path) if exists
 
-    continue = if File.exist?(path)
-       ask("#{Rainbow(".containers.yml already exists").red} Overwrite?", default: "Y").to_s.upcase == "Y"
+    continue = if exists
+      ask("#{Rainbow(".containers.yml already exists").red} Overwrite?", default: "n").to_s.upcase == "Y"
     else
       true
     end
 
     return unless continue
 
+    FileUtils.rm_f path
+
     vars = {
-      organization_name: ask("What is the organization name? (lowercase, dasherized)", default: organization_name).to_s,
-      project_name: ask("What is the project name? (lowercase, dasherized)", default: project_name).to_s,
-      app_directory: File.expand_path(ask("What is the application directory? ", default: app_directory).to_s),
-      docker_directory: File.expand_path(ask("What is the docker directory? ", default: docker_directory).to_s)
+      organization_name: ask("What is the organization name?", default: organization_name).to_s.parameterize,
+      app_name: ask("What is the app name?", default: app_name).to_s.parameterize,
+      app_directory: File.expand_path(ask("What is the path to the app directory? ", default: app_directory).to_s),
+      docker: {
+        directory: File.expand_path(ask("What is the path to the Docker directory? ", default: docker_directory).to_s),
+        default_service: ask("What is the default Docker service?", default: docker_default_service).to_s,
+        compose_files: docker_compose_files
+      }
     }
 
     File.write path, render_template("containers.yml", vars)
+  rescue => error
+    puts Rainbow("Unexpected error! #{error.message}").red.bright
+    if exists && original
+      puts Rainbow("Restoring the original file.").green.faint
+      File.write path, original
+    end
   end
 end

data/lib/containers/generator/commands/dockerfile.rb

@@ -11,15 +11,19 @@ class Containers::Generator::CLI < Thor
   def dockerfile
     FileUtils.mkdir_p docker_directory
     path = File.expand_path("#{docker_directory}/Dockerfile")
+    exists = File.exist?(path)
+    original = File.read(path) if exists
 
-    continue = if File.exist?(path)
-      ask("#{Rainbow("Dockerfile already exists").red} Overwrite?", default: "Y").to_s.upcase == "Y"
+    continue = if exists
+      ask("#{Rainbow("Dockerfile already exists").red} Overwrite?", default: "n").to_s.upcase == "Y"
     else
       true
     end
 
     return unless continue
 
+    FileUtils.rm_f path
+
     ruby_version = ask("What Ruby version does this project use?", default: "3.1.2").to_s
     vars = {ruby_version: ruby_version}
 
@@ -32,5 +36,11 @@ class Containers::Generator::CLI < Thor
     puts_command Rainbow("(Create #{path})").green.faint
     File.write path, contents
     puts Rainbow("Dockerfile created successfully").green.bright
+  rescue => error
+    puts Rainbow("Unexpected error! #{error.message}").red.bright
+    if exists && original
+      puts Rainbow("Restoring the original file.").green.faint
+      File.write path, original
+    end
   end
 end

data/lib/containers/generator/templates/containers.yml.erb

@@ -1,5 +1,15 @@
 ---
-organization_name: <%= organization_name %>
-project_name: <%= project_name %>
-app_directory: <%= app_directory %>
-docker_directory: <%= docker_directory %>
+organization:
+  name: <%= organization_name %>
+
+app:
+  name: <%= app_name %>
+  directory: <%= app_directory %>
+
+docker:
+  directory: <%= docker[:directory] %>
+  default_service: <%= docker[:default_service] %>
+  compose_files:
+<% docker[:compose_files].each do |file| -%>
+    - <%= file %>
+<% end -%>

data/lib/containers/generator/templates/docker-compose.yml.erb

@@ -14,17 +14,17 @@ x-default-env: &default_env
 
 x-default-app: &default_app
   build: .
-  image: <%= organization_name %>/<%= project_name %>
-  working_dir: /<%= project_name %>
+  image: <%= organization[:name] %>/<%= app[:name] %>
+  working_dir: /<%= app[:name] %>
   tty: true
   stdin_open: true
-  env_file: <%= File.join app_directory, ".env" %>
+  env_file: <%= File.join app[:directory], ".env" %>
   environment:
     <<: *default_env
   volumes:
-    - <%= app_directory %>:/<%= project_name %>:cached
+    - <%= app[:directory] %>:/<%= app[:name] %>:cached
     - bundle:/bundle:delegated
-    - node_modules:/<%= project_name %>/node_modules:delegated
+    - node_modules:/<%= app[:name] %>/node_modules:delegated
 
 # TODO: dump pg database then rename db -> postgres
 volumes:
@@ -41,7 +41,7 @@ services:
   # ----------------------------------------------------------------------------
   postgres:
     image: postgres:13.4-alpine3.14
-    container_name: <%= project_name %>-postgres
+    container_name: <%= app[:name] %>-postgres
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: password
@@ -55,7 +55,7 @@ services:
   # ----------------------------------------------------------------------------
   redis_cable:
     image: redis:6.2.6-alpine3.14
-    container_name: <%= project_name %>-redis-cable
+    container_name: <%= app[:name] %>-redis-cable
     restart: unless-stopped
     expose:
       - 6379
@@ -68,7 +68,7 @@ services:
   # ----------------------------------------------------------------------------
   redis_cache:
     image: redis:6.2.6-alpine3.14
-    container_name: <%= project_name %>-redis-cache
+    container_name: <%= app[:name] %>-redis-cache
     restart: unless-stopped
     expose:
       - 6379
@@ -81,7 +81,7 @@ services:
   # ----------------------------------------------------------------------------
   redis_queue:
     image: redis:6.2.6-alpine3.14
-    container_name: <%= project_name %>-redis-queue
+    container_name: <%= app[:name] %>-redis-queue
     restart: unless-stopped
     expose:
       - 6379
@@ -94,7 +94,7 @@ services:
   # ----------------------------------------------------------------------------
   shell:
     <<: *default_app
-    container_name: <%= project_name %>-shell
+    container_name: <%= app[:name] %>-shell
     command: /bin/bash -c "tail -f /dev/null"
 
   # ----------------------------------------------------------------------------
@@ -102,7 +102,7 @@ services:
   # ----------------------------------------------------------------------------
   js:
     <<: *default_app
-    container_name: <%= project_name %>-js
+    container_name: <%= app[:name] %>-js
     command: /bin/bash -c "yarn && yarn build --watch"
 
   # ----------------------------------------------------------------------------
@@ -110,7 +110,7 @@ services:
   # ----------------------------------------------------------------------------
   css:
     <<: *default_app
-    container_name: <%= project_name %>-css
+    container_name: <%= app[:name] %>-css
     command: /bin/bash -c "yarn build:css --watch"
     depends_on:
       - js
@@ -120,7 +120,7 @@ services:
   # ----------------------------------------------------------------------------
   web:
     <<: *default_app
-    container_name: <%= project_name %>-web
+    container_name: <%= app[:name] %>-web
     command: >
       /bin/bash -c "bundle &&
                     rm -f tmp/pids/server.pid &&
@@ -145,7 +145,7 @@ services:
   # ----------------------------------------------------------------------------
   worker:
     <<: *default_app
-    container_name: <%= project_name %>-worker
+    container_name: <%= app[:name] %>-worker
     command: /bin/bash -c "bin/rails log:clear &&
                            bundle exec sidekiq -C config/sidekiq.yml"
     depends_on:
@@ -156,7 +156,7 @@ services:
   # ----------------------------------------------------------------------------
   anycable_ws:
     image: anycable/anycable-go:1.2
-    container_name: <%= project_name %>-anycable-ws
+    container_name: <%= app[:name] %>-anycable-ws
     restart: unless-stopped
     environment:
       ANYCABLE_HOST: "0.0.0.0"
@@ -173,7 +173,7 @@ services:
   # ----------------------------------------------------------------------------
   anycable_rpc:
     <<: *default_app
-    container_name: <%= project_name %>-anycable-rpc
+    container_name: <%= app[:name] %>-anycable-rpc
     restart: unless-stopped
     environment:
       <<: *default_env
@@ -191,10 +191,10 @@ services:
   # ----------------------------------------------------------------------------
   logs:
     image: amir20/dozzle
-    container_name: <%= project_name %>-logs
+    container_name: <%= app[:name] %>-logs
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
       - ${PORT_LOGS:-3004}:8080
     restart: unless-stopped
-    command: "--filter name=<%= project_name %>*"
+    command: "--filter name=<%= app[:name] %>*"

data/lib/containers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Containers
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: containers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Hopsoft
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: magic_frozen_string_literal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +122,52 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standardrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage local development environments with Docker
 email:
 - natehop@gmail.com
 executables:
 - containers
+- ctrs
 extensions: []
 extra_rdoc_files: []
 files:
 - exe/containers
+- exe/ctrs
 - lib/containers.rb
 - lib/containers/cli.rb
 - lib/containers/commands/attach.rb
 - lib/containers/commands/bash.rb
-- lib/containers/commands/bundle.rb
+- lib/containers/commands/bin.rb
+- lib/containers/commands/config/print.rb
 - lib/containers/commands/down.rb
 - lib/containers/commands/exec.rb
 - lib/containers/commands/inspect.rb
 - lib/containers/commands/list.rb
-- lib/containers/commands/rails.rb
+- lib/containers/commands/rails/rails.rb
 - lib/containers/commands/restart.rb
+- lib/containers/commands/ruby/bundle.rb
+- lib/containers/commands/ruby/rake.rb
 - lib/containers/commands/start.rb
 - lib/containers/commands/stop.rb
 - lib/containers/commands/tail.rb
 - lib/containers/commands/up.rb
-- lib/containers/commands/yarn.rb
+- lib/containers/commands/yarn/yarn.rb
 - lib/containers/concerns/commandable.rb
 - lib/containers/concerns/configurable.rb
-- lib/containers/generator.rb
 - lib/containers/generator/cli.rb
 - lib/containers/generator/commands/compose.rb
 - lib/containers/generator/commands/config.rb
@@ -127,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Manage local development environments with Docker

data/lib/containers/commands/bundle.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Containers::CLI < Thor
-  desc "bundle", "Runs the bundle command"
-  method_option :container, type: :string, aliases: "-c", default: "shell", desc: "The short name for the container"
-  def bundle(*args)
-    execute_command "containers exec -c #{options[:container]} bundle #{args.join " "}"
-  end
-end

data/lib/containers/commands/rails.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Containers::CLI < Thor
-  desc "rails", "Runs the Rails command"
-  method_option :container, type: :string, aliases: "-c", default: "shell", desc: "The short name for the container"
-  def rails(*args)
-    execute_command "containers bundle -c #{options[:container]} exec rails #{args.join " "}"
-  end
-end

data/lib/containers/commands/yarn.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Containers::CLI < Thor
-  desc "yarn", "Runs the yarn command"
-  method_option :container, type: :string, aliases: "-c", default: "shell", desc: "The short name for the container"
-  def yarn(*args)
-    execute_command "containers exec -c #{options[:container]} yarn #{args.join " "}"
-  end
-end

data/lib/containers/generator.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-
-class Generator < Thor
-  desc "dockerfile", "Creates a Dockerfile for the project"
-  def dockerfile
-    path = File.expand_path("Dockerfile")
-
-    continue = if File.exist?(path)
-      ask("#{Rainbow("Dockerfile already exists").red} Overwrite?", default: "Y").to_s.upcase == "Y"
-    else
-      true
-    end
-
-    return unless continue
-
-    ruby_version = ask("What Ruby version does this project use?", default: "3.1.2").to_s
-    File.write path, render("Dockerfile", ruby_version: ruby_version)
-  end
-
-  desc "compose", "Creates a docker-compose.yml file for the project"
-  def compose
-  end
-
-  private
-
-  def root_path
-    File.expand_path(File.join(__dir__, "..", ".."))
-  end
-
-  def template(name)
-    ERB.new(File.read(File.join(root_path, "lib/containers/templates/#{name}.erb")))
-  end
-
-  def render(template_name, vars = {})
-    view = Struct.new(*vars.keys).new(*vars.values).instance_eval { binding }
-    template(template_name).result view
-  end
-end