djin 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33934f255ebae5d8738c8f0152d1684eb1ece014c275f596d0e9aeea59c1caac
-  data.tar.gz: 89103ce2b41819ddac02c95b4441eb959ea1d03cd92996deb80012a67c098cc9
+  metadata.gz: 395a6c76f1aac739197b1721dfedca93dfffcfcf456d3fc748fa16f024fb5a94
+  data.tar.gz: c2915512107075ee0fb3bafbfe50033925410241fef29dd54db747a2d0686328
 SHA512:
-  metadata.gz: 2c0c492492dfd58153ae3ff0ee093b09e1c1e5587d6ed8e68b1e9ab4a5dc7aedee7b3c461262731145307cd095750eec01754094265447a8159e6f8a8dc9842f
-  data.tar.gz: 0edeedbd0c7f12e7a09e178847923ace1068ccf5c76db43ac61fe7f8fec65332a805a14b0531d967230fe38e94436a4f25e7119e5c759a08f158a483ef76bc87
+  metadata.gz: 802cfbb81399c9ec9494b98036c7bd5932e735eb028b44ff84abc1ff0f2ff7930fe4d5a2d9b2bdae2b493684289e0e1d8631e570c942c71351321faa641bac85
+  data.tar.gz: 3b895f090fb9c73aac047c234a13191702393cf7fdff8c6b9eb0437daed931e7ae71ba0d6c8113d45b84d6424897309c66f310bfd470f58c955c1b508aa771d9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    djin (0.3.0)
-      dry-cli (~> 0.5.0)
+    djin (0.4.0)
+      dry-cli (~> 0.6.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)
     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)
@@ -31,7 +33,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.5.0)
+    dry-schema (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
@@ -51,7 +53,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.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
@@ -59,7 +61,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 +82,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 +106,7 @@ DEPENDENCIES
   djin!
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -25,7 +25,7 @@ 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'
+djin_version: '0.4.0'
 
 # With a docker image
 script:
@@ -50,7 +50,7 @@ You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.3.0'
+djin_version: '0.4.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -78,6 +78,46 @@ _default_run_options: &default_run_options
 
 After that you can run `djin {{task_name}}`, like `djin script` or `djin test`
 
+## Using Environment variables and custom args in djin.yml run tasks
+
+You can use environment variables using the '{{YOUR_ENV_HERE}}' syntax, like so:
+
+```yaml
+djin_version: '0.4.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+"db:migrate":
+  docker-compose:
+    service: app
+    run:
+      commands: ENV={{ENV}} rake db:migrate
+      <<: *default_run_options
+
+```
+
+It's also possible to pass custom arguments to the command, wich means is possible to make a djin task act like the command itself:
+
+```yaml
+djin_version: '0.4.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+"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.

data/Vertofile

@@ -0,0 +1,44 @@
+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)
+    git!('add lib/djin/version.rb')
+
+    file('README.md').replace_all(latest_version.to_s, new_version.to_s)
+    git!('add README.md')
+
+    sh!('bundle install')
+    sh!('rake install')
+    git!('add Gemfile.lock')
+
+    git!('commit -m "Bumps Version"')
+  }
+}
+

data/djin.gemspec

@@ -26,11 +26,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-struct", "~> 1.3.0"
-  spec.add_dependency "dry-cli", "~> 0.5.0"
-  spec.add_dependency "dry-validation", "~> 1.5.0"
+  spec.add_dependency "dry-cli", "~> 0.6.0"
+  spec.add_dependency "dry-validation", "~> 1.5.1"
   spec.add_dependency "vseries", "~> 0.1.0"
+  spec.add_dependency "mustache", "~> 1.1.1"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "byebug"
 end

data/djin.yml

@@ -16,3 +16,11 @@ sh:
     run:
       commands: "sh"
       <<: *default_run_options
+run:
+  docker-compose:
+    service: app
+    run:
+      commands: "sh -c '{{args}}'"
+      <<: *default_run_options
+
+

data/exe/djin

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+Signal.trap("INT") { exit 2 }
+
 require_relative '../lib/djin'
 
 Djin.load_tasks!

data/lib/djin.rb

@@ -5,6 +5,7 @@ require "dry-struct"
 require "dry-validation"
 require "vseries"
 require "dry/cli"
+require "mustache"
 require "djin/extensions/hash_extensions"
 require "djin/extensions/custom_predicates"
 require "djin/entities/types"
@@ -17,12 +18,12 @@ require "djin/repositories/task_repository"
 
 module Djin
   class Error < StandardError; end
-  # Your code goes here...
 
   def self.load_tasks!(path = Pathname.getwd.join('djin.yml'))
     abort 'Error: djin.yml not found' unless path.exist?
 
     djin_file = YAML.safe_load(path.read, [], [], true)
+
     tasks = Djin::Interpreter.load!(djin_file)
 
     @task_repository = TaskRepository.new(tasks)

data/lib/djin/cli.rb

@@ -9,14 +9,12 @@ module Djin
 
           define_method(:task) { task }
 
-          def call(**options)
-            Executor.new.call(task)
+          def call(args: [], **)
+            Executor.new(args: args).call(task)
           end
         end
 
         register task.name, command
-
-
       end
     end
 

data/lib/djin/executor.rb

@@ -1,7 +1,8 @@
 module Djin
   class Executor
-    def initialize(task_repository: Djin.task_repository)
+    def initialize(task_repository: Djin.task_repository, args: [])
       @task_repository = task_repository
+      @args = args
     end
 
     def call(*tasks)
@@ -22,7 +23,15 @@ module Djin
     end
 
     def run(command)
-      system command
+      command_with_args = Mustache.render(command,
+                                          args: @args.join(' '),
+                                          args?: @args.any?,
+                                          **env)
+      system command_with_args
+    end
+
+    def env
+      @env = ENV.to_h.map {|k,v| [k.to_sym, v]}.to_h
     end
   end
 end

data/lib/djin/version.rb

@@ -1,3 +1,3 @@
 module Djin
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: vseries
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +169,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vertofile
 - bin/console
 - bin/setup
 - djin.gemspec