marv 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de8cb66f865209dd7adb2eaa8a060fec5b68b8b8ca98ec29555b68084e45df0
-  data.tar.gz: b008ce79fec0eed4fd11445ac6500c24020f27f0dcbeed0b4aeea43fbe4057d4
+  metadata.gz: 209e4109aa6fc946ab1fd735f344b63ed9b066667d9ab8874f36dc7a2b80eaf5
+  data.tar.gz: 00d538ced0256b14674dda07cf179ed700c76ffd9341a64ba3b130784fdf0364
 SHA512:
-  metadata.gz: a985fad10cd61e8bdbfb6a2e7b02b055721199aabed2947a4617edbb1041e71b0a00101ce1e5b88971cafb25d275cb79e9ae9282652b72d5e06f5918ae93126d
-  data.tar.gz: e4627b94fcf1288729a5b73f583b0e54a3f985dfc659e0e382ea2b3b646df4902dacc0d8bb0ee7b349d95b08aaa0fb69da4fb0108899f7380fe44f45925165a6
+  metadata.gz: 408c437bad71f061a6fdc68cf46a002259bcf3acab84e2c00f0db94d2895466fdbeed5f3cd77b5328ad71bf0ac4f63dfae59f8725d86e381142e17c5cf3b71ad
+  data.tar.gz: 8dac33f09a0d74133e5e49541fb208d823c3dd085c3196ff1ebe2a13e273a175ec0affa200446a97cf3483f9fbe7c464f1291965caeaa41e8ade6d62d8dfd16d

data/lib/marv/server/create.rb

@@ -24,8 +24,7 @@ module Marv
           abort
         end
 
-        @server.server_options
-        @config = @server.server_config
+        @config.merge! @server.server_options
 
         begin
           @task.shell.mute do

data/lib/marv/version.rb

@@ -1,3 +1,3 @@
 module Marv
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Jonian Guveli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard