dpmrb 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d251b5232b12841efab78a0f74f65056ae375e39a08445338d9265b6d83d75e
-  data.tar.gz: ce4fd73830d32e9d8384c151a9f8a9c1d80c0adece695b94ccd52f12abcf5627
+  metadata.gz: d408ee6f24c0e503159587c35ef634821cba4143ee0a4bde49c0497636cde125
+  data.tar.gz: 1de01b1572bcc96575e7f2716ac78fefc5e38f87da9ed59e25a8d27117861e79
 SHA512:
-  metadata.gz: 95386af7e0176db7a926b5cbea3e3e1822d7d7ef4ce31dfc35446b7d59aeb50f060f27542f7ca34bc0bb0a5ae2d86de03fe81f0b36f75ed0bc5c014eeb775dd8
-  data.tar.gz: 235b12ac3c8c62bdafaad7a6c3632c319a4396fbcd98feb36cc102611c6b8bc0e63b5436c63ce47472835d4efaf149bf85b12ad8653ed83733315af13ea06d44
+  metadata.gz: 14f44aa24ca13e24032199766ddfc0ee90e25e8ffd873cba6d53ecffbc751def9a01cedd4c9e52457b64a44ccff48d65da6e30e20d9cbd3e1d23595708a760ed
+  data.tar.gz: 0cf758ea38f95aea2cd0ce13d3ca300f0936d5c751b1fc957b993395d3f020ecef5850f78ad39c9135f587dd88b03b993cfe612f2819a3e700ebc5703702e0bf

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    dpmrb (0.1.0)
-      activesupport (~> 7.x)
+    dpmrb (0.2.1)
+      activesupport (~> 6.x)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
     concurrent-ruby (1.1.10)
     i18n (1.12.0)
@@ -47,9 +48,11 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   arm64-darwin-21
+  ruby
 
 DEPENDENCIES
   dpmrb!

data/README.en-US.md

@@ -0,0 +1,41 @@
+[简体中文](README.md) | [English](README.en-US.md)
+
+# DPM
+
+Docker Package Manager, makes using your containers as easy as package managers (`apt`, `yml`, `brew`).
+
+## Installation
+
+```bash
+gem install dpmrb
+```
+
+## Usage
+
+```bash
+dpm help                       # Show help
+dpm list                       # docker ps --filter "name=dpm-"
+dpm start mysql                # docker run --name=dpm-mysql -d --rm -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes ...
+dpm stop mysql                 # docker stop dpm-mysql
+dpm status mysql               # docker ps --filter "name=dpm-mysql"
+dpm start elasticsearch:7.10.2 # docker run --name=dpm-elasticsearch-7.10.2 -d --rm -p 9200:9200 -e discovery.type=single-node ...
+dpm start mysql:5.7            # docker run --name=dpm-mysql-5.7 -d --rm -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes ...
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/songhuangcn/dpm. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/songhuangcn/dpm/blob/main/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the DPM project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/songhuangcn/dpm/blob/main/CODE_OF_CONDUCT.md).

data/README.md

@@ -1,16 +1,16 @@
-[English](README.md) | [简体中文](README.zh-CN.md)
+[简体中文](README.md) | [English](README.en-US.md)
 
 # DPM
 
-Docker Package Manager, makes using your containers as easy as package managers (`apt`, `yml`, `brew`).
+Docker Package Manager, 让你的容器用起来跟包管理器（`apt`, `yml`, `brew`）一样简单。
 
-## Installation
+## 安装
 
 ```bash
 gem install dpmrb
 ```
 
-## Usage
+## 使用
 
 ```bash
 dpm help                       # Show help
