caracara 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f11b7e5046f36a5e073b2121fd0092e112db24
-  data.tar.gz: 19139ef72f333155cd5e557e6e2dd0853e64a14b
+  metadata.gz: ab96b125ff43b99cabeb03ac79df39650ac0450d
+  data.tar.gz: 792bb59a52125237feb0ec0338e0b342d0d0f3ba
 SHA512:
-  metadata.gz: 8759b163b1139a15b127feb70edcdd1bc49f8942b9fb492555281e3c813d8ec0436d88f65f977934b08c70a86b7c8efa14cdf166f64c548cc38c0df5b030f375
-  data.tar.gz: 6184d8f96e7b0d20d2e034168faea6754959e95795ccf3210263fdd61cbb5ccc65649d29dcf653012593784a8a02265a6c55448d86001f6fda12d7429c7d0e82
+  metadata.gz: 414c81ea3959f9cfdca06fba6e779babad9c099c87cc2a06961534fda43da645d4c66b4d874f39398417e2df62a065d343f7cc265f7ac774efd6017a5bd456ac
+  data.tar.gz: 07320448213273898f202449443cbda54127a1b587ebdb4afdf162830904d1b4d93f2804b305ef37f8882408a441f13f1362969dde5a799301836e3c6bbb8c42

data/Gemfile.lock

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

data/README.md

@@ -72,9 +72,14 @@ deploy = DeployGroup.init options
 commands = deploy.compile_all
 ```
 
+**Generate the SSH Command**
+```ruby
+ssh_command = Caracara::SSH.generate 'user', 'localhost', commands
+```
+
 **Run the command in your server**
 ```ruby
-Caracara::SSH.exec 'user', 'localhost', commands
+Caracara::SSH.exec ssh_command
 ```
 
 # Development

data/lib/caracara/group.rb

@@ -14,7 +14,7 @@ module Caracara
     # Compile the tasks
     def compile(name, options = {})
       # Set options
-      options = @options.merge options
+      options = Utils.merge @options, options
 
       # Get the tasks
       task = @tasks[name]
@@ -35,7 +35,7 @@ module Caracara
     # Generate the SSH command
     def command(name, options = {}, ssh_command = true, escape = true)
       # Set options
-      options = @options.merge options
+      options = Utils.merge @options, options
 
       # Generate task command
       task = @tasks[name].command options, false

data/lib/caracara/task.rb

@@ -23,12 +23,13 @@ module Caracara
     # Compile the tasks
     def compile(args = {})
       # Merge args with defult options
-      options = @options.merge args
+      options = Utils.merge @options, args
 
       # 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 = 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

data/lib/caracara/utils.rb

@@ -0,0 +1,15 @@
+#
+module Caracara
+  module Utils
+    # Merge the options in an intelligent way
+    def self.merge(a, b)
+      a.merge(b) do |key, oldval, newval|
+        # Return if both of the values are Hash instances
+        next merge(oldval, newval) if oldval.is_a?(Hash) && newval.is_a?(Hash)
+
+        # Return the value
+        newval
+      end
+    end
+  end
+end

data/lib/caracara/version.rb

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

data/lib/caracara.rb

@@ -6,6 +6,7 @@ end
 require 'mustache'
 
 # Include the sources
+require 'caracara/utils'
 require 'caracara/ssh'
 require 'caracara/task'
 require 'caracara/group'

data/spec/caracara/utils_spec.rb

@@ -0,0 +1,47 @@
+# Include the helper
+require 'spec_helper'
+
+# Tests
+describe 'Utils' do
+  context 'merge method' do
+    # Define the first array
+      let(:first) {
+      {
+        a: 1,
+        b: {
+          c: 2,
+          d: 3
+        },
+        e: {
+          f: 4,
+          g: 5
+        }
+      }
+    }
+
+    # Define the second array
+    let(:second) {
+      {
+        b: {
+          c: 15,
+          abc: '123'
+        },
+        e: {
+          g: 35
+        }
+      }
+    }
+
+    it 'should merge to arrays perfectly' do
+      # Merge first -> second
+      first_merge_result = Caracara::Utils.merge first, second
+
+      # Merge second -> first
+      second_merge_result = Caracara::Utils.merge second, first
+
+      # Assertions
+      expect(first_merge_result).to eq({a: 1, b: {abc: '123', c: 15, d: 3}, e: {f: 4, g: 35}})
+      expect(second_merge_result).to eq({b: {c: 2, abc: '123', d: 3}, e: {g: 5, f: 4}, a: 1})
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caracara
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Gabriel Corado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -55,10 +55,12 @@ files:
 - lib/caracara/group.rb
 - lib/caracara/ssh.rb
 - lib/caracara/task.rb
+- lib/caracara/utils.rb
 - lib/caracara/version.rb
 - spec/caracara/group_spec.rb
 - spec/caracara/ssh_spec.rb
 - spec/caracara/task_spec.rb
+- spec/caracara/utils_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/gabrielcorado/caracara
 licenses: []