Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge remote-tracking branch 'upstream/1_15' into boot-and-follow
Conflicts: card/lib/card/migration.rb
- Loading branch information
Showing
16 changed files
with
107 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,3 +24,4 @@ decko*gem | |
*.sqlite3 | ||
*.DS_Store | ||
*.swp | ||
test_work/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/bin/bash | ||
|
||
VER=1.15.pre | ||
DBCFG=../database.yml.local | ||
SEEDSQL=../mdummy_test.sql | ||
cd wagn/ | ||
gem build wagn.gemspec | ||
mv *.gem ../card/ | ||
cd ../decko-rails | ||
gem build decko.gemspec | ||
mv *.gem ../card/ | ||
cd ../card | ||
gem build card.gemspec | ||
gem install *-${VER}.gem | ||
cd ../test_work | ||
rbenv which wagn | ||
echo Generate a wagn app | ||
wagn new test_wagn_app -c --gem-path='../../' | ||
cd test_wagn_app | ||
# load seed db (customize to your database.yml) | ||
echo "Load seed db (enter the pw)" | ||
mysql -u decko_user -p mdummy_test < ${SEEDSQL} | ||
# copy db config (populate .local with you user/pw) | ||
cp ${DBCFG} config/database.yml | ||
echo "migrating" | ||
#RAILS_ENV=test bundle exec rake db:migrate --trace | ||
RAILS_ENV=test bundle exec rake wagn:migrate --trace | ||
#RAILS_ENV=development bundle exec rake db:migrate --trace | ||
#RAILS_ENV=development bundle exec rake wagn:migrate --trace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# -*- encoding : utf-8 -*- | ||
|
||
require 'decko/engine' | ||
|
||
Rails.application.routes.draw do | ||
<% if @include_jasmine_engine %> | ||
if !Rails.env.production? && Object.const_defined?( :JasmineRails ) | ||
mount Object.const_get(:JasmineRails).const_get(:Engine) => "<%= decko_path %>/specs" | ||
end | ||
<% end %> | ||
mount Decko::Engine => '<%= decko_path %>/' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.