kuby-core 0.11.6 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231bc8c37af35418336ba5bb5853049e0d9192932a65eeb3e81a0471b5761953
-  data.tar.gz: 9a4e4426e1d183505f09fac2761601c101c92423761647484c1dae3c3a75e235
+  metadata.gz: 78bc9ff66849f7b55046753a84be77fd64af68d28c1746245a463f5f240d0e9e
+  data.tar.gz: '079e0ccccc1ae12a18a2cb459e7a6b1f2b3ef05149d5bf347fed5ba1e6abbb2b'
 SHA512:
-  metadata.gz: 64bd169c3454d196efcf0a21f400107ca8b8c584a20793a8ccf232767aba7ae52fab27307f01e104186b73f537d12907afc86c901538f86266773dacb740cbaa
-  data.tar.gz: a54f9fa2eb0cdbfe52a0d4799c1f4fa9bd4677bef8ef4ed4f11caa4690d28f077918a0feb76926b94923ee6ba00e5065d8edabb1997d829d4f7ff5f9b9832708
+  metadata.gz: f27a9bd4698e6cdcb4c0308c91a78e5c86ac6eccd6dcd8f9ff1b28a73e8c1aa50f79512dc9ad3b5fdb43c024ba5054c1df1844bd74473c5bd9dd3c3cf034c7c4
+  data.tar.gz: fca6952c0bfe4cb5d2e6e9b0f4f50d46483bb43ad32d601dbdfcc14eeccb4070706043e786d18ade2730b9521443f55fb317620334f212fb88cfb92ab8672cb1

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.11.11
+* Add support for a Docker registry running on localhost.
+  - Correctly parse and handle URLs with specific ports.
+  - Only perform a Docker login if a username is provided.
+
+## 0.11.10
+* Fix spelling in error message.
+
+## 0.11.9
+* Use correct Docker Hub registry URL (index.docker.io).
+
+## 0.11.8
+* Alias Rails `config_map` to `env`.
+
+## 0.11.7
+* Properly namespace constant lookup for `Kubernetes::MissingPluginError`.
+* Add missing `#storage` method for Postgres plugin.
+
 ## 0.11.6
 * Fix Rails generator.
   - Causing `undefined method 'module_parent_name'`. Apparently `module_parent_name` wasn't introduced until Rails 6.

data/lib/kuby/docker/metadata.rb

@@ -8,7 +8,7 @@ module Kuby
       extend T::Sig
 
       DEFAULT_DISTRO = :debian
-      DEFAULT_REGISTRY_HOST = T.let('https://www.docker.com'.freeze, String)
+      DEFAULT_REGISTRY_HOST = T.let('https://index.docker.io'.freeze, String)
       DEFAULT_REGISTRY_SCHEME = T.let('https', String)
       LATEST_TAG = T.let('latest'.freeze, String)
 
@@ -40,7 +40,8 @@ module Kuby
 
       sig { returns(String) }
       def image_host
-        @image_host ||= "#{full_image_uri.scheme}://#{full_image_uri.host}"
+        uri = full_image_uri
+        @image_host ||= "#{uri.scheme}://#{uri.host}:#{uri.port}"
       end
 
       sig { returns(String) }
@@ -74,7 +75,7 @@ module Kuby
       def full_image_uri
         @full_image_uri ||= if image_url.include?('://')
           URI.parse(image_url)
-        elsif image_url =~ /\A[^.]+\.[^\/]+\//
+        elsif image_url =~ /\A[^.:]+[\.:][^\/]+\//
           URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{image_url}")
         else
           URI.parse("#{DEFAULT_REGISTRY_HOST}/#{image_url.sub(/\A[\/]+/, '')}")

data/lib/kuby/kubernetes/deployer.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'fileutils'
 require 'securerandom'
 require 'yaml'
@@ -6,6 +7,8 @@ require 'yaml'
 module Kuby
   module Kubernetes
     class Deployer
+      extend T::Sig
+
       attr_reader :environment
       attr_accessor :logdev
 
@@ -93,7 +96,7 @@ module Kuby
         task.run!(verify_result: true, prune: false)
       ensure
         ENV['KUBECONFIG'] = old_kubeconfig
-        FileUtils.rm_rf(tmpdir)
+        FileUtils.rm_rf(T.must(tmpdir))
       end
 
       def restart_rails_deployment_if_necessary

data/lib/kuby/plugin_registry.rb

@@ -12,7 +12,7 @@ module Kuby
       plugins_by_env = plugins[plugin_name]
 
       unless plugins_by_env
-        raise MissingPluginError, "no plugin registered with name #{plugin_name}, "\
+        raise Kubernetes::MissingPluginError, "no plugin registered with name #{plugin_name}, "\
           'do you need to add a gem to your Gemfile?'
       end
 

data/lib/kuby/plugins/rails_app/plugin.rb

@@ -202,6 +202,8 @@ module Kuby
           @config_map
         end
 
+        alias_method :env, :config_map
+
         def app_secrets(&block)
           spec = self
 

data/lib/kuby/plugins/rails_app/postgres.rb

@@ -63,6 +63,20 @@ module Kuby
             end
           end
         end
+        
+        def storage(amount)
+          database do
+            spec do
+              storage do
+                resources do
+                  requests do
+                    set :storage, amount
+                  end
+                end
+              end
+            end
+          end
+        end        
 
         def secret(&block)
           context = self

data/lib/kuby/tasks.rb

@@ -43,7 +43,7 @@ module Kuby
 
       hostname = docker.metadata.image_hostname
 
-      unless docker.cli.auths.include?(hostname)
+      if docker.credentials.username && !docker.cli.auths.include?(hostname)
         Kuby.logger.info("Attempting to log in to registry at #{hostname}")
 
         begin
@@ -66,7 +66,7 @@ module Kuby
           docker.cli.push(image_url, tag)
         end
       rescue Kuby::Docker::MissingTagError => e
-        msg = "#{e.message} Run rake kuby:build to build the"\
+        msg = "#{e.message} Run kuby build to build the "\
           'Docker image before running this task.'
 
         Kuby.logger.fatal(msg)

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.11.6'.freeze
+  VERSION = '0.11.11'.freeze
 end

data/spec/docker/metadata_spec.rb

@@ -19,18 +19,18 @@ describe Kuby::Docker::Metadata do
   describe '#image_host' do
     subject { metadata.image_host }
 
-    it { is_expected.to eq(described_class::DEFAULT_REGISTRY_HOST) }
+    it { is_expected.to eq("#{described_class::DEFAULT_REGISTRY_HOST}:443") }
 
     context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('https://registry.foo.com') }
+      it { is_expected.to eq('https://registry.foo.com:443') }
     end
 
     context 'when the image URL contains an explicit host with scheme' do
       let(:docker_image_url) { 'http://registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('http://registry.foo.com') }
+      it { is_expected.to eq('http://registry.foo.com:80') }
     end
   end
 
@@ -49,7 +49,7 @@ describe Kuby::Docker::Metadata do
   describe '#image_hostname' do
     subject { metadata.image_hostname }
 
-    it { is_expected.to eq('www.docker.com') }
+    it { is_expected.to eq('index.docker.io') }
 
     context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'registry.foo.com/foo/testapp' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.11
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize