djin 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33934f255ebae5d8738c8f0152d1684eb1ece014c275f596d0e9aeea59c1caac
-  data.tar.gz: 89103ce2b41819ddac02c95b4441eb959ea1d03cd92996deb80012a67c098cc9
+  metadata.gz: 2c1694ef43737efb232e0ec9ae802c573fd1b76262a77c4d729c3abb26b2fa14
+  data.tar.gz: a2c322c54fd3cfee6dcb3e238bb0c97f2f84ce69a55e0697da38497123840072
 SHA512:
-  metadata.gz: 2c0c492492dfd58153ae3ff0ee093b09e1c1e5587d6ed8e68b1e9ab4a5dc7aedee7b3c461262731145307cd095750eec01754094265447a8159e6f8a8dc9842f
-  data.tar.gz: 0edeedbd0c7f12e7a09e178847923ace1068ccf5c76db43ac61fe7f8fec65332a805a14b0531d967230fe38e94436a4f25e7119e5c759a08f158a483ef76bc87
+  metadata.gz: 1951778dbcd47e2f15c2f5cf5300e746b5550f6f1d9284277df61ec567c94f46283673e78b9c7253fa8fe6770ae5ded21b5cec64cf4bff40ad47873fed1a3929
+  data.tar.gz: 1dcb9d493713d32acd50c9c3238723a4a5b3c179383dcaea3b30ae80a6727f32466b296d6866e7a611ad2fa634328a1c26f3219702738fd7491fb36bc5f2074f

data/.github/workflows/ruby.yml

@@ -18,3 +18,17 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
           bundle exec rake
+
+  lint:
+    runs-on: ubuntu-16.04
+    name: Lint
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+      - run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rubocop
+

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_from: .rubocop_todo.yml
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*

data/.rubocop_todo.yml

@@ -0,0 +1,17 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-07-14 01:12:35 UTC using RuboCop version 0.86.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 21
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 19

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.7.0 - 20/08/2020
+ * [FEATURE] Adds description option
+
+## 0.6.1 - 11/08/2020
+ * [TECH] Better Error Handling
+
+## 0.6.0 - 22/07/2020
+ * [FEATURE] Djin Variables
+
+## 0.5.0 - 13/07/2020
+ * [FEATURE] Adds local command task
+ * [FEATURE] Template Args for entire djin.yml
+
+## 0.4.0 - 25/06/2020
+ * [FEATURE] Adds Custom Args and Environment support in djin.yml
+
+## 0.3.1 - 29/05/2020
+ * [PATCH] Handles Ctrl + C
+ * [TECH] Adds Vertofile
+
 ## 0.3.0 - 19/05/2020
  * [FEATURE] Adds Version Option
  * [PATCH] Add task name in djin.yml parse errors

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in djin.gemspec
 gemspec

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    djin (0.3.0)
-      dry-cli (~> 0.5.0)
+    djin (0.7.0)
+      dry-cli (~> 0.6.0)
+      dry-equalizer (~> 0.3.0)
       dry-struct (~> 1.3.0)
-      dry-validation (~> 1.5.0)
+      dry-validation (~> 1.5.1)
+      mustache (~> 1.1.1)
       vseries (~> 0.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
     byebug (11.1.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    dry-cli (0.5.1)
+    dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
-    dry-configurable (0.11.5)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -27,11 +30,11 @@ GEM
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.3)
-    dry-logic (1.0.6)
+    dry-logic (1.0.7)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.5.0)
+    dry-schema (1.5.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
@@ -51,7 +54,7 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.5.0)
+    dry-validation (1.5.3)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
@@ -59,7 +62,14 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
     ice_nine (0.11.2)
