Skip to content

Commit e457584

Browse files
committed
Update padrino 0.12.3
1 parent 7237479 commit e457584

File tree

4 files changed

+45
-32
lines changed

4 files changed

+45
-32
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
.DS_Store
22
log/**/*
33
tmp/**/*
4-
tmp/*
5-
bin/*
64
vendor/gems/*
75
!vendor/gems/cache/
86
.sass-cache/*

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ group :test do
2929
gem 'rack-test', :require => 'rack/test'
3030
end
3131

32-
gem 'padrino', '0.12.2'
32+
gem 'padrino', '0.12.3'

Gemfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,48 @@ GEM
1818
http_router (0.11.1)
1919
rack (>= 1.0.0)
2020
url_mount (~> 0.2.1)
21-
i18n (0.6.9)
21+
i18n (0.6.11)
2222
json (1.8.1)
2323
mail (2.5.4)
2424
mime-types (~> 1.16)
2525
treetop (~> 1.4.8)
2626
method_source (0.8.2)
2727
mime-types (1.25.1)
28-
minitest (5.3.5)
28+
minitest (5.4.0)
2929
moneta (0.7.20)
30-
padrino (0.12.2)
31-
padrino-admin (= 0.12.2)
32-
padrino-cache (= 0.12.2)
33-
padrino-core (= 0.12.2)
34-
padrino-gen (= 0.12.2)
35-
padrino-helpers (= 0.12.2)
36-
padrino-mailer (= 0.12.2)
37-
padrino-support (= 0.12.2)
38-
padrino-admin (0.12.2)
39-
padrino-core (= 0.12.2)
40-
padrino-helpers (= 0.12.2)
41-
padrino-cache (0.12.2)
30+
padrino (0.12.3)
31+
padrino-admin (= 0.12.3)
32+
padrino-cache (= 0.12.3)
33+
padrino-core (= 0.12.3)
34+
padrino-gen (= 0.12.3)
35+
padrino-helpers (= 0.12.3)
36+
padrino-mailer (= 0.12.3)
37+
padrino-support (= 0.12.3)
38+
padrino-admin (0.12.3)
39+
padrino-core (= 0.12.3)
40+
padrino-helpers (= 0.12.3)
41+
padrino-cache (0.12.3)
4242
moneta (~> 0.7.0)
43-
padrino-core (= 0.12.2)
44-
padrino-helpers (= 0.12.2)
45-
padrino-core (0.12.2)
43+
padrino-core (= 0.12.3)
44+
padrino-helpers (= 0.12.3)
45+
padrino-core (0.12.3)
4646
activesupport (>= 3.1)
4747
http_router (~> 0.11.0)
48-
padrino-support (= 0.12.2)
48+
padrino-support (= 0.12.3)
4949
rack-protection (>= 1.5.0)
5050
sinatra (~> 1.4.2)
51-
thor (~> 0.18.0)
52-
padrino-gen (0.12.2)
51+
thor (~> 0.18)
52+
padrino-gen (0.12.3)
5353
bundler (~> 1.0)
54-
padrino-core (= 0.12.2)
55-
padrino-helpers (0.12.2)
54+
padrino-core (= 0.12.3)
55+
padrino-helpers (0.12.3)
5656
i18n (~> 0.6, >= 0.6.7)
57-
padrino-support (= 0.12.2)
57+
padrino-support (= 0.12.3)
5858
tilt (~> 1.4.1)
59-
padrino-mailer (0.12.2)
59+
padrino-mailer (0.12.3)
6060
mail (~> 2.5.3)
61-
padrino-core (= 0.12.2)
62-
padrino-support (0.12.2)
61+
padrino-core (= 0.12.3)
62+
padrino-support (0.12.3)
6363
activesupport (>= 3.1)
6464
polyglot (0.3.5)
6565
pry (0.9.12.6)
@@ -95,13 +95,13 @@ GEM
9595
tilt (>= 1.3.3, < 2.1)
9696
slop (3.5.0)
9797
temple (0.6.8)
98-
thor (0.18.1)
98+
thor (0.19.1)
9999
thread_safe (0.3.4)
100100
tilt (1.4.1)
101101
treetop (1.4.15)
102102
polyglot
103103
polyglot (>= 0.3.1)
104-
tzinfo (1.2.1)
104+
tzinfo (1.2.2)
105105
thread_safe (~> 0.1)
106106
url_mount (0.2.1)
107107
rack
@@ -113,7 +113,7 @@ DEPENDENCIES
113113
dalli
114114
erubis
115115
foreman
116-
padrino (= 0.12.2)
116+
padrino (= 0.12.3)
117117
pry-padrino
118118
puma
119119
rack-test

bin/kaja

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env ruby
2+
3+
Dir.chdir(File.dirname(__FILE__)+'/..')
4+
5+
# Start the app with Padrino::Server
6+
require 'rubygems'
7+
require 'bundler/setup'
8+
require 'padrino-core/cli/launcher'
9+
10+
ARGV.unshift('start') if ARGV.first.nil? || ARGV.first.start_with?('-')
11+
Padrino::Cli::Launcher.start ARGV
12+
13+
# Start the app with Rack::Server
14+
#require "rack"
15+
#Rack::Server.start

0 commit comments

Comments
 (0)