boxing 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f2ef307cfd69550543543bbf5562444e5ab3183e297e71fbb4a067c74c85f6
-  data.tar.gz: 5d869dd503707d73792e52e153766c96a4030f4894e9a3242a722abdada7dd06
+  metadata.gz: fe3d343131564fde7cf4de0e29e3ef500be4107eee0893855473f6efc958eaf5
+  data.tar.gz: a2d34fe4ce57859dc44b20ddcd77026f07f24ea25b77d54a15ab6980c1d06817
 SHA512:
-  metadata.gz: c6d0e213e1de04a2d4e78884ba8f7cfc500a4c3de81df76343a70eab87372639cbd0c5315252d55eab65a10e7bc9cca7ffc577712be10ab713aab8d87a6416e8
-  data.tar.gz: b2af368f6b149e19150089363b8512e24c3ad3a82be21b34a256ce89cb176f6ec6bf7bd0599942809c0634bb053e26ca617526e4297a5332e94cdbc629dd1632
+  metadata.gz: 37e4a71b5784d2226b0ce46267f299b968a0307930eea655303c1050d7861fcc9ece58e50f8018ac10e243258b22b96e12261a5ff91b99f95c1d9b403643957d
+  data.tar.gz: 20ec4384c3be3fbd1f904cd1911aab41c95aa100f1cef6f243a245b1697865131e114ef878a31fca4f88e6f5119edf558986d2c9a669e05a5be1060b65b3f90e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boxing (0.2.0)
+    boxing (0.4.1)
       bundler (~> 2.0)
       thor (~> 1.0)
 

data/README.md

@@ -2,6 +2,8 @@
 
 The zero-configuration Dockerfile generator for Ruby.
 
