ddsl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07b6c315e69c2af20ad368cbcf4825675490c3c
-  data.tar.gz: 939717c286543d4dc4b1ab9d5360341fc7998aa1
+  metadata.gz: cc50eec07295a16c3ecd6a8be51092c807574804
+  data.tar.gz: 5d752cc123531436e14ac1697638826a6dc38e9e
 SHA512:
-  metadata.gz: 95daea93b2c47753e9d54c0504a3fba3312a632e04738abb9564fd85c3365c840b86e10d79e3be62e7094a3a562729d8bc7b690bed4c96a52daf90e8ce4f828a
-  data.tar.gz: dbc8baf5444dd9d21e3104c045dadae3cd0be3abd5fb1438e7d988947b3f672ad62bf783f1c4ce559e47b904b658c615fc06459ab2b2fb16b3ebe6ada1f74303
+  metadata.gz: a37dc864649a554971209c92280934618c8140fc8f9b8dbe67153078aaccf6d889c55de6a04f11808835f6d5ca30a65ded1c5de026b4df651ca1e76a0c064e01
+  data.tar.gz: eda8481c21285581092ccafba56b4c8d0bb18143fb3940ced1931b3dcf01630218b78252b84bf21bd1b209096f1fa192baa27b0a33e7011232cef36009de93e7

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+rvm:
+  - 2.4.5
 
 services:
   - docker
@@ -17,15 +19,16 @@ before_install:
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
-  - gem install ddsl --version=$DDSL_VERSION
-  - echo "$TRAVIS_COMMIT"
   - docker login -u "$DOCKER_REGISTRY_USERNAME" -p "$DOCKER_REGISTRY_PASSWORD"
   - export CI_SHA1=travis-$TRAVIS_COMMIT
 
+install: gem install ddsl --version=$DDSL_VERSION
+
 jobs:
   include:
     - stage: build
-      script: ddsl build feature-branch
+      script: |
+        ddsl build feature-branch
     - stage: checks
       script: |
         ddsl run test-ci 

data/README.md

@@ -57,11 +57,11 @@ runs:
 
 ## Contnious Integration
 
