heroku_whiz 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5800f5f32cb8db97a0533705239764f93beda9e9f5bd05440d2e3a29c82e2b68
-  data.tar.gz: 6e3b4e3ff383822c3c6db9b62f4010f422e3a85cec747f70eba7f4d6e61885e1
+  metadata.gz: c8fa80bb83fdb773d2b05d79c4df5e1f176de51608c90eb8e24506e88c22027f
+  data.tar.gz: 2a3c0e94b9737149aefa1e10148e88bb1875c62be15775807d33edb75859e155
 SHA512:
-  metadata.gz: '049384d28472b0b534610be275db670e977509be3af49132907ad6f5b6825ea20ae9c13a1f8e6a88196d023e27e1456fccc418ac250f506d89e96e6f7580f507'
-  data.tar.gz: feef8ec4211b1e8e9d7a790a5ae06c35997b5fb62f2da53eec1d0eb91f68cbef49eee1e3914e8a21a251d22cb30a2e72f00483c4a7f4bbc8e43e217239737546
+  metadata.gz: 1f00da4e02b5bd3ec99079d64a085b08581d2f1ce326e4a293e5931f59eae480b81854b33e0c9930c14d9dc0604894e1de662008cbd2d25246cd06bddee09397
+  data.tar.gz: 6f9fbaa7facaf1227583a364f19c29be59ba7a6ab136e929e11fd8d386af995e8fe28b9897ece4cb25c7c5e14825d565ccc6c34f70657f9f636badbca128b3ef

data/lib/heroku_whiz.rb

@@ -3,18 +3,40 @@
 # file: heroku_whiz.rb
 
 # created: 8th March 2022
-# description: Handy (experimental) Heroku gem for noobs to create a 
+# updated: 9th March 2022
+
+# description: Handy (experimental) Heroku gem for noobs to create a
 #              simple Heroku app in a whiz!
 
-# note: If this gem becomes outdated because of a change in the Heroku app 
-#       setup process, please inform the owner of this project via *Issues* 
+# Q: Why Heroku?
+#
+# A: With a quick Twitter search for Free wen hosting, a
+#    popular Tweet mentioned Heroku
+#
+# 10 FREE Hosting/Clouds for Your website:
+#
+# ➡️ GitHub Pages
+# ➡️ Heroku
+# ➡️ Amazon Web Services (AWS)
+# ➡️ Vercel
+# ➡️ Firebase Hosting
+# ➡️ Awardspace
+# ➡️ Netlify
+# ➡️ Google Cloud
+# ➡️ Cloudflare
+# ➡️ Weebly
+#
+
+
+# note: If this gem becomes outdated because of a change in the Heroku app
+#       setup process, please inform the owner of this project via *Issues*
 #       on GitHub (https://github.com/jrobertson/heroku_whiz).
 
 
 require 'open-uri'
 require 'fileutils'
 require 'clipboard'
-
+require 'launchy'
 
 # Resources
 #
@@ -23,8 +45,9 @@ require 'clipboard'
 
 # Example usage:
 #
-# hw = HerokuWhiz.new dir: '/home/james/heroku', template: 'rack', appname: 'hello2', debug: true
-# 
+# hw = HerokuWhiz.new dir: '/home/james/heroku', template: 'rack',
+#                     appname: 'hello2', debug: true
+#
 # hw.wipe_clean    # removes the previous local app file directory
 # hw.create        # creates the local app file directory
 # #hw.local_run    # runs the web app locally
@@ -33,52 +56,44 @@ require 'clipboard'
 # hw.app_url       #=> e.g. https://frozen-dusk-65820.herokuapp.com/
 
 
-class HerokuWhiz
 
-  def initialize(dir: '.', template: 'rack', appname: 'myapp', 
-        verbose: true, debug: false)
+class WhizBase
 
-    @dir, @template, @appname, @verbose = dir, template, appname, verbose
+  def initialize(app_path, verbose: true, debug: false)
 
-    @app_path = File.join(@dir, @appname)
+    @app_path, @verbose, debug = app_path, verbose, debug
 
-    
   end
 
-  def app_url()
-
-    app = `heroku config`.lines.first.split[1]
-    s = "https://#{app}.herokuapp.com/"
-
-    Clipboard.copy s
-    puts 'app URL copied to clipboard.'
-
-    return s
-
-  end
+  def create(add: nil)
 
