r_dockerize 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba9604da9f5b4557a8b762578fc99f42d7c9efcd26d197313ce38cbf6024cf2f
-  data.tar.gz: d0da7d0675f684e500b7d8f2d91a3e3f320f1d3b67b4a9968cab39b332e409fe
+  metadata.gz: 150ba14ca5eda083ea568d40b5b897f21eaca257d3e9c37210f5c15a6d9cd077
+  data.tar.gz: 6a84c3b339ef7309190eefcc951a8dbafe09f1bd367d46297968ccc9866158db
 SHA512:
-  metadata.gz: 6960309e002b6fe7813c7e2ebbd9b845e0f569d30902864325c8463a317480d5c49db9cb664500d3a613742a296500f9186dcd1a62e5260dc3e8c764ebaeea82
-  data.tar.gz: ffa1b4a96057d64c7f71ac5393a411125c56bddc9ea2c6e02384168e733cb2410ae346e030ae0272da5980675e44296892ed92c060fe37e4bb8e39d7d68d9bb0
+  metadata.gz: 947daf45247848128be71e6cf58fc40f869256f9f3ae024cbd43cc1c5c8db9290703fb075a97eb7a2bbaefe911072d47ef7c4a44135a37a13aee65ae8679236c
+  data.tar.gz: 5e46bbbc0583445c95aecbfd5d3bd473318b5a69fc20646dcc7829121ae9ec9059788d6f268bfe44ee90d30909b51fb08798bcac9dfb7a1671bfdf5d5aaae240

data/README.md

@@ -34,9 +34,10 @@ Options:
     -u, --user                       # Use saved user's template
     -j, --javascript=JAVASCRIPT      # Choose JavaScript approach [options: npm, yarn]
     -r, --ruby=RUBY_VERSION          # Choose version of ruby
-    -d, --database=DATABASE          # Choose database [options: sqlite]
+    -d, --database=DATABASE          # Choose database [options: postgresql, mysql, mongodb sqlite]
     --standard                       # Standard template
     -h, --help                       # Print help for command
+    -p, --port                       # Set port for expose
 ```
 2. `r_dockerize dco ` / `compose`/ `docker-compose [options]` - for create docker-compose.yml
 ```bash
@@ -48,15 +49,15 @@ Usage:
 Options:
     -s, --show                       # Show assembled docker-compose file
     -u, --user                       # Use saved user's template
-    -d, --database=DATABASE          # Choose database [options: sqlite]
+    -d, --database=DATABASE          # Choose database [options: postgresql, mysql, mongodb, sqlite]
     -b, --subservice=SUBSERVICE      # Choose subservice [options: redis rabbitmq sidekiq]
     -h, --help                       # Print help for command
 
 ```
-3. `r_dockerize dockerize [options]` - for create both (Dockerfie and docker-compose.yml)
+3. `r_dockerize dockerize` - for create both (Dockerfie and docker-compose.yml)
 ```bash
 Usage:
-  rdockerize dockerize [options]
+  rdockerize dockerize
 ```
 
 ## Development

data/lib/config/locales/en.yml

@@ -51,6 +51,7 @@
         COPY ./ $APP_PATH
         %{db_option}%{js_pm_option}
         RUN bundle install
+        %{port}
       :db:
         :sqlite: |
           RUN apt-get update -qq && \

data/lib/r_dockerize/cli.rb

@@ -4,9 +4,10 @@ require "optionparser"
 
 module RDockerize
   class CLI
+    # Available commands
     COMMANDS = {
-      "dco" => "RDockerize::Commands::Dco",
-      "compose" => "RDockerize::Commands::Dco",
+      "dco" => "RDockerize::Commands::Dco", # alias for docker-compose
+      "compose" => "RDockerize::Commands::Dco", # alias for docker-compose
       "docker-compose" => "RDockerize::Commands::Dco",
       "docker" => "RDockerize::Commands::Docker",
       "dockerize" => "RDockerize::Commands::Dockerize",
@@ -18,6 +19,7 @@ module RDockerize
       @print_help = false
     end
 
+    # Build necessary class using command's pull of constants
     def run(args = ARGV)
       command = parse_command(args)
 
@@ -40,6 +42,7 @@ module RDockerize
 
     private
 
+    # Initialize base options for r_dockerize command
     def option_parser
       @option_parser ||= OptionParser.new do |opts|
         opts.banner = banner

data/lib/r_dockerize/commands/base.rb

@@ -4,7 +4,9 @@ require "optionparser"
 
 module RDockerize
   module Commands
+    # Abstract class for all commands
     class Base
+      # Base key for access i18n templates
       BASE_KEY = "r_dockerize"
 
       def self.run(args)

data/lib/r_dockerize/commands/dco.rb

@@ -4,8 +4,6 @@ module RDockerize
   module Commands
     # rubocop disable:Style/IfUnlessModifier
     class Dco < Base
-      attr_reader :db, :js, :subservices, :volumes
-
       def self.run(args)
         new(args).run
       end
@@ -18,6 +16,7 @@ module RDockerize
       end
 
       def parse(args)
+        # TODO: sqlite not generated!!!
         @db = "sqlite"
 
         parser = opt_parser do |opts|
@@ -31,11 +30,11 @@ module RDockerize
             @user_temp = true
           end
 
-          opts.on("-d", "--database=DATABASE", "# Choose database [options: sqlite]") do |val|
+          opts.on("-d", "--database=DATABASE", "# Choose database [options: #{DATABASE.join(", ")}]") do |val|
             prepare_db(val)
           end
 
-          opts.on("-b", "--subservice=SUBSERVICE", "# Choose subservice [options: redis rabbitmq sidekiq]") do |val|
+          opts.on("-b", "--subservice=SUBSERVICE", "# Choose subservice [options: #{SUBSERVICES.join(", ")}]") do |val|
             prepare_subservices(val)
           end
         end
@@ -83,6 +82,7 @@ module RDockerize
         @subservices << option
       end
 
+      # Create final text for docker-compose.yml file
       def prepare_text
         return I18n.t("#{BASE_KEY}.dco.user_template") if @user_temp
 

data/lib/r_dockerize/commands/docker.rb

@@ -3,8 +3,6 @@
 module RDockerize
   module Commands
     class Docker < Base
-      attr_reader :db, :js_pm, :rv
-
       def self.run(args)
         new(args).run
       end
@@ -13,6 +11,7 @@ module RDockerize
         @user_temp = false
         @show = false
         @standard = false
+        @port = nil
         super(args)
       end
 
@@ -31,7 +30,7 @@ module RDockerize
             @user_temp = true
           end
 
-          opts.on("-j", "--javascript=JAVASCRIPT", "# Choose JavaScript approach [options: npm, yarn]") do |val|
+          opts.on("-j", "--javascript=JAVASCRIPT", "# Choose JavaScript approach [options: #{JAVASCRIPT_PM.join(", ")}]") do |val|
             prepare_js_pm(val)
           end
 
@@ -39,13 +38,17 @@ module RDockerize
             @rv = val
           end
 
-          opts.on("-d", "--database=DATABASE", "# Choose database [options: sqlite]") do |val|
+          opts.on("-d", "--database=DATABASE", "# Choose database [options: #{DATABASE.join(", ")}]") do |val|
             prepare_db(val)
           end
 
           opts.on("--standard", "# Standard template") do
             @standard = true
           end
+
+          opts.on("-p", "--port=PORT", "# Set port") do |val|
+            @port = val
+          end
         end
 
         parser.parse!(args)
@@ -57,6 +60,7 @@ module RDockerize
         return $stdout.puts text if @show
 
         File.open("Dockerfile", "w+") { |f| f.write(text) }
+        
       end
 
       protected
@@ -86,15 +90,17 @@ module RDockerize
         @db = option
       end
 
+      # Create final text for Dockerfile file
       def prepare_text
         return I18n.t("#{BASE_KEY}.docker.user_template") if @user_temp
         return I18n.t("#{BASE_KEY}.docker.standard", ruby_version: @rv) if @standard
 
         js_pm_text = I18n.t("#{BASE_KEY}.docker.js_pm.#{@js_pm}") if @js_pm
         db_text = I18n.t("#{BASE_KEY}.docker.db.#{@db}") if @db
+        port_text = "EXPOSE #{@port}" if @port
 
         I18n.t("#{BASE_KEY}.docker.template",
-               ruby_version: @rv, js_pm_option: js_pm_text, db_option: db_text)
+               ruby_version: @rv, js_pm_option: js_pm_text, db_option: db_text, port: port_text)
       end
     end
   end

data/lib/r_dockerize/commands/dockerize.rb

@@ -7,9 +7,10 @@ module RDockerize
         new(args)
       end
 
+      # Create docker-compose file and Dockerfile
       def parse(args)
-        RDockerize::Commands::Dco.run(args)
         RDockerize::Commands::Docker.run(args)
+        RDockerize::Commands::Dco.run(args)
       end
 
       protected

data/lib/r_dockerize/config.rb

@@ -4,11 +4,9 @@ require "i18n"
 require "yaml"
 
 module RDockerize
-  VERSION = "0.1.0"
-
   DEBUG = false
 
-  STANDARD_COMPOSE_VERSION = 3.5
+  STANDARD_COMPOSE_VERSION = 3.5.freeze
 
   DATABASE = %w[postgresql mysql mongodb sqlite].freeze
 

data/lib/r_dockerize/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module RDockerize
+  VERSION = "0.1.1"
+end
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: r_dockerize
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Keallar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,7 @@ files:
 - lib/r_dockerize/errors/docker_filename_error.rb
 - lib/r_dockerize/errors/js_not_found.rb
 - lib/r_dockerize/errors/subservice_not_found.rb
+- lib/r_dockerize/version.rb
 - lib/rdockerize.rb
 homepage: https://github.com/Keallar/r_dockerize
 licenses:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: CLI app for creating ruby and rails Dockerfile and docker-compose.yml.