@@ -22,20 +22,82 @@ dpm start elasticsearch:7.10.2 # docker run --name=dpm-elasticsearch-7.10.2 -d -
 dpm start mysql:5.7            # docker run --name=dpm-mysql-5.7 -d --rm -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes ...
 ```
 
-## Development
+## 为项目添加新包
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+DPM 跟 [Homebrew](https://brew.sh/) 一样，需要完善更多的包配置，欢迎为 `packages` 目录添加你需要的包配置。
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### 配置级别
 
-## Contributing
+容器配置都是通用的 YAML 格式，有三个级别：
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/songhuangcn/dpm. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/songhuangcn/dpm/blob/main/CODE_OF_CONDUCT.md).
+1. 默认级别：`packages/default.yml`
+1. 包级别：`packages/PACKAGE/default.yml`
+1. 版本级别：`packages/PACKAGE/tag-TAG.yml`
 
-## License
+配置是合并机制，如果一个包没有自定义配置，他就会根据默认级别配置跑起来。
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+### 配置示例
 
-## Code of Conduct
+例如有配置如下：
 
-Everyone interacting in the Dpm project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/songhuangcn/dpm/blob/main/CODE_OF_CONDUCT.md).
+1. `packages/default.yml`：
+    ```yml
+    run_options:
+      rm: true
+      d: true
+    ```
+1. `packages/mysql/default.yml`：
+    ```yml
+    run_options:
+      e: "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      p: "3306:3306"
+    ```
+1. `packages/mysql/tag-5.7.yml`：
+    ```yml
+    run_options:
+      p: "3307:3307"
+    ```
+
+则最终这些包配置的启动命令为：
+
+- `mysql:5.7` 的配置：
+    ```bash
+    docker run --rm -d -p 3307:3307 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:5.7
+    ```
+- `mysql` 的配置：
+    ```bash
+    docker run --rm -d -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql
+    ```
+- `not-exist-pkg` 的配置：
+    ```bash
+    docker run --rm -d not-exist-pkg
+    ```
+
+### 其他配置
+
+有一些其他配置项，例如 `image`：
+
+`packages/elasticsearch/default.yml`
+```yml
+image: "docker.elastic.co/elasticsearch/elasticsearch"
+```
+
+则 `elasticsearch` 包的镜像将不在按约定自动计算，而是变成了：
+
+```bash
+docker.elastic.co/elasticsearch/elasticsearch
+```
+
+还有一些配置，例如：`args`，这个是传入到容器的参数，例如有配置文件 `packages/mysql/default.yml`：
+
+```yml
+args:
+  character-set-server: "utf8mb4"
+  collation-server: "utf8mb4_unicode_ci"
+```
+
+则所有版本的 `mysql` 包将会多这两个启动参数：
+
+```bash
+docker run mysql --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+```

data/bin/dpm

@@ -3,8 +3,8 @@
 require_relative "../lib/dpm"
 
 begin
-  DPM::Runner.call!(ARGV)
+  DPM.call!(ARGV)
 rescue => exception
-  puts "Errors: #{exception.message}"
+  puts "Fatal error: #{exception.message}"
   exit 1
 end

data/{packages/default.yml → config/package.yml}

@@ -1,7 +1,8 @@
+base:
+  {}
 run_options:
   name: "<%= container_name %>"
   d: true
   rm: true
-image: ""
-command: ""
-args: {}
+run_args:
+  {}

data/dpm.gemspec

@@ -4,7 +4,7 @@ require_relative "lib/dpm/version"
 
 Gem::Specification.new do |spec|
   spec.name = "dpmrb"
-  spec.version = Dpm::VERSION
+  spec.version = DPM::VERSION
   spec.authors = ["Song Huang"]
   spec.email = ["songhuangcn@gmail.com"]
 
@@ -30,6 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = "Please start with `dpm help`"
 
-  spec.add_dependency "activesupport", "~> 7.x"
-
+  spec.add_dependency "activesupport", "~> 6.x"
 end

data/lib/dpm/options.rb

@@ -0,0 +1,88 @@
+require "optparse"
+
+module DPM
+  class Options
+    PACKAGE_COMMANDS = %w[tags status start stop restart].freeze
+    PACKAGE_REGEX = /\A[\w.\-:]+\z/.freeze
+    UNPACKAGE_COMMANDS = %w[list packages].freeze
+
+    attr_accessor :argv, :dry_run, :parser, :command, :package
+
+    def initialize(argv)
+      self.argv = argv
+      self.dry_run = false
+    end
+
+    def self.parse!(argv)
+      new(argv).parse!
+    end
+
+    def parse!
+      OptionParser.new do |parser|
+        self.parser = parser
+
+        parser.banner = "Usage: dpm [options] [COMMAND] [PACKAGE]"
+        parser.separator ""
+        parser.separator "Specific options:"
+
+        parser.on("-d", "--dry-run", "Don't actually run anything, just print") do |v|
+          self.dry_run = v
+        end
+
+        parser.separator ""
+        parser.separator "Common options:"
+
+        parser.on_tail("-h", "--help", "Show the help") do
+          puts help_text
+          exit
+        end
+
+        parser.on_tail("-v", "--version", "Show the version") do
+          puts VERSION
+          exit
+        end
+
+        parser.parse!(argv)
+      end
+
+      process_args!
+      self
+    end
+
+    def help_text
+      <<~EOF
+        #{parser}
+        COMMAND:
+            help                             Show the help
+            version                          Show the version
+            packages                         List supported packages
+            list                             List running packages
+            tags PACKAGE                     List supported tags of a package
+            status PACKAGE                   Get the status of a package
+            start PACKAGE                    Start a package
+            stop PACKAGE                     Stop a package
+            restart PACKAGE                  Restart a package
+
+        See more at https://github.com/songhuangcn/dpm
+      EOF
+    end
+
+    def process_args!
+      self.command, self.package = argv
+
+      case command
+      when "help"
+        puts help_text
+        exit
+      when "version"
+        puts VERSION
+        exit
+      when *PACKAGE_COMMANDS
+        raise Error, "Command `#{command}` need a package" if package.blank?
+        raise Error, "Package invalid, valid regex: #{PACKAGE_REGEX}" if !PACKAGE_REGEX.match?(package)
+      else
+        raise Error, "Unknown command `#{command}`, see `dpm help`" unless UNPACKAGE_COMMANDS.include?(command)
+      end
+    end
+  end
+end

