Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move support_lite and locale to padrino-support gem, restructure it #1612

Merged
merged 4 commits into from Mar 6, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -45,6 +45,7 @@ end
padrino-gen
padrino-helpers
padrino-mailer
padrino-support
].each do |dep|
gem dep, :path => File.expand_path('../' + dep, __FILE__)
end
1 change: 1 addition & 0 deletions Rakefile
Expand Up @@ -10,6 +10,7 @@ GEM_NAME = 'padrino-framework'

padrino_gems = %w[
padrino-core
padrino-support
padrino-gen
padrino-helpers
padrino-mailer
Expand Down
1 change: 0 additions & 1 deletion padrino-admin/test/helper.rb
Expand Up @@ -8,7 +8,6 @@
require 'rack/test'
require 'rack'
require 'thor/group'
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'padrino-admin'
require 'dm-core'
require 'dm-migrations'
Expand Down
2 changes: 1 addition & 1 deletion padrino-core/lib/padrino-core.rb
@@ -1,6 +1,6 @@
require 'sinatra/base'
require 'padrino-core/version'
require 'padrino-core/support_lite'
require 'padrino-support'
require 'padrino-core/application'

require 'padrino-core/caller'
Expand Down
2 changes: 1 addition & 1 deletion padrino-core/lib/padrino-core/application/rendering.rb
@@ -1,4 +1,4 @@
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'padrino-support'

module Padrino
##
Expand Down
2 changes: 1 addition & 1 deletion padrino-core/lib/padrino-core/application/routing.rb
@@ -1,5 +1,5 @@
require 'http_router' unless defined?(HttpRouter)
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'padrino-support'

##
# Adds to Sinatra +controller+ informations
Expand Down
259 changes: 0 additions & 259 deletions padrino-core/lib/padrino-core/support_lite.rb

This file was deleted.

1 change: 1 addition & 0 deletions padrino-core/padrino-core.gemspec
Expand Up @@ -23,6 +23,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.rdoc_options = ["--charset=UTF-8"]

s.add_dependency("padrino-support", Padrino.version)
s.add_dependency("tilt", "~> 1.4.1")
if ENV["SINATRA_EDGE"]
s.add_dependency("sinatra")
Expand Down
2 changes: 2 additions & 0 deletions padrino-core/test/helper.rb
Expand Up @@ -5,11 +5,13 @@
require 'minitest/autorun'
require 'minitest/pride'
require 'i18n'
require 'padrino-support'
require 'padrino-core'
require 'json'
require 'builder'
require 'rack/test'
require 'rack'
require 'yaml'

# Rubies < 1.9 don't handle hashes in the properly order so to prevent
# this issue for now we remove extra values from mimetypes.
Expand Down
1 change: 0 additions & 1 deletion padrino-gen/lib/padrino-gen.rb
@@ -1,4 +1,3 @@
require 'padrino-core/support_lite'
require 'padrino-core/tasks'
require 'padrino-gen/command'
require 'active_support/ordered_hash'
Expand Down
3 changes: 1 addition & 2 deletions padrino-gen/lib/padrino-gen/generators/cli.rb
Expand Up @@ -25,8 +25,7 @@ def load_boot
if File.exist?(boot)
require File.expand_path(boot)
else
# If we are outside app we need to load support_lite
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'padrino-support'
end
rescue StandardError => e
puts "=> Problem loading #{boot}"
Expand Down
2 changes: 1 addition & 1 deletion padrino-helpers/lib/padrino-helpers.rb
@@ -1,4 +1,4 @@
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'padrino-support'
require 'i18n'
require 'enumerator'
require 'active_support/time_with_zone' # next extension depends on this
Expand Down
2 changes: 1 addition & 1 deletion padrino-helpers/padrino-helpers.gemspec
Expand Up @@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.rdoc_options = ["--charset=UTF-8"]

s.add_dependency("padrino-core", Padrino.version)
s.add_dependency("padrino-support", Padrino.version)
s.add_dependency("i18n", "~> 0.6", ">= 0.6.7")
end
1 change: 0 additions & 1 deletion padrino-mailer/lib/padrino-mailer.rb
Expand Up @@ -3,7 +3,6 @@
rescue LoadError
require 'sinatra/tilt'
end
require 'padrino-core/support_lite' unless defined?(SupportLite)

module Padrino
##
Expand Down
5 changes: 5 additions & 0 deletions padrino-support/.document
@@ -0,0 +1,5 @@
lib/**/*.rb
bin/*
-
README.rdoc
LICENSE.txt
22 changes: 22 additions & 0 deletions padrino-support/.gitignore
@@ -0,0 +1,22 @@
## MAC OS
.DS_Store

## TEXTMATE
*.tmproj
tmtags

## EMACS
*~
\#*
.\#*

## VIM
*.swp

## PROJECT::GENERAL
coverage
rdoc
pkg

## PROJECT::SPECIFIC
test/tmp/*
1 change: 1 addition & 0 deletions padrino-support/.yardopts
@@ -0,0 +1 @@
--title 'Padrino Support Documentation' --protected