kontena-cli 1.4.0.pre6 → 1.4.0.pre7

data/spec/fixtures/app.json

@@ -1,42 +0,0 @@
-{
-  "name": "Small Sharp Tool",
-  "description": "This app does one little thing, and does it well.",
-  "keywords": [
-    "productivity",
-    "HTML5",
-    "scalpel"
-  ],
-  "website": "https://small-sharp-tool.com/",
-  "repository": "https://github.com/jane-doe/small-sharp-tool",
-  "logo": "https://small-sharp-tool.com/logo.svg",
-  "success_url": "/welcome",
-  "scripts": {
-    "postdeploy": "bundle exec rake bootstrap"
-  },
-  "env": {
-    "SECRET_TOKEN": {
-      "description": "A secret key for verifying the integrity of signed cookies.",
-      "generator": "secret"
-    },
-    "WEB_CONCURRENCY": {
-      "description": "The number of processes to run.",
-      "value": "5"
-    }
-  },
-  "formation": {
-    "web": {
-      "quantity": 2,
-      "size": "Performance-M"
-    }
-  },
-  "image": "heroku/ruby",
-  "addons": [
-    "openredis",
-    "mongolab:shared-single-small"
-  ],
-  "buildpacks": [
-    {
-      "url": "https://github.com/stomita/heroku-buildpack-phantomjs"
-    }
-  ]
-}

data/spec/fixtures/health.yml

@@ -1,26 +0,0 @@
-web:
-  image: nginx
-  stateful: false
-  health_check:
-    protocol: http
-    port: 80
-    interval: 20
-    uri: /
-    initial_delay: 10
-    timeout: 2
-
-
-mysql:
-  image: mysql
-  stateful: false
-  deploy:
-    strategy: ha
-    wait_for_port: 3306
-  environment:
-    - MYSQL_ALLOW_EMPTY_PASSWORD=true
-  health_check:
-    protocol: tcp
-    port: 3306
-    interval: 20
-    initial_delay: 10
-    timeout: 2

data/spec/fixtures/kontena-build.yml

@@ -1,16 +0,0 @@
-wordpress:
-  build: .
-  image: registry.kontena.local/wordpress:latest
-  stateful: true
-  environment:
-    WORDPRESS_DB_PASSWORD: ${project}_secret
-  instances: 2
-  deploy:
-    strategy: ha
-mysql:
-  extends:
-    file: docker-compose.yml
-    service: mysql
-  stateful: true
-  environment:
-    - MYSQL_ROOT_PASSWORD=${project}_secret

data/spec/fixtures/kontena-internal-extend.yml

@@ -1,8 +0,0 @@
-base:
-  stateful: true
-  instances: 2
-  deploy:
-    strategy: ha
-app:
-  extends: base
-  stateful: true  

data/spec/fixtures/kontena-invalid.yml

@@ -1,4 +0,0 @@
-wordpress:
-  stateful: 'true'
-  environment:
-    WORDPRESS_DB_PASSWORD: ${project}_secret

data/spec/fixtures/kontena-with-env-file.yml

@@ -1,18 +0,0 @@
-wordpress:
-  extends:
-    file: docker-compose.yml
-    service: wordpress
-  stateful: true
-  env_file: .env
-  environment:
-    WORDPRESS_DB_PASSWORD: ${project}_secret
-  instances: 2
-  deploy:
-    strategy: ha
-mysql:
-  extends:
-    file: docker-compose.yml
-    service: mysql
-  stateful: true
-  environment:
-    - MYSQL_ROOT_PASSWORD=${project}_secret

data/spec/fixtures/kontena-with-variables.yml

@@ -1,19 +0,0 @@
-wordpress:
-  extends:
-    file: docker-compose.yml
-    service: wordpress
-  image: "wordpress:$TAG"
-  stateful: true
-  environment:
-    - WORDPRESS_DB_PASSWORD=%{project}_secret
-  instances: 2
-  deploy:
-    strategy: ha
-mysql:
-  extends:
-    file: docker-compose.yml
-    service: mysql
-  image: ${MYSQL_IMAGE}
-  stateful: true
-  environment:
-    - INTERNAL_VAR=$$INTERNAL_VAR

data/spec/fixtures/kontena.yml

@@ -1,17 +0,0 @@
-wordpress:
-  extends:
-    file: docker-compose.yml
-    service: wordpress
-  stateful: true
-  environment:
-    WORDPRESS_DB_PASSWORD: %{project}_secret
-  instances: 2
-  deploy:
-    strategy: ha
-mysql:
-  extends:
-    file: docker-compose.yml
-    service: mysql
-  stateful: true
-  environment:
-    - MYSQL_ROOT_PASSWORD=%{project}_secret

data/spec/fixtures/kontena_build_v2.yml