data/lib/dpm/runner.rb

@@ -5,81 +5,71 @@ require "erb"
 
 module DPM
   class Runner
-    PACKAGE_COMMANDS = %w[status start stop restart].freeze
-    PACKAGE_REGEX = /\A[\w.\-:]+\z/.freeze
     CONTAINER_NAME_PREFIX = "dpm-"
     BASH_COLOR_GRAY = "\033[0;37m"
     BASH_COLOR_NONE = "\033[0m"
+    DOCKER_COMMANDS = %w[list status start stop restart].freeze
 
-    attr_reader :command, :package
+    attr_accessor :options
 
-    def self.call!(argv)
-      new(argv).call!
+    def self.call!(options)
+      new(options).call!
     end
 
-    def initialize(argv)
-      @command, @package = argv
-      validate_argv!
+    def initialize(options)
+      self.options = options
     end
 
     def call!
-      if docker_command
-        puts bash_color(docker_command)
-        puts ""
-        puts `#{docker_command}`
-      else
-        puts help_text
+      case options.command
+      when *DOCKER_COMMANDS
+        call_docker!
+      when "packages"
+        call_packages!
+      when "tags"
+        call_tags!
       end
     end
 
     private
 
-    def validate_argv!
-      if PACKAGE_COMMANDS.include?(command) && !PACKAGE_REGEX.match?(package)
-        raise Error, "`package` invalid, valid regex: #{PACKAGE_REGEX}"
-      end
-    end
-
-    def bash_color(text)
-      "#{BASH_COLOR_GRAY}#{text}#{BASH_COLOR_NONE}"
-    end
-
-    def docker_command
-      case command
+    def call_docker!
+      docker_command = case options.command
       when "list"
         %(docker ps --filter "name=#{CONTAINER_NAME_PREFIX}")
       when "status"
-        %(docker ps --filter "name=#{container_name}")
+        %(docker ps --filter "name=^/#{container_name}$")
       when "start"
         "docker run #{docker_run_params}"
       when "stop"
         "docker stop #{container_name}"
       when "restart"
-        "dpm stop #{package} && dpm start #{package}"
+        "dpm stop #{options.package} && dpm start #{options.package}"
+      else
+        raise "Not implemented command: `#{command}`"
+      end
+      if options.dry_run
+        puts "Dry run:"
+        puts bash_color(docker_command)
+      else
+        puts bash_color(docker_command)
+        puts ""
+        puts `#{docker_command}`
       end
     end
 
-    def help_text
-      <<~EOF
-        Usage: dpm command [PACKAGE]
-
-        Docker Package Manager
+    def call_packages!
+      packages = Dir.glob(File.join(ROOT, "packages", "*.yml")).map { |file| File.basename(file, ".yml") }
+      puts packages
+    end
 
