djin 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bdfb8fd785c550c478fc40887e41c1b60cea1c5fa7348661a4d8042053a76c
-  data.tar.gz: 375b1702c5056a567495108549bf7c8eb6dbe554a6c175a823b142b30a83739a
+  metadata.gz: 73e54a9af2cfce75467f847bac4a279fbf97e502b3a4da93341f81d115fe80ce
+  data.tar.gz: d81ff6e9205f17290b7abf7b55754caef024bce6655fc0ed612a39c358810c59
 SHA512:
-  metadata.gz: 25e1ebd2bbba35409ccd291b9c8a3ca0335e6f7a8f923c2a2c4865c957134e1dcc856346be0474ea701976d673970a688d440d7bfc756b1d6370ee1154907fb3
-  data.tar.gz: df8de9e96bd1e5bf7f96b3ec63e8df222d6f650f2f8e6a33af5da979ab0d496807f9e52fa68092e6e5726ba65f7725d4115cd2b4106f9bfd0985b9ae6158eee6
+  metadata.gz: 5266c1fe3fe4ce7c65e33f22f714c46e117722a455a096a3bbab04c99d19e2ed079b9896c4a98551ef115347e81e5e97032289303f045e3693c6e7bd6a0ba056
+  data.tar.gz: 1e12eeb951e19ecf6f1be10ad442979677d638c53139e9ad4b387f6258ee5ea8909c143bd33cf4fe21eca46da02e37c920a75cc5f924e73f964796f69d131483

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.6 - 26/02/2021
+ * [FIX] Enable ssh and file repositories in include option
+
 ## 0.11.5 - 23/02/2021
  * [FIX] Aborting when dependent task fail
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    djin (0.11.5)
+    djin (0.11.6)
       dry-cli (~> 0.6.0)
       dry-equalizer (~> 0.3.0)
       dry-struct (~> 1.3.0)

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.5'
+djin_version: '0.11.6'
 
 tasks:
   # With a docker image
@@ -54,7 +54,7 @@ You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.11.5'
+djin_version: '0.11.6'
 
 _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.5'
+djin_version: '0.11.6'
 
 _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.5'
+djin_version: '0.11.6'
 
 _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.5'
+djin_version: '0.11.6'
 
 _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.5'
+djin_version: '0.11.6'
 
 _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.5'
+djin_version: '0.11.6'
 
 tasks:
   "host1:ssh":
@@ -228,7 +228,7 @@ can become this:
 
 ```yaml
 # djin.yml
-djin_version: '0.11.5'
+djin_version: '0.11.6'
 
 include:
   - file: '.djin/server_tasks.yml'
@@ -250,7 +250,7 @@ include:
 
 ```yaml
 # .djin/server_tasks.yml
-djin_version: '0.11.5'
+djin_version: '0.11.6'
 
 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.5'
+djin_version: '0.11.6'
 
 include:
   - git: 'https://github.com/catks/djin.git'

data/djin.yml

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

data/examples/djin.yml

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

data/examples/djin_lib/test.yml

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

data/examples/local_tasks/djin.yml

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

data/examples/remote_tasks/djin.yml

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

data/lib/djin/include_contract.rb

@@ -5,6 +5,8 @@ module Djin
     using Djin::ObjectExtensions
 
     GIT_URI_REGEXP = Regexp.new('(\w+://)(.+@)*([\w\d\.]+)(:[\d]+){0,1}/*(.*)')
+    GIT_SSH_REGEXP = Regexp.new('(.+@)+([\w\d\.]+):(.*)')
+    GIT_FILE_REGEXP = Regexp.new('file://(.*)')
 
     ContextSchema = Dry::Schema.Params do
       optional(:variables).filled(:hash)
@@ -21,9 +23,17 @@ module Djin
     end
 
     rule(:git) do
-      key.failure("Invalid git uri in: #{value}") if value.present? && !GIT_URI_REGEXP.match?(value)
+      key.failure("Invalid git uri in: #{value}") if value.present? && !valid_git_repository_path?(value)
     end
 
     # TODO: Add more validations to file and to restricted unespected keys
+    #
+    private
+
+    def valid_git_repository_path?(path)
+      [GIT_URI_REGEXP,
+       GIT_SSH_REGEXP,
+       GIT_FILE_REGEXP].any? { |regexp| regexp.match?(path) }
+    end
   end
 end

data/lib/djin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli