kuby-core 0.11.16 → 0.12.0

data/lib/kuby/version.rb

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

data/spec/docker/spec_spec.rb

@@ -1,12 +1,11 @@
 # typed: false
 require 'spec_helper'
-require 'timecop'
 
 describe Kuby::Docker::Spec do
   let(:spec) { definition.environment.docker }
 
   describe '#base_image' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default base image for Debian' do
       expect(subject).to include("FROM ruby:#{RUBY_VERSION}\n")
@@ -34,7 +33,7 @@ describe Kuby::Docker::Spec do
       Kuby::Docker::SetupPhase::DEFAULT_WORKING_DIR
     end
 
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default working dir' do
       expect(subject).to(
@@ -52,7 +51,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#rails_env' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the name of the current Kuby environment' do
       expect(subject).to include("ENV RAILS_ENV=#{spec.environment.name}\n")
@@ -73,7 +72,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#bundler_version' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'installs the current bundler version' do
       expect(subject).to(
@@ -91,7 +90,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#gemfile' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default Gemfile' do
       expect(subject).to include("COPY Gemfile .\n")
@@ -111,7 +110,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#package' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'installs the given package' do
       # configured in spec_helper.rb
@@ -122,7 +121,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#files' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'copies the current directory contents by default' do
       expect(subject).to include("COPY ./ .\n")
@@ -142,7 +141,7 @@ describe Kuby::Docker::Spec do
       Kuby::Docker::WebserverPhase::DEFAULT_PORT
     end
 
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'exposes the default port' do
       expect(subject).to include("EXPOSE #{default_port}\n")
@@ -157,116 +156,8 @@ describe Kuby::Docker::Spec do
     end
   end
 
-  describe '#tag' do
-    let(:tag) { make_ts_tag(Time.now) }
-
-    subject { spec.tag }
-
-    context 'with no local or remote tags' do
-      it 'raises an error' do
-        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
-      end
-    end
-
-    context 'with an available remote tag' do
-      before { docker_remote_client.tags << tag }
-
-      it { is_expected.to eq(tag) }
-    end
-
-    context 'with an available local tag' do
-      before do
-        docker_cli.build(
-          dockerfile: nil,
-          image_url: docker_image_url,
-          tags: [tag]
-        )
-      end
-
-      it { is_expected.to eq(tag) }
-    end
-
-    context 'with multiple remote tags' do
-      let(:time) { Time.now }
-
-      before do
-        docker_remote_client.tags +=
-          [time - 5, time + 10, time - 10, time + 15].map do |t|
-            make_ts_tag(t)
-          end
-      end
-
-      it { is_expected.to eq(make_ts_tag(time + 15)) }
-    end
-
-    context 'with multiple local and remote tags' do
-      let(:time) { Time.now }
-
-      before do
-        docker_remote_client.tags +=
-          [time - 5, time + 10, time - 10, time + 15].map do |t|
-            make_ts_tag(t)
-          end
-
-        docker_cli.build(
-          dockerfile: nil,
-          image_url: docker_image_url,
-          tags: [time - 3, time + 6, time - 6, time + 18].map do |t|
-            make_ts_tag(t)
-          end
-        )
-      end
-
-      it { is_expected.to eq(make_ts_tag(time + 18)) }
-    end
-  end
-
-  describe '#previous_tag' do
-    let(:time) { Time.now }
-    let(:current_tag) { make_ts_tag(time) }
-
-    before do
-      docker_remote_client.tags << current_tag
-      docker_cli.build(
-        dockerfile: nil,
-        image_url: docker_image_url,
-        tags: [current_tag]
-      )
-    end
-
-    subject { spec.previous_tag(current_tag) }
-
-    context 'with no previous local or remote tag' do
-      it 'raises an error' do
-        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
-      end
-    end
-
-    context 'with an available previous remote tag' do
-      let(:previous_tag) { make_ts_tag(time - 5) }
-
-      before { docker_remote_client.tags << previous_tag }
-
-      it { is_expected.to eq(previous_tag) }
-    end
-
-    context 'with an available previous local tag' do
-      let(:previous_tag) { make_ts_tag(time - 5) }
-
-      before do
-        docker_cli.build(
-        dockerfile: nil,
-        image_url: docker_image_url,
-        tags: [previous_tag]
-        )
-      end
-
-      it { is_expected.to eq(previous_tag) }
-    end
-  end
-
   describe '#insert' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     context 'with a custom class-based build phase' do
       before do

data/spec/docker/timestamped_image_spec.rb

@@ -0,0 +1,123 @@
+# typed: false
+require 'spec_helper'
+
+describe Kuby::Docker::TimestampedImage do
+  let(:dockerfile) { Kuby::Docker::Dockerfile.new }
+  let(:image_url) { docker_image_url }
+  let(:credentials) do
+    Kuby::Docker::Credentials.new do
+      username 'foo'
+      password 'bar'
+      email 'foo@bar.com'
+    end
+  end
+  let(:image) { described_class.new(dockerfile, image_url, credentials) }
+
+  describe '#current_version' do
+    let(:tag) { make_ts_tag(Time.now) }
+
+    subject { image.current_version&.main_tag }
+
+    context 'with no local or remote tags' do
+      it 'raises an error' do
+        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
+      end
+    end
+
+    context 'with an available remote tag' do
+      before { docker_remote_client.tags << tag }
+
+      it { is_expected.to eq(tag) }
+    end
+
+    context 'with an available local tag' do
+      before do
+        docker_cli.build(
+          dockerfile: nil,
+          image_url: docker_image_url,
+          tags: [tag]
+        )
+      end
+
+      it { is_expected.to eq(tag) }
+    end
+
+    context 'with multiple remote tags' do
+      let(:time) { Time.now }
+
+      before do
+        docker_remote_client.tags +=
+          [time - 5, time + 10, time - 10, time + 15].map do |t|
+            make_ts_tag(t)
+          end
+      end
+
+      it { is_expected.to eq(make_ts_tag(time + 15)) }
+    end
+
+    context 'with multiple local and remote tags' do
+      let(:time) { Time.now }
+
+      before do
+        docker_remote_client.tags +=
+          [time - 5, time + 10, time - 10, time + 15].map do |t|
+            make_ts_tag(t)
+          end
+
+        docker_cli.build(
+          dockerfile: nil,
+          image_url: docker_image_url,
+          tags: [time - 3, time + 6, time - 6, time + 18].map do |t|
+            make_ts_tag(t)
+          end
+        )
+      end
+
+      it { is_expected.to eq(make_ts_tag(time + 18)) }
+    end
+  end
+
+  describe '#previous_version' do
+    let(:time) { Time.now }
+    let(:current_tag) { make_ts_tag(time) }
+
+    before do
+      docker_remote_client.tags << current_tag
+      docker_cli.build(
+        dockerfile: nil,
+        image_url: docker_image_url,
+        tags: [current_tag]
+      )
+    end
+
+    subject { image.previous_version(current_tag)&.main_tag }
+
+    context 'with no previous local or remote tag' do
+      it 'raises an error' do
+        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
+      end
+    end
+
+    context 'with an available previous remote tag' do
+      let(:previous_tag) { make_ts_tag(time - 5) }
+
+      before { docker_remote_client.tags << previous_tag }
+
+      it { is_expected.to eq(previous_tag) }
+    end
+
+    context 'with an available previous local tag' do
+      let(:previous_tag) { make_ts_tag(time - 5) }
+
+      before do
+        docker_cli.build(
+        dockerfile: nil,
+        image_url: docker_image_url,
+        tags: [previous_tag]
+        )
+      end
+
+      it { is_expected.to eq(previous_tag) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -71,24 +71,23 @@ module SpecHelpers
           end
         end
       end
-
-      environment(:development) do
-        kubernetes do
-          configure_plugin(:rails_app) do
-            root File.expand_path(File.join(*%w(. dummy)), __dir__)
-          end
-        end
-      end
     end
 
     docker = definition.environment.docker
 
-    docker.instance_variable_set(:@remote_client, docker_remote_client)
-    docker.instance_variable_set(:@cli, docker_cli)
-
     definition
   end
 
+  before do
+    allow_any_instance_of(Kuby::Docker::TimestampedImage).to(
+      receive(:remote_client).and_return(docker_remote_client)
+    )
+
+    allow_any_instance_of(Kuby::Docker::Image).to(
+      receive(:docker_cli).and_return(docker_cli)
+    )
+  end
+
   def make_ts_tag(time)
     Kuby::Docker::TimestampTag.new(time).to_s
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.16
+  version: 0.12.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -219,25 +219,24 @@ files:
 - lib/kuby/cli_base.rb
 - lib/kuby/commands.rb
 - lib/kuby/definition.rb
-- lib/kuby/dev_setup.rb
 - lib/kuby/docker.rb
 - lib/kuby/docker/alpine.rb
+- lib/kuby/docker/app_image.rb
 - lib/kuby/docker/assets_phase.rb
 - lib/kuby/docker/bundler_phase.rb
 - lib/kuby/docker/cli.rb
 - lib/kuby/docker/copy_phase.rb
 - lib/kuby/docker/credentials.rb
 - lib/kuby/docker/debian.rb
-- lib/kuby/docker/dev_spec.rb
 - lib/kuby/docker/distro.rb
 - lib/kuby/docker/docker_uri.rb
 - lib/kuby/docker/dockerfile.rb
 - lib/kuby/docker/errors.rb
+- lib/kuby/docker/image.rb
 - lib/kuby/docker/inline_layer.rb
 - lib/kuby/docker/layer.rb
 - lib/kuby/docker/layer_stack.rb
 - lib/kuby/docker/local_tags.rb
-- lib/kuby/docker/metadata.rb
 - lib/kuby/docker/package_list.rb
 - lib/kuby/docker/package_phase.rb
 - lib/kuby/docker/packages.rb
@@ -249,8 +248,8 @@ files:
 - lib/kuby/docker/remote_tags.rb
 - lib/kuby/docker/setup_phase.rb
 - lib/kuby/docker/spec.rb
-- lib/kuby/docker/tags.rb
 - lib/kuby/docker/timestamp_tag.rb
+- lib/kuby/docker/timestamped_image.rb
 - lib/kuby/docker/webserver_phase.rb
 - lib/kuby/docker/yarn_phase.rb
 - lib/kuby/environment.rb
@@ -274,6 +273,7 @@ files:
 - lib/kuby/plugins/rails_app.rb
 - lib/kuby/plugins/rails_app/asset_copy_task.rb
 - lib/kuby/plugins/rails_app/assets.rb
+- lib/kuby/plugins/rails_app/assets_image.rb
 - lib/kuby/plugins/rails_app/database.rb
 - lib/kuby/plugins/rails_app/generators/kuby.rb
 - lib/kuby/plugins/rails_app/mysql.rb
@@ -282,14 +282,13 @@ files:
 - lib/kuby/plugins/rails_app/rewrite_db_config.rb
 - lib/kuby/plugins/rails_app/sqlite.rb
 - lib/kuby/plugins/rails_app/tasks.rake
-- lib/kuby/rails_commands.rb
 - lib/kuby/railtie.rb
 - lib/kuby/tasks.rb
 - lib/kuby/trailing_hash.rb
 - lib/kuby/version.rb
-- spec/docker/metadata_spec.rb
 - spec/docker/spec_spec.rb
 - spec/docker/timestamp_tag_spec.rb
+- spec/docker/timestamped_image_spec.rb
 - spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
 - spec/dummy/README.md