-        dpm help:
-            Show the help
-        dpm list:
-            List running packages
-        dpm status PACKAGE:
-            Get the status of the package
-        dpm start PACKAGE:
-            Start the package
-        dpm stop PACKAGE:
-            Stop the package
-        dpm restart PACKAGE:
-            Restart the package
+    def call_tags!
+      tags = package_config_yaml.keys.reject { |key| key.start_with?(".") }
+      puts tags
+    end
 
-        See more at https://github.com/songhuangcn/dpm
-      EOF
+    def bash_color(text)
+      "#{BASH_COLOR_GRAY}#{text}#{BASH_COLOR_NONE}"
     end
 
     def docker_run_params
@@ -87,15 +77,15 @@ module DPM
     end
 
     def config_run_options
-      process_options(manager_config["run_options"])
+      process_options(package_config["run_options"])
     end
 
     def config_command
-      manager_config["command"]
+      package_config["base"]["command"]
     end
 
     def config_args
-      process_options(manager_config["args"])
+      process_options(package_config["run_args"])
     end
 
     def process_options(hash)
@@ -110,57 +100,71 @@ module DPM
           option_prefix = "--"
           value_joiner = "="
         end
-        full_value = "#{value_joiner}#{value}" if value != true
 
-        "#{option_prefix}#{key}#{full_value}"
+        if value == true
+          "#{option_prefix}#{key}"
+        elsif value.is_a?(Array)
+          value.map { |v| "#{option_prefix}#{key}#{value_joiner}#{v}" }.join(" ")
+        else
+          "#{option_prefix}#{key}#{value_joiner}#{value}"
+        end
       end
       hash_arr.join(" ")
     end
 
     def docker_image
-      image_tag ? "#{image_name}:#{image_tag}" : image_name
+      "#{image_name}:#{image_tag}"
     end
 
     def image_name
-      @image_name ||= manager_config["image_name"] || package_name
+      @image_name ||= package_config["image_name"] || package_name
     end
 
     def image_tag
-      @image_tag ||= manager_config["image_tag"] || package_tag
+      @image_tag ||= package_config["image_tag"] || package_tag
     end
 
-    def manager_config
-      @manager_config ||= begin
-        default_options = load_yaml(File.join(ROOT, "packages", "default.yml"))
-        image_options = load_yaml(File.join(ROOT, "packages", package_name, "default.yml"))
-        tag_options = load_yaml(File.join(ROOT, "packages", package_name, "tag-#{package_tag}.yml"))
-
-        default_options \
-          .deep_merge(image_options) \
-          .deep_merge(tag_options)
+    def package_config
+      @package_config ||= begin
+        version = package_tag.dup
+        version_config = loop do
+          raise Error, "Package tag `#{package_tag}` not support" unless version
+          break package_config_yaml[version] if package_config_yaml[version]
+          version = version.sub!(/\.\d+\z/, "")
+        end
+        default_config.deep_merge(version_config)
       end
     end
 
+    def package_config_yaml
+      @package_config_yaml ||= load_yaml(File.join(ROOT, "packages", "#{package_name}.yml"))
+    rescue Errno::ENOENT
+      raise Error, "Package `#{package_name}` not support"
+    end
+
+    def default_config
+      @default_config ||= load_yaml(File.join(ROOT, "config", "package.yml"))
+    end
+
     def package_name
-      @package_name ||= package.split(":")[0]
+      @package_name ||= options.package.split(":")[0]
     end
 
     def package_tag
-      @package_tag ||= package.split(":")[1]
+      @package_tag ||= options.package.split(":")[1] || "latest"
     end
 
     def container_name
-      @container_name ||= "#{CONTAINER_NAME_PREFIX}#{package.tr(":", "-")}"
+      @container_name ||= "#{CONTAINER_NAME_PREFIX}#{options.package.tr(":", "-")}"
     end
 
     def load_yaml(file_path)
       text = File.read(file_path)
       data = ERB.new(text).result(binding)
-      YAML.safe_load(data).tap do |yaml|
+      yaml = YAML.safe_load(data, aliases: true).tap do |yaml|
         raise Error, "Config need to be a hash yaml: #{file_path}" unless yaml.is_a?(Hash)
       end
-    rescue Errno::ENOENT
-      {}
+      yaml.transform_keys!(&:to_s)
     end
   end
 end

data/lib/dpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Dpm
-  VERSION = "0.1.0"
+module DPM
+  VERSION = "0.2.1"
 end

data/lib/dpm.rb

@@ -5,9 +5,17 @@ require "active_support/core_ext"
 
 require_relative "dpm/version"
 require_relative "dpm/errors"
+require_relative "dpm/options"
 require_relative "dpm/runner"
 
 module DPM
   ROOT = File.expand_path("..", __dir__).freeze
   HOME = File.expand_path("~/.dpm").freeze
+
+  def self.call!(argv)
+    options = Options.parse!(argv)
+    Runner.call!(options)
+  rescue Error => exception
+    puts "Error: #{exception.message}"
+  end
 end

data/packages/elasticsearch.yml

@@ -0,0 +1,35 @@
+.base: &base
+  {}
+.run_options: &run_options
+  p:
+    - "9200:9200"
+    - "9300:9300"
+  v: "<%= DPM::HOME %>/data/<%= package_name %>/<%= package_tag || 'default' %>:/usr/share/elasticsearch/data"
+.run_args: &run_args
+  {}
+
+latest:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+8:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+7:
+  base:
+    <<: *base
+    image_name: "docker.elastic.co/elasticsearch/elasticsearch"
+  run_options:
+    <<: *run_options
+    e: "discovery.type=single-node"
+  run_args:
+    <<: *run_args

data/packages/mysql.yml

@@ -0,0 +1,35 @@
+.base: &base
+  {}
+.run_options: &run_options
+  p: "3306:3306"
+  e: "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+  v: "<%= DPM::HOME %>/data/<%= package_name %>/<%= package_tag || 'default' %>:/var/lib/mysql"
+.run_args: &run_args
+  character-set-server: "utf8mb4"
+  collation-server: "utf8mb4_unicode_ci"
+
+latest:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+8:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+    p: "3306:3306"
+  run_args:
+    <<: *run_args
+
+5:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+    p: "3307:3307"
+  run_args:
+    <<: *run_args

data/packages/nginx.yml

@@ -0,0 +1,22 @@
+.base: &base
+  {}
+.run_options: &run_options
+  p: "80:80"
+.run_args: &run_args
+  {}
+
+latest:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+1:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args

data/packages/postgres.yml

@@ -0,0 +1,56 @@
+.base: &base
+  {}
+.run_options: &run_options
+  p: "5432:5432"
+  e: "POSTGRES_PASSWORD=mysecretpassword"
+  v: "<%= DPM::HOME %>/data/<%= package_name %>/<%= package_tag || 'default' %>:/var/lib/postgressql/data"
+.run_args: &run_args
+  {}
+
+latest:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+14:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+13:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+12:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+11:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+10:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args

data/packages/redis.yml

@@ -0,0 +1,38 @@
+.base: &base
+  {}
+.run_options: &run_options
+  p: "6379:6379"
+.run_args: &run_args
+  {}
+
+latest:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+7:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+6:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args
+
+5:
+  base:
+    <<: *base
+  run_options:
+    <<: *run_options
+  run_args:
+    <<: *run_args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpmrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Song Huang
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.x
+        version: 6.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.x
+        version: 6.x
 description: Makes using your containers as easy as package managers (`apt`, `yml`,
   `brew`).
 email:
@@ -39,22 +39,22 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README.en-US.md
 - README.md
-- README.zh-CN.md
 - Rakefile
 - bin/dpm
+- config/package.yml
 - dpm.gemspec
 - lib/dpm.rb
 - lib/dpm/errors.rb
+- lib/dpm/options.rb
 - lib/dpm/runner.rb
 - lib/dpm/version.rb
-- packages/default.yml
-- packages/elasticsearch/default.yml
-- packages/mysql/default.yml
-- packages/mysql/tag-5.7.yml
-- packages/nginx/default.yml
-- packages/redis/default.yml
-- sig/dpm.rbs
+- packages/elasticsearch.yml
+- packages/mysql.yml
+- packages/nginx.yml
+- packages/postgres.yml
+- packages/redis.yml
 homepage: https://github.com/songhuangcn/dpm
 licenses:
 - MIT
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.20
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Docker Package Manager.
 test_files: []

data/README.zh-CN.md

