dindi 0.2.1 → 0.3.0

data/README.rdoc

@@ -6,15 +6,23 @@ Dindi help you create a spanking new sinatra app (modular only) with default dir
 
 == Usage
 
-To view dindi options
+To view dindi options:
 
     dindi -h
 
-Creating a new sinatra app called appname
+Creating a new sinatra app called appname:
 
     dindi -n appname
 
-Dont forget to run bundle install for the gems
+OR
+
+Creating a new sinatra app for ruby 1.9.1:
+
+    dindi -n appname -r 1.9.1
+
+IMPORTANT
+
+Dont forget to run bundle install for the gems:
 
     bundle install --path vendor/bundle
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bin/dindi

@@ -25,6 +25,11 @@ class OptionParser
         options.project_name = lib
       end
 
+      opts.on("-r", "--ruby RUBY_VERSION",
+              "Set RUBY_VERSION to 1.9.1 for compatibility mode") do |ver|
+        options.ruby_version = ver
+      end
+
       # No argument, shows at tail. This will print an options summary.
       # Try it and see!
       opts.on_tail("-h", "--help", "Show this message") do
@@ -55,6 +60,13 @@ if options.project_name.nil?
   exit
 end
 
+# make sure ruby version is valid
+if options.ruby_version.nil?
+  options.ruby_version = "1.9.2"
+else
+  options.ruby_version = "1.9.1"
+end
+
 project_absolute_dir = FileUtils.pwd + "/" + options.project_name
 
 # create default directories
@@ -63,80 +75,237 @@ project_absolute_dir = FileUtils.pwd + "/" + options.project_name
   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
+if options.ruby_version == "1.9.2"
+  #=================
+  # 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
-#=================
+  #=================
+  # create config.ru
+  #=================
 
-config_ru_contents = <<-config_ru
-$: << "."
+  config_ru_contents = <<-config_ru
+  $: << "."
 
-# we use bundler
-require 'bundler/setup'
+  # we use bundler
+  require 'bundler/setup'
 
-# modular sinatra app
-require 'sinatra/base'
+  # modular sinatra app
+  require 'sinatra/base'
 
-# gems
-%w(logger json haml csv digest date time active_support pony).each  {|lib| require lib}
+  # gems
+  %w(logger json haml csv digest date time active_support pony).each  {|lib| require lib}
 
-# load db config and models
-require 'models'
+  # load db config and models
+  require 'models'
 
-# extra library
-Dir.glob("./extlibs/*.rb").each {|extlib| require extlib}
+  # extra library
+  Dir.glob("./extlibs/*.rb").each {|extlib| require extlib}
 
-# helpers
-#Dir.glob("./helpers/*.rb").each {|helper| require helper}
+  # helpers
+  #Dir.glob("./helpers/*.rb").each {|helper| require helper}
 
-# controllers
-Dir.glob("./routes/*.rb").each {|route| require route}
+  # controllers
+  Dir.glob("./routes/*.rb").each {|route| require route}
 
-# app file
-require '#{options.project_name}'
+  # app file
+  require '#{options.project_name}'
 
-# app logger
-$LOG = ::Logger.new("log/#{options.project_name}.log")
+  # app logger
+  $LOG = ::Logger.new("log/#{options.project_name}.log")
 
-class Sinatra::Base
-  # set sinatra's variables
-  set     :environment, :production
-  enable  :sessions, :logging, :dump_errors, :show_exceptions
-  disable :run, :reload
-end
+  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
+  # app routes
+  App = Rack::Builder.app do
 
-  run #{options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase }}
-end
+    run #{options.project_name.gsub(/(?:^|_)(.)/) { $1.upcase }}
+  end
+
+  # finally
+  run App
+
+  config_ru
+
+  File.open("#{project_absolute_dir}/config.ru", "w") do |file|
+    file.puts config_ru_contents
+  end
+  #====================
+  # create database.yml
+  #====================
+
+  database_yml_contents = <<-database_yml
+  login: &login
+    adapter: mysql2
+    username: root
+    password: password
+    host: localhost
+    timezone: SGT
+    reconnect: true
+
+  production:
+    <<: *login
+    database: #{options.project_name}
+    encoding: utf8
+  database_yml
+
+  File.open("#{project_absolute_dir}/database.yml", "w") do |file|
+    file.puts database_yml_contents
+  end
+
+  #=======================
+  # create models.rb
+  #=======================
+
+  models_rb_contents = <<-models_rb
+  require 'mysql2'
+  require 'active_record'
+
+  config = YAML.load_file('database.yml')
+  ActiveRecord::Base.establish_connection(config["production"])
+
+  Dir.glob("#{project_absolute_dir}/models/*.rb").each {|model| require model}
+  models_rb
+
+  File.open("#{project_absolute_dir}/models.rb", "w") do |file|
+    file.puts models_rb_contents
+  end
+
+else
+  #=================
+  # create Gemfile.191
+  #=================
+  gemfile191_contents = <<-gemfile191
+  source "http://rubygems.org"
+  gem "rack", "1.2.2"
+  gem "sinatra", "1.2.6"
+  gem "haml"
+  gem "activesupport", "=2.3.14"
+  gem "activerecord", "=2.3.14"
+  gem "json"
+  gem "pony"
+  gemfile191
+
+  File.open("#{project_absolute_dir}/Gemfile", "w") do |file|
+    file.puts gemfile191_contents
+  end
+  #=================
+  # create config.ru
+  #=================
+
+  config_ru_contents = <<-config_ru
+  $: << "."
+
+  # we use bundler
+  require 'bundler/setup'
+
+  # modular sinatra app
+  require 'sinatra/base'
+
+  # gems
+  %w(logger json haml csv digest date time activesupport pony).each  {|lib| require lib}
+
+  # load db config and models
+  require 'models'
+
+  # extra library
+  Dir.glob("./extlibs/*.rb").each {|extlib| require extlib}
 
