heroku_whiz 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bc391ad209aec5d41a9e32f27ea91fe8c29d58c3e69d3432a41ab7848fc9ee
-  data.tar.gz: cf016eb8d4ee4acd39276401d90a82b6eafceb3649c0f4b57bd115f2dceda2c7
+  metadata.gz: f70cf65decd9910c18bb065d30defe5a9f30e61ea8dbe7adf95995c5838d3c15
+  data.tar.gz: bb3ce5eecb89cf1ec143b9b8a5c3082a36ebd55b9c8bd588375058baf7c0f96f
 SHA512:
-  metadata.gz: 2d71fbce6a42e1998f6a733bf2ca12bbc6c9bb0eeee2a9e16020128395e0f1374b1dc54a953379afcfce7cddc1eae3920c9fae6f4669dd3947cb52296f31b69c
-  data.tar.gz: caf12a507bf4f55ee42ca4705c45acf2a6699434eb4fa2a2cc09edb5906d5e05f6065ea5d9d86b0db1b3bce7e132d59d9cdfc6f1648bed46a8900b5d66713c31
+  metadata.gz: d7378be0f617fc11166e1c682a31c45a65aa5beb8df5e0731a3431989fa39f9d774f1664ac86c453f2f65add103b676ea3065cfdcc408d7edc0bf4d8595c1847
+  data.tar.gz: 34f5f3db437981f68c8748f0138555f53a7378b847551b2b66d7e71d398368cbb02176592c46eeb3f368a481eef12897cccaa5fd6cd2bf77671fe761831b2780

data/lib/heroku_whiz.rb

@@ -3,6 +3,8 @@
 # file: heroku_whiz.rb
 
 # created: 8th March 2022
+# updated: 9th March 2022
+
 # description: Handy (experimental) Heroku gem for noobs to create a
 #              simple Heroku app in a whiz!
 
@@ -14,7 +16,7 @@
 require 'open-uri'
 require 'fileutils'
 require 'clipboard'
-
+require 'launchy'
 
 # Resources
 #
@@ -23,7 +25,8 @@ 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
@@ -33,52 +36,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)
 
-    @dir, @template, @appname, @verbose = dir, template, appname, verbose
+class WhizBase
 
-    @app_path = File.join(@dir, @appname)
+  def initialize(app_path, debug: false)
 
-
-  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
+    @app_path, debug = app_path, debug
 
   end
 
   def create()
 
-    case @template.to_sym
-    when :rack
-      create_rack()
-    else
-      return puts 'template not recognised!'
-    end
+    config = %q(
+run lambda {|env|
+  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")]
+})
 
-    # build
-    `bundle install`
-    sleep 1
+    gemfile = %q(
+source 'https://rubygems.org'
+gem 'rack'
+gem 'puma'
+)
 
+    # 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)
@@ -92,8 +87,7 @@ class HerokuWhiz
 
     return unless setup == :both
 
-    app = `heroku config`.lines.first.split[1]
-    `heroku apps:destroy --confirm #{app}`
+    `heroku apps:destroy --confirm #{heroku_app()}`
 
   end
 
@@ -122,12 +116,18 @@ class HerokuWhiz
   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
 
@@ -136,36 +136,37 @@ class HerokuWhiz
 
     Process.kill('QUIT', r.pid)
 
-
     puts 'SUCCESS! Ready to deploy' if s == "Hello World!\n"
 
   end
 
   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 {|env|
-  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")]
-})
     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()
+    `heroku config`.lines.first.split[1]
   end
 
   def rm(file)
@@ -182,3 +183,137 @@ gem 'puma'
 
 end
 
+class SinatraWhiz < WhizBase
+
+  def initialize(app_path, debug: false)
+    super(app_path, debug: debug)
+  end
+
+  def create()
+
+    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
+
+class HerokuWhiz
+
+  def initialize(dir: '.', template: 'rack', appname: 'myapp',
+        verbose: true, debug: false)
+
+    @dir, @template, @appname, @verbose = dir, template, appname, verbose
+
+    @app_path = File.join(@dir, @appname)
+
+    case @template.to_sym
+    when :rack
+      @tapp = WhizBase.new @app_path, debug: debug
+    when :sinatra
+      @tapp = SinatraWhiz.new @app_path, 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()
+
+    return unless @tapp
+
+    @tapp.create
+
+    # 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
+
+  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()
+    `heroku config`.lines.first.split[1]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_whiz
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 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: []