djin 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e54a9af2cfce75467f847bac4a279fbf97e502b3a4da93341f81d115fe80ce
-  data.tar.gz: d81ff6e9205f17290b7abf7b55754caef024bce6655fc0ed612a39c358810c59
+  metadata.gz: 334bacc0c5681d6f6f231afaaa65c8be71a6d8c9f6c0aa1d2c77a830328285df
+  data.tar.gz: 123947c969381b5bdca2e5a66635333f8f5f63ab771833cfccfbc8a1ee5d7efe
 SHA512:
-  metadata.gz: 5266c1fe3fe4ce7c65e33f22f714c46e117722a455a096a3bbab04c99d19e2ed079b9896c4a98551ef115347e81e5e97032289303f045e3693c6e7bd6a0ba056
-  data.tar.gz: 1e12eeb951e19ecf6f1be10ad442979677d638c53139e9ad4b387f6258ee5ea8909c143bd33cf4fe21eca46da02e37c920a75cc5f924e73f964796f69d131483
+  metadata.gz: fab86e9ee5d886fc8e9717df718af42fe8694dc7bbcb0911699b987da94f3faecbdb29112af212152d3050b9a8919558a09af05afccc75ec89380556c38f7141
+  data.tar.gz: 22445b50834c0d054c5d1bc5caea641ab2f8361f9c0c7862773281e37be68269ad27743a25de4eb5277d77ae29a693e009ad19def31e138f2ad55eef93dd16f1

data/.github/workflows/ruby.yml

@@ -4,7 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         ruby: [ '2.5', '2.6', '2.7' ]
@@ -20,7 +20,7 @@ jobs:
 
       - name: Build
         run: |
-          docker-compose -p djin_ruby_${{ matrix.ruby }} build --build-arg ${{ matrix.ruby }} app
+          docker-compose -p djin_ruby_${{ matrix.ruby }} build --build-arg RUBY_VERSION=${{ matrix.ruby }} app
 
       - name: Run tests
         run: |
@@ -34,7 +34,7 @@ jobs:
           docker-compose -p djin_ruby_${{ matrix.ruby }} run --rm app 'export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}" && ./cc-test-reporter after-build -r ${{secrets.CC_TEST_REPORTER_ID}}'
 
   lint:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     name: Lint
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.11.7 - 27/10/2021
+ * [FIX] Djin Dependencies
+ * [TECH][FIX] Ruby Versions in CI
+ * [FIX] Version Error Message
+
 ## 0.11.6 - 26/02/2021
  * [FIX] Enable ssh and file repositories in include option
 

data/Dockerfile

@@ -1,5 +1,5 @@
 ARG RUBY_VERSION
-FROM ruby:${RUBY_VERSION:-2.6.5}-alpine AS builder
+FROM ruby:${RUBY_VERSION:-2.6}-alpine3.12 AS builder
 
 ENV BUILD_PACKAGES build-base git
 ENV DEV_PACKAGES bash

data/Gemfile.lock

@@ -1,11 +1,16 @@
 PATH
   remote: .
   specs:
-    djin (0.11.6)
+    djin (0.11.7)
       dry-cli (~> 0.6.0)
+      dry-configurable (~> 0.9.0)
+      dry-container (~> 0.7.0)
+      dry-core (~> 0.6.0)
       dry-equalizer (~> 0.3.0)
+      dry-inflector (~> 0.1.0)
+      dry-schema (~> 1.6.0)
       dry-struct (~> 1.3.0)
-      dry-validation (~> 1.5.1)
+      dry-validation (= 1.5.1)
       git (~> 1.8.1)
       mustache (~> 1.1.1)
       vseries (~> 0.1.0)
@@ -26,21 +31,21 @@ GEM
     docile (1.3.2)
     dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
-    dry-configurable (0.12.1)
+    dry-configurable (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
+      dry-core (~> 0.4, >= 0.4.7)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
+    dry-inflector (0.1.2)
     dry-initializer (3.0.4)
-    dry-logic (1.1.0)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.6.1)
+    dry-schema (1.6.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.5, >= 0.5)
@@ -58,13 +63,13 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.5.6)
+    dry-validation (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.5, >= 1.5.2)
+      dry-schema (~> 1.5)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
     git (1.8.1)
