devkitkat 0.1.30 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3152cc8e42ea8f2250acaf60e0617f38b6feefdfbcbcee6ce17c39d96a4489f0
-  data.tar.gz: 980bd93077f8158669103d0b13ba2bf4169ed1ca7dfa011c6a85b17c1e11866b
+  metadata.gz: 165a5288cd8a82c659cdb88bd8f26f78b8cbed8e1d694d7860c420a1d5237494
+  data.tar.gz: 25b48673025000c5b1122a8ddd899d1cf4962ec2de5e1ad8826785ac5ce6420a
 SHA512:
-  metadata.gz: acf978184845ac81f6d1df26b0d35f47916fb1885c07b2d65ee43bfe72d19ee9bb8b99ca36aa35239d49139ce67a6e34830216a525edc43aeec43f65d5101562
-  data.tar.gz: a07603e9275c93826e39d1a298fb3fac31c4e77b19b1d6985ee66be4ae90bcea138f902c85785989f184cf3f95482a39cf1fe7e36ac02dae5a4fa8a0e0f0d9ee
+  metadata.gz: fc5073ab8d1b7221fa0e557a40131b2bbaba1a57e3d401800852924c6613352b1cecfdfa60b952d23ef4c94dcd069c43e798418397ea43aab993c804cc593d8b
+  data.tar.gz: 493248dc330f0781484edcf5d089c3579154447c2369169f931a4e8dd2fd14446c5263bb59b612ca79f6559dfc9d3a999e271837cffba55c5c5b538096c72378

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.29)
+    devkitkat (0.1.35)
       activesupport (~> 6.0.0)
       colorize (~> 0.8.1)
-      docker-api (~> 1.34.2)
+      docker-api (~> 2.0.0)
       parallel (~> 1.17.0)
       pry (~> 0.12.2)
       pry-nav
@@ -14,25 +14,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    coderay (1.1.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
-    docker-api (1.34.2)
+    docker-api (2.0.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.73.0)
-    i18n (1.8.2)
+    excon (0.79.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    minitest (5.14.2)
+    multi_json (1.15.0)
     parallel (1.17.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -58,19 +58,19 @@ GEM
       rspec (>= 3.0)
     ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1.4)
   devkitkat!
   rake (~> 12.3.3)
   rspec (~> 3.0)
   rspec-temp_dir (~> 1.1.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -38,6 +38,7 @@ download/prepare services. These are available keys.
 |`services:`                                 |Hash        |Yes     |-|The services to run the application|
 |`services:<name>`                           |Hash        |Yes     |-|The service name e.g. `rails`, `db`, `redis`|
 |`services:<name>:repo: <value>`             |String      |No      |-|The git URL of the repository|
+|`services:<name>:repo_ref: <value>`         |String      |No      |-|The ref of the repository|
 |`services:<name>:<key>: <value>`            |Hash        |No      |-|The key and value of the environment variable. e.g. `POSTGRES_PASSWORD: abcdef`. |
 |`image:`                                    |String      |No      |-|The docker image. Only effective when `type` is `docker` or `cloud`|
 |`groups:`                                   |Hash        |No      |-|The groups of the services|

data/devkitkat.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = "devkitkat"
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-temp_dir", "~> 1.1.0"
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "parallel", "~> 1.17.0"
   spec.add_runtime_dependency "ruby-progressbar", "~> 1.10.1"
   spec.add_runtime_dependency "colorize", "~> 0.8.1"
-  spec.add_runtime_dependency "docker-api", "~> 1.34.2"
+  spec.add_runtime_dependency "docker-api", "~> 2.0.0"
   spec.add_runtime_dependency "require_all", "~> 3.0.0"
 end

data/lib/devkitkat/command.rb

@@ -99,6 +99,7 @@ module Devkitkat
         opts.separator "poop                - Poop"
         opts.separator "show-variables      - Show all variables via 'export' command"
         opts.separator "remove-containers   - Remove all related containers"
+        opts.separator "start-container     - Start a container (dry-run)"
       end
     end
 

data/lib/devkitkat/service.rb

@@ -8,7 +8,7 @@ module Devkitkat
     attr_reader :name, :config, :command, :executor
 
     DIVISIONS = %w[src script data cache log example dockerfile].freeze
-    SERVICE_PROPERTIES = %w[repo host port]
+    SERVICE_PROPERTIES = %w[repo repo_ref host port]
 
     def initialize(name, config, command)
       @name, @config, @command = name, config, command

data/lib/devkitkat/service/driver/docker/container.rb

@@ -145,6 +145,10 @@ module Devkitkat
             @group_id ||= `id -u`.delete("\n")
           end
 
+          def docker_group_id
+            @docker_group_id ||= `getent group docker | awk -F: '{ printf $3 }'`
+          end
+
           def user_id
             @user_id ||= `id -g`
           end
@@ -164,6 +168,7 @@ module Devkitkat
             prepare!(['chown', "#{user_name}:#{user_name}", ROOT_IN_CONTAINER])
             prepare!(['chown', '-R', "#{user_name}:#{user_name}", "#{ROOT_IN_CONTAINER}/services/#{service.name}"])
             prepare!(['usermod', '-aG', 'docker', user_name])
+            prepare!(['groupmod', '-g', docker_group_id, 'docker'])
           end
 
           def prepare!(cmds, params = {})

data/lib/devkitkat/service/predefined_command/pull.rb

@@ -2,14 +2,20 @@ module Devkitkat
   class Service
     class PredefinedCommand
       class Pull < Base
+        DEFAULT_REPO_REF = 'master'.freeze
+
         def to_script
           <<~EOS
             cd #{service.src_dir}
-            git checkout master
-            git pull origin master
+            git checkout #{repo_ref}
+            git pull origin #{repo_ref}
           EOS
         end
 
+        def repo_ref
+          service.repo_ref || DEFAULT_REPO_REF
+        end
+
         def available?
           service.repo_defined?
         end

data/lib/devkitkat/service/predefined_command/start_container.rb

@@ -0,0 +1,21 @@
+module Devkitkat
+  class Service
+    class PredefinedCommand
+      class StartContainer < Base
+        def to_script
+          <<~EOS
+            tail -f
+          EOS
+        end
+
+        def available?
+          true
+        end
+
+        def machine_driver
+          'docker'
+        end
+      end
+    end
+  end
+end

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.30"
+  VERSION = "0.1.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.35
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/devkitkat/service/predefined_command/reconfigure.rb
 - lib/devkitkat/service/predefined_command/remove_containers.rb
 - lib/devkitkat/service/predefined_command/show_variables.rb
+- lib/devkitkat/service/predefined_command/start_container.rb
 - lib/devkitkat/version.rb
 homepage: https://gitlab.com/dosuken123/devkitkat
 licenses:
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Make micro services easy