ruby-app 0.1.4 → 0.1.5

data/README.md

@@ -14,4 +14,9 @@ Run like:
 
     $ ./bin/example
     $ APP_ENV=production ./bin/example
-    
+
+
+Generate app with ActiveRecord support:
+
+    $ ruby-app new_app --ar
+    

data/bin/ruby-app

@@ -8,11 +8,17 @@ class RubyAppGenerator < Thor::Group
  
   # Define arguments and options
   argument :name
+  class_option :ar, :default => false
  
   def copy_tree
-    directory('', "#{name}/")
+    directory('project', "#{name}/")
     empty_directory("#{name}/log")
     empty_directory("#{name}/tmp")
+    
+    if ar
+      copy_file("database.yml", "#{name}/config/database.yml")
+      empty_directory("#{name}/db/migrate")
+    end
   end
   
   def chmod_example_bin
@@ -23,13 +29,17 @@ class RubyAppGenerator < Thor::Group
 private
 
   def self.source_root
-    File.join(File.dirname(__FILE__), %w{.. generator})
+    File.join(File.dirname(__FILE__), %w{.. generator })
   end
   
   def base_name 
     File.basename(name)
   end
   
+  def ar 
+    options[:ar]
+  end
+  
 end
 
 RubyAppGenerator.start

data/generator/database.yml

@@ -0,0 +1,12 @@
+development:
+  adapter:  sqlite3
+  database: <%= App.root %>/db/development.db
+
+test:
+  adapter:  sqlite3
+  database: <%= App.root %>/db/test.db
+  
+production:
+  adapter:  sqlite3
+  database: /some/path/production.db
+    

data/generator/{.gitignore → project/.gitignore.tt}

@@ -4,3 +4,4 @@ log/*
 !log/.gitkeep
 tmp/*
 !tmp/.gitkeep
+<%= "db/schema.rb\n*.db\n*.sqlite" if ar %>

data/generator/{Gemfile → project/Gemfile.tt}

@@ -2,6 +2,10 @@ source :rubygems
 
 gem 'rake',     :require => false
 gem 'ruby-app'
+<%= "gem 'ruby-app-ar'" if ar %>
+<%= "gem 'sqlite3'" if ar %>
+
+
 
 
 
@@ -15,6 +19,5 @@ group :development do
 end
 
 group :test do 
-
   gem 'rspec', '~>2'  
 end

data/generator/{Rakefile → project/Rakefile.tt}

@@ -1,3 +1,4 @@
 require File.join(File.dirname(__FILE__), %w{config boot})
 
 load "ruby-app/tasks.rake"
+<%= 'load "ruby-app-ar/tasks.rake"' if ar %>

data/lib/ruby-app/version.rb

@@ -1,3 +1,3 @@
 module RubyApp
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-app
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Makarchev Konstantin
@@ -116,23 +116,24 @@ files:
 - README.md
 - Rakefile
 - bin/ruby-app
-- generator/.gitignore
-- generator/Gemfile
-- generator/Rakefile
-- generator/app/models/.gitkeep
-- generator/bin/console
-- generator/bin/example
-- generator/config/boot.rb
-- generator/config/config.rb
-- generator/config/environment.rb
-- generator/config/environments/development.rb
-- generator/config/environments/production.rb
-- generator/config/environments/test.rb
-- generator/config/initializers/.gitkeep
-- generator/lib/application.rb.tt
-- generator/lib/rake_tasks/.gitkeep
-- generator/spec/spec1_spec.rb.tt
-- generator/spec/spec_helper.rb
+- generator/database.yml
+- generator/project/.gitignore.tt
+- generator/project/Gemfile.tt
+- generator/project/Rakefile.tt
+- generator/project/app/models/.gitkeep
+- generator/project/bin/console
+- generator/project/bin/example
+- generator/project/config/boot.rb
+- generator/project/config/config.rb
+- generator/project/config/environment.rb
+- generator/project/config/environments/development.rb
+- generator/project/config/environments/production.rb
+- generator/project/config/environments/test.rb
+- generator/project/config/initializers/.gitkeep
+- generator/project/lib/application.rb.tt
+- generator/project/lib/rake_tasks/.gitkeep
+- generator/project/spec/spec1_spec.rb.tt
+- generator/project/spec/spec_helper.rb
 - lib/ruby-app/application.rb
 - lib/ruby-app/boot.rb
 - lib/ruby-app/common_config.rb