padrino-gen 0.5.0 → 0.6.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Padrino
+Copyright (c) 2010 Padrino
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -194,4 +194,4 @@ This remove all created mailer files.
 
 == Copyright
 
-Copyright (c) 2009 Padrino. See LICENSE for details.
+Copyright (c) 2010 Padrino. See LICENSE for details.

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'rake'
 
+GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -12,7 +14,7 @@ begin
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.executables = ["padrino-gen"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
-    gem.add_runtime_dependency     "padrino-core",  ">= 0.1.1"
+    gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
     gem.add_runtime_dependency     "thor",          ">= 0.11.8"
     gem.add_runtime_dependency     "bundler",       ">= 0.5.0"
     gem.add_development_dependency "haml",          ">= 2.2.1"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.1

data/bin/padrino-gen

@@ -7,10 +7,9 @@ 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]
-arguments = ARGV.any? ? ARGV : ['-h']
 
 if generator_class
-  generator_class.start(arguments)
+  generator_class.start(ARGV)
 else
   puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"
 end

data/lib/padrino-gen.rb

@@ -1,27 +1,11 @@
 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.rb'
-require File.dirname(__FILE__) + '/padrino-gen/generators/base.rb'
-
-module Padrino
-  module Generators
 
-    class << self
-      def load_paths
-        @load_paths ||= Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{app,mailer,controller,model,migration}.rb']
-      end
-
-      def mappings
-        @mappings ||= SupportLite::OrderedHash.new
-      end
+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'
 
-      def add_generator(name, klass)
-        mappings[name] = klass
-      end
 
-      def lockup!
-        load_paths.each { |lib| require lib  }
-      end
-    end
-  end
-end
+# 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/lib/padrino-gen/generators.rb

@@ -0,0 +1,22 @@
+module Padrino
+  module Generators
+
+    class << self
+      def load_paths
+        @load_paths ||= Dir[File.dirname(__FILE__) + '/generators/{app,mailer,controller,model,migration}.rb']
+      end
+
+      def mappings
+        @mappings ||= SupportLite::OrderedHash.new
+      end
+
+      def add_generator(name, klass)
+        mappings[name] = klass
+      end
+
+      def lockup!
+        load_paths.each { |lib| require lib  }
+      end
+    end
+  end
+end

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

@@ -84,7 +84,7 @@ module Padrino
       end
       
       # Constructs a path from the specified app root
-      # build_target_path("app/mailers", "#{@mailer_basename}.rb")
+      # app_root_path("app/mailers", "#{@mailer_basename}.rb")
       def app_root_path(*paths)
         settings = paths.extract_options!
         File.join(settings[:root] || options[:root] || '.', *paths)

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

@@ -19,7 +19,7 @@ module Padrino
       desc "Description:\n\n\tpadrino-gen project generates a new Padrino project"
 
       argument :name, :desc => "The name of your padrino project"
-      argument :path, :desc => "The path to create your padrino project"
+      argument :path, :desc => "The path to create your padrino project", :default => "."
       class_option :run_bundler, :aliases => '-b', :default => false, :type => :boolean
 
       # Definitions for the available customizable components
@@ -29,6 +29,12 @@ module Padrino
       component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]
       component_option :renderer, "template engine",    :aliases => '-r', :choices => [:erb, :haml]
 
+      # Show help if no argv given
+      def self.start(given_args=ARGV, config={})
+        given_args = ["-h"] if given_args.empty?
+        super
+      end
+
       # Copies over the Padrino base application App
       def setup_app
         self.destination_root = File.join(path, name)

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

@@ -11,7 +11,6 @@ module Padrino
 
       class_option :root, :aliases => '-r', :default => nil, :type => :string
 
-      # Copies over the base sinatra starting project
       def load_boot
         if in_app_root?(options[:root])
           require(options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb')

data/lib/padrino-gen/generators/components/orms/activerecord_gen.rb

@@ -12,21 +12,21 @@ module Padrino
               app.configure :development do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => "your_dev_db_here"
+                  :database => Padrino.root('db', "development.db")
                 )
               end
 
               app.configure :production do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => "your_production_db_here"
+                  :database => Padrino.root('db', "production.db")
                 )
               end
 
               app.configure :test do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => "your_test_db_here"
+                  :database => Padrino.root('db', "test.db")
                 )
               end
             end

data/lib/padrino-gen/generators/components/orms/datamapper_gen.rb

@@ -8,9 +8,9 @@ module Padrino
           module DatabaseSetup
             def self.registered(app)
               app.configure               { DataMapper.logger = logger }
-              app.configure(:development) { DataMapper.setup(:default, "sqlite3://your_dev_db_here") }
-              app.configure(:production)  { DataMapper.setup(:default, "sqlite3://your_production_db_here") }
-              app.configure(:test)        { DataMapper.setup(:default, "sqlite3://your_test_db_here") }
+              app.configure(:development) { DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "development.db")) }
+              app.configure(:production)  { DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "production.db")) }
+              app.configure(:test)        { DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "test.db")) }
             rescue ArgumentError => e
               logger.error "Database options need to be configured within 'config/database.rb'!" if app.logging?
             end