+    mustache (1.1.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -73,6 +83,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.86.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
     vseries (0.1.1)
 
 PLATFORMS
@@ -84,6 +107,7 @@ DEPENDENCIES
   djin!
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -1,6 +1,7 @@
 # Djin
 
 ![](https://github.com/catks/djin/workflows/Ruby/badge.svg?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/824a2e78399813543212/maintainability)](https://codeclimate.com/github/catks/djin/maintainability)
 
 Djin is a make-like utility for docker containers
 
@@ -25,64 +26,164 @@ If you use Rbenv you can install djin only once and create a alias in your .basr
 To use djin first you need to create a djin.yml file:
 
 ```yaml
-djin_version: '0.3.0'
-
-# With a docker image
-script:
-  docker:
-    image: "ruby:2.6"
-    run:
-      commands:
-        - "ruby /scripts/my_ruby_script.rb"
-      options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
-
-# Using a docker-compose service
-test:
+djin_version: '0.7.0'
+
+tasks:
+  # With a docker image
+  script:
+    docker:
+      image: "ruby:2.6"
+      run:
+        commands:
+          - "ruby /scripts/my_ruby_script.rb"
+        options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
+
+  # Using a docker-compose service
+  test:
   docker-compose:
     service: app
     run:
       commands: rspec
       options: "--rm"
-
 ```
 
 You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.3.0'
+djin_version: '0.7.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
 
-"db:create":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:create
-      <<: *default_run_options
+tasks: 
+  "db:create":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:create
+        <<: *default_run_options
+
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:migrate
+        <<: *default_run_options
+
+  "db:setup":
+    depends_on:
+      - "db:create"
+      - "db:migrate"
+```
 
-"db:migrate":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:migrate
-      <<: *default_run_options
+Or mix local commands and docker/docker-compose commands:
 
-"db:setup":
-  depends_on:
-    - "db:create"
-    - "db:migrate"
+```yaml
+djin_version: '0.7.0'
 
+_default_run_options: &default_run_options
+  options: "--rm"
+
+tasks:
+  "db:create":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:create
+        <<: *default_run_options
+
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:migrate
+        <<: *default_run_options
+
+  "setup:copy_samples":
+    local:
+      run:
+        - cp config/database.yml.sample config/database.yml
+
+  "setup":
+    depends_on:
+      - "setup:copy_samples"
+      - "db:create"
+      - "db:migrate"
 ```
 
 After that you can run `djin {{task_name}}`, like `djin script` or `djin test`
 
+## Using Environment variables, custom variables and custom args in djin.yml tasks
+
+You can also use environment variables using the '{{YOUR_ENV_HERE}}' syntax, like so:
+
+```yaml
+djin_version: '0.7.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+tasks:
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: ENV={{ENV}} rake db:migrate
+        <<: *default_run_options
+
+```
+
+Or define some variables to use in multiple locations
+```yaml
+djin_version: '0.7.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+variables:
+  my_ssh_user: user
+  some_host: test.local
+
+tasks:
+  "some_host:ssh":
+    local:
+      run:
+        - ssh {{my_ssh_user}}@{{some_host}}
+
+  "some_host:logs":
+    local:
+      run:
+        - ssh -t {{my_ssh_user}}@{{some_host}} 'tail -f /var/log/syslog'
+```
+
+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.7.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+tasks:
+  "rubocop":
+    docker-compose:
+      service: app
+      run:
+        commands: rubocop {{args}}
+        <<: *default_run_options
+
+```
+
+With that you can pass custom args after `--`, eg: `djin rubocop -- --parallel`, which wil make djin runs `rubocop --parallel` inside the service `app`.
+
+Under the hood djin uses [Mustache](https://mustache.github.io/), so you can use other features like conditionals: `{{#IS_ENABLE}} Enabled {{/IS_ENABLE}}` (for args use the `args?`, eg: `{{#args?}} {{args}} --and-other-thing{{/args?}}`), to see more more options you can access this [Link](https://mustache.github.io/mustache.5.html)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, run `djin release -- {{increment_option}}` (where {{incremment_option}} can be `--patch`, `--minor` or `major`), which will change version, update the CHANGELOG.md, create a new commit, create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## TODO:
 

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require_relative "lib/djin"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require_relative 'lib/djin'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 desc 'Djin REPL'
 task :console do

data/Vertofile

@@ -0,0 +1,45 @@
+verto_version '0.8.0'
+
+config {
+  version.prefix = 'v' # Adds a version_prefix
+  git.pull_before_tag_creation = true
+  git.push_after_tag_creation = true
+}
+
+context(branch('master')) {
+  before_command_tag_up {
+    command_options.add(filter: 'release_only')
+  }
+
+  before_tag_creation {
+    version_changes = sh(
+      %q#git log --oneline --decorate  | grep -B 100 -m 1 "tag:" | grep "pull request" | awk '{print $1}' | xargs git show --format='%b' | grep -v Approved | grep -v "^$" | grep -E "^[[:space:]]*\[.*\]" | sed 's/^[[:space:]]*\(.*\)/ * \1/'#, output: false
+     ).output
+
+    puts "---------------------------"
+    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
+    exit unless confirm("Create new Realease?\n" \
+      "---------------------------\n" \
+      "#{version_changes}" \
+      "---------------------------\n"
+    )
+
+    # CHANGELOG
+    file('CHANGELOG.md').prepend(version_changes)
+    git!('add CHANGELOG.md')
+
+    file('lib/djin/version.rb').replace(latest_version.to_s, new_version.to_s)
+    file('djin.yml').replace(latest_version.to_s, new_version.to_s)
+    file('examples/djin.yml').replace(latest_version.to_s, new_version.to_s)
+    file('README.md').replace_all(latest_version.to_s, new_version.to_s)
+
+    git!('add lib/djin/version.rb djin.yml examples/djin.yml README.md')
+
+    sh!('bundle install')
+    sh!('rake install')
+    git!('add Gemfile.lock')
+
+    git!('commit -m "Bumps Version"')
+  }
+}
+