@@ -1,26 +0,0 @@
-version: '2'
-name: test-project
-services:
-  mysql:
-    extends:
-      file: docker-compose.yml
-      service: mysql
-    stateful: true
-    environment:
-      - MYSQL_ROOT_PASSWORD=%{project}_secret
-
-  webapp:
-    image: webapp
-    build:
-      context: .
-      args:
-        - foo=bar
-        - baz=baf
-
-  some_app:
-    image: some_app
-    build:
-      context: .
-      args:
-        foo: bar
-        baz:

data/spec/fixtures/kontena_numeric_version.yml

@@ -1,9 +0,0 @@
-version: 2
-name: foo
-
-services:
-  bar:
-    image: konttisample
-    build:
-      context: .
-      dockerfile: Dockerfile

data/spec/fixtures/kontena_v2.yml

@@ -1,35 +0,0 @@
-version: '2'
-name: test-project
-services:
-  wordpress:
-    extends:
-      file: docker-compose_v2.yml
-      service: wordpress
-    stateful: true
-    environment:
-      WORDPRESS_DB_PASSWORD: ${project}_secret
-    instances: 2
-    deploy:
-      strategy: ha
-    networks:
-      - front-tier
-      - back-tier
-  mysql:
-    extends:
-      file: docker-compose_v2.yml
-      service: mysql
-    stateful: true
-    environment:
-      - MYSQL_ROOT_PASSWORD=${project}_secret
-    volumes:
-      - mysql-data:/var/lib/mysql
-    networks:
-      - back-tier
-volumes:
-  mysql-data:
-    driver: local
-networks:
-  front-tier:
-    driver: bridge
-  back-tier:
-    driver: bridge

data/spec/fixtures/mysql.yml

@@ -1,3 +0,0 @@
-mysql:
-  image: mysql:5.6
-

data/spec/fixtures/wordpress-scaled.yml

@@ -1,3 +0,0 @@
-wordpress:
-  image: wordpress:latest
-  instances: 2

data/spec/fixtures/wordpress.yml

@@ -1,2 +0,0 @@
-wordpress:
-  image: wordpress:latest

data/spec/kontena/cli/app/build_command_spec.rb

@@ -1,55 +0,0 @@
-require "kontena/cli/apps/build_command"
-
-describe Kontena::Cli::Apps::BuildCommand do
-  include FixturesHelpers
-
-  let(:subject) do
-    described_class.new(File.basename($0))
-  end
-
-  let(:kontena_yml) do
-    fixture('kontena-build.yml')
-  end
-
-  let(:mysql_yml) do
-    fixture('kontena.yml')
-  end
-
-  let(:docker_compose_yml) do
-    fixture('docker-compose.yml')
-  end
-
-  describe '#execute' do
-    before(:each) do
-      allow(subject).to receive(:current_dir).and_return("kontena-test")
-      allow(File).to receive(:exists?).and_return(true)
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
-      allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose.yml").and_return(docker_compose_yml)
-    end
-
-    it 'requests process_docker_images with services from yaml' do
-      expect(subject).to receive(:process_docker_images) do |services, force_build, no_cache|
-        expect(services.keys).to eq(['wordpress', 'mysql'])
-      end
-      subject.run([])
-    end
-
-    it 'requests process_docker_images with force_build' do
-      expect(subject).to receive(:process_docker_images).with(anything, true, anything)
-      subject.run([])
-    end
-
-    it 'requests process_docker_images with given no_cache option' do
-      expect(subject).to receive(:process_docker_images).with(anything, anything, true)
-      subject.run(['--no-cache'])
-    end
-
-    it 'raises error if no services found with build options' do
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(mysql_yml)
-      expect(subject).not_to receive(:process_docker_images)
-      expect {
-        subject.run([])
-      }.to exit_with_error
-    end
-  end
-end

data/spec/kontena/cli/app/common_spec.rb

