devkitkat 0.1.29 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91fde9edf9ce28487edc62750fa05a2b28eb47b873f210d604253228c54cdf8
-  data.tar.gz: 723f2f178357b49750fc8b16e04f648caf345a151ca8e0b393ae574237a78c12
+  metadata.gz: e8fd1702bb57e08ff95b457deda0700eaceabe5bb1b016e2510c55aeb00da4e1
+  data.tar.gz: 130d60d2212815e550c7c9588f8912162345830089b8618fb3265eab66ddc47a
 SHA512:
-  metadata.gz: '0679b7c01e774727548d8628b34ac3263c398e32d7b1457d1cfdc43f7d045391afa1d936e97b61aaccd606c0e3b9f5786bbddaad3901eb6c80b1756b2fff1502'
-  data.tar.gz: b74a7d2df3304e3fbc5eb825c054590ee61e53b217e9a30da7df4da0073a8d9b95fd77affb808e70989e605f4ffa06935c9f7834b241275593036eab8c860ed8
+  metadata.gz: ada0dcf7dd8124c3baae87cf127c842afc4e55e533bab0541ed8943d323e5bf694e61fac2fddf802de4b78986887c62034b65bca18d152925f3f8445b52c46ae
+  data.tar.gz: cd9152bc0d81c5d623d49a1a3931687a52e796a78794ae17254ebee5328e8e9c5e36bd8b8723a1fa3e3accd45ae499466b61e63543a15ca4b887f14c90e83169

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.28)
+    devkitkat (0.1.34)
       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.4)
       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.7)
     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.78.0)
+    i18n (1.8.5)
       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)
@@ -60,17 +60,17 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 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
@@ -61,7 +61,7 @@ module Devkitkat
     end
 
     def machine_driver
-      config.service_hash(name).dig(:machine, :driver)
+      config.service_hash(name).dig('machine', 'driver')
     end
   end
 end

data/lib/devkitkat/service/executor/variables.rb

@@ -22,7 +22,7 @@ module Devkitkat
           variables << "export DK_MACHINE_DRIVER=#{config.machine_driver.to_s}"
           variables << "export DK_MACHINE_LOCATION=#{config.machine_location.to_s}"
           variables << "export DK_MACHINE_IMAGE=#{config.machine_image.to_s}"
-          variables << "export DK_MACHINE_EXTRA_HOSTS=#{config.machine_extra_hosts.join(',').to_s}"
+          variables << "export DK_MACHINE_EXTRA_HOSTS=#{config.machine_extra_hosts&.join(',').to_s}"
           variables << "export DK_MACHINE_NETWORK_MODE=#{config.machine_network_mode.to_s}"
           variables << "export DK_APPLICATION=#{config.application.to_s}"
           variables

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.29"
+  VERSION = "0.1.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.34
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-01-08 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