Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mokevnin
mokevnin committed Jul 14, 2013
1 parent 0ae42d2 commit f648d46
Show file tree
Hide file tree
Showing 80 changed files with 471 additions and 376 deletions.
1 change: 1 addition & 0 deletions .rspec
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--color
14 changes: 9 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ruby '2.0.0'
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '>= 4.0.0.rc2'
gem 'rails', '4.0.0'

# Use postgresql as the database for Active Record
gem 'pg'
Expand All @@ -25,15 +25,15 @@ gem 'foreman'
gem 'uglifier', '>= 1.3.0'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0.rc1'
gem 'sass-rails', '~> 4.0.0'

# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'

gem 'haml-rails'
gem 'twitter-bootstrap-rails'
gem 'less-rails'

gem "chosen-rails"
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby

Expand All @@ -54,7 +54,7 @@ end
# Use ActiveModel has_secure_password
gem 'bcrypt-ruby', '~> 3.0.0'

gem 'unicorn'
gem 'puma'

group :development do
gem 'capistrano'
Expand All @@ -68,10 +68,14 @@ group :test do
#NOTE for travis-ci
gem 'rake'
gem 'coveralls', require: false
gem 'minitest'
gem 'seedbank', git: "https://github.com/james2m/seedbank.git"
gem 'capybara'
gem 'site_prism'
gem 'wrong'
end

group :development, :test do
gem 'minitest'
gem 'factory_girl_rails'
end

Expand Down
157 changes: 108 additions & 49 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,95 @@
GIT
remote: https://github.com/ernie/ransack.git
revision: 4078f4fd0ff8b48658e1b69fe8bce0c36933f19c
revision: 43fff052ca7a850103c2ac122c99541cd34cf48d
branch: rails-4
specs:
ransack (0.7.3)
actionpack
activerecord
actionpack (~> 4.0.0)
activerecord (~> 4.0.0)
polyamorous (~> 0.6.0)

GIT
remote: https://github.com/james2m/seedbank.git
revision: c7a272751336f0d17103028f45b88eac62cbedd7
specs:
seedbank (0.3.0.pre2)

GIT
remote: https://github.com/plataformatec/simple_form.git
revision: 782db58e27e152a4246fdb2cbc3a1bc7e43b492b
revision: 3ea3226e2f5eb83c6723639fc10480a721347f7e
specs:
simple_form (3.0.0.rc)
actionpack (>= 4.0.0.rc1, < 4.1)
activemodel (>= 4.0.0.rc1, < 4.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
ParseTree (3.0.9)
RubyInline (~> 3.9.0)
sexp_processor (~> 3.2.0)
RubyInline (3.9.0)
ZenTest (~> 4.3)
ZenTest (4.9.2)
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
active_model_serializers (0.8.1)
activemodel (>= 3.0)
activemodel (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0.rc2)
activemodel (= 4.0.0.rc2)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0.rc2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0.rc2)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.4)
arel (4.0.0)
atomic (1.1.9)
authority (2.5.0)
rails (>= 3.0.0)
backports (3.3.2)
atomic (1.1.10)
authority (2.7.0)
activesupport (>= 3.0.0)
rake (>= 0.8.7)
backports (3.3.3)
bcrypt-ruby (3.0.1)
builder (3.1.4)
capistrano (2.15.4)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chosen-rails (0.12.0)
coffee-rails (>= 3.2)
railties (>= 3.0)
sass-rails (>= 3.2)
coderay (1.0.9)
coffee-rails (4.0.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
coffee-script-source (1.6.3)
colorize (0.5.8)
commonjs (0.2.6)
configus (0.0.4)
Expand All @@ -77,6 +101,8 @@ GEM
simplecov (>= 0.7)
thor
descendants_tracker (0.0.1)
diff (0.3.6)
diff-lcs (1.2.4)
dotenv (0.8.0)
draper (1.2.1)
actionpack (>= 3.0)
Expand All @@ -101,8 +127,9 @@ GEM
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-minitest (0.5.0)
guard (>= 0.4)
guard-minitest (1.0.0)
guard (>= 1.8)
minitest (>= 2.1)
haml (4.0.3)
tilt
haml-rails (0.4)
Expand All @@ -114,14 +141,13 @@ GEM
highline (1.6.19)
hike (1.2.3)
i18n (0.6.4)
jquery-rails (3.0.1)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.8.0)
less (2.3.2)
commonjs (~> 0.2.6)
less-rails (2.3.3)
Expand All @@ -132,49 +158,54 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.3)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.23)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.7.7)
net-scp (1.1.1)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.7)
net-ssh (2.6.8)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
pg (0.15.1)
polyamorous (0.6.3)
activerecord (>= 3.0)
polyglot (0.3.3)
predicated (0.2.6)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
puma (2.3.2)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0.rc2)
actionmailer (= 4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activerecord (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0.rc2)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.11.0)
rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
Expand All @@ -187,20 +218,38 @@ GEM
request_store (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
ruby2ruby (1.3.1)
ruby_parser (~> 2.0)
sexp_processor (~> 3.0)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
russian (0.6.0)
i18n (>= 0.5.0)
sass (3.2.9)
sass-rails (4.0.0.rc2)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
sexp_processor (3.2.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
site_prism (2.4)
addressable (~> 2.3.3)
capybara (>= 2.1, < 3.0)
rspec (~> 2.0)
slop (3.4.5)
spring (0.0.10)
sprockets (2.10.0)
Expand All @@ -227,7 +276,7 @@ GEM
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.2.0)
turbolinks (1.3.0)
coffee-rails
twitter-bootstrap-rails (2.2.7)
actionpack (>= 3.1)
Expand All @@ -238,17 +287,22 @@ GEM
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
validates (0.0.8)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
virtus (0.5.5)
backports (~> 3.3)
descendants_tracker (~> 0.0.1)
yard (0.8.6.1)
wrong (0.3.3)
ParseTree (>= 3.0.5)
diff (>= 0.3.6)
diff-lcs (>= 1.1.2)
predicated (>= 0.2.1)
ruby2ruby (>= 1.2.4)
ruby_parser (>= 2.0.4)
xpath (2.0.0)
nokogiri (~> 1.3)
yard (0.8.6.2)

PLATFORMS
ruby
Expand All @@ -258,6 +312,8 @@ DEPENDENCIES
authority
bcrypt-ruby (~> 3.0.0)
capistrano
capybara
chosen-rails
coffee-rails (~> 4.0.0)
configus
coveralls
Expand All @@ -272,13 +328,16 @@ DEPENDENCIES
minitest
omniauth
pg
rails (>= 4.0.0.rc2)
puma
rails (= 4.0.0)
rake
ransack!
russian
sass-rails (~> 4.0.0.rc1)
sass-rails (~> 4.0.0)
sdoc
seedbank!
simple_form!
site_prism
spring
sqlite3
state_machine
Expand All @@ -287,7 +346,7 @@ DEPENDENCIES
turbolinks
twitter-bootstrap-rails
uglifier (>= 1.3.0)
unicorn
validates
virtus
wrong
yard

0 comments on commit f648d46

Please sign in to comment.