flame 4.0.16 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989ddfd1e75b461a27418e6fbcb87a5aaa3f1d43
-  data.tar.gz: d2f1d305b9e74f2b8b5672f91b71c33460ddcb67
+  metadata.gz: a16fd784ae388046bd56640aedc3d84799f0e6ff
+  data.tar.gz: 02a5c9fa3e6b2c2eb6d655aba33d70160643a19d
 SHA512:
-  metadata.gz: 4db8444d523a7df72a5d3bffa12fa97bf24b7fd20b5f930b935174ae86eda222f19f22967a6de74e45a3b79314c4a53efe745c41aa8a2482672723357842836a
-  data.tar.gz: 7a659f6815edb885f70fc34c14b102b1a913b2f31f8e44ec0671acc82c60281b3d2ee98428414754a5568a03d331c0608b5486ba33d6e14d8b3a4dd5651a8479
+  metadata.gz: 9ff76b22007c5e11890da7acbcd32e2e6489f3ad0702018362e3756e01cbb2e78d2e11a287ab534c00e1bf61b6886aee54534611febbde50d5458561f59f7340
+  data.tar.gz: 8d6c2133c19e5c4b1d24bee411059294727d2f32cd4806583cf620cc56462326467a1fed7a4cf25fc353735f54c759db7824c5a4bf0fc7d91708453fc517dfeb

data/bin/flame

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+require 'fileutils'
+require 'gorilla-patch/string'
+require 'erb'
+
+## CLI Application
+class FlameCLI < Thor
+	desc 'new APP', 'Generate new application directory with sub-directories'
+	def new(app_name)
+		FlameApp.new app_name
+	end
+
+	## Class for Flame Application
+	class FlameApp
+		def initialize(app_name)
+			@app_name = app_name
+			New.build @app_name
+			puts 'Done!'
+			puts "\nMoving to '#{@app_name}' directory by:\n\ncd #{@app_name}\n\n"
+		end
+
+		## Module for new application
+		module New
+			module_function
+
+			using GorillaPatch::StringExt
+
+			def build(app_name)
+				@app_name = app_name
+				@module_name = @app_name.camelize
+				make_dir do
+					copy_template
+				end
+			end
+
+			def make_dir(&block)
+				puts "Creating '#{@app_name}' directory..."
+				FileUtils.mkdir @app_name
+				FileUtils.cd @app_name, &block
+			end
+
+			def copy_template
+				puts 'Copy template directories and files...'
+				FileUtils.cp_r File.join(__dir__, '..', 'template', '.'), '.'
+				clean_dirs
+				render_templates
+			end
+
+			def clean_dirs
+				puts 'Clean directories...'
+				FileUtils.rm Dir[File.join('**', '*', '.keep')]
+			end
+
+			def render_templates
+				puts 'Replace module names in template...'
+				Dir[File.join('**', '*.erb')].each do |file|
+					basename = File.basename(file, '.*')
+					puts "- #{basename}"
+					content = ERB.new(File.read(file)).result(binding)
+					File.write(File.join(File.dirname(file), basename), content)
+					FileUtils.rm file
+				end
+			end
+		end
+	end
+end
+
+FlameCLI.start(ARGV)

data/lib/flame/application.rb

@@ -92,6 +92,28 @@ module Flame
 				end
 				result
 			end
+
+			## Method for loading YAML-files from config directory
+			## @param file [String, Symbol] file name (typecast to String with '.yml')
+			## @param key [Symbol, String, nil]
+			##   key for allocating YAML in config Hash (typecast to Symbol)
+			## @param set [Boolean] allocating YAML in Config Hash
+			## @example Load SMTP file from `config/smtp.yml' to config[]
+			##   config.load_yaml('smtp.yml')
+			## @example Load SMTP file without extension, by Symbol
+			##   config.load_yaml(:smtp)
+			## @example Load SMTP file with other key to config[:mail]
+			##   config.load_yaml('smtp.yml', :mail)
+			## @example Load SMTP file without allocating in config[]
+			##   config.load_yaml('smtp.yml', set: false)
+			def load_yaml(file, key: nil, set: true)
+				file = "#{file}.yml" if file.is_a? Symbol
+				file_path = File.join(self[:config_dir], file)
+				yaml = YAML.load_file(file_path)
+				key ||= File.basename(file, '.*')
+				self[key.to_sym] = yaml if set
+				yaml
+			end
 		end
 	end
 end

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.0.16'.freeze
+	VERSION = '4.2.0'.freeze
 end

data/template/.gitignore

@@ -0,0 +1,11 @@
+# configuration
+config/*.yml
+!config/*example.yml
+
+# temp
+log/
+tmp/
+*.bak
+
+# dumps
+*.sql

data/template/Gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+## Framework
+gem 'flame'
+# gem 'flame-flash'
+# gem 'flame-r18n'
+
+## Server
+gem 'thin'
+
+## DataBase
+gem 'sequel'
+# gem 'pg'

data/template/Rakefile.erb

@@ -0,0 +1,62 @@
+namespace :db do
+	## Require libs and config
+	require 'sequel'
+	require File.join(__dir__, 'config', 'sequel.rb')
+	## Default path to db-files
+	db_dir = File.join(__dir__, 'db')
+
+	desc 'Run migrations'
+	task :migrate, [:version] do |_t, args|
+		Sequel.extension :migration
+		migrations_dir = File.join(db_dir, 'migrations')
+
+		if args[:version]
+			puts "Migrating to version #{args[:version]}"
+			Sequel::Migrator.run(
+				<%= @module_name %>::DB,
+				migrations_dir,
+				target: args[:version].to_i
+			)
+		else
+			puts 'Migrating to latest'
+			Sequel::Migrator.run(<%= @module_name %>::DB, migrations_dir)
+		end
+
+		Rake::Task['db:schema:dump'].invoke('same_db=true')
+	end
+
+	desc 'Run seeds'
+	task :seed do |_t|
+		require 'sequel/extensions/seed'
+		seeds_dir = File.join(db_dir, 'seeds')
+
+		## Doesn't support version yet
+		puts 'Seeding latest'
+		Sequel::Seeder.apply(<%= @module_name %>::DB, seeds_dir)
+	end
+
+	namespace :schema do
+		schema_filename = '001_schema.rb'
+
+		desc 'Run schema dump'
+		task :dump do |_t|
+			<%= @module_name %>::DB.extension :schema_dumper
+			puts 'Dump latest schema'
+			dump = <%= @module_name %>::DB.dump_schema_migration(
+				same_db: env_true?('same_db')
+			)
+			File.write(File.join(db_dir, schema_filename), dump)
+		end
+
+		desc 'Run schema load'
+		task :load do |_t|
+			Sequel.extension :migration
+			puts 'Load latest schema'
+			Sequel::Migrator.run(<%= @module_name %>::DB, db_dir, target: 1)
+		end
+	end
+end
+
+def env_true?(key)
+	%(true yes 1 y).include?(ENV[key].to_s.downcase)
+end

data/template/app.rb.erb

@@ -0,0 +1,5 @@
+module <%= @module_name %>
+	## Class for application (mounting controllers)
+	class Application
+	end
+end

data/template/config.ru.erb

@@ -0,0 +1,18 @@
+## Require gems
+require 'bundler'
+Bundler.require
+
+## Require project
+Dir[File.join(
+	__dir__, '{config,models,helpers,controllers}', '{,**}', '{_,}*.rb'
+)].each { |file| require file }
+
+## Require application
+require_relative './app'
+
+## Use middlewares
+use Rack::Session::Cookie, key: 'rack.session', secret: 'dummy_secret'
+use Rack::CommonLogger
+
+## Run application
+run <%= @module_name %>::Application

data/template/config/config.rb.erb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module <%= @module_name %>
+	## Constants
+	SITE_NAME = '<%= @module_name %>'.freeze
+
+	## Configuration for application
+	module Config
+		def self.included(app)
+			## Translations
+			# Flame::R18n.config(app)
+		end
+	end
+end

data/template/config/database.example.yml

@@ -0,0 +1,5 @@
+:adapter: 'postgres'
+:host: 'localhost'
+:database: 'database'
+:user: 'user'
+:password: 'password'

data/template/config/sequel.rb.erb

@@ -0,0 +1,13 @@
+require 'yaml'
+
+## Database initialize for Sequel
+module <%= @module_name %>
+	# Sequel::Model.plugin :timestamps
+	# Sequel::Model.raise_on_save_failure = false
+
+	DB = Sequel.connect(
+		YAML.load_file(File.join(__dir__, 'database.yml'))
+	)
+
+	# DB.extension :pg_enum
+end

data/template/config/thin.example.yml

@@ -0,0 +1,18 @@
+---
+# user: www-data
+# group: www-data
+pid: tmp/pids/thin.pid
+timeout: 30
+wait: 30
+log: log/thin.log
+max_conns: 1024
+require: []
+environment: development # production
+max_persistent_conns: 512
+servers: 1
+threaded: true
+no-epoll: true
+daemonize: true
+socket: tmp/sockets/thin.sock
+chdir: /path/to/the/project
+# tag: a-name-to-show-up-in-ps aux

data/template/controllers/_base_controller.rb.erb

@@ -0,0 +1,11 @@
+module <%= @module_name %>
+	## Base controller for any others controllers
+	class Controller < Flame::Controller
+		# include Flame::R18n
+
+		def execute(method)
+			# session[:locale] = params[:locale] || 'ru'
+			super
+		end
+	end
+end

data/template/server

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+## Functons
+def show_usage
+	puts 'Usage: ./server COMMAND'
+	puts 'COMMAND is one of:'
+	puts '    start - Start server'
+	puts '     stop - Stop server'
+	puts '  restart - Stop/Start server'
+	puts '  monitor - Show log'
+	puts '    devel - Restart/Monitor server'
+end
+
+def start_server
+	system 'rm log/*'
+	system 'thin -C config/thin.yml start'
+end
+
+def stop_server
+	system 'thin -C config/thin.yml stop'
+end
+
+def restart_server
+	stop_server
+	start_server
+end
+
+def monitor_server
+	system 'tail -f log/thin.*.log'
+end
+
+## Runtime
+case ARGV[0]
+when 'start'
+	start_server
+when 'stop'
+	stop_server
+when 'restart'
+	restart_server
+when 'monitor'
+	monitor_server
+when 'devel'
+	restart_server
+	monitor_server
+else
+	puts "Unknown command #{ARGV[0]}"
+	show_usage
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.0.16
+  version: 4.2.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -64,14 +64,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.8.1
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use controller's classes with instance methods as routing actions, mounting
   its in application class.
 email:
 - alex.wayfer@gmail.com
-executables: []
+executables:
+- flame
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/flame
 - lib/flame.rb
 - lib/flame/application.rb
 - lib/flame/controller.rb
@@ -87,6 +103,24 @@ files:
 - lib/flame/validators.rb
 - lib/flame/version.rb
 - public/favicon.ico
+- template/.gitignore
+- template/Gemfile
+- template/Rakefile.erb
+- template/app.rb.erb
+- template/config.ru.erb
+- template/config/config.rb.erb
+- template/config/database.example.yml
+- template/config/sequel.rb.erb
+- template/config/thin.example.yml
+- template/controllers/_base_controller.rb.erb
+- template/db/.keep
+- template/helpers/.keep
+- template/lib/.keep
+- template/locales/en.yml
+- template/models/.keep
+- template/public/.keep
+- template/server
+- template/views/.keep
 homepage: https://github.com/AlexWayfer/flame
 licenses:
 - MIT