+> The [Database Repository](https://github.com/elct9620/ruby-boxing-db) will be used for package information.
+
 ## Installation
 
 Add this line to your application's Gemfile development group:
@@ -66,9 +68,22 @@ To generate `Dockerfile` for current project
 bundle exec boxing generate
 ```
 
+### Update
+
+To update the database for package information
+
+```ruby
+bundle exec boxing update
+```
+
+> If the generated `Dockerfile` is not satisfy, please try to update it.
+
 ## Roadmap
 
 * [x] `Dockerfile` generator
+* [x] `.gitignore` generator
+  * [x] Common ignore files
+  * [ ] Customizable ignore files
 * [ ] Customize config file `config/boxing.rb`
 * [ ] Entrypoint Detection
   * [x] Openbox (Suggested)
@@ -77,12 +92,14 @@ bundle exec boxing generate
   * [ ] Ruby
 * [ ] Package Database
   * [x] Built-in (Move to standalone repoistory in future)
-  * [ ] Standalone Repoistory
-  * [ ] Customize Source
+  * [x] Standalone Repoistory
+  * [x] Support gems from `git` repoistory
+  * [x] Customize Source
   * [ ] Base Image
     * [x] Alpine
     * [ ] Ubuntu
-  * [ ] Ruby Version
+  * [ ] Filter by Ruby Version
+  * [ ] Filter by Gem Version
 
 ## Development
 

data/lib/boxing/command.rb

@@ -13,5 +13,6 @@ module Boxing
     end
 
     require_relative 'commands/generate'
+    require_relative 'commands/update'
   end
 end

data/lib/boxing/commands/generate.rb

@@ -21,6 +21,8 @@ module Boxing
       #
       # @since 0.1.0
       def execute
+        Database.download! unless Database.exist?
+
         template('templates/Dockerfile.tt', 'Dockerfile', context: context.to_binding)
         template('templates/dockerignore.tt', '.dockerignore', context: context.to_binding)
       end

data/lib/boxing/commands/update.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Boxing
+  # :nodoc:
+  module Commands
+    # The Database Updater
+    #
+    # @since 0.3.0
+    class Update < Thor::Group
+      # Update Database
+      #
+      # @since 0.3.0
+      def execute
+        if Database.exist?
+          Database.new.update!
+        else
+          Database.download!
+        end
+      end
+    end
+
+    Boxing::Command.register(Update, 'update', 'update', 'Update Database')
+  end
+end

data/lib/boxing/context.rb

@@ -20,11 +20,14 @@ module Boxing
     #
     # @since 0.1.0
     def packages
-      @packages ||= Set.new(
-        @dependencies
-        .map(&:name)
-        .flat_map { |name| @database.package_for(name).to_a }
-      )
+      @packages ||=
+        Set
+        .new(default_packages)
+        .merge(
+          @dependencies
+          .map(&:name)
+          .flat_map { |name| @database.package_for(name).to_a }
+        )
     end
 
     # Check rubygems exists
@@ -38,6 +41,28 @@ module Boxing
       @dependencies.any? { |dep| names.include?(dep.name) }
     end
 
+    # Does any gem from git
+    #
+    # @return [TrueClass|FalseClass]
+    #
+    # @since 0.4.0
+    def git?
+      @dependencies.any?(&:git)
+    end
+
+    # Default packages
+    #
+    # @return [Array<Boxing::Package>]
+    #
+    # @since 0.4.0
+    def default_packages
+      [
+        Package.new('build-base', mode: Package::BUILD)
+      ]
+        .push(git? ? Package.new('git', mode: Package::BUILD) : nil)
+        .compact
+    end
+
     # Convert to binding
     #
     # @return [Binding]

data/lib/boxing/database.rb

@@ -9,12 +9,80 @@ module Boxing
   # @since 0.1.0
   class Database
     class << self
-      # The database root
+      # Check for the database exists
       #
-      # @since 0.1.0
-      def root
-        @root ||= Pathname.new(File.dirname(__FILE__)).join('../../database')
+      # @param [String] path
+      #
+      # @return [TrueClass\FalseClass]
+      #
+      # @since 0.3.0
+      def exist?(path = DEFAULT_PATH)
+        File.directory?(path) && !(Dir.entries(path) - %w[. ..]).empty?
+      end
+
+      # Download Database
+      #
+      # @since 0.3.0
+      def download!(path = DEFAULT_PATH)
+        command = %w[git clone --quiet]
+        command << URL << path.to_s
+
+        raise DownloadFailed, "failed to download #{URL} to #{path}" unless system(*command)
+
+        new(path)
+      end
+    end
+
+    # @since 0.3.0
+    class DownloadFailed < RuntimeError; end
+
+    # @since 0.3.0
+    class UpdateFailed < RuntimeError; end
+
+    # Git URL of the ruby-boxing-db
+    #
+    # @since 0.3.0
+    URL = 'https://github.com/elct9620/ruby-boxing-db.git'
+
+    # Path to the user's copy of ruby-boxing-db
+    #
+    # @since 0.3.0
+    USER_PATH = Pathname.new(Gem.user_home).join('.local/share/ruby-boxing-db')
+
+    # @since 0.3.0
+    DEFAULT_PATH = ENV['BOXING_DB'] || USER_PATH
+
+    # @since 0.3.0
+    attr_reader :path
+
+    # Initialize Database
+    #
+    # @since 0.3.0
+    def initialize(path = DEFAULT_PATH)
+      @path = path
+    end
+
+    # The Database is Git Repoistory
+    #
+    # @return [TrueClass|FalseClass]
+    #
+    # @since 0.3.0
+    def git?
+      File.directory?(File.join(@path, '.git'))
+    end
+
+    # Update the database
+    #
+    # @since 0.3.0
+    def update!
+      return unless git?
+
+      Dir.chdir(@path) do
+        command = %w[git pull --quiet origin main]
+        raise UpdateFailed, "failed to update #{@path}" unless system(*command)
       end
+
+      true
     end
 
     # Find packages for rubygems
@@ -41,7 +109,7 @@ module Boxing
     #
     # @since 0.1.0
     def each_package_path_for(name, &block)
-      Dir.glob(Database.root.join('gems', name, '*.yml'), &block)
+      Dir.glob(File.join(@path, 'gems', name, '*.yml'), &block)
     end
   end
 end

data/lib/boxing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Boxing
-  VERSION = '0.2.0'
+  VERSION = '0.4.1'
 end

data/templates/Dockerfile.tt

@@ -4,7 +4,7 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 FROM ruby:${RUBY_VERSION}-alpine AS gem
 ARG APP_ROOT
 
-RUN apk add --no-cache build-base <%= packages.select(&:build?).join(' ') %>
+RUN apk add --no-cache <%= packages.select(&:build?).join(' ') %>
 
 RUN mkdir -p ${APP_ROOT}
 COPY Gemfile Gemfile.lock ${APP_ROOT}/
@@ -29,9 +29,6 @@ ARG APP_ROOT
 <%- if packages.select(&:runtime?).any? -%>
 RUN apk add --no-cache <%= packages.select(&:runtime?).join(' ') %>
 
-ARG REVISION
-ENV REVISION $REVISION
-
 <%- end -%>
 COPY --from=gem /usr/local/bundle/config /usr/local/bundle/config
 COPY --from=gem /usr/local/bundle /usr/local/bundle
@@ -46,6 +43,9 @@ ENV RAILS_LOG_TO_STDOUT=true
 ENV APP_ROOT=$APP_ROOT
 
 COPY . ${APP_ROOT}
+
+ARG REVISION
+ENV REVISION $REVISION
 RUN echo $REVISION > ${SERVER_ROOT}/REVISION
 
 # Apply Execute Permission

data/templates/dockerignore.tt

@@ -8,8 +8,10 @@ docker-compose*.yml
 # CI/CD
 .github/
 .cache/
+.circleci/
 coverage/
 spec/
+test/
 features/
 .gitlab-ci.yml
 .travis.yml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxing
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,16 +57,11 @@ files:
 - bin/console
 - bin/setup
 - boxing.gemspec
-- database/gems/pg/postgresql-dev.yml
-- database/gems/pg/postgresql-libs.yml
-- database/gems/rails/shared-mime-info.yml
-- database/gems/rails/tzdata.yml
-- database/gems/sqlite3/sqlite-dev.yml
-- database/gems/sqlite3/sqlite-libs.yml
 - exe/boxing
 - lib/boxing.rb
 - lib/boxing/command.rb
 - lib/boxing/commands/generate.rb
+- lib/boxing/commands/update.rb
 - lib/boxing/context.rb
 - lib/boxing/database.rb
 - lib/boxing/package.rb

data/database/gems/pg/postgresql-dev.yml

@@ -1,2 +0,0 @@
-name: postgresql-dev
-build: yes

data/database/gems/pg/postgresql-libs.yml

@@ -1,2 +0,0 @@
-name: postgresql-libs
-runtime: yes

data/database/gems/rails/shared-mime-info.yml

@@ -1,2 +0,0 @@
-name: shared-mime-info
-runtime: yes

data/database/gems/rails/tzdata.yml

@@ -1,2 +0,0 @@
-name: tzdata
-runtime: yes

data/database/gems/sqlite3/sqlite-dev.yml

@@ -1,2 +0,0 @@
-name: sqlite-dev
-build: yes

data/database/gems/sqlite3/sqlite-libs.yml

@@ -1,2 +0,0 @@
-name: sqlite-libs
-runtime: true