dindi 0.1.0 → 0.2.0

data/Gemfile

@@ -2,12 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "activesupport", "= 2.3.8"
-gem "activerecord", "=2.3.8"
-gem "sinatra", ">= 0"
-gem "json", ">= 0"
-gem "haml", ">= 0"
-gem "pony", ">= 0"
+gem "activesupport", ">= 3.0.0"
+gem "bundler", "~> 1.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,48 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     git (1.2.5)
-    haml (3.1.3)
-    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.2)
-    pony (1.3)
-      mail (> 2.0)
-    rack (1.3.3)
-    rake (0.9.2)
-    rcov (0.9.10)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    rcov (0.9.11)
     shoulda (2.11.3)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.8)
-  activesupport (= 2.3.8)
+  activesupport (>= 3.0.0)
   bundler (~> 1.0.0)
-  haml
   jeweler (~> 1.6.4)
-  json
-  pony
   rcov
   shoulda
-  sinatra

data/README.rdoc

@@ -1,6 +1,14 @@
 = dindi
 
-Description goes here.
+"Another hit by Sinatra"
+
+Dindi help you create a spanking new sinatra app (modular only) with default directory structures.
+
+== Usage
+
+`dindi -h` -- To view the command options
+
+`dindi -n appname` -- Will create a new sinatra app called appname
 
 == Contributing to dindi
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/dindi

@@ -4,6 +4,10 @@
 require 'ostruct'
 require 'optparse'
 require 'fileutils'
+require 'active_support/core_ext/string/inflections'
+
+# extend ActiveSupport::CoreExtensions
+# include ActiveSupport::CoreExtensions::String::Inflections
 
 class OptionParser
 
@@ -59,32 +63,78 @@ project_absolute_dir = FileUtils.pwd + "/" + options.project_name
 
 # create default directories
 # lib, log, public, push, routes, tmp, views
-%w(lib log public push routes tmp views db).each do |dir|
+%w(tmp log public push views routes extlibs models helpers).each do |dir|
   FileUtils.mkdir_p(project_absolute_dir + "/" + dir)
 end
 
+#=================
+# create Gemfile
+#=================
+gemfile_contents = <<-gemfile
+source "http://rubygems.org"
+gem "sinatra"
+gem "mysql2"
+gem "haml"
+gem "activesupport"
+gem "activerecord"
+gem "json"
+gem "pony"
+gemfile
+
+File.open("#{project_absolute_dir}/Gemfile", "w") do |file|
+  file.puts gemfile_contents
+end
+
 #=================
 # create config.ru
 #=================
 
 config_ru_contents = <<-config_ru
+$: << "."
+
+# we use bundler
+require 'bundler/setup'
+
+# modular sinatra app
+require 'sinatra/base'
+
 # gems
-%w(sinatra logger json haml csv digest pony date time activesupport).each  {|lib| require lib}
+%w(logger json haml csv digest date time active_support pony).each  {|lib| require lib}
+
+# load db config and models
+require 'models'
 
 # extra library
-# require '#{project_absolute_dir}/lib/websocket_client'
+Dir.glob("./extlibs/*.rb").each {|extlib| require extlib}
+
+# helpers
+#Dir.glob("./helpers/*.rb").each {|helper| require helper}
+
+# controllers
+Dir.glob("./routes/*.rb").each {|route| require route}
+
+# app file
+require '#{options.project_name}'
 
-# app files
-%w(#{options.project_name}).each {|lib| require lib}
+# app logger
+$LOG = ::Logger.new("log/#{options.project_name}.log")
 
-Time.zone = 'Singapore'
+class Sinatra::Base
+  # set sinatra's variables
+  set     :environment, :production
+  enable  :sessions, :logging, :dump_errors, :show_exceptions
+  disable :run, :reload
+end
+
+# app routes
+App = Rack::Builder.app do
+
+  run #{options.project_name.camelcase}
+end
 
-# server config
-set     :environment, :production
-enable  :sessions, :logging, :dump_errors, :show_exceptions
-disable :run, :reload
+# finally
+run App
 
-run Sinatra::Application
 config_ru
 
 File.open("#{project_absolute_dir}/config.ru", "w") do |file|
@@ -114,7 +164,7 @@ helpers do
 end
 helpers_rb
 
-File.open("#{project_absolute_dir}/helpers.rb", "w") do |file|
+File.open("#{project_absolute_dir}/helpers/debug_on.rb", "w") do |file|
   file.puts helpers_rb_contents
 end
 
@@ -124,7 +174,7 @@ end
 
 database_yml_contents = <<-database_yml
 login: &login
-  adapter: mysql
+  adapter: mysql2
   username: root
   password: password
   host: localhost
@@ -137,36 +187,22 @@ production:
   encoding: utf8
 database_yml
 
-File.open("#{project_absolute_dir}/db/database.yml", "w") do |file|
+File.open("#{project_absolute_dir}/database.yml", "w") do |file|
   file.puts database_yml_contents
 end
 
-#====================
-# create db_config.rb
-#====================
-
-db_config_contents = <<-db_config_rb
-#gem 'activerecord', '=2.3.8'
-require 'activerecord'
-config = YAML.load_file(File.join(File.dirname(__FILE__),'database.yml'))
-ActiveRecord::Base.establish_connection(config["production"])
-db_config_rb
-
-File.open("#{project_absolute_dir}/db/db_config.rb", "w") do |file|
-  file.puts db_config_contents
-end
-
 #=======================
 # create models.rb
 #=======================
 
 models_rb_contents = <<-models_rb
-require '#{project_absolute_dir}/db/db_config'
+require 'mysql2'
+require 'active_record'
 
-# DB Models
+config = YAML.load_file('database.yml')
+ActiveRecord::Base.establish_connection(config["production"])
 
-# class Token < ActiveRecord::Base
-# end
+Dir.glob("#{project_absolute_dir}/models/*.rb").each {|model| require model}
 models_rb
 
 File.open("#{project_absolute_dir}/models.rb", "w") do |file|
@@ -178,28 +214,19 @@ end
 #=======================
 
 project_name_rb_contents = <<-project_name_rb
-# DB connection and data models
-# require 'models'
+class #{options.project_name.camelcase} < Sinatra::Base
 
-# logger 
-before do 
-  $LOG = Logger.new('log/#{options.project_name}.log')
-end
-
-require 'helpers'
+  # index
+  get '/' do
+    '#{options.project_name}'
+  end
 
-# index
-get '/' do
-  '#{options.project_name}'
-end
+  # docs
+  get '/docs' do
+    haml :docs
+  end
 
-# docs
-get '/docs' do
-  haml :docs
 end
-
-### Load other routes
-# load 'routes/startup.rb'
 project_name_rb
 
 File.open("#{project_absolute_dir}/#{options.project_name}.rb", "w") do |file|
@@ -223,3 +250,7 @@ docs_haml
 File.open("#{project_absolute_dir}/views/docs.haml", "w") do |file|
   file.puts docs_haml_contents
 end
+
+# Completion
+puts "Your project folder #{options.project_name} was successfully created"
+puts "Run 'bundle install --path vendor/bundle' to install required gems"

data/dindi.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "dindi"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Chandra"]
+  s.date = "2011-11-29"
+  s.description = "This gem will create a barebone base for a new Sinatra Project"
+  s.email = "samuelchandra@yahoo.com"
+  s.executables = ["dindi"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/dindi",
+    "dindi.gemspec",
+    "lib/dindi.rb",
+    "test/helper.rb",
+    "test/test_dindi.rb"
+  ]
+  s.homepage = "http://github.com/schandra/dindi"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Dindi is a hit of Sinatra"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

metadata

@@ -1,180 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dindi
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Samuel Chandra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70338097528820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: pony
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70338097528820
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70338097527880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70338097527880
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70338097526900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70338097526900
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70338097525800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70338097525800
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70338097524840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70338097524840
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70338097524020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *70338097524020
 description: This gem will create a barebone base for a new Sinatra Project
 email: samuelchandra@yahoo.com
-executables: 
+executables:
 - dindi
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -183,41 +94,36 @@ files:
 - Rakefile
 - VERSION
 - bin/dindi
+- dindi.gemspec
 - lib/dindi.rb
 - test/helper.rb
 - test/test_dindi.rb
 homepage: http://github.com/schandra/dindi
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1036017763519044002
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Dindi is a hit of Sinatra
 test_files: []
-