-  def create()
+    config = %q(
+run lambda {|env|
+  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")]
+})
 
-    case @template.to_sym
-    when :rack
-      create_rack()
-    else
-      return puts 'template not recognised!'
-    end
+    gemfile = %q(
+source 'https://rubygems.org'
+gem 'rack'
+gem 'puma'
+)
 
-    # build
-    `bundle install`
-    sleep 1
+    # Procfile: see https://devcenter.heroku.com/articles/procfile
+    #           for more info
+    procfile = 'web: bundle exec rackup config.ru -p $PORT'
 
+    create_basefiles(config, gemfile, procfile)
   end
 
+  # currently only removes a file directory if there are no user created files
+  #
   def wipe_clean(setup=:local)
 
     return unless File.exists? @app_path
 
     # remove the app files
     #
-    %w(Gemfile config.ru Gemfile.lock).each do |file|
+    %w(Gemfile config.ru Procfile Gemfile.lock).each do |file|
 
       puts 'removing file ' + file if @debug
       rm File.join(@app_path, file)
@@ -86,15 +101,20 @@ class HerokuWhiz
 
     end
 
+    appname = heroku_app()
+
+    if setup == :both then
+
+      Clipboard.copy appname
+      puts 'App name ' + appname + ' copied to clipboard'
+      `heroku apps:destroy #{appname}`
+
+    end
+
     rm_rf File.join(@app_path, '.git')
     rmdir File.join(@app_path, '.git')
     rmdir @app_path
 
-    return unless setup == :both
-
-    app = `heroku config`.lines.first.split[1]
-    `heroku apps:destroy --confirm #{app}`
-
   end
 
   def deploy()
@@ -110,24 +130,33 @@ class HerokuWhiz
 
     #`heroku create #{@appname}`
 
-    # the above statement was commented out because there's a 
+    # the above statement was commented out because there's a
     # high probability the appname you have chosen has already been taken
     #  e.g. hello2 => hello2.herokuapp.com
-    
+
+    puts  'Running *heroku create*' if @verbose
     `heroku create`
-    sleep 2
+    sleep 3
 
+    puts  'Running *git push heroku master*' if @verbose
     r = `git push heroku master`
+    sleep 10
 
   end
 
   def local_run()
+
+    #`heroku local &`
+    # attempted to use heroku local but couldn't automatically kill the
+    # process directly
+
     `bundle exec rackup -p 9292 config.ru &`
   end
 
   def local_testrun()
 
-    r = IO.popen( "bundle exec rackup -p 9292 config.ru" )
+    #r = IO.popen("heroku local")
+    r = IO.popen("bundle exec rackup -p 9292 config.ru")
     puts 'r: ' + r.inspect if @debug
     sleep 2
 
@@ -135,7 +164,6 @@ class HerokuWhiz
     sleep 1
 
     Process.kill('QUIT', r.pid)
- 
 
     puts 'SUCCESS! Ready to deploy' if s == "Hello World!\n"
 
@@ -143,29 +171,32 @@ class HerokuWhiz
 
   private
 
-  def create_rack()
+  def create_basefiles(config, gemfile, procfile)
 
     FileUtils.mkdir_p @app_path
     FileUtils.chdir @app_path
 
     # write the config.ru file
     #
-    config = %q(
-run lambda do |env|
-  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")]
-end)
     File.write File.join(@app_path, 'config.ru'), config
+    sleep 0.2
 
     # write the Gemfile
     #
-    gemfile = %q(
-source 'https://rubygems.org'
-gem 'rack'
-gem 'puma'
-)
     File.write File.join(@app_path, 'Gemfile'), gemfile
-    sleep 0.5
+    sleep 0.2
 
+    # write the Procfile (although not essential it will flag a warning when
+    # deploying if the file doesn't exist
+    #
+    File.write File.join(@app_path, 'Procfile'), procfile
+    sleep 0.2
+
+  end
+
+  def heroku_app()
+    s = `heroku config`
+    s.lines.first.split[1] if s
   end
 
   def rm(file)
@@ -182,3 +213,186 @@ gem 'puma'
 
 end
 
