rubiclifier 2.0.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55728a2ee2075c6e1f9dff351518b86f3fa3723697724e690bfd42d5e88a86e4
-  data.tar.gz: e506ac9933ce858270541697e10242c6cbd7b1f030174da731036d22dd276e6c
+  metadata.gz: 968bd3787bc49db6d701faae3a1c325eb33ac5efa8f0842f978cb6a6fed2b0f4
+  data.tar.gz: aad58334d2272e3741b90045f71d1aab50ae99b597bcdc7af31a4d63bfb75d1e
 SHA512:
-  metadata.gz: 79b1be94b2c6cdfba1c356cd8ed0e17e12e2ab36b07e1f4b528cb23f024edb2a5af565de5220fb878bdeb3c7ccd7813a9783512ca463816da366886b2555f51a
-  data.tar.gz: 1234dc02fc367519b1713ac1987bc76b6c3c4b9d28cf1678a9aa2846644a239367f9c8599c1c65ce3e540efd21e8763401c6d8a846599eb4fa166f7142ff6974
+  metadata.gz: 073baf0f68fba15496f41daf5912657f08d046d8434760de34ce99045f024d7574f84cde11ca1e71280342ba12134010a5ec6dcfd0adccd0e97514121539a88f
+  data.tar.gz: 7352b51728777587902fda0cbe7f360f25f072295082835e59186ff174fce87b9adc0728d844f487e610af13598cf03d5aafb6a6e936d49ca1a0fb2d8bf2fce9

data/Gemfile

@@ -4,3 +4,9 @@ gemspec
 
 gem "httparty"
 gem "sqlite3"
+gem "sinatra"
+
+group :test do
+  gem "byebug"
+  gem "rspec"
+end

data/lib/base_application.rb

@@ -18,20 +18,36 @@ module Rubiclifier
     def call
       show_help if args.command == "help" || args.boolean("help", "h")
       setup_or_fail if needs_setup?
-      run_application
+      if Feature.enabled?(Feature::SERVER)
+        run_server
+      else
+        run_application
+      end
     end
 
     def show_help
       raise NotImplementedError
     end
 
+    def run_server
+      raise NotImplementedError
+    end
+
     def run_application
       raise NotImplementedError
     end
 
+    def run_server
+      server_class.hydrate
+      server_class.run!
+    end
+
     def additional_setup
     end
 
+    def post_setup_message
+    end
+
     def not_setup
     end
 
@@ -67,7 +83,7 @@ module Rubiclifier
 
     def brew_dependencies_installed?
       all_brew_dependencies.all? do |dep|
-        system("brew list #{dep} &> /dev/null")
+        system("/usr/local/bin/brew list #{dep} &> /dev/null")
       end
     end
 
@@ -112,6 +128,7 @@ module Rubiclifier
           setup_as_background_service
         else
           puts("Finished setup! Run with `".green + "#{executable_name}" + "`".green)
+          post_setup_message
         end
         exit
       elsif !settings.all?(&:is_setup?) || !brew_dependencies_installed?
@@ -129,15 +146,19 @@ module Rubiclifier
       puts
       print("Would you like this script to set it up for you? (y/n) ")
       if STDIN.gets.chomp.downcase == "y"
-        puts "Installing serviceman..."
-        system("curl -sL https://webinstall.dev/serviceman | bash")
+        unless system("ls \"$HOME/.local/bin/serviceman\" &> /dev/null")
+          puts "Installing serviceman..."
+          system("-sL https://webinstall.dev/serviceman | bash")
+        end
         puts "Adding #{executable_name} as a service..."
-        system("serviceman add --name #{executable_name} #{executable_name}")
+        system("$HOME/.local/bin/serviceman add --name #{executable_name} #{executable_name}")
         puts
         puts("Finished setup! The service is set to run in the background!".green)
+        post_setup_message
       else
         puts
         puts("Finished setup!".green)
+        post_setup_message
       end
     end
   end

data/lib/cli/rubiclifier_cli.rb

@@ -16,6 +16,7 @@ class RubiclifierCli < Rubiclifier::BaseApplication
     puts('                   --homebrew "[first [second]]"  |   Require specific homebrew kegs')
     puts("                   --idle-detection               |   Generate with ability to detect if user is idle")
     puts("                   --notifications                |   Generate with notification functionality")
+    puts("                   --server                       |   Generate with server")
     puts("                   --settings                     |   Generate with persistent setting functionality")
     puts
     exit
@@ -45,6 +46,10 @@ class RubiclifierCli < Rubiclifier::BaseApplication
     unless template_hydrator.feature_enabled?(Rubiclifier::Feature::DATABASE)
       system("rm #{project_name}/migrations.rb")
     end
+    unless template_hydrator.feature_enabled?(Rubiclifier::Feature::SERVER)
+      system("rm #{project_name}/lib/server.rb")
+      system("rm -rf #{project_name}/public")
+    end
     puts("Finished creating project #{project_name}! Build out the application in #{project_name}/lib/#{project_name}.rb".green)
   end
 

