marv 0.7.1 → 0.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2de8cb66f865209dd7adb2eaa8a060fec5b68b8b8ca98ec29555b68084e45df0
4
- data.tar.gz: b008ce79fec0eed4fd11445ac6500c24020f27f0dcbeed0b4aeea43fbe4057d4
3
+ metadata.gz: 209e4109aa6fc946ab1fd735f344b63ed9b066667d9ab8874f36dc7a2b80eaf5
4
+ data.tar.gz: 00d538ced0256b14674dda07cf179ed700c76ffd9341a64ba3b130784fdf0364
5
5
  SHA512:
6
- metadata.gz: a985fad10cd61e8bdbfb6a2e7b02b055721199aabed2947a4617edbb1041e71b0a00101ce1e5b88971cafb25d275cb79e9ae9282652b72d5e06f5918ae93126d
7
- data.tar.gz: e4627b94fcf1288729a5b73f583b0e54a3f985dfc659e0e382ea2b3b646df4902dacc0d8bb0ee7b349d95b08aaa0fb69da4fb0108899f7380fe44f45925165a6
6
+ metadata.gz: 408c437bad71f061a6fdc68cf46a002259bcf3acab84e2c00f0db94d2895466fdbeed5f3cd77b5328ad71bf0ac4f63dfae59f8725d86e381142e17c5cf3b71ad
7
+ data.tar.gz: 8dac33f09a0d74133e5e49541fb208d823c3dd085c3196ff1ebe2a13e273a175ec0affa200446a97cf3483f9fbe7c464f1291965caeaa41e8ade6d62d8dfd16d
@@ -24,8 +24,7 @@ module Marv
24
24
  abort
25
25
  end
26
26
 
27
- @server.server_options
28
- @config = @server.server_config
27
+ @config.merge! @server.server_options
29
28
 
30
29
  begin
31
30
  @task.shell.mute do
@@ -1,3 +1,3 @@
1
1
  module Marv
2
- VERSION = "0.7.1"
2
+ VERSION = "0.7.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marv
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonian Guveli
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2018-12-02 00:00:00.000000000 Z
12
+ date: 2018-12-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: guard