vagrant-opsworks 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 766caa1de0d13b688ce42c9b608db05752182e67
-  data.tar.gz: 02981e7a488c63fe05f42c5e242771b51f373ce9
+  metadata.gz: 9dd57f8c18a8b61cfdaf3f751859221cde75816d
+  data.tar.gz: edacca8d60558893cd1d72d1286e9a7b15e0103d
 SHA512:
-  metadata.gz: 243fe0387d0ca9789ffafc4a66bffe8447094ffc12752c128a12326106a30bf44547a4c56003c11467bef5f68946cd585e217e9537a4d0f85796722bac6ee97b
-  data.tar.gz: f57d48e251a93043b5133a6f21647c3ae2c32da4653e77a9b1b2bf158a807301fcd130ab0c71fcfb270234338b51f4e04b4fb2496646df5eab19fdffbd496fdb
+  metadata.gz: 53f7f35568d7abe63e824cd0a78cf5a9d41f33092aadd52b294de4c75fb9c8fe412acbe2d0101888f2902e4493ae711022fa696c7f6ae02cbfd77c4c5031fa9a
+  data.tar.gz: aaacc79f7cb8a27d3d83d95e9a2ca89c0a7bc392f0e6e6bbec407e807b6ffc2777fae364dd47a81fe66eac1359815b326e3ca873a73150b2a40c34a97750f0d5

data/lib/vagrant-opsworks/config.rb

@@ -1,5 +1,7 @@
 module VagrantPlugins
   module OpsWorks
+    require_relative 'custom_json'
+
     class Config < ::Vagrant.plugin('2', :config)
       # @return [Boolean]
       #   disable use of OpsWorks in Vagrant
@@ -76,8 +78,8 @@ module VagrantPlugins
         @ignore_instances  = Array.new                                   if @ignore_instances  == UNSET_VALUE
         @ignore_layers     = Array.new                                   if @ignore_layers     == UNSET_VALUE
         @ignore_recipes    = Array.new                                   if @ignore_recipes    == UNSET_VALUE
-        @supplimental_json = Hash.new                                    if @supplimental_json == UNSET_VALUE
-        @supplimental_json = merge_hash({
+
+        default_json       = VagrantPlugins::OpsWorks::CustomJson.new({
                                           :opsworks => {
                                             :agent_version => @agent_version,
                                             :ruby_version => '2.0.0',
@@ -94,10 +96,13 @@ module VagrantPlugins
                                             },
                                           },
                                           :sudoers => [{:name => 'vagrant'}]
-                                        }, @supplimental_json)
+                                        })
+
+        @supplimental_json = default_json if @supplimental_json == UNSET_VALUE
+        @supplimental_json = default_json.deep_merge(@supplimental_json) unless @supplimental_json == UNSET_VALUE
       end
 
-      # TODO: refactor hash merging logic to mixin
+      # TODO: implement proper merge handling
       # def merge(other)
       #   super.tap do |result|
       #     result.ignore_apps       = Array.new if other.ignore_apps.nil?
@@ -129,28 +134,6 @@ module VagrantPlugins
         {'opsworks configuration' => errors}
       end
 
-      protected
-
-      def merge_hash(old, new)
-        old = unsymbolize_keys(old)
-        new = unsymbolize_keys(new)
-
-        new.each_pair{|current_key,new_value|
-          old_value = old[current_key]
-
-          old[current_key] = if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-                               merge_hash(old_value, new_value)
-                             else
-                               new_value
-                             end
-        }
-        old
-      end
-
-      def unsymbolize_keys(h)
-        return Hash[h.map{ |k,v| [k.to_s, v] }]
-      end
-
     end
   end
 end

data/lib/vagrant-opsworks/custom_json.rb

@@ -2,6 +2,15 @@ module VagrantPlugins::OpsWorks
   require 'vagrant/util/hash_with_indifferent_access'
   class CustomJson < ::Vagrant::Util::HashWithIndifferentAccess
 
+    def initialize(hash={}, &block)
+      super(hash, &block)
+
+      self.each_pair do |k,v|
+        v = self.class.new(v) if v.is_a?(Hash)
+        self[k] = v
+      end
+    end
+
     def deep_merge(other_json, &block)
       dup.deep_merge!(other_json, &block)
     end

data/lib/vagrant-opsworks/loader/stack.rb

@@ -17,7 +17,7 @@ module VagrantPlugins::OpsWorks::Loader
       end
 
       env[:config].vm.provision :shell do |s|
-        s.inline = "DEBIAN_FRONTEND=noninteractive apt-get -qq install acl &&setfacl -m o:rw $SSH_AUTH_SOCK && setfacl -m o:x $(dirname $SSH_AUTH_SOCK)"
+        s.inline = '[ -n "$SSH_AUTH_SOCK" ] && DEBIAN_FRONTEND=noninteractive apt-get -qq install acl && setfacl -m o:rw $SSH_AUTH_SOCK && setfacl -m o:x $(dirname $SSH_AUTH_SOCK)'
       end
 
       @app.pass(env)

data/lib/vagrant-opsworks/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpsWorks
-    VERSION = '0.0.5'
+    VERSION = '0.0.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-opsworks
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Steve Buzonas