padrino-gen 0.6.1 → 0.6.2

data/README.rdoc

@@ -1,15 +1,6 @@
-= padrino-gen
+= Agnostic Application Generators (padrino-gen)
 
-== Installation
-
-To install the 'full-stack' padrino framework, simply grab the latest version from gemcutter:
-
-  $ sudo gem install padrino --source http://gemcutter.org
-  
-This will install the necessary padrino gems to get you started.
-Now you are ready to use this gem to enhance your existing Sinatra projects or build new Padrino applications.
-  
-== Overview
+=== Overview
 
 Padrino comes preloaded with flexible code generators powered in part by the excellent Thor gem
 (incidentally also used in the Rails 3 generators). These generators are intended to allow for easy code generation
@@ -18,7 +9,7 @@ as possible, supporting a myriad of test frameworks, js libraries, mocking libra
 
 See the wiki article for additional information: <...WIKI...>
 
-=== Application Generator ===
+=== Application Generator
 
 Padrino provides generator support for quickly creating new Padrino applications. This provides many benefits
 such as constructing the recommended Padrino application structure, auto-generating a Gemfile listing
@@ -78,7 +69,7 @@ This would be achieved through forking our project and reading through the code
 the setup instructions inside the relevant files within <tt>lib/generators/components/</tt>. We are happy to accept pull requests
 for additional component types not originally included (although helping us maintain them would also be appreciated).
 
-=== Model Generator ===
+=== Model Generator
 
 Padrino provides generator support for quickly creating new models within your Padrino application. Note that
 the models (and migrations) generated are specifically tailored towards the ORM component and testing framework
@@ -111,7 +102,7 @@ You can destroy models that you created via the destroy option and setting it to
   
 This remove all created model files.
 
-=== Migration Generator ===
+=== Migration Generator
 
 Padrino provides generator for quickly generating new migrations to change or manipulate the database schema.
 These migrations generated will be tailored towards the ORM chosen when generating the application.
@@ -139,7 +130,7 @@ You can destroy migrations that you created via the destroy option and setting i
   
 This removes the migration file.
 
-=== Controller Generator ===
+=== Controller Generator
 
 Padrino provides generator support for quickly creating new controllers within your Padrino application. Note that
 the controller tests are generated specifically tailored towards the testing framework chosen 
@@ -170,7 +161,7 @@ You can destroy controllers that you created via the destroy option and setting
 
 This removes all created controller files.
 
-=== Mailer Generator ===
+=== Mailer Generator
 
 Padrino provides generator support for quickly creating new mailers within your Padrino application.
 Very important to note that mailer generators are intended primarily to work within applications 

data/Rakefile

@@ -50,7 +50,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+# task :test => :check_dependencies
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bin/padrino-gen

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
 %w[rubygems thor].each { |gem| require gem }
-require File.dirname(__FILE__) + "/../lib/padrino-gen"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 
-Padrino::Generators::Base.start(ARGV)
-Padrino::Generators.lockup!
+# We try to load the vendored padrino-core if exist
+if File.exist?(File.dirname(__FILE__) + "/../../padrino-core/lib")
+  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-core/lib"
+end
 
-generator_kind  = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
-generator_class = Padrino::Generators.mappings[generator_kind]
+require 'padrino-gen'
 
-if generator_class
-  generator_class.start(ARGV)
-else
-  puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"
-end
+# We need our config boot because we need to load registered generators so:
+Padrino::Generators::Cli.start(ARGV)

data/lib/padrino-gen/generators/components/actions.rb

@@ -78,19 +78,19 @@ module Padrino
           end.max.to_i || 0
         end
 
-        #For model destroy option
-        #removes the initial migration file of model
+        # For model destroy option
+        # removes the initial migration file of model
         def remove_model_migration(name)
           remove_migration "Create" + name
         end
         
