caracara 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50c26f77f84e931ddaebccefcf04be5719db1d2
-  data.tar.gz: a47824aa31549922404bbf7e8db756d1a5863d0b
+  metadata.gz: 1e6b75d677c18a7a16ae131f4db608651df8e9af
+  data.tar.gz: e166ae41ca6419c679fa90a5268de608bcbfc66e
 SHA512:
-  metadata.gz: 99d8b2ca1a4dbf51238c9afab8bac90975cf56acb54be4c8c2de8d8c8a8b7207ec16b47f14352a73443cf0482a32b377e797e1badba2f7c273f8c884519d252c
-  data.tar.gz: becec1267fed45c615b97e4c0f65b213d96bee7d89ee415d84063bf11b3d39e7a4b2bfccb5f1e39ee75b078cbf2b4834ee9ad037c74fd653d24edf9013abc247
+  metadata.gz: c3be139eb8c16ce3b4d20768b3a7ded1f7331b9d80c75b71694782c4198e53cc7180334400e1cb98a5e35659ef425ab46daf7b1095b45021a2d6ab24879a40c6
+  data.tar.gz: 573a95094a1d476209cffb7a3b4f2063cd7988fdfc1fc5afd46c5ab1430b4095bb07f5cae26097a6e0a5e4eef4e2366f7790a3471c0baaef07ededba182379d2

data/Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    caracara (0.1.0)
+    caracara (0.2.0)
       mustache (~> 1.0)
-      rake
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
     mustache (1.0.2)
-    rake (10.4.2)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)

data/lib/caracara/task.rb

@@ -59,7 +59,12 @@ module Caracara
         @steps = [] if @steps.nil?
 
         # Add a new step
-        @steps.push cmd
+        return @steps.push(cmd) if cmd.is_a?(String)
+
+        # If it is another task
+        cmd.steps.each do |task_cmd|
+          @steps.push task_cmd
+        end
       end
 
       # Initialize a task

data/lib/caracara/version.rb

@@ -1,5 +1,5 @@
 module Caracara
   def self.version
-    '0.2.0'
+    '0.3.0'
   end
 end

data/spec/caracara/task_spec.rb

@@ -1,23 +1,24 @@
 # Include the helper
 require 'spec_helper'
 
+class SharedTask < Caracara::Task
+  step 'echo "Im doing some tasks with Caracara"'
+end
+
 # Class definitions
 class TaskSpec < Caracara::Task
+  step SharedTask
+
   step 'mkdir {{folder.name}}/'
   step 'chown -R {{user}} {{folder.name}}'
   step 'chmod -R {{folder.permission}} {{folder.name}}/'
 
   dir '{{folder.name}}' do
+    step SharedTask
     step 'echo "{{text}}" > file.txt'
   end
 end
 
-class TaskTwoSpec < Caracara::Task
-  step 'mkdir {{folder.name}}/'
-  step 'chown -R {{user}} {{folder.name}}'
-  step 'chmod -R {{folder.permission}} {{folder.name}}/'
-end
-
 # Tests
 describe 'Task' do
   # Initialize the task
@@ -35,10 +36,11 @@ describe 'Task' do
     steps = task.steps
 
     # Assertions
-    expect(steps[0]).to eq('mkdir {{folder.name}}/')
-    expect(steps[1]).to eq('chown -R {{user}} {{folder.name}}')
-    expect(steps[2]).to eq('chmod -R {{folder.permission}} {{folder.name}}/')
-    expect(steps[3]).to eq('(cd {{folder.name}} && (echo "{{text}}" > file.txt))')
+    expect(steps[0]).to eq("echo \"Im doing some tasks with Caracara\"")
+    expect(steps[1]).to eq('mkdir {{folder.name}}/')
+    expect(steps[2]).to eq('chown -R {{user}} {{folder.name}}')
+    expect(steps[3]).to eq('chmod -R {{folder.permission}} {{folder.name}}/')
+    expect(steps[4]).to eq("(cd {{folder.name}} && (echo \"Im doing some tasks with Caracara\"\\necho \"{{text}}\" > file.txt))")
   end
 
   it 'should compile the steps' do
@@ -46,10 +48,11 @@ describe 'Task' do
     steps = task.compile
 
     # Assertions
-    expect(steps[0]).to eq('mkdir niceFolder/')
-    expect(steps[1]).to eq('chown -R ubuntu niceFolder')
-    expect(steps[2]).to eq('chmod -R 755 niceFolder/')
-    expect(steps[3]).to eq('(cd niceFolder && (echo "Some nice text!" > file.txt))')
+    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[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
 
   it 'should compile the steps using specific args' do
@@ -61,10 +64,11 @@ describe 'Task' do
                          }
 
     # Assertions
-    expect(steps[0]).to eq('mkdir argsFolder/')
-    expect(steps[1]).to eq('chown -R root argsFolder')
-    expect(steps[2]).to eq('chmod -R 655 argsFolder/')
-    expect(steps[3]).to eq('(cd argsFolder && (echo "Some nice text!" > file.txt))')
+    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[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
 
   it 'should generate the SSH command' do
@@ -72,6 +76,6 @@ describe 'Task' do
     command = task.command
 
     # Assertions
-    expect(command).to eq("mkdir\\ niceFolder/'\n'chown\\ -R\\ ubuntu\\ niceFolder'\n'chmod\\ -R\\ 755\\ niceFolder/'\n'\\(cd\\ niceFolder\\ \\&\\&\\ \\(echo\\ \\\"Some\\ nice\\ text\\!\\\"\\ \\>\\ file.txt\\)\\)")
+    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\\)\\)")
   end
 end

metadata

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