mini-heroku 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94bcfa6aecf60d189067ea284422e600f25df6ef
-  data.tar.gz: c3b250df77eb780ee78f357d13524fc90e356986
+  metadata.gz: e8f6345fa963060bdc97308a806ee8339e13ab33
+  data.tar.gz: 3b7d7b7738061829c5a941f165c29b2db78f99b5
 SHA512:
-  metadata.gz: 77fc7a72e64a72a035f02a52e1278b1cf212e678e973c73aa6a6dbbaf374840c47c5358d907ad9803483b3ee002528b9084e52d153dc497a35a56cbff93efdd6
-  data.tar.gz: e2b47fd067415336d3a1c6b9df50d4f152b9c03418bea1d00c478278469812341b54b824107d1f22ff5df5339ff16b5d48e9f65172244e17dfe962c978ba9cab
+  metadata.gz: d162ca0a9f7167e9e87952c9e12e27f2ea4ca1ea265df45220f0eb4f419dfc8f54a6e326786bf7fd4dd931e9616192ab5013f49c6047dc13955eb8b0ce82f7f2
+  data.tar.gz: dd4b7f10dc3e3ca9adcb8bda330505399e008bc17d4b2c4fb21c3092d4648d225137bd953ff43438a14e2dd0b9b252dd591e8a843be83ccfb91c3dcc8594e15d

data/lib/mini-heroku.rb

@@ -1,6 +1,13 @@
 require "rubygems"
 require "json"
 
+class ::Hash
+    def deep_merge(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+        self.merge(second.to_h, &merger)
+    end
+end
+
 module MiniHeroku
     DEFAULT_PROCFILE = "web: bundle exec ruby server.rb -p $PORT"
     DEFAULT_GITIGNORE = ["mhenvironment.json"].join("\n")
@@ -33,6 +40,9 @@ module MiniHeroku
         environment = readJSON("mhconfig.json")[:devUsesProdEnviromnent] ? :production : :development
         environment = readJSON("mhenvironment.json")[environment]
         environment.each do |key, val|
+            if val.is_a?(Hash)
+                val = "JSON:" + val.to_json
+            end
             ENV[key.to_s] = val.gsub("\n", "\\n")
         end
         puts "MH: Starting server"
@@ -81,7 +91,7 @@ module MiniHeroku
         if File.file?("mhenvironment.json")
             puts "MH: Found environment"
             old = readJSON("mhenvironment.json")
-            environment.merge!(old)
+            environment = environment.deep_merge(old)
         else
             puts "MH: Creating default environment"
         end
@@ -134,7 +144,6 @@ module MiniHeroku
             end
         end
         config[:customGems].each do |key, val|
-            puts val
             if gems.include?(key.to_s)
                 gems.delete(key.to_s)
                 gems << val.to_s if val
@@ -170,7 +179,10 @@ module MiniHeroku
     def self.setProductionEnvironment()
         environment = readJSON("mhenvironment.json")[:production]
         out = "heroku config:set"
-        environment.each do |key, val| 
+        environment.each do |key, val|
+            if val.is_a?(Hash)
+                val = "JSON:" + val.to_json
+            end
             out += " #{key}=\"#{val.gsub("\n", "\\n")}\""
         end
         puts out
@@ -187,7 +199,12 @@ module MiniHeroku
     end
 
     def self.env(key)
-        return ENV[key].gsub("\\n", "\n")
+        val = ENV[key].gsub("\\n", "\n")
+        if val[0..4] == "JSON:"
+            val.gsub!("JSON:", "")
+            val = JSON.parse(val)
+        end
+        return val
     end
 end
 MH = MiniHeroku

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini-heroku
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Martin Larsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies: []
 description: Makes it easy to create, update and deploy a sinatra webserver to heroku.
   Be warned, this gem might run over your files if something goes worng. see 'mh help'
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Small gem for heroku and sinatra based webservers