-# finally
-run App
+  # helpers
+  #Dir.glob("./helpers/*.rb").each {|helper| require helper}
 
-config_ru
+  # controllers
+  Dir.glob("./routes/*.rb").each {|route| require route}
 
-File.open("#{project_absolute_dir}/config.ru", "w") do |file|
-  file.puts config_ru_contents
+  # app file
+  require '#{options.project_name}'
+
+  # app logger
+  $LOG = ::Logger.new("log/#{options.project_name}.log")
+
+  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.gsub(/(?:^|_)(.)/) { $1.upcase }}
+  end
+
+  # finally
+  run App
+
+  config_ru
+
+  File.open("#{project_absolute_dir}/config.ru", "w") do |file|
+    file.puts config_ru_contents
+  end
+
+  #====================
+  # create database.yml
+  #====================
+
+  database_yml_contents = <<-database_yml
+  login: &login
+    adapter: mysql
+    username: root
+    password: password
+    host: localhost
+    timezone: SGT
+    reconnect: true
+
+  production:
+    <<: *login
+    database: #{options.project_name}
+    encoding: utf8
+  database_yml
+
+  File.open("#{project_absolute_dir}/database.yml", "w") do |file|
+    file.puts database_yml_contents
+  end
+
+  #=======================
+  # create models.rb
+  #=======================
+
+  models_rb_contents = <<-models_rb
+  require 'activerecord'
+
+  config = YAML.load_file('database.yml')
+  ActiveRecord::Base.establish_connection(config["production"])
+
+  Dir.glob("#{project_absolute_dir}/models/*.rb").each {|model| require model}
+  models_rb
+
+  File.open("#{project_absolute_dir}/models.rb", "w") do |file|
+    file.puts models_rb_contents
+  end
 end
 
+
 #==================
 # create helpers.rb
 #==================
@@ -164,46 +333,6 @@ File.open("#{project_absolute_dir}/helpers/debug_on.rb", "w") do |file|
   file.puts helpers_rb_contents
 end
 
-#====================
-# create database.yml
-#====================
-
-database_yml_contents = <<-database_yml
-login: &login
-  adapter: mysql2
-  username: root
-  password: password
-  host: localhost
-  timezone: SGT
-  reconnect: true
-
-production:
-  <<: *login
-  database: #{options.project_name}
-  encoding: utf8
-database_yml
-
-File.open("#{project_absolute_dir}/database.yml", "w") do |file|
-  file.puts database_yml_contents
-end
-
-#=======================
-# create models.rb
-#=======================
-
-models_rb_contents = <<-models_rb
-require 'mysql2'
-require 'active_record'
-
-config = YAML.load_file('database.yml')
-ActiveRecord::Base.establish_connection(config["production"])
-
-Dir.glob("#{project_absolute_dir}/models/*.rb").each {|model| require model}
-models_rb
-
-File.open("#{project_absolute_dir}/models.rb", "w") do |file|
-  file.puts models_rb_contents
-end
 
 #=======================
 # create project_name.rb

data/dindi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dindi"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Samuel Chandra"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dindi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70207838994920 !ruby/object:Gem::Requirement
+  requirement: &70127703985040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207838994920
+  version_requirements: *70127703985040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70207838994180 !ruby/object:Gem::Requirement
+  requirement: &70127703984300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70207838994180
+  version_requirements: *70127703984300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70207838993240 !ruby/object:Gem::Requirement
+  requirement: &70127703983580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70207838993240
+  version_requirements: *70127703983580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70207838992260 !ruby/object:Gem::Requirement
+  requirement: &70127703982760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207838992260
+  version_requirements: *70127703982760
 description: This gem will create a barebone base for a new Sinatra Project
 email: samuelchandra@yahoo.com
 executables:
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2827027482435854666
+      hash: -2284743464459468648
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: