caracara 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab96b125ff43b99cabeb03ac79df39650ac0450d
-  data.tar.gz: 792bb59a52125237feb0ec0338e0b342d0d0f3ba
+  metadata.gz: 42a29332f3fa5bf0fe4401638b686036a7349990
+  data.tar.gz: 96464b4ae59be6cb174e9032723af4c9f1a91fc5
 SHA512:
-  metadata.gz: 414c81ea3959f9cfdca06fba6e779babad9c099c87cc2a06961534fda43da645d4c66b4d874f39398417e2df62a065d343f7cc265f7ac774efd6017a5bd456ac
-  data.tar.gz: 07320448213273898f202449443cbda54127a1b587ebdb4afdf162830904d1b4d93f2804b305ef37f8882408a441f13f1362969dde5a799301836e3c6bbb8c42
+  metadata.gz: 7774ba33ebb8c22fa95a2c5e33e9737d2037159298d72cbef6b29328079d4dd126cc90ead7ab816a3cc5c39f59f2e0d1415ea61ed076375358df9b93a39cb31d
+  data.tar.gz: b0524f25ace2614d93f84abea93bc5814e76b48174c0362fdf239fb28cca889ded156d646fe72e0089c01e12e3b62a1b00c996f90996b7dbb241174a11878468

data/Gemfile.lock

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

data/lib/caracara/task.rb

@@ -28,11 +28,10 @@ module Caracara
       # Each the steps
       @steps.map.with_index do |step, index|
         # Append with the fixed options
-        # options = options.merge(@fixed_options[index]) unless @fixed_options[index].nil?
         options = Utils.merge(options, @fixed_options[index]) unless @fixed_options[index].nil?
 
         # Compile the mustache template
-        Mustache.render step, options
+        Mustache.render step, compile_options(options, options)
       end
     end
 
@@ -41,6 +40,34 @@ module Caracara
       SSH.command compile(args), escape
     end
 
+    private
+
+    # Compile hash of options
+    # @param {Hash} compile The hash that will be compiled using Mustache
+    # @param {Hash} options Options used to compile this Hash
+    # @return {Hash} A compiled hash with the same structure of the `compile` one
+    def compile_options(compile, options)
+      # Compiled options
+      compiled_options = {}
+
+      # Each options
+      compile.each do |key, value|
+        # Check if the value is another hash
+        # Compile the content with the options
+        compiled = if value.is_a?(Hash)
+          compile_options value, options
+        else
+          Mustache.render value.to_s, options
+        end
+
+        # Put it into the compile_options
+        compiled_options[key] = compiled
+      end
+
+      # Return the compile options
+      compiled_options
+    end
+
     # Static methods
     class << self
       # Static attributes

data/lib/caracara/version.rb

@@ -1,5 +1,5 @@
 module Caracara
   def self.version
-    '0.5.0'
+    '0.6.0'
   end
 end

data/spec/caracara/task_spec.rb

@@ -19,6 +19,10 @@ class TaskSpec < Caracara::Task
   end
 end
 
+class AnotherTaskSpec < Caracara::Task
+  step 'docker -d run {{image}}'
+end
+
 # Tests
 describe 'Task' do
   # Initialize the task
@@ -31,6 +35,13 @@ describe 'Task' do
                   text: 'Some nice text!'
   }
 
+  # Initialize the task
+  let(:another_task) {
+    AnotherTaskSpec.init project: 'app',
+                         version: '1.5.0',
+                         image: '{{project}}-{{version}}'
+  }
+
   it 'should return the steps' do
     # Get the steps
     steps = task.steps
@@ -55,6 +66,14 @@ describe 'Task' do
     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 from AnotherTask' do
+    # Compile the steps
+    steps = another_task.compile
+
+    # Assertions
+    expect(steps[0]).to eq('docker -d run app-1.5.0')
+  end
+
   it 'should compile the steps using specific args' do
     # Get the steps
     steps = task.compile user: 'root',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caracara
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Gabriel Corado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache