caracara 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15da2ac62e35cf7c36e706c8077614dd95ed406f
-  data.tar.gz: 1c302df1c0c89abe82c15d283f5a56ffab94f45c
+  metadata.gz: 38f11b7e5046f36a5e073b2121fd0092e112db24
+  data.tar.gz: 19139ef72f333155cd5e557e6e2dd0853e64a14b
 SHA512:
-  metadata.gz: 085821827214b725660fa39709bad08de4b92a1f0d9e793e9a5218374c76cd13dc9bb9330b2208c89c9825f3c4647891de3e24018f58cb723fa135b6b33f549a
-  data.tar.gz: 47c576f6485bd23f6d077187a4f88f69d68b78393dea6beb3186c781407d134450976f5f48d8397b655424a4fb907291dc490bc0adb95b6b6c60e6d6933db85e
+  metadata.gz: 8759b163b1139a15b127feb70edcdd1bc49f8942b9fb492555281e3c813d8ec0436d88f65f977934b08c70a86b7c8efa14cdf166f64c548cc38c0df5b030f375
+  data.tar.gz: 6184d8f96e7b0d20d2e034168faea6754959e95795ccf3210263fdd61cbb5ccc65649d29dcf653012593784a8a02265a6c55448d86001f6fda12d7429c7d0e82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    caracara (0.3.1)
+    caracara (0.4.0)
       mustache (~> 1.0)
 
 GEM

data/README.md

@@ -1,4 +1,4 @@
-# Caracara [![Build Status](https://travis-ci.org/gabrielcorado/caracara.svg)](https://travis-ci.org/gabrielcorado/caracara)
+# Caracara [![Build Status](https://travis-ci.org/gabrielcorado/caracara.svg)](https://travis-ci.org/gabrielcorado/caracara) [![Gem Version](https://badge.fury.io/rb/caracara.svg)](http://badge.fury.io/rb/caracara)
 Task runner based on [Envoy](http://laravel.com/docs/5.1/envoy) and [Mina](http://mina-deploy.github.io/mina/)
 
 # Concepts

data/lib/caracara/task.rb

@@ -5,9 +5,13 @@ module Caracara
     # Task steps
     @steps = []
 
+    # Fixed options
+    @fixed_options = {}
+
     # Initialize
-    def initialize(steps, args = {})
+    def initialize(steps, fixed_options = {}, args = {})
       @steps = steps
+      @fixed_options = fixed_options
       @options = args
     end
 
@@ -22,7 +26,10 @@ module Caracara
       options = @options.merge args
 
       # Each the steps
-      @steps.map do |step|
+      @steps.map.with_index do |step, index|
+        # Append with the fixed options
+        options = options.merge(@fixed_options[index]) unless @fixed_options[index].nil?
+
         # Compile the mustache template
         Mustache.render step, options
       end
@@ -35,8 +42,8 @@ module Caracara
 
     # Static methods
     class << self
-      # Task steps
-      attr_reader :steps
+      # Static attributes
+      attr_reader :steps, :fixed_options
 
       # Run steps inside a dir
       def dir(name, &blk)
@@ -54,23 +61,42 @@ module Caracara
       end
 
       # Add a step
-      def step(cmd)
+      def step(cmd, fixed_options = {})
         # Define the step
         @steps = [] if @steps.nil?
 
+        # Define the step
+        @fixed_options = {} if @fixed_options.nil?
+
         # Add a new step
-        return @steps.push(cmd) if cmd.is_a?(String)
+        if cmd.is_a?(String)
+          # Push step and get the index
+          index = @steps.push(cmd).length - 1
+
+          # Add fixed options
+          @fixed_options[index] = fixed_options
+
+          # Default return
+          return @steps
+        end
 
         # If it is another task
         cmd.steps.each do |task_cmd|
-          @steps.push task_cmd
+          # Push and get the index
+          index = @steps.push(task_cmd).length - 1
+
+          # Add fixed options
+          @fixed_options[index] = fixed_options
         end
+
+        # Default return
+        @steps
       end
 
       # Initialize a task
       def init(args = {})
         # Create a new instance
-        new @steps, args
+        new @steps, @fixed_options, args
       end
     end
   end

data/lib/caracara/version.rb

@@ -1,5 +1,5 @@
 module Caracara
   def self.version
-    '0.3.1'
+    '0.4.0'
   end
 end

data/spec/caracara/task_spec.rb

@@ -10,7 +10,7 @@ class TaskSpec < Caracara::Task
   step SharedTask
 
   step 'mkdir {{folder.name}}/'
-  step 'chown -R {{user}} {{folder.name}}'
+  step 'chown -R {{user}} {{folder.name}}', user: 'forcedUser'
   step 'chmod -R {{folder.permission}} {{folder.name}}/'
 
   dir '{{folder.name}}' do
@@ -50,7 +50,7 @@ describe 'Task' do
     # Assertions
     expect(steps[0]).to eq("echo \"Im doing some tasks with Caracara\"")
     expect(steps[1]).to eq('mkdir niceFolder/')
-    expect(steps[2]).to eq('chown -R ubuntu niceFolder')
+    expect(steps[2]).to eq('chown -R forcedUser niceFolder')
     expect(steps[3]).to eq('chmod -R 755 niceFolder/')
     expect(steps[4]).to eq("(cd niceFolder && (echo \"Im doing some tasks with Caracara\"\\necho \"Some nice text!\" > file.txt))")
   end
@@ -66,7 +66,7 @@ describe 'Task' do
     # Assertions
     expect(steps[0]).to eq("echo \"Im doing some tasks with Caracara\"")
     expect(steps[1]).to eq('mkdir argsFolder/')
-    expect(steps[2]).to eq('chown -R root argsFolder')
+    expect(steps[2]).to eq('chown -R forcedUser argsFolder')
     expect(steps[3]).to eq('chmod -R 655 argsFolder/')
     expect(steps[4]).to eq("(cd argsFolder && (echo \"Im doing some tasks with Caracara\"\\necho \"Some nice text!\" > file.txt))")
   end
@@ -76,6 +76,6 @@ describe 'Task' do
     command = task.command
 
     # Assertions
-    expect(command).to eq("echo\\ \\\"Im\\ doing\\ some\\ tasks\\ with\\ Caracara\\\"'\n'mkdir\\ niceFolder/'\n'chown\\ -R\\ ubuntu\\ niceFolder'\n'chmod\\ -R\\ 755\\ niceFolder/'\n'\\(cd\\ niceFolder\\ \\&\\&\\ \\(echo\\ \\\"Im\\ doing\\ some\\ tasks\\ with\\ Caracara\\\"\\\\necho\\ \\\"Some\\ nice\\ text\\!\\\"\\ \\>\\ file.txt\\)\\)")
+    expect(command).to eq("echo\\ \\\"Im\\ doing\\ some\\ tasks\\ with\\ Caracara\\\"'\n'mkdir\\ niceFolder/'\n'chown\\ -R\\ forcedUser\\ niceFolder'\n'chmod\\ -R\\ 755\\ niceFolder/'\n'\\(cd\\ niceFolder\\ \\&\\&\\ \\(echo\\ \\\"Im\\ doing\\ some\\ tasks\\ with\\ Caracara\\\"\\\\necho\\ \\\"Some\\ nice\\ text\\!\\\"\\ \\>\\ file.txt\\)\\)")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracara
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Gabriel Corado