-        #For the removal of migration files
+        # For the removal of migration files
         # removes the migration file based on the migration name
         def remove_migration(name)
           migration_path =  Dir[app_root_path('db/migrate/*.rb')].select do |f| 
             File.basename(f).match(/#{name.to_s.underscore}/)
           end.first
-          remove_file migration_path
+          remove_file migration_path if migration_path && File.exist?(migration_path)
         end
 
         # For testing components

data/lib/padrino-gen/generators/model.rb

@@ -23,6 +23,7 @@ module Padrino
       argument :fields, :desc => "The fields for the model", :type => :array, :default => []
       class_option :root, :aliases => '-r', :default => nil, :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
+      class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
 
       # Show help if no argv given
       def self.start(given_args=ARGV, config={})
@@ -39,7 +40,7 @@ module Padrino
           migration_name = "create_#{name.pluralize.underscore}"
           create_model_file(name, fields)
           generate_model_test(name)
-          create_model_migration(migration_name, name, fields)
+          create_model_migration(migration_name, name, fields) unless options[:skip_migration]
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end

data/lib/padrino-gen/generators.rb

@@ -18,5 +18,41 @@ module Padrino
         load_paths.each { |lib| require lib  }
       end
     end
+
+    class Cli < Thor::Group
+
+      # Include related modules
+      include Thor::Actions
+
+      class_option :root, :aliases => '-r', :default => nil, :type => :string
+
+      # We need to TRY to load boot because some of our app dependencies maybe have 
+      # custom generators, so is necessary know who are.
+      def load_boot
+        if options[:root]
+          require File.join(options[:root], 'config/boot.rb') if File.exist?(File.join(options[:root], 'config/boot.rb'))
+        else
+          require 'config/boot.rb' if File.exist?('config/boot.rb')
+        end
+      end
+
+      def setup
+        require 'padrino-gen/generators/actions'
+        Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
+
+        Padrino::Generators.lockup!
+
+        generator_kind  = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
+        generator_class = Padrino::Generators.mappings[generator_kind]
+
+        if generator_class
+          generator_class.start(ARGV)
+        else
+          puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"
+        end
+      end
+
+    end
+
   end
 end

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -0,0 +1,325 @@
+if defined?(ActiveRecord)
+  namespace :ar do
+    namespace :create do
+      desc 'Create all the local databases defined in config/database.yml'
+      task :all => :environment do
+        ActiveRecord::Base.configurations.each_value do |config|
+          # Skip entries that don't have a database key, such as the first entry here:
+          #
+          #  defaults: &defaults
+          #    adapter: mysql
+          #    username: root
+          #    password:
+          #    host: localhost
+          #
+          #  development:
+          #    database: blog_development
+          #    <<: *defaults
+          next unless config['database']
+          # Only connect to local databases
+          local_database?(config) { create_database(config) }
+        end
+      end
+    end
+
+    desc 'Create the database defined in config/database.yml for the current Padrino.env'
+    task :create => :environment do
+      create_database(ActiveRecord::Base.configurations[Padrino.env])
+    end
+
+    def create_database(config)
+      begin
+        if config['adapter'] =~ /sqlite/
+          if File.exist?(config['database'])
+            $stderr.puts "#{config['database']} already exists"
+          else
+            begin
+              # Create the SQLite database
+              ActiveRecord::Base.establish_connection(config)
+              ActiveRecord::Base.connection
+            rescue
+              $stderr.puts $!, *($!.backtrace)
+              $stderr.puts "Couldn't create database for #{config.inspect}"
+            end
+          end
+          return # Skip the else clause of begin/rescue
+        else
+          ActiveRecord::Base.establish_connection(config)
+          ActiveRecord::Base.connection
+        end
+      rescue
+        case config['adapter']
+        when 'mysql'
+          @charset   = ENV['CHARSET']   || 'utf8'
+          @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+          creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+          begin
+            ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+            ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+            ActiveRecord::Base.establish_connection(config)
+          rescue Mysql::Error => sqlerr
+            if sqlerr.errno == Mysql::Error::ER_ACCESS_DENIED_ERROR
+              print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+              root_password = $stdin.gets.strip
+              grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
+                "TO '#{config['username']}'@'localhost' " \
+                "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
+              ActiveRecord::Base.establish_connection(config.merge(
+                  'database' => nil, 'username' => 'root', 'password' => root_password))
+              ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+              ActiveRecord::Base.connection.execute grant_statement
+              ActiveRecord::Base.establish_connection(config)
+            else
+              $stderr.puts sqlerr.error
+              $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
+              $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+            end
+          end
+        when 'postgresql'
+          @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8'
+          begin
+            ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+            ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+            ActiveRecord::Base.establish_connection(config)
+          rescue
+            $stderr.puts $!, *($!.backtrace)
+            $stderr.puts "Couldn't create database for #{config.inspect}"
+          end
+        end
+      else
+        $stderr.puts "#{config['database']} already exists"
+      end
+    end
+
+    namespace :drop do
+      desc 'Drops all the local databases defined in config/database.yml'
+      task :all => :environment do
+        ActiveRecord::Base.configurations.each_value do |config|
+          # Skip entries that don't have a database key
+          next unless config['database']
+          begin
+            # Only connect to local databases
+            local_database?(config) { drop_database(config) }
+          rescue Exception => e
+            puts "Couldn't drop #{config['database']} : #{e.inspect}"
+          end
+        end
+      end
+    end
+
+    desc 'Drops the database for the current Padrino.env'
+    task :drop => :environment do
+      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      begin
+        drop_database(config)
+      rescue Exception => e
+        puts "Couldn't drop #{config['database']} : #{e.inspect}"
+      end
+    end
+
+    def local_database?(config, &block)
+      if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?
+        yield
+      else
+        puts "This task only modifies local databases. #{config['database']} is on a remote host."
+      end
+    end
+
+
+    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+    task :migrate => :environment do
+      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+
+    namespace :migrate do
+      desc  'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
+      task :redo => :environment do
+        if ENV["VERSION"]
+          Rake::Task["db:migrate:down"].invoke
+          Rake::Task["db:migrate:up"].invoke
+        else
+          Rake::Task["db:rollback"].invoke
+          Rake::Task["db:migrate"].invoke
+        end
+      end
+
+      desc 'Resets your database using your migrations for the current environment'
+      task :reset => ["db:drop", "db:create", "db:migrate"]
+
+      desc 'Runs the "up" for a given migration VERSION.'
+      task :up => :environment do
+        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+        raise "VERSION is required" unless version
+        ActiveRecord::Migrator.run(:up, "db/migrate/", version)
+        Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      end
+
+      desc 'Runs the "down" for a given migration VERSION.'
+      task :down => :environment do
+        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+        raise "VERSION is required" unless version
+        ActiveRecord::Migrator.run(:down, "db/migrate/", version)
+        Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      end
+    end
+
+    desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
+    task :rollback => :environment do
+      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+      ActiveRecord::Migrator.rollback('db/migrate/', step)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+
+    desc 'Pushes the schema to the next version. Specify the number of steps with STEP=n'
+    task :forward => :environment do
+      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+      ActiveRecord::Migrator.forward('db/migrate/', step)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+
+    desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+    task :reset => [ 'db:drop', 'db:setup' ]
+
+    desc "Retrieves the charset for the current environment's database"
+    task :charset => :environment do
+      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      case config['adapter']
+      when 'mysql'
+        ActiveRecord::Base.establish_connection(config)
+        puts ActiveRecord::Base.connection.charset
+      when 'postgresql'
+        ActiveRecord::Base.establish_connection(config)
+        puts ActiveRecord::Base.connection.encoding
+      else
+        puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+    end
+
+    desc "Retrieves the collation for the current environment's database"
+    task :collation => :environment do
+      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      case config['adapter']
+      when 'mysql'
+        ActiveRecord::Base.establish_connection(config)
+        puts ActiveRecord::Base.connection.collation
+      else
+        puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+    end
+
+    desc "Retrieves the current schema version number"
+    task :version => :environment do
+      puts "Current version: #{ActiveRecord::Migrator.current_version}"
+    end
+
+    desc "Raises an error if there are pending migrations"
+    task :abort_if_pending_migrations => :environment do
+      if defined? ActiveRecord
+        pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
+
+        if pending_migrations.any?
+          puts "You have #{pending_migrations.size} pending migrations:"
+          pending_migrations.each do |pending_migration|
+            puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+          end
+          abort %{Run "rake db:migrate" to update your database then try again.}
+        end
+      end
+    end
+
+    desc 'Create the database, load the schema, and initialize with the seed data'
+    task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+
+    namespace :schema do
+      desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
+      task :dump => :environment do
+        require 'active_record/schema_dumper'
+        File.open(ENV['SCHEMA'] || Padrino.root("db", "schema.rb"), "w") do |file|
+          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        end
+        Rake::Task["db:schema:dump"].reenable
+      end
+
+      desc "Load a schema.rb file into the database"
+      task :load => :environment do
+        file = ENV['SCHEMA'] || Padrino.root("db", "schema.rb")
+        if File.exists?(file)
+          load(file)
+        else
+          raise %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Padrino.root}/config/boot.rb to limit the frameworks that will be loaded}
+        end
+      end
+    end
+
+    namespace :structure do
+      desc "Dump the database structure to a SQL file"
+      task :dump => :environment do
+        abcs = ActiveRecord::Base.configurations
+        case abcs[Padrino.env]["adapter"]
+        when "mysql", "oci", "oracle"
+          ActiveRecord::Base.establish_connection(abcs[Padrino.env])
+          File.open("#{Padrino.root}/db/#{Padrino.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+        when "postgresql"
+          ENV['PGHOST']     = abcs[Padrino.env]["host"] if abcs[Padrino.env]["host"]
+          ENV['PGPORT']     = abcs[Padrino.env]["port"].to_s if abcs[Padrino.env]["port"]
+          ENV['PGPASSWORD'] = abcs[Padrino.env]["password"].to_s if abcs[Padrino.env]["password"]
+          search_path = abcs[Padrino.env]["schema_search_path"]
+          unless search_path.blank?
+            search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+          end
+          `pg_dump -i -U "#{abcs[Padrino.env]["username"]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{abcs[Padrino.env]["database"]}`
+          raise "Error dumping database" if $?.exitstatus == 1
+        when "sqlite", "sqlite3"
+          dbfile = abcs[Padrino.env]["database"] || abcs[Padrino.env]["dbfile"]
+          `#{abcs[Padrino.env]["adapter"]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
+        when "sqlserver"
+          `scptxfr /s #{abcs[Padrino.env]["host"]} /d #{abcs[Padrino.env]["database"]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
+          `scptxfr /s #{abcs[Padrino.env]["host"]} /d #{abcs[Padrino.env]["database"]} /I /F db\ /q /A /r`
+        when "firebird"
+          set_firebird_env(abcs[Padrino.env])
+          db_string = firebird_db_string(abcs[Padrino.env])
+          sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
+        else
+          raise "Task not supported by '#{abcs["test"]["adapter"]}'"
+        end
+
+        if ActiveRecord::Base.connection.supports_migrations?
+          File.open("#{Padrino.root}/db/#{Padrino.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        end
+      end
+    end
+
+  end
+
+  def drop_database(config)
+    case config['adapter']
+    when 'mysql'
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.drop_database config['database']
+    when /^sqlite/
+      require 'pathname'
+      path = Pathname.new(config['database'])
+      file = path.absolute? ? path.to_s : Padrino.root(path)
+
+      FileUtils.rm(file)
+    when 'postgresql'
+      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config['database']
+    end
+  end
+
+  def session_table_name
+    ActiveRecord::SessionStore::Session.table_name
+  end
+
+  def set_firebird_env(config)
+    ENV["ISC_USER"]     = config["username"].to_s if config["username"]
+    ENV["ISC_PASSWORD"] = config["password"].to_s if config["password"]
+  end
+
+  def firebird_db_string(config)
+    FireRuby::Database.db_string_for(config.symbolize_keys)
+  end
+end

data/lib/padrino-gen/padrino-tasks/datamapper.rb

@@ -1,15 +1,83 @@
 if defined?(DataMapper)
   namespace :dm do
-    desc "DataMapper: perform migration (reset your db data)"
-    task :migrate => :environment do
-      DataMapper.auto_migrate!
-      puts "=> db:migrate executed"
+    namespace :auto do
+      desc "Perform automigration (reset your db data)"
+      task :migrate => :environment do
+        ::DataMapper.auto_migrate!
+        puts "<= dm:auto:migrate executed"
+      end
+      
+      desc "Perform non destructive automigration"
+      task :upgrade => :environment do
+        ::DataMapper.auto_upgrade!
+        puts "<= dm:auto:upgrade executed"
+      end
     end
 
-    desc "DataMapper: perform upgrade (with a no-destructive way)"
-    task :upgrade => :environment do
-      DataMapper.auto_upgrade!
-      puts "=> db:upgrade executed"
+    namespace :migrate do
+      task :load => :environment do
+        require 'dm-migrations/migration_runner'
+        FileList["db/migrate/*.rb"].each do |migration|
+          load migration
+        end
+      end
+
+      desc "Migrate up using migrations"
+      task :up, :version, :needs => :load do |t, args|
+        version = args[:version] || ENV['VERSION']
+        migrate_up!(version)
+        puts "<= dm:migrate:up #{version} executed"
+      end
+
+      desc "Migrate down using migrations"
+      task :down, :version, :needs => :load do |t, args|
+        version = args[:version] || ENV['VERSION']
+        migrate_down!(version)
+        puts "<= dm:migrate:down #{version} executed"
+      end
+    end
+
+    desc "Migrate the database to the latest version"
+    task :migrate => 'dm:migrate:up'
+
+    desc "Create the database"
+    task :create => :environment do
+      config = DataMapper.repository.adapter.options.symbolize_keys
+      puts "=> Creating database #{config[:database]}"
+      case config[:adapter]
+      when 'postgres'
+        `createdb -U #{config[:username]} #{config[:database]}`
+        puts "<= dm:create executed"
+      when 'mysql'
+        user, password, database = config[:username], config[:password], config[:database]
+        `mysql -u #{user} #{password ? "-p #{password}" : ''} -e "create database #{database}"`
+        puts "<= dm:create executed"
+      when 'sqlite3'
+        Rake::Task['dm:auto:migrate'].invoke
+      else
+        raise "Adapter #{config[:adapter]} not supported for creating databases yet."
+      end
     end
+
+    desc "Drop the database (postgres and mysql only)"
+    task :drop => :environment do
+      config = DataMapper.repository.adapter.options.symbolize_keys
+      puts "=> Dropping database '#{config[:database]}'"
+      case config[:adapter]
+      when 'postgres'
+        `dropdb -U #{config[:username]} #{config[:database]}`
+        puts "<= dm:drop executed"
+      when 'mysql'
+        user, password, database = config[:username], config[:password], config[:database]
+        `mysql -u #{user} #{password ? "-p #{password}" : ''} -e "drop database #{database}"`
+        puts "<= dm:drop executed"
+      else
+        raise "Adapter #{config[:adapter]} not supported for dropping databases yet.\ntry dm:auto:migrate"
+      end
+    end
+
+    desc "Drop the database, and migrate from scratch"
+    task :reset => [:drop, :create, :migrate]
+
   end
 end

data/lib/padrino-gen.rb

@@ -1,11 +1,5 @@
 require 'padrino-core/support_lite'
-
-Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{components}/**/*.rb'].each { |lib| require lib }
-require File.dirname(__FILE__) + '/padrino-gen/generators/actions'
-require File.dirname(__FILE__) + '/padrino-gen/generators/base'
-require File.dirname(__FILE__) + '/padrino-gen/generators'
-
-
+require 'padrino-gen/generators'
 # Add our rakes when padrino core require this file.
 require 'padrino-core/tasks'
 Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

data/padrino-gen.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/config/initializers/.empty_directory",
      "lib/padrino-gen/generators/app/config/initializers/example.rb",
      "lib/padrino-gen/generators/app/tmp/.empty_directory",
-     "lib/padrino-gen/generators/base.rb",
      "lib/padrino-gen/generators/components/actions.rb",
      "lib/padrino-gen/generators/components/mocks/mocha_gen.rb",
      "lib/padrino-gen/generators/components/mocks/rr_gen.rb",
@@ -76,6 +75,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/templates/scripts/lowpro.js",
      "lib/padrino-gen/generators/templates/scripts/protopak.js",
      "lib/padrino-gen/generators/templates/scripts/right.js",
+     "lib/padrino-gen/padrino-tasks/activerecord.rb",
      "lib/padrino-gen/padrino-tasks/datamapper.rb",
      "padrino-gen.gemspec",
      "test/helper.rb",
@@ -98,7 +98,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
       s.add_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
     s.add_dependency(%q<bundler>, [">= 0.5.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/helper.rb

@@ -4,9 +4,19 @@ require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'webrat'
+require 'thor'
+
+# We try to load the vendored padrino-core if exist
+%w(core).each do |gem|
+  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
+    $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+  end
+end
 
 require 'padrino-gen'
 
+Padrino::Generators::Cli.start
+
 class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -151,7 +151,6 @@ files:
 - lib/padrino-gen/generators/app/config/initializers/.empty_directory
 - lib/padrino-gen/generators/app/config/initializers/example.rb
 - lib/padrino-gen/generators/app/tmp/.empty_directory
-- lib/padrino-gen/generators/base.rb
 - lib/padrino-gen/generators/components/actions.rb
 - lib/padrino-gen/generators/components/mocks/mocha_gen.rb
 - lib/padrino-gen/generators/components/mocks/rr_gen.rb
@@ -182,6 +181,7 @@ files:
 - lib/padrino-gen/generators/templates/scripts/lowpro.js
 - lib/padrino-gen/generators/templates/scripts/protopak.js
 - lib/padrino-gen/generators/templates/scripts/right.js
+- lib/padrino-gen/padrino-tasks/activerecord.rb
 - lib/padrino-gen/padrino-tasks/datamapper.rb
 - padrino-gen.gemspec
 - test/helper.rb

data/lib/padrino-gen/generators/base.rb

@@ -1,22 +0,0 @@
-require 'thor'
-
-module Padrino
-  module Generators
-
-    class Base < Thor::Group
-
-      # Include related modules
-      include Thor::Actions
-      include Padrino::Generators::Actions
-
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
-
-      def load_boot
-        if in_app_root?(options[:root])
-          require(options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb')
-        end
-      end
-    end
-
-  end
-end