@@ -1,103 +0,0 @@
-[English](README.md) | [简体中文](README.zh-CN.md)
-
-# DPM
-
-Docker Package Manager, 让你的容器用起来跟包管理器（`apt`, `yml`, `brew`）一样简单。
-
-## 安装
-
-```bash
-gem install dpmrb
-```
-
-## 使用
-
-```bash
-dpm help                       # Show help
-dpm list                       # docker ps --filter "name=dpm-"
-dpm start mysql                # docker run --name=dpm-mysql -d --rm -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes ...
-dpm stop mysql                 # docker stop dpm-mysql
-dpm status mysql               # docker ps --filter "name=dpm-mysql"
-dpm start elasticsearch:7.10.2 # docker run --name=dpm-elasticsearch-7.10.2 -d --rm -p 9200:9200 -e discovery.type=single-node ...
-dpm start mysql:5.7            # docker run --name=dpm-mysql-5.7 -d --rm -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes ...
-```
-
-## 为项目添加新包
-
-DPM 跟 [Homebrew](https://brew.sh/) 一样，需要完善更多的包配置，欢迎为 `packages` 目录添加你需要的包配置。
-
-### 配置级别
-
-容器配置都是通用的 YAML 格式，有三个级别：
-
-1. 默认级别：`packages/default.yml`
-1. 包级别：`packages/PACKAGE/default.yml`
-1. 版本级别：`packages/PACKAGE/tag-TAG.yml`
-
-配置是合并机制，如果一个包没有自定义配置，他就会根据默认级别配置跑起来。
-
-### 配置示例
-
-例如有配置如下：
-
-1. `packages/default.yml`：
-    ```yml
-    run_options:
-      rm: true
-      d: true
-    ```
-1. `packages/mysql/default.yml`：
-    ```yml
-    run_options:
-      e: "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
-      p: "3306:3306"
-    ```
-1. `packages/mysql/tag-5.7.yml`：
-    ```yml
-    run_options:
-      p: "3307:3307"
-    ```
-
-则最终这些包配置的启动命令为：
-
-- `mysql:5.7` 的配置：
-    ```bash
-    docker run --rm -d -p 3307:3307 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:5.7
-    ```
-- `mysql` 的配置：
-    ```bash
-    docker run --rm -d -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql
-    ```
-- `not-exist-pkg` 的配置：
-    ```bash
-    docker run --rm -d not-exist-pkg
-    ```
-
-### 其他配置
-
-有一些其他配置项，例如 `image`：
-
-`packages/elasticsearch/default.yml`
-```yml
-image: "docker.elastic.co/elasticsearch/elasticsearch"
-```
-
-则 `elasticsearch` 包的镜像将不在按约定自动计算，而是变成了：
-
-```bash
-docker.elastic.co/elasticsearch/elasticsearch
-```
-
-还有一些配置，例如：`args`，这个是传入到容器的参数，例如有配置文件 `packages/mysql/default.yml`：
-
-```yml
-args:
-  character-set-server: "utf8mb4"
-  collation-server: "utf8mb4_unicode_ci"
-```
-
-则所有版本的 `mysql` 包将会多这两个启动参数：
-
-```bash
-docker run mysql --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-```

data/packages/elasticsearch/default.yml

@@ -1,5 +0,0 @@
-image_name: "docker.elastic.co/elasticsearch/elasticsearch"
-run_options:
-  p: "9200:9200"
-  e: "discovery.type=single-node"
-  v: "<%= DPM::HOME %>/data/<%= package_name %>/<%= package_tag || 'default' %>:/usr/share/elasticsearch/data"

data/packages/mysql/default.yml

@@ -1,7 +0,0 @@
-run_options:
-  p: "3306:3306"
-  e: "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
-  v: "<%= DPM::HOME %>/data/<%= package_name %>/<%= package_tag || 'default' %>:/var/lib/mysql"
-args:
-  character-set-server: "utf8mb4"
-  collation-server: "utf8mb4_unicode_ci"

data/packages/mysql/tag-5.7.yml

@@ -1,2 +0,0 @@
-run_options:
-  v: "<%= DPM::HOME %>/data/mysql-5.7:/var/lib/mysql"

data/packages/nginx/default.yml

@@ -1,2 +0,0 @@
-run_options:
-  p: "80:80"

data/packages/redis/default.yml

@@ -1,2 +0,0 @@
-run_options:
-  p: "6379:6379"

data/sig/dpm.rbs

@@ -1,4 +0,0 @@
-module Dpm
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end