-| Provider  | Status                                                                                                                          |
-|-----------|---------------------------------------------------------------------------------------------------------------------------------|
-| GitLab CI |                                                                                                                                 |
-| Circle CI | [![CircleCI](https://circleci.com/gh/bilby91/ddsl/tree/master.svg?style=svg)](https://circleci.com/gh/bilby91/ddsl/tree/master) |
-| Travis CI | [![Build Status](https://travis-ci.com/bilby91/ddsl.svg?branch=master)](https://travis-ci.com/bilby91/ddsl)                     |
+| Provider  | Status                                                                                                                                   |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------|
+| GitLab CI | [![Gitlab CI](https://img.shields.io/gitlab/pipeline/bilby91/ddsl/master.svg)](https://gitlab.com/bilby91/ddsl)                          |
+| Circle CI | [![Circle CI](https://img.shields.io/circleci/project/github/bilby91/ddsl/master.svg)](https://circleci.com/gh/bilby91/ddsl/tree/master) |
+| Travis CI | [![Travis CI](https://img.shields.io/travis/bilby91/ddsl/master.svg)](https://travis-ci.com/bilby91/ddsl)                                |
 
 ## Dependencies
 
@@ -76,7 +76,7 @@ runs:
 - [X] Add CircleCI
 - [X] Add GitLabCI
 - [X] Add TravisCI
-- [ ] Registries?
+- [X] Registries?
 - [ ] Variable sharing/reusing
 - [ ] External secret proviers ? (KMS, Google?)
 

data/docker/Dockerfile

@@ -43,4 +43,4 @@ RUN gem build ddsl.gemspec
 
 # Install binary
 # FIXME: We need to load the version dynamically
-RUN gem install --no-rdoc --no-ri --local ddsl-0.0.2.gem
+RUN gem install --no-rdoc --no-ri --local ddsl-0.0.3.gem

data/lib/ddsl/cli.rb

@@ -15,9 +15,9 @@ module DDSL
       parameter 'NAME ...', 'name of the build', required: true, attribute_name: :names
 
       def execute
-        with_builder(search_targets!('builds')) do |runner, spec|
+        with_command('builds') do |command, spec|
           begin
-            runner.run(spec)
+            command.run(spec)
           rescue DDSL::Shell::ExitStatusError
             $stdout.puts 'Build failed.'
             exit(-1)
@@ -30,9 +30,9 @@ module DDSL
       parameter 'NAME ...', 'name of the run', required: true, attribute_name: :names
 
       def execute
-        with_runner(search_targets!('runs')) do |runner, spec|
+        with_command('runs') do |command, spec|
           begin
-            runner.run(spec)
+            command.run(spec)
           rescue DDSL::Shell::ExitStatusError
             $stdout.puts 'Run failed.'
             exit(-1)
@@ -41,15 +41,22 @@ module DDSL
       end
     end
 
-    private def with_builder(builds)
-      builds.map do |b|
-        yield(builder_for_type(b['type']), b)
+    private def with_command(command_type)
+      collection = search_targets!(command_type)
+
+      login_if_needed
+
+      collection.map do |x|
+        yield(command_class(command_type, x['type']), x)
       end
     end
 
-    private def with_runner(runs)
-      runs.map do |r|
-        yield(runner_for_type(r['type']), r)
+    private def command_class(command, type)
+      case command
+      when 'builds'
+        builder_for_type(type)
+      when 'runs'
+        runner_for_type(type)
       end
     end
 
@@ -71,6 +78,22 @@ module DDSL
       end
     end
 
+    private def login_if_needed
+      parsed_config['registries'].each do |r|
+        Command::Docker::Login.new.run(r) if need_login?(r)
+      end
+    end
+
+    private def need_login?(registry)
+      !registry['use_cache'] || (registry['use_cache'] && !cached_docker_auth?(registry['url']))
+    end
+
+    private def cached_docker_auth?(host)
+      parsed_docker_config['auths'].any? do |url, _|
+        URI.parse(url).host == URI.parse(host).host
+      end
+    end
+
     private def search_targets!(type)
       command_targets = targets(type)
       raise Clamp::UsageError.new('invalid NAME given', type) unless command_targets.count == names.count
@@ -82,14 +105,30 @@ module DDSL
       parsed_config[type].select { |item| names.include? item['name'] }
     end
 
-    private def config_path
-      @config_path ||= config || '.ddsl.yml'
-    end
-
     private def parsed_config
       @parsed_config ||= DDSL::VariableInjector.new(ENV).inject(
         DDSL::Parser.new.parse(config_path)
       )
     end
+
+    private def parsed_docker_config
+      return { 'auths' => [] } unless File.exist?(docker_config_path)
+
+      @parsed_docker_config ||= JSON.parse(
+        File.read(docker_config_path)
+      )
+    end
+
+    private def config_path
+      @config_path ||= config || '.ddsl.yml'
+    end
+
+    private def docker_config_path
+      @docker_config_path ||= File.join(home_path, '.docker', 'config.json')
+    end
+
+    private def home_path
+      %w[HOME HOMEPATH].map { |e| ENV[e] }.compact.first
+    end
   end
 end

data/lib/ddsl/command.rb

@@ -3,5 +3,6 @@
 require_relative './command/docker/build'
 require_relative './command/docker/push'
 require_relative './command/docker/run'
+require_relative './command/docker/login'
 require_relative './command/docker_compose/run'
 require_relative './command/docker_compose/build'

data/lib/ddsl/command/docker/login.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+
+module DDSL
+  module Command
+    module Docker
+      class Login < Base
+        executable 'docker'
+        command 'login'
+
+        options do
+          accept_keys(%w[username password])
+
+          optionize_keys
+          expand_options
+        end
+
+        arguments do
+          accept_keys(%w[url])
+        end
+      end
+    end
+  end
+end

data/lib/ddsl/command/dsl.rb

@@ -47,18 +47,19 @@ module DDSL
       end
 
       module InstanceMethods
-        DEFAULT_TRANSFORMER = ->(_x) { [] }
+        DEFAULT_OPTIONS_TRANSFORMER   = ->(_x) { [] }
+        DEFAULT_ARGUMENTS_TRANSFORMER = ->(_x) { {} }
 
         def executable_options
-          search_ancestor_tree_variable(:@executable_options) || DEFAULT_TRANSFORMER
+          search_ancestor_tree_variable(:@executable_options) || DEFAULT_OPTIONS_TRANSFORMER
         end
 
         def options
-          search_ancestor_tree_variable(:@options) || DEFAULT_TRANSFORMER
+          search_ancestor_tree_variable(:@options) || DEFAULT_OPTIONS_TRANSFORMER
         end
 
         def arguments
-          search_ancestor_tree_variable(:@arguments) || DEFAULT_TRANSFORMER
+          search_ancestor_tree_variable(:@arguments) || DEFAULT_ARGUMENTS_TRANSFORMER
         end
 
         def after_block

data/lib/ddsl/schema.rb

@@ -12,6 +12,11 @@ module DDSL
         type: :integer,
         enum: [1]
       },
+      registries: {
+        type: :array,
+        items: { '$ref': '#/definitions/registry' },
+        default: []
+      },
       builds: {
         type: :array,
         items: { '$ref': '#/definitions/build' }
@@ -22,6 +27,16 @@ module DDSL
       }
     },
     definitions: {
+      registry: {
+        type: :object,
+        required: %i[url username password],
+        properties: {
+          url: { type: :string },
+          username: { type: :string },
+          password: { type: :string },
+          use_cache: { type: :boolean }
+        }
+      },
       build: {
         type: :object,
         required: [:name],

data/lib/ddsl/schema_validator.rb

@@ -8,15 +8,18 @@ module DDSL
     class InvalidError < StandardError; end
 
     #
-    # Validate given data against DDSL schema. If data is not compliant with the schema,
-    # InvalidError will be raised
+    # Validate given data against DDSL schema. Will add any defaults if nil values are found
+    #
+    # @raise [InvalidError] if data is not compliant with the schema,
     #
     # @param [Hash] data
     #
-    # @return [Hash] same data that was given
+    # @return [Hash] data with defaults if appropiate
     #
     def validate!(data)
-      errors = JSON::Validator.fully_validate(DDSL::SCHEMA, data, version: DDSL::SCHEMA_VERSION)
+      errors = JSON::Validator.fully_validate(DDSL::SCHEMA, data,
+                                              version: DDSL::SCHEMA_VERSION,
+                                              insert_defaults: true)
 
       raise InvalidError, errors.join('\n') if errors.count.positive?
 

data/lib/ddsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DDSL
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddsl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -137,6 +137,7 @@ files:
 - lib/ddsl/command.rb
 - lib/ddsl/command/base.rb
 - lib/ddsl/command/docker/build.rb
+- lib/ddsl/command/docker/login.rb
 - lib/ddsl/command/docker/push.rb
 - lib/ddsl/command/docker/run.rb
 - lib/ddsl/command/docker_compose/build.rb