data/lib/padrino-gen/generators/components/orms/sequel_gen.rb

@@ -9,9 +9,9 @@ module Padrino
           module DatabaseSetup
             def self.registered(app)
               Sequel::Model.plugin(:schema)
-              app.configure(:development) { Sequel.connect("sqlite://your_dev_db_here", :loggers => [logger]) }
-              app.configure(:production)  { Sequel.connect("sqlite://your_production_db_here", :loggers => [logger]) }
-              app.configure(:test)        { Sequel.connect("sqlite://your_test_db_here", :loggers => [logger]) }
+              app.configure(:development) { Sequel.connect("sqlite3://" + Padrino.root('db', "development.db"), :loggers => [logger]) }
+              app.configure(:production)  { Sequel.connect("sqlite3://" + Padrino.root('db', "production.db"), :loggers => [logger]) }
+              app.configure(:test)        { Sequel.connect("sqlite3://" + Padrino.root('db', "test.db"), :loggers => [logger]) }
             end
           end
           SEQUEL

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

@@ -24,13 +24,18 @@ module Padrino
       class_option :root, :aliases => '-r', :default => nil, :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
-      # Copies over the base sinatra starting project
+      # Show help if no argv given
+      def self.start(given_args=ARGV, config={})
+        given_args = ["-h"] if given_args.empty?
+        super
+      end
+
       def create_controller
         if in_app_root?(options[:root])
           @app_name = fetch_app_name(options[:root])
           @actions = controller_actions(fields)
           self.behavior = :revoke if options[:destroy]
-          inject_into_file app_root_path("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
+          # inject_into_file app_root_path("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
           template "templates/controller.rb.tt", app_root_path("app/controllers", "#{name}.rb")
           template "templates/helper.rb.tt",     app_root_path("app/helpers", "#{name}_helper.rb")
           empty_directory app_root_path("app/views/#{name}")

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

@@ -23,7 +23,12 @@ module Padrino
       class_option :root, :aliases => '-r', :default => nil, :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
-      # Copies over the base sinatra starting project
+      # Show help if no argv given
+      def self.start(given_args=ARGV, config={})
+        given_args = ["-h"] if given_args.empty?
+        super
+      end
+
       def create_mailer
         if in_app_root?(options[:root])
           self.behavior = :revoke if options[:destroy]

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

@@ -24,7 +24,12 @@ module Padrino
       class_option :root, :aliases => '-r', :default => nil, :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
-      # Copies over the base sinatra starting project
+      # Show help if no argv given
+      def self.start(given_args=ARGV, config={})
+        given_args = ["-h"] if given_args.empty?
+        super
+      end
+
       def create_model
         if in_app_root?(options[:root])
           remove_migration(name) if options[:destroy]

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

@@ -24,7 +24,12 @@ module Padrino
       class_option :root, :aliases => '-r', :default => nil, :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
-      # Copies over the base sinatra starting project
+      # Show help if no argv given
+      def self.start(given_args=ARGV, config={})
+        given_args = ["-h"] if given_args.empty?
+        super
+      end
+
       def create_model
         if in_app_root?(options[:root])
           remove_model_migration(name) if options[:destroy]

data/lib/padrino-gen/generators/templates/controller.rb.tt

@@ -1,10 +1,7 @@
-# Define your named routes inside config/urls.rb or define them inline
-# You can also use unnamed routes by defining them directly
-
 <%= @app_name %>.controllers do
-  # get :index do
+  # get :index, :map => "/foo/bar" do
   #   session[:foo] = "bar"
-  #   haml_template 'index'
+  #   render 'index'
   # end
   
   # get :sample, :map => "/sample/url" do

data/lib/padrino-gen/generators/templates/scripts/jquery.js

@@ -2,7 +2,7 @@
  * jQuery JavaScript Library v1.3.2
  * http://jquery.com/
  *
- * Copyright (c) 2009 John Resig
+ * Copyright (c) 2010 John Resig
  * Dual licensed under the MIT and GPL licenses.
  * http://docs.jquery.com/License
  *

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

@@ -0,0 +1,15 @@
+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"
+    end
+
+    desc "DataMapper: perform upgrade (with a no-destructive way)"
+    task :upgrade => :environment do
+      DataMapper.auto_upgrade!
+      puts "=> db:upgrade executed"
+    end
+  end
+end

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.5.0"
+  s.version = "0.6.1"
 
   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"]
-  s.date = %q{2010-01-06}
+  s.date = %q{2010-01-14}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{nesquena@gmail.com}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/padrino-gen",
      "lib/padrino-gen.rb",
+     "lib/padrino-gen/generators.rb",
      "lib/padrino-gen/generators/actions.rb",
      "lib/padrino-gen/generators/app.rb",
      "lib/padrino-gen/generators/app/.gitignore",
@@ -43,8 +44,6 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/config/boot.rb",
      "lib/padrino-gen/generators/app/config/initializers/.empty_directory",
      "lib/padrino-gen/generators/app/config/initializers/example.rb",
-     "lib/padrino-gen/generators/app/config/urls.rb.tt",
-     "lib/padrino-gen/generators/app/lib/.empty_directory",
      "lib/padrino-gen/generators/app/tmp/.empty_directory",
      "lib/padrino-gen/generators/base.rb",
      "lib/padrino-gen/generators/components/actions.rb",
@@ -77,6 +76,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/datamapper.rb",
      "padrino-gen.gemspec",
      "test/helper.rb",
      "test/test_app_generator.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.1.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.1"])
       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.1.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
       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.1.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
     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

