foreplay 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35a3ae418413c4a78a0c33ef41eb5e7168287e32
-  data.tar.gz: 954d074b1b34dc7643b3cd4a3b8daa433fa74ad1
+  metadata.gz: 8309e23db1f7672cdaed6a12e16ff0b169d12585
+  data.tar.gz: 44607300ff2632d6c3d55f7a2d2ed254c1519b86
 SHA512:
-  metadata.gz: 20fd2bc4dc6f9eae22d3c098425b581d7b53d19bb0a1085ef8263edcb54b8bbd6f61b98f91ae78034d393316231203c97a90308b9f98cfc4c95af63569b8ddd8
-  data.tar.gz: aa5ad1cdc055544d768d7ffd63e2dd7766f5eddc23103ea4ab90c8a131efdb8d9b662a4e74e02a770856900c477d337123a8d2f2289797b24959b6a06a10bced
+  metadata.gz: 44ffafaac345689e2e0da36d4a2abf5c65545508d38ad5b881d99e2c40621cee76d7ea4b22f0a7d15853c89894bbfe1fbd645c384f6404b994f4339c6cec10e2
+  data.tar.gz: 3fd4c8e252f3692d77252f4b3deb724a45356007423b28aa51f9e58d99a12425b96734c730802b683a593476be5474cafc01a7564b6d85f1e954e572b6db2143

data/lib/foreplay.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext'
 require 'foreplay/version'
 require 'foreplay/engine'
 require 'foreplay/launcher'
@@ -14,3 +15,56 @@ module Foreplay
     fail message
   end
 end
+
+require 'active_support/core_ext/object'
+
+class Hash
+  # Returns a new hash with +hash+ and +other_hash+ merged recursively, including arrays.
+  #
+  #   h1 = { x: { y: [4,5,6] }, z: [7,8,9] }
+  #   h2 = { x: { y: [7,8,9] }, z: 'xyz' }
+  #   h1.supermerge(h2)
+  #   #=> {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
+  def supermerge(other_hash)
+    fail 'supermerge only works if you pass a hash. '\
+      "You passed a #{self.class} and a #{other_hash.class}." unless other_hash.is_a?(Hash)
+
+    new_hash = deep_dup
+
+    other_hash.each_pair do |k, v|
+      tv = new_hash[k]
+
+      if tv.is_a?(Hash) && v.is_a?(Hash)
+        new_hash[k] = tv.supermerge(v)
+      elsif tv.is_a?(Array) || v.is_a?(Array)
+        new_hash[k] = Array.wrap(tv) + Array.wrap(v)
+      else
+        new_hash[k] = v
+      end
+    end
+
+    new_hash
+  end
+end
+
+# Some useful additions to the String class
+class String
+  colors = %w(black red green yellow blue magenta cyan white)
+
+  colors.each_with_index do |fg_color, i|
+    fg = 30 + i
+    define_method(fg_color) { ansi_attributes(fg) }
+
+    colors.each_with_index do |bg_color, j|
+      define_method("#{fg_color}_on_#{bg_color}") { ansi_attributes(fg, 40 + j) }
+    end
+  end
+
+  def ansi_attributes(*args)
+    "\e[#{args.join(';')}m#{self}\e[0m"
+  end
+
+  def fake_erb
+    gsub(/(<%=\s+([^%]+)\s+%>)/) { |e| eval "_ = #{e.split[1]}" }
+  end
+end

data/lib/foreplay/engine.rb

@@ -1,6 +1,4 @@
 require 'yaml'
-require 'string'
-require 'hash'
 
 require 'foreplay/engine/defaults'
 require 'foreplay/engine/logger'

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
 end

data/spec/lib/hash_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'hash'
+require 'foreplay'
 
 describe Hash do
   context '#supermerge' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -236,8 +236,6 @@ files:
 - lib/foreplay/setup.rb
 - lib/foreplay/setup/foreplay.yml
 - lib/foreplay/version.rb
-- lib/hash.rb
-- lib/string.rb
 - spec/lib/foreplay/deploy_spec.rb
 - spec/lib/foreplay/secrets_spec.rb
 - spec/lib/foreplay/setup_spec.rb
@@ -263,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: 'Example: foreplay deploy production'

data/lib/hash.rb

@@ -1,30 +0,0 @@
-require 'active_support/core_ext/object'
-
-class Hash
-  # Returns a new hash with +hash+ and +other_hash+ merged recursively, including arrays.
-  #
-  #   h1 = { x: { y: [4,5,6] }, z: [7,8,9] }
-  #   h2 = { x: { y: [7,8,9] }, z: 'xyz' }
-  #   h1.supermerge(h2)
-  #   #=> {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
-  def supermerge(other_hash)
-    fail 'supermerge only works if you pass a hash. '\
-      "You passed a #{self.class} and a #{other_hash.class}." unless other_hash.is_a?(Hash)
-
-    new_hash = deep_dup
-
-    other_hash.each_pair do |k, v|
-      tv = new_hash[k]
-
-      if tv.is_a?(Hash) && v.is_a?(Hash)
-        new_hash[k] = tv.supermerge(v)
-      elsif tv.is_a?(Array) || v.is_a?(Array)
-        new_hash[k] = Array.wrap(tv) + Array.wrap(v)
-      else
-        new_hash[k] = v
-      end
-    end
-
-    new_hash
-  end
-end

data/lib/string.rb

@@ -1,21 +0,0 @@
-# Some useful additions to the String class
-class String
-  colors = %w(black red green yellow blue magenta cyan white)
-
-  colors.each_with_index do |fg_color, i|
-    fg = 30 + i
-    define_method(fg_color) { ansi_attributes(fg) }
-
-    colors.each_with_index do |bg_color, j|
-      define_method("#{fg_color}_on_#{bg_color}") { ansi_attributes(fg, 40 + j) }
-    end
-  end
-
-  def ansi_attributes(*args)
-    "\e[#{args.join(';')}m#{self}\e[0m"
-  end
-
-  def fake_erb
-    gsub(/(<%=\s+([^%]+)\s+%>)/) { |e| eval "_ = #{e.split[1]}" }
-  end
-end