mini-heroku 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4864763dbc5e62ff86ddd7c66bd1fc62afaf9dd1
-  data.tar.gz: 4ea1d614b5cd4d7c0978f07a13836cc7547bec47
+  metadata.gz: dd91fcfa20f2fe1bbd25eeafbdeda695c382d5d0
+  data.tar.gz: 8319d32570abb4bef06a2674f28f54af9483a583
 SHA512:
-  metadata.gz: 6c85b238a2e6af1ad1eddffd2478499072c6615a4cbccaa1d34e07b9ff1df69c6c6d68bc64ee581606a58401cd40a667e118ffbeee07082e04b7923a2728efca
-  data.tar.gz: 9fda6f9faeea3dc478aa3dd0533c597c0870a2b7a8450090e2cb2647d22c94902c1876cc72e79357bf545c0a6c057295b44b7c4da22d24c5cc318ebcdf815d38
+  metadata.gz: cef6950a50a94026fa9462c76f20124192b0d9ad8201abb3f6ab4bc8c9687bf51179986fa029c9ba55379effe65723290d9930450771707e574e05428f392597
+  data.tar.gz: 4178b1287d394d4be75e6d4086880d6a9a9d87f7bf3eaf67c75bb6df265bfb8d40bd68d87f9c7f454503593a77f7a736b3749bc562164d9e2e53eb3afc3e4d89

data/lib/mini-heroku.rb

@@ -2,26 +2,41 @@ require "rubygems"
 require "json"
 
 module MiniHeroku
-
     DEFAULT_PROCFILE = "web: bundle exec ruby server.rb -p $PORT"
-    DEFAULT_PROCFILE_DEV = "web: bundle exec ruby server.rb"
-    DEFAULT_GITIGNORE = [".env","mhenvironment.json"].join("\n")
+    DEFAULT_GITIGNORE = ["mhenvironment.json"].join("\n")
     DEFAULT_SERVER = [
         "require 'sinatra'",
+        "require 'mini-heroku'",
         "",
         "get '/' do",
-        "    \"Hello world! Your variable defaultKey is (probably empty): \#{ENV['defaultKey']}\"",
+        "    \"Hello world! Your variable defaultKey is (probably empty): \#{MH.env('defaultKey')} \#{MH.env('defaultKey').inspect}\"",
         "end"
     ]
     DEFAULT_CONFIG = {
         devUsesProdEnviromnent: true,
+        mhVersion: "0.2.1",
         environmentKeys: [
             :defaultKey
-        ]
+        ],
+        customGems: {
+            "rack/ssl": "rack-ssl"
+        }
     }
 
+    def self.readJSON(filename)
+        return JSON.parse(File.read(filename), :symbolize_names => true)
+    end
+
     def self.start()
-        system("heroku local -f Procfile.dev")
+        puts "MH: Loading environment"
+        environment = :development
+        environment = readJSON("mhconfig.json")[:devUsesProdEnviromnent] ? :production : :development
+        environment = readJSON("mhenvironment.json")[environment]
+        environment.each do |key, val|
+            ENV[key.to_s] = val.gsub("\n", "\\n")
+        end
+        puts "MH: Starting server"
+        system("ruby server.rb")
     end
 
     def self.create(name)
@@ -35,7 +50,7 @@ module MiniHeroku
         installed = `gem list`.split("\n")
         installed.map! do |g|
             name, rest = g.split(" (")
-            version = rest.scan(/(^)((\d|\.)*)/)[0][1]
+            version = rest.scan(/^(\D)*((\d|\.)*)/)[0][1]
             [name, version]
         end
         return Hash[installed]
@@ -44,9 +59,11 @@ module MiniHeroku
     def self.refresh()
         #config
         config = DEFAULT_CONFIG
-        if File.file?("mhconfig.json")
-            config.merge!(JSON.parse(File.read("mhconfig.json"), :symbolize_names => true))
-            puts("MH: Config found")
+        if File.file?("mhconfig.json") 
+            config.merge!(readJSON("mhconfig.json"))
+            puts("MH: Found config")
+        else
+            puts "MH: Creating default config"
         end
         File.open("mhconfig.json", "wb") do |f|
             f.write JSON.pretty_generate(config)
@@ -63,77 +80,71 @@ module MiniHeroku
         end
         if File.file?("mhenvironment.json")
             puts "MH: Found environment"
-            old = JSON.parse(File.read("mhenvironment.json"), :symbolize_names => true)
-            environment.merge(old)
+            old = readJSON("mhenvironment.json")
+            environment.merge!(old)
         else
-            puts "MH: Creating environment"
+            puts "MH: Creating default environment"
         end
         File.open("mhenvironment.json", "wb") do |f|
             f.write(JSON.pretty_generate(environment))
         end
 
-        #env file
-        File.open(".env", "w") do |f|
-            vars = {}
-            if config[:devUsesProdEnviromnent]
-                vars = environment[:production]
-            else
-                vars = environment[:development]
-            end
-            vars.each do |key, value|
-                f.puts("#{key}=#{value}")
-            end
-        end
-
         #procfile
         if File.file?("Procfile")
-            puts "MH: Procfile found"
+            puts "MH: Found procfile"
         else
-            puts "MH: Creating Procfile"
+            puts "MH: Creating default procfile"
             File.open("Procfile", "w") do |f|
                 f.puts(DEFAULT_PROCFILE)
             end
         end
 
-        if File.file?("Procfile.dev")
-            puts "MH: Dev Procfile found"
-        else
-            puts "MH: Creating Dev Procfile"
-            File.open("Procfile.dev", "w") do |f|
-                f.puts(DEFAULT_PROCFILE_DEV)
-            end
-        end
-
         #gitignore
         if File.file?(".gitignore")
-            puts "MH: .gitignore found"
+            puts "MH: Found .gitignore"
         else
-            puts "MH: Creating .gitignore"
+            puts "MH: Creating default .gitignore"
             File.open(".gitignore", "w") do |f|
                 f.puts(DEFAULT_GITIGNORE)
             end
         end
 
         #gems
-        gems = ["sinatra"]
+        gems = ["sinatra", "mini-heroku"]
+        files = ["server"]
         if File.file?("server.rb")
-            puts "MH: Checking Gems from server file"
-            gems = File.read("server.rb").split("\n").map do |line|
-                line.scan(/^([^#]*?)(require(\s*?)("|'))(.*?)("|')/).map{|match| match[4]}
+            puts "MH: Found server file, checking gems" #^(\s*?)(require(\s*?)("|'))(\.\/)(.*?)("|')
+            until files.size == 0
+                filename = files.pop
+                for line in File.read(filename + ".rb").split("\n") do
+                    # (start of line)(any amount of indentation)(begin quote)(gem name, but not .)(end quote)
+                    gem = line.scan(/^(\s*?)(require(\s*?)("|'))([^\.]*?)("|')/).dig(0, 4)
+                    gems << gem if gem
+                    file = line.scan(/^(\s*?)(require(\s*?)("|'))(\.\/)(.*?)("|')/).dig(0, 5)
+                    files << file.gsub(".rb", "") if file
+                    file = line.scan(/^(\s*?)(require_relative(\s*?)("|'))(.*?)("|')/).dig(0, 4)
+                    files << file.gsub(".rb", "") if file
+                end
             end
-            gems.flatten!
+            gems.uniq!
         else
-            puts "MH: Creating Default server file"
+            puts "MH: Creating default server file"
             File.open("server.rb", "w") do |f|
                 f.puts(DEFAULT_SERVER)
             end
         end
+        config[:customGems].each do |key, val|
+            if gems.include?(key.to_s)
+                gems.delete(key.to_s)
+                gems << val.to_s
+            end
+        end
         installedGems = getGems()
         didInstall = false
         for gem in gems
             if !(installedGems.keys.include?(gem))
                 puts "MH: Installing Gem #{gem}"
-                system("gem install #{gem}")
+                system("gem install #{gem} --no-document")
                 didInstall = true
             end
         end
@@ -156,7 +167,7 @@ module MiniHeroku
     end
 
     def self.setProductionEnvironment()
-        environment = JSON.parse(File.read("mhenvironment.json"), :symbolize_names => true)[:production]
+        environment = readJSON("mhenvironment.json")[:production]
         out = "heroku config:set"
         environment.each do |key, val| 
             out += " #{key}=\"#{val.gsub("\n", "\\n")}\""
@@ -178,6 +189,4 @@ module MiniHeroku
         return ENV[key].gsub("\\n", "\n")
     end
 end
-MH = MiniHeroku
-#MiniHeroku.create("mini-heroku-test")
-#MiniHeroku.setProductionEnvironment()
+MH = MiniHeroku

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: mini-heroku
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Martin Larsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies: []
-description: Makes it easy to create, update and deply a sinatra webserver to heroku.
+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'
   for commands
 email: martin.99.larsson@telia.com