@@ -1,110 +0,0 @@
-require "kontena/cli/apps/common"
-
-describe Kontena::Cli::Apps::Common do
-  include ClientHelpers
-  include FixturesHelpers
-
-  let(:subject) do
-    Class.new { include Kontena::Cli::Apps::Common}.new
-  end
-
-  let(:kontena_yml) do
-    fixture('kontena.yml')
-  end
-
-  let(:kontena_numeric_version_yml) do
-    fixture('kontena_numeric_version.yml')
-  end
-
-  let(:kontena_v2_yml) do
-    fixture('kontena_v2.yml')
-  end
-
-  let(:docker_compose_yml) do
-    fixture('docker-compose.yml')
-  end
-
-  let(:mysql_yml) do
-    fixture('mysql.yml')
-  end
-
-  let(:health_yml) do
-    fixture('health.yml')
-  end
-
-  let(:services) do
-    {
-      'wordpress' => {
-        'image' => 'wordpress:4.1',
-        'ports' => ['80:80']
-      }
-    }
-  end
-
-  describe '#service_prefix' do
-    it 'returns given project name' do
-      allow(subject).to receive(:project_name).and_return('test')
-      expect(subject.service_prefix).to eq('test')
-    end
-
-    it 'returns app name from yaml if project name not given' do
-      allow(subject).to receive(:project_name).and_return(nil)
-      allow(subject).to receive(:filename).and_return('kontena.yml')
-      allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose_v2.yml").and_return(docker_compose_yml)
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_v2_yml)
-      expect(subject.service_prefix).to eq('test-project')
-    end
-
-    it 'returns current dir as default' do
-      allow(subject).to receive(:project_name).and_return(nil)
-      allow(subject).to receive(:filename).and_return('kontena.yml')
-      allow(subject).to receive(:project_name_from_yaml).and_return(nil)
-      allow(subject).to receive(:current_dir).and_return('working_dir')
-      expect(subject.service_prefix).to eq('working_dir')
-    end
-  end
-
-  describe '#services_from_yaml' do
-    before(:each) do
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
-      allow(File).to receive(:read).with("#{Dir.getwd}/health.yml").and_return(health_yml)
-      allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose.yml").and_return(docker_compose_yml)
-    end
-
-    it 'populates env variables' do
-      services = subject.services_from_yaml('kontena.yml',[],'load-test')
-      expect(ENV['grid']).to eq('test-grid')
-      expect(ENV['project']).to eq('load-test')
-    end
-
-    it 'returns services from given YAML file' do
-      services = subject.services_from_yaml('kontena.yml',[],'')
-      expect(services['wordpress']).not_to be_nil
-    end
-
-    it 'aborts on validation failure' do
-      allow_any_instance_of(Kontena::Cli::Apps::YAML::Validator).to receive(:validate)
-        .and_return({ :errors => [{ 'wordress' => [] }], :notifications => [] })
-      expect { subject.services_from_yaml('kontena.yml',[],'') }.to exit_with_error
-    end
-
-    it 'returns given service from given YAML file' do
-      services = subject.services_from_yaml('kontena.yml',['wordpress'],'')
-      expect(services['wordpress']).not_to be_nil
-      expect(services.size).to eq(1)
-    end
-
-    it 'populates health check' do
-      services = subject.services_from_yaml('health.yml',['web'],'')
-      expect(services['web']).not_to be_nil
-      expect(services['web']['health_check']).not_to be_nil
-    end
-
-    it 'allows version to be numeric' do
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena-numeric-version.yml").and_return(kontena_numeric_version_yml)
-      services = subject.services_from_yaml('kontena-numeric-version.yml', [], '')
-      expect(services.dig('bar', 'build', 'context')).to eq(Dir.pwd)
-      expect(services.dig('bar', 'build', 'dockerfile')).to eq('Dockerfile')
-    end
-  end
-end

data/spec/kontena/cli/app/config_command_spec.rb

@@ -1,78 +0,0 @@
-require "kontena/cli/apps/config_command"
-require 'ruby_dig'
-require 'yaml'
-
-describe Kontena::Cli::Apps::ConfigCommand do
-  include FixturesHelpers
-
-  let(:subject) do
-    described_class.new(File.basename($0))
-  end
-
-  let(:kontena_yml) do
-    fixture('mysql.yml')
-  end
-
-  let(:yaml_with_app_name) do
-    {
-      'version' => '2',
-      'name' => 'myapp',
-      'services' => {
-        'mysql' => {
-          'image' => '$project-mysql:5.6'
-        }
-      }
-    }
-  end
-
-  let(:settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {
-           'name' => 'some_master',
-           'url' => 'some_master'
-         }
-     ]
-    }
-  end
-
-  describe '#execute' do
-    before(:each) do
-      allow(subject).to receive(:settings).and_return(settings)
-      allow(subject).to receive(:current_dir).and_return("kontena-test")
-      allow(File).to receive(:exists?).and_return(true)
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
-    end
-
-    it 'outputs service configs' do
-      valid_output = {
-        'services' => {
-          'mysql' => {
-            'image' => 'mysql:5.6',
-            'stateful' => false
-          }
-        }
-      }
-      expect {
-        subject.run([])
-      }.to output(valid_output.to_yaml).to_stdout
-    end
-
-    it 'uses app name from yaml as project variable' do
-
-      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(yaml_with_app_name.to_yaml)
-      valid_output = {
-        'services' => {
-          'mysql' => {
-            'image' => 'myapp-mysql:5.6',
-            'stateful' => false
-          }
-        }
-      }
-      expect {
-        subject.run([])
-      }.to output(valid_output.to_yaml).to_stdout
-    end
-
-  end
-end