@@ -79,10 +84,10 @@ GEM
     parser (2.7.1.4)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.6)
     rchardet (1.8.0)
     regexp_parser (1.7.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -133,4 +138,4 @@ DEPENDENCIES
   simplecov (~> 0.17.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.24

data/README.md

@@ -27,7 +27,7 @@ If you use Rbenv you can install djin only once and create an alias in your .bas
 To use djin first you need to create a djin.yml file:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 tasks:
   # With a docker image
@@ -54,7 +54,7 @@ You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -83,7 +83,7 @@ tasks:
 Or mix local commands and docker/docker-compose commands:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -122,7 +122,7 @@ After that you can run `djin {{task_name}}`, like `djin script` or `djin test`
 You can also use environment variables using the '{{YOUR_ENV_HERE}}' syntax, like so:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -139,7 +139,7 @@ tasks:
 
 Or define some variables to use in multiple locations
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -163,7 +163,7 @@ tasks:
 It's also possible to pass custom arguments to the command, which means is possible to make a djin task act like the command itself:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -189,7 +189,7 @@ Under the hood djin uses [Mustache](https://mustache.github.io/), so you can use
 If you have multiple tasks with similar behavior and with small differences you can use the `include` keyword, so this:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 tasks:
   "host1:ssh":
@@ -228,7 +228,7 @@ can become this:
 
 ```yaml
 # djin.yml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 include:
   - file: '.djin/server_tasks.yml'
@@ -250,7 +250,7 @@ include:
 
 ```yaml
 # .djin/server_tasks.yml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 tasks:
   "{{namespace}}:ssh":
@@ -272,7 +272,7 @@ tasks:
 You can also reuse tasks in some git repository, to do that you need to declare a git source and optionally a version:
 
 ```yaml
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 include:
   - git: 'https://github.com/catks/djin.git'
@@ -315,10 +315,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## TODO
 
-1. Enable multiple -f options to merge configuration between files
-2. Option to export tasks to Makefile
-3. djin-export docker image to create and sync makefiles
-4. include a key option to add tasks in git repositories files (maybe with a local cache)
+1. Option to export tasks to Makefile
+2. djin-export docker image to create and sync makefiles
+
 
 ## Contributing
 

data/djin.gemspec

@@ -28,9 +28,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-cli', '~> 0.6.0'
+  spec.add_dependency 'dry-configurable', '~> 0.9.0'
+  spec.add_dependency 'dry-container', '~> 0.7.0'
+  spec.add_dependency 'dry-core', '~> 0.6.0'
   spec.add_dependency 'dry-equalizer', '~> 0.3.0'
+  spec.add_dependency 'dry-inflector', '~> 0.1.0'
+  spec.add_dependency 'dry-schema', '~> 1.6.0'
   spec.add_dependency 'dry-struct', '~> 1.3.0'
-  spec.add_dependency 'dry-validation', '~> 1.5.1'
+  spec.add_dependency 'dry-validation', '= 1.5.1'
   spec.add_dependency 'git', '~> 1.8.1'
   spec.add_dependency 'mustache', '~> 1.1.1'
   spec.add_dependency 'vseries', '~> 0.1.0'

data/examples/djin.yml

@@ -1,5 +1,5 @@
 ---
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 include:
   - file: 'djin_lib/test.yml'

data/examples/djin_lib/test.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"

data/examples/local_tasks/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 include:
   - file: '.djin/server_tasks.yml'

data/examples/remote_tasks/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.6'
+djin_version: '0.11.7'
 
 include:
   - git: 'https://gitserver/myrepo.git'

data/lib/djin/config_loader.rb

@@ -161,7 +161,7 @@ module Djin
 
       return if file_config.version_supported?
 
-      raise VersionNotSupportedError, "Version #{version} is not supported, use #{Djin::VERSION} or higher"
+      raise VersionNotSupportedError, "Version #{version} is not supported, the current version is #{Djin::VERSION}"
     end
 
     def validate_missing_config!

data/lib/djin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Djin
-  VERSION = '0.11.6'
+  VERSION = '0.11.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +126,14 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
@@ -273,8 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: djin is a make-like utility for docker containers