@@ -5,8 +5,6 @@ require 'mocha'
 require 'rack/test'
 require 'webrat'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'padrino-gen'
 
 class Test::Unit::TestCase

data/test/test_app_generator.rb

@@ -34,7 +34,6 @@ class TestAppGenerator < Test::Unit::TestCase
       silence_logger { @app.start(['sample_app', '/tmp', '--script=none']) }
       assert_match_in_file(/class SampleApp < Padrino::Application/m, '/tmp/sample_app/app/app.rb')
       assert_match_in_file(/Padrino.mount_core\("SampleApp"\)/m, '/tmp/sample_app/config/apps.rb')
-      assert_match_in_file(/SampleApp.urls do/m, '/tmp/sample_app/config/urls.rb')
     end
 
     should "create components file containing options chosen with defaults" do

data/test/test_controller_generator.rb

@@ -8,7 +8,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     @contgen = Padrino::Generators::Controller.dup
     @controller_path = '/tmp/sample_app/app/controllers/demo_items.rb'
     @controller_test_path = '/tmp/sample_app/test/controllers/demo_items_controller_test.rb'
-    @route_path = '/tmp/sample_app/config/urls.rb'
+    # @route_path = '/tmp/sample_app/config/urls.rb'
     `rm -rf /tmp/sample_app`
   end
 
@@ -70,8 +70,8 @@ class TestControllerGenerator < Test::Unit::TestCase
     should "generate url routes for get:yoda post:yada" do
       silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
       silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
-      assert_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
-      assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
+      # assert_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
+      # assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
     end
 
   end
@@ -100,8 +100,8 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon'])}
       silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
-      assert_no_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
-      assert_no_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
+      # assert_no_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
+      # assert_no_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -132,6 +132,7 @@ files:
 - VERSION
 - bin/padrino-gen
 - lib/padrino-gen.rb
+- lib/padrino-gen/generators.rb
 - lib/padrino-gen/generators/actions.rb
 - lib/padrino-gen/generators/app.rb
 - lib/padrino-gen/generators/app/.gitignore
@@ -149,8 +150,6 @@ files:
 - lib/padrino-gen/generators/app/config/boot.rb
 - lib/padrino-gen/generators/app/config/initializers/.empty_directory
 - lib/padrino-gen/generators/app/config/initializers/example.rb
-- lib/padrino-gen/generators/app/config/urls.rb.tt
-- lib/padrino-gen/generators/app/lib/.empty_directory
 - lib/padrino-gen/generators/app/tmp/.empty_directory
 - lib/padrino-gen/generators/base.rb
 - lib/padrino-gen/generators/components/actions.rb
@@ -183,6 +182,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/datamapper.rb
 - padrino-gen.gemspec
 - test/helper.rb
 - test/test_app_generator.rb

data/lib/padrino-gen/generators/app/config/urls.rb.tt

@@ -1,44 +0,0 @@
-<%= @class_name %>.urls do
-  # map(:index).to("/")
-  # map(:test).to("/test")
-end
-
-=begin
-
-This file contains named routes to be used in the Padrino application. 
-To create named routes simply add them to the urls block below.
-
-You can specify simple routes as:
-
-    map(:index).to("/")
-    map(:test).to("/test")
-  
-Routes can also contain query parameters:
-
-    map(:account).to("/the/accounts/:name/and/:id")
-    
-Routes can also be grouped by a namespaced:
-
-    map :admin do |namespace|
-      namespace.map(:show).to("/admin/:id/show")
-      namespace.map(:destroy).to("/admin/:id/destroy")
-    end
-    
-Routes can then be accessed in controllers and views:
-
-    url_for(:account, :id => 1, :name => 'first')
-    url_for(:admin, :show, :id => 25)
-    
-To define the controller actions for a named route simply refer to the alias symbol:
-
-    # Configure the routes using the named alias
-    get(:account)  { "name: params[:name] - id: params[:id]" }
-    get(:accounts) { "I am the body for the url /the/accounts/index" }
-    # and for namespaced routes
-    namespace :admin do
-      get :show do
-        "admin show for #{params[:id]}"
-      end
-    end
-
-=end