+class SinatraWhizError < Exception
+end
+
+class SinatraWhiz < WhizBase
+
+  def initialize(app_path, verbose: true, debug: false)
+    super(app_path, verbose: verbose, debug: debug)
+  end
+
+  def create(add: nil)
+
+    if add then
+
+      FileUtils.mkdir_p @app_path
+      FileUtils.chdir @app_path
+
+      # copying the files into file directory @app_path
+      # ensure the files config.ru, Gemfile, and Procfile exist
+      #
+      a = Dir.glob(File.join(add,'*'))
+      files = a.map {|x| File.basename(x)}
+
+      expected = %w(config.ru Gemfile Procfile)
+      found = (files & expected)
+
+      if found.length < 3 then
+        raise SinatraWhizError, 'missing ' + (expected - found).join(', ')
+      end
+
+      puts 'copying files ' + a.inspect if @debug
+
+      a.each {|x| FileUtils.cp x, @app_path }
+
+    else
+
+      config = %q(
+require './hello'
+run Sinatra::Application
+)
+      gemfile = %q(
+source 'https://rubygems.org'
+gem 'sinatra'
+gem 'puma'
+)
+
+      procfile = 'web: bundle exec rackup config.ru -p $PORT'
+      create_basefiles(config, gemfile, procfile)
+
+      hello_rb = %q(
+require 'sinatra'
+
+get '/' do
+  "Hello World!"
+end
+)
+      File.write File.join(@app_path, 'hello.rb'), hello_rb
+      sleep 0.3
+
+    end
+
+  end
+
+  def local_testrun()
+    r = IO.popen("bundle exec rackup -p 9292 config.ru")
+    puts 'r: ' + r.inspect if @debug
+    sleep 2
+
+    s = URI.open('http://127.0.0.1:9292').read
+    sleep 1
+
+    Process.kill('QUIT', r.pid)
+
+    puts 'SUCCESS! Ready to deploy' if s == "Hello World!"
+  end
+
+  def wipe_clean(setup=nil)
+
+    rm File.join(@app_path, 'hello.rb')
+    super(setup)
+
+  end
+
+end
+
+class HerokuWhiz
+
+  def initialize(dir: '.', template: 'rack', appname: File.basename(Dir.pwd),
+        verbose: true, debug: false)
+
+    @dir, @template, @appname, @verbose = dir, template, appname, verbose
+
+    @app_path = File.join(@dir, @appname)
+    FileUtils.chdir @app_path if File.exists? @app_path
+
+    case @template.to_sym
+    when :rack
+      @tapp = WhizBase.new @app_path, verbose: verbose, debug: debug
+    when :sinatra
+      @tapp = SinatraWhiz.new @app_path, verbose: verbose, debug: debug
+    end
+
+  end
+
+  def app_url()
+
+    s = "https://#{heroku_app()}.herokuapp.com/"
+
+    Clipboard.copy s
+    puts 'app URL copied to clipboard.'
+
+    return s
+
+  end
+
+  def app_open()
+    `heroku open`
+  end
+
+  def create(add: nil)
+
+    return unless @tapp
+
+    @tapp.create add: add
+
+    # build
+    `bundle install`
+    sleep 1
+
+  end
+
+  def goto(target)
+
+    case target.to_sym
+    when :apps
+      Launchy.open("https://dashboard.heroku.com/apps")
+    when :docs
+      Launchy.open('https://devcenter.heroku.com/articles/rack')
+    end
+
+  end
+
+  # currently only removes a file directory if there are no user created files
+  #
+  def wipe_clean(setup=:local)
+
+    return unless @tapp
+
+    @tapp.wipe_clean setup
+
+  end
+
+  def deploy()
+
+    return unless @tapp
+
+    @tapp.deploy
+
+  end
+
+  def local_run()
+
+    return unless @tapp
+
+    @tapp.local_run
+
+  end
+
+  def local_testrun()
+
+    return unless @tapp
+
+    @tapp.local_testrun()
+
+  end
+
+  private
+
+  def heroku_app()
+    s = `heroku config`
+    s.lines.first.split[1] if s
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_whiz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   n5lICiaMyvvvMKfV1rE1Pz0tCPqOu++rZFRC9XbrR+Vio0ha4mHPPAUsvY2f9DtE
   ZOz9jhKlb8t2o3xNUKH/e3WN
   -----END CERTIFICATE-----
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: 
 email: digital.robertson@gmail.com
 executables: []