data/lib/cli/template_hydrator.rb

@@ -35,6 +35,7 @@ class TemplateHydrator
       (Rubiclifier::Feature::DATABASE if (args.boolean("database") || include_settings?)),
       (Rubiclifier::Feature::IDLE_DETECTION if args.boolean("idle-detection")),
       (Rubiclifier::Feature::NOTIFICATIONS if args.boolean("notifications")),
+      (Rubiclifier::Feature::SERVER if args.boolean("server")),
     ].compact
   end
 

data/lib/database.rb

@@ -38,13 +38,14 @@ module Rubiclifier
 
     def self.save_setting(key, value, is_secret:)
       salt = "NULL"
-      if is_secret
+      output_value = "NULL"
+      if is_secret && value
         salt, encrypted = Cipher.encrypt(value)
         salt = "'#{salt}'"
-        value = encrypted
+        output_value = "'#{encrypted}'"
       end
       conn.execute("DELETE FROM settings WHERE key = '#{key}';")
-      conn.execute("INSERT INTO settings (key, value, salt) VALUES('#{key}', '#{value}', #{salt});")
+      conn.execute("INSERT INTO settings (key, value, salt) VALUES('#{key}', #{output_value}, #{salt});")
     end
 
     def self.migrate_if_needed(migrations_location)

data/lib/feature.rb

@@ -4,6 +4,7 @@ module Rubiclifier
     DATABASE = "DATABASE"
     NOTIFICATIONS = "NOTIFICATIONS"
     IDLE_DETECTION = "IDLE_DETECTION"
+    SERVER = "SERVER"
 
     def self.set_enabled(features)
       @enabled = features

data/lib/server.rb

@@ -0,0 +1,13 @@
+require 'sinatra/base'
+
+module Rubiclifier
+  class Server < Sinatra::Base
+    def self.hydrate
+      raise NotImplementedError
+    end
+
+    get "/" do
+      redirect("/index.html")
+    end
+  end
+end

data/project_template/PROJECT_NAME.gemspec.erb

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.summary     = "SUMMARY HERE"
   s.authors     = ["AUTHOR NAME"]
   s.email       = "AUTHOR EMAIL"
-  s.files       = Dir.glob("{lib}/**/*") + ["Gemfile"]
+  s.files       = Dir.glob("{lib<%= ",public" if feature_enabled?(Rubiclifier::Feature::SERVER) %>}/**/*") + ["Gemfile"]
   s.homepage    = "https://rubygems.org/gems/<%= project_name %>"
   s.metadata    = { "source_code_uri" => "https://github.com/PATH_TO_PROJECT" }
   s.require_path = "lib"

data/project_template/lib/PROJECT_NAME.rb.erb

@@ -1,4 +1,7 @@
 require "rubiclifier"
+<%- if feature_enabled?(Rubiclifier::Feature::SERVER) -%>
+require_relative "./server.rb"
+<%- end -%>
 
 class <%= project_name_camel_case %> < Rubiclifier::BaseApplication
   def show_help
@@ -15,12 +18,18 @@ class <%= project_name_camel_case %> < Rubiclifier::BaseApplication
     exit
   end
 
+  <%- if feature_enabled?(Rubiclifier::Feature::SERVER) -%>
+  def server_class
+    Server
+  end
+  <%- else -%>
   def run_application
     while true
       puts "Running!"
       sleep 5
     end
   end
+  <%- end -%>
   <%- if !features.empty? -%>
 
   def features

data/project_template/lib/server.rb

@@ -0,0 +1,8 @@
+require "rubiclifier"
+
+class Server < Rubiclifier::Server
+  def self.hydrate
+    set :public_folder, "#{File.expand_path(File.dirname(__FILE__) + "/..")}/public"
+    set :port, 5000
+  end
+end

data/project_template/public/index.html.erb

@@ -0,0 +1,12 @@
+<!doctype html>
+
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title><%= project_name %></title>
+  </head>
+
+  <body>
+    <h1><%= project_name %></h1>
+  </body>
+</html>

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rubiclifier
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Kyle Grinstead
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: kyleag@hey.com
 executables:
 - rubiclifier
@@ -31,6 +31,7 @@ files:
 - lib/idle_detector.rb
 - lib/notification.rb
 - lib/rubiclifier.rb
+- lib/server.rb
 - lib/setting.rb
 - project_template/.gitignore
 - project_template/Gemfile
@@ -40,13 +41,15 @@ files:
 - project_template/bin/PROJECT_NAME.erb
 - project_template/lib/PROJECT_NAME.rb.erb
 - project_template/lib/api.rb
+- project_template/lib/server.rb
 - project_template/migrations.rb
+- project_template/public/index.html.erb
 homepage: https://rubygems.org/gems/rubiclifier
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/MrGrinst/rubiclifier
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Easily spin up new Ruby CLI applications with built-in backgrounding and
   data storage.