djin 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06daa5a16dcd5adf9e7ff60d976689fbe7e146cf58f708b97d3fea8de2113599
-  data.tar.gz: e36aad9524a35db424096893fc2f817306c25160b8afea4fb19bd7c1951053fc
+  metadata.gz: b8b751c3b121d17a2b12ff1a74150298fb04e6a5a412a4b8def42992f7008804
+  data.tar.gz: b178db2c40895920abf006f9c3ac2d73af23d789651642096e9e30ef38a6c099
 SHA512:
-  metadata.gz: 071abc594f4ee1ac16f3983550abba863fb22594afba6c2a0d1b54b92888feb8eda51f55445d6562f061f065b5da12b55e4a964dbe863e33227fb3e421e13cab
-  data.tar.gz: 118d467194cbcad067c942e692794ac48afbcd4295183971e9a3a3c3ef41aec4ec2d693da83e7f86686e70cdfe9369458ae0eee319258b3dd8d3eb54f0761893
+  metadata.gz: b4c9807ae25080ec6cb2f6118b6a1d24ccccecf7b1205a677dfffb79d178668f69cf373213360e877a3fc2f2f7a9f901bfab6e7517490c59adf7d6c586b5c853
+  data.tar.gz: feec1ba8678b52c50f8d7bb12fd218e4bf08e147aee7ca7a634673b6f6abd76b6c4f1fe2fe4e0f902cb028deb1ae76c1a738339d46c44a81271cf8db7d1e23c3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.1 - 15/01/2021
+ * [FIX] remote-config fetch with same repo reference
+
 ## 0.11.0 - 14/01/2021
  * [FEATURE] Remote Configs
  * [TECH] Adds Test Coverage

data/Gemfile.lock

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

data/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.0'
+djin_version: '0.11.1'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"
@@ -41,5 +41,6 @@ tasks:
   release:
     local:
       run:
+        - (source ~/.zshrc || true)
         - verto tag up {{args}}
         - bundle exec rake release

data/examples/djin.yml

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

data/examples/djin_lib/test.yml

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

data/examples/local_tasks/djin.yml

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

data/examples/remote_tasks/djin.yml

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

data/lib/djin/repositories/remote_config_repository.rb

@@ -23,11 +23,12 @@ module Djin
     end
 
     def fetch_all
-      remote_configs.each do |rc|
+      remote_configs_by_folders.each do |rc|
         git_folder = base_path.join(rc.folder_name).expand_path
 
         # TODO: Extract STDEER Output, maybe publishing events and subscribing a observer for the logs.
         stderr.puts "Remote Path: #{base_path.expand_path}"
+
         git_repo = rc.missing? ? clone_repo(git_folder, rc) : fetch_repo(git_folder, rc)
 
         stderr.puts "Checking out to '#{rc.version}'"
@@ -37,7 +38,7 @@ module Djin
     end
 
     def clear
-      remote_configs.each do |rc|
+      remote_configs_by_folders.each do |rc|
         git_folder = base_path.join(rc.folder_name)
 
         stderr.puts "Removing #{rc.folder_name} repository..."
@@ -57,6 +58,13 @@ module Djin
 
     attr_accessor :stderr
 
+    def remote_configs_by_folders
+      @remote_configs_by_folders ||= remote_configs
+                                     .group_by(&:folder_name)
+                                     .values
+                                     .map(&:first)
+    end
+
     def remove_remote_folder
       stderr.puts "Removing #{base_path}..."
       `rm -rf #{base_path}`
@@ -64,7 +72,7 @@ module Djin
 
     def clone_repo(git_folder, remote_config)
       stderr.puts "Missing #{remote_config.folder_name} repository, cloning in #{git_folder}"
-      Git.clone(remote_config.git, git_folder, progress: true)
+      Git.clone(remote_config.git.to_s, git_folder.to_s, branch: remote_config.version)
     end
 
     def fetch_repo(git_folder, remote_config)

data/lib/djin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -270,7 +270,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: djin is a make-like utility for docker containers