dindi 0.7.1 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3522841c64dc34852076206b046951aac9b870f6
-  data.tar.gz: b4b1ffd015816cd77e9b38bf26a1289b18f1b6a5
+  metadata.gz: b61da3dc18d12f004cc34351e6df3f755d33150f
+  data.tar.gz: bb4dfcf7f7d8f3782168dc510bb45d19b545b058
 SHA512:
-  metadata.gz: f88d6242f94bed2ca1038d7d3e16265de3c10ca1d5ec6d84c315c5849372fdb673bd8dc1d6ccca6c3f8563689315ce3b372bf16c70afe5b8a4e707c4ba9f0795
-  data.tar.gz: c2b40ca3940b2c15ae6dc1f595ed045ff3c961ce2c1bb49c85f41e40935a8561a71e61ccd7d55723b4eb7786e1acce4ee2694a76999fe63b95ad644fe0aa13f0
+  metadata.gz: ef0f292d992a6a91aa586b02018ed9a3b5a414871e5bb51fc5378b668d32984f77da2b3d79586d77f5ba481f9c659fe9455ad41700f5d6981e719a7b6ae24c2a
+  data.tar.gz: 94004172d90944fbc2b344569799afdf7039e973370bbce876735f7dae0a8eb104cad894ca4b711375e395bc446c951b2e28797e0af7c339661580133387e52d

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in cronies.gemspec
+# Specify your gem's dependencies in dindi.gemspec
 gemspec

data/README.rdoc

@@ -17,9 +17,9 @@ To view all options
 
 == Example
 
-To create a new Sinatra app called 'convore'
+To create a new Sinatra app called 'lelong'
 
-    dindi -n convore
+    dindi -n lelong
 
 == Contributing to dindi
  

data/bin/dindi

@@ -36,10 +36,13 @@ Dindi::FileHelper.copy_file_templates(options)
 # Completion
 puts "Your project folder #{options.project_name} was successfully created".green
 
-puts "Running 'bundle install --path vendor/bundle' ......."
-bundler_result = system("cd #{options.project_absolute_dir}; bundle install --path vendor/bundle")
-if bundler_result
-  puts "passed".green + " bundler install"
-else
-  puts "failed".red + " bundler install"
+# Optional steps
+if options.with_bundle_install
+  puts "Running 'bundle install --path vendor/bundle' ......."
+  bundler_result = system("cd #{options.project_absolute_dir}; bundle install --path vendor/bundle")
+  if bundler_result
+    puts "passed".green + " bundler install"
+  else
+    puts "failed".red + " bundler install"
+  end
 end

data/lib/dindi/command_parser.rb

@@ -13,6 +13,7 @@ module Dindi
       #
       # We set the default value here
       options.project_name = nil
+      options.with_bundle_install = false
 
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: dindi [options]"
@@ -21,8 +22,12 @@ module Dindi
         opts.separator "Specific options:"
 
         opts.on("-n", "--name PROJECT_NAME",
-                "Specify your project name PROJECT_NAME that will be created") do |lib|
-          options.project_name = lib.downcase
+                "Specify your project name PROJECT_NAME that will be created") do |project_name|
+          options.project_name = project_name.downcase
+        end
+
+        opts.on("-b", "--[no-]bundle-install", "Run bundler install after project creation") do |b|
+          options.with_bundle_install = b
         end
 
         # No argument, shows at tail. This will print an options summary.

data/lib/dindi/file_helper.rb

@@ -45,10 +45,14 @@ module Dindi
       project_absolute_dir = options.project_absolute_dir
 
       # copy location for not common template files
-      special_location_hash = {"debug_on.rb"        => File.join(project_absolute_dir, 'helpers', 'debug_on.rb'),
-                               "deploy_setting.rb"  => File.join(project_absolute_dir, 'configs', 'deploy_setting.rb'),
-                               "docs.haml"          => File.join(project_absolute_dir, 'views', 'docs.haml'), 
-                               "project_name.rb"    => File.join(project_absolute_dir, "#{options.project_name}.rb")
+      special_location_hash = {"debug_on.rb"              => File.join(project_absolute_dir, 'helpers', 'debug_on.rb'),
+                               "deploy_setting.rb"        => File.join(project_absolute_dir, 'configs', 'deploy_setting.rb'),
+                               "database.yml"             => File.join(project_absolute_dir, 'configs', 'database.yml'),
+                               "active_record_setting.rb" => File.join(project_absolute_dir, 'configs', 'active_record_setting.rb'),
+                               "initializer.rb"           => File.join(project_absolute_dir, 'configs', 'initializer.rb'),
+                               "docs.haml"                => File.join(project_absolute_dir, 'views', 'docs.haml'), 
+                               "docs_controller.rb"       => File.join(project_absolute_dir, 'routes', 'docs_controller.rb'), 
+                               "main_controller.rb"       => File.join(project_absolute_dir, 'routes', 'main_controller.rb')
                               }
 
       if special_location_hash[filename]

data/lib/dindi/file_templates/latest/Gemfile.erb

@@ -12,3 +12,4 @@ gem "activesupport"
 gem "redis"
 gem "pony"
 gem "rest-client"
+gem "thin"

data/lib/dindi/file_templates/latest/README.erb

@@ -0,0 +1,18 @@
+<%= options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase } %>
+
+## Install Required Gems
+
+In the project root directory run:
+$ bundle install --path vendor/bundle
+
+## Running Thin
+
+In the project root directory run:
+$ bundle exec thin start -a 0.0.0.0 -p 3000 -R config.ru -e production
+
+## Debugging code in IRB
+
+In the project root directory run:
+$ bundle exec irb
+irb> require_relative 'configs/initializer'
+

data/lib/dindi/file_templates/latest/config.ru.erb

@@ -1,52 +1,17 @@
-$: << "."
+# Main initializer to load required libraries
+require_relative 'configs/initializer'
 
-# we use bundler
-require 'bundler/setup'
+# App Router
+app = Rack::Builder.new do
 
-# modular sinatra app
-require 'sinatra/base'
-
-# gems
-%w(logger json haml digest date time yaml).each {|gem| require gem}
-
-# load app config
-Dir.glob("./configs/*.rb").each {|config| require config}
-
-# load db config and models
-require 'models'
-
-# helpers
-Dir.glob("./helpers/*.rb").each {|helper| require helper}
-
-# external library
-Dir.glob("./extlibs/*.rb").each {|extlib| require extlib}
-
-# controllers
-Dir.glob("./routes/*.rb").each {|route| require route}
-
-# app file
-require '<%= options.project_name %>'
-
-class Sinatra::Base
-  # helpers
-  include DebugOn
-
-  # set sinatra's variables
-  set :app_name, "<%= options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase } %>" 
-  set :app_logger, ::Logger.new(File.join(File.dirname(__FILE__), 'log', "<%= options.project_name %>.log"))
-  set :root, File.dirname(__FILE__)
-  set :environment, DeploySetting.environment
-
-  if settings.environment == :production
-    enable  :sessions, :logging, :dump_errors
-    disable :run, :reload, :show_exceptions
-    # set :redis, Redis.new(:db => 2)
-  else
-    enable  :sessions, :logging, :dump_errors, :show_exceptions
-    disable :run, :reload
-    # set :redis, Redis.new(:db => 15)
-  end
+  # CMS
+  # map "/cms" do
+  #   map("/")   {run CmsController.new }
+  # end
 
+  map("/docs") {run DocsController.new }
+  map("/")     {run MainController.new }
+  
 end
 
-run <%= options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase } %>
+run app

data/lib/dindi/file_templates/shared/active_record_setting.rb.erb

@@ -0,0 +1,5 @@
+config = YAML.load_file(File.join(File.dirname(__FILE__), 'database.yml'))
+env = DeploySetting.environment.to_s
+
+ActiveRecord::Base.establish_connection(config[env])
+ActiveRecord::Base.include_root_in_json = false

data/lib/dindi/file_templates/shared/docs_controller.rb.erb

@@ -0,0 +1,8 @@
+class DocsController < Sinatra::Base
+
+  get '/' do
+    protected!
+    haml :docs, :layout => false
+  end
+
+end

data/lib/dindi/file_templates/shared/initializer.rb.erb

@@ -0,0 +1,49 @@
+# base
+require 'bundler/setup'
+require 'sinatra/base'
+
+# gems
+require 'logger'
+require 'json'
+require 'haml'
+require 'digest'
+require 'date'
+require 'time'
+require 'yaml'
+require 'mysql2'
+require 'active_record'
+
+# configs
+require_relative 'deploy_setting'
+require_relative 'active_record_setting'
+
+$root_path = File.join(File.dirname(__FILE__), '..')
+
+['helpers', 'extlibs', 'models', 'routes'].each do |dir_name|
+  dir_path = File.join($root_path, dir_name, '*.rb')
+  Dir.glob(dir_path).each do |file|
+    require file
+  end
+end
+
+class Sinatra::Base
+  # helpers
+  include DebugOn
+
+  # set sinatra's variables
+  set :app_name, "<%= options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase } %>" 
+  set :app_logger, Logger.new(File.join($root_path, 'log', "<%= options.project_name %>.log"), 'daily')
+  set :root, $root_path
+  set :environment, DeploySetting.environment
+
+  if settings.environment == :production
+    enable  :sessions, :logging, :dump_errors
+    disable :run, :reload, :show_exceptions
+    # set :redis, Redis.new(:db => 2)
+  else
+    enable  :sessions, :logging, :dump_errors, :show_exceptions
+    disable :run, :reload
+    # set :redis, Redis.new(:db => 15)
+  end
+
+end

data/lib/dindi/file_templates/shared/main_controller.rb.erb

@@ -0,0 +1,7 @@
+class MainController < Sinatra::Base
+
+  get '/' do
+    '<h1><%= options.project_name %></h1>'
+  end
+
+end

data/lib/dindi/version.rb

@@ -1,3 +1,3 @@
 module Dindi
-  VERSION = "0.7.1"
+  VERSION = "1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dindi
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: '1.0'
 platform: ruby
 authors:
 - Samuel Chandra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,13 +57,16 @@ files:
 - lib/dindi/command_parser.rb
 - lib/dindi/file_helper.rb
 - lib/dindi/file_templates/latest/Gemfile.erb
+- lib/dindi/file_templates/latest/README.erb
 - lib/dindi/file_templates/latest/config.ru.erb
-- lib/dindi/file_templates/latest/database.yml.erb
-- lib/dindi/file_templates/latest/models.rb.erb
+- lib/dindi/file_templates/shared/active_record_setting.rb.erb
+- lib/dindi/file_templates/shared/database.yml.erb
 - lib/dindi/file_templates/shared/debug_on.rb.erb
 - lib/dindi/file_templates/shared/deploy_setting.rb.erb
 - lib/dindi/file_templates/shared/docs.haml.erb
-- lib/dindi/file_templates/shared/project_name.rb.erb
+- lib/dindi/file_templates/shared/docs_controller.rb.erb
+- lib/dindi/file_templates/shared/initializer.rb.erb
+- lib/dindi/file_templates/shared/main_controller.rb.erb
 - lib/dindi/version.rb
 homepage: http://github.com/samchandra/dindi
 licenses:

data/lib/dindi/file_templates/latest/models.rb.erb

@@ -1,14 +0,0 @@
-require 'mysql2'
-require 'active_record'
-
-config = YAML.load_file(File.join(File.dirname(__FILE__), 'database.yml'))
-
-if DeploySetting.environment == :production
-  ActiveRecord::Base.establish_connection(config["production"])
-else
-  ActiveRecord::Base.establish_connection(config["development"])
-end
-
-ActiveRecord::Base.include_root_in_json = false
-
-Dir.glob(File.join(File.dirname(__FILE__), "models", "*.rb")).each {|model| require model}

data/lib/dindi/file_templates/shared/project_name.rb.erb

@@ -1,17 +0,0 @@
-class <%= options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase } %> < Sinatra::Base
-
-  # Routes
-  # use Cms
-
-  # index
-  get '/' do
-    '<%= options.project_name %>'
-  end
-
-  # docs
-  get '/docs' do
-    protected!
-    haml :docs, :layout => false
-  end
-
-end