Permalink
Browse files

Moved Vagrantfile to root

Fixed Makefile issues with 'setup' being depricated in preference to install
  • Loading branch information...
1 parent b37baa5 commit ae9a51a5b3dd0f4b83fdafcd0608dd01c1f55e05 @calaldees committed Feb 10, 2014
Showing with 10 additions and 16 deletions.
  1. +2 −2 README.md
  2. +1 −1 {vagrant → }/Vagrantfile
  3. +1 −3 vagrant/vagrant_bootstrap.sh → Vagrantfile_.sh
  4. +6 −10 website/Makefile
View
@@ -67,12 +67,12 @@ Trial Setup
1. Install VirtualBox: <http://www.virtualbox.org/>
2. Install Vagrant: <http://www.vagrantup.com/>
3. Navigate to data folder
- 4. Download Vagrantfile and Bootstrap: (Linux/Mac can use `curl -O https://raw.github.com/calaldees/KaraKara/master/vagrant/Vagrantfile && curl -O https://raw.github.com/calaldees/KaraKara/master/vagrant/vagrant_bootstrap.sh`) (Windows just download the files)
+ 4. Download Vagrantfile and Bootstrap: (Linux/Mac can use `curl -O https://raw.github.com/calaldees/KaraKara/master/Vagrantfile && curl -O https://raw.github.com/calaldees/KaraKara/master/vagrant/Vagrantfile_.sh`) (Windows just download the files)
5. `vagrant up`
6. view <http://localhost:6543/> and <http://localhost:6543/player/player.html>
* Option 2 - Linux/Mac (native with sqllite dev db)
1. navigate to data folder
- 2. `git clone https://github.com/calaldees/KaraKara.git && ln -s . KaraKara/mediaserver/www/files && cd KaraKara/website && make setup && make test && make import_tracks_dev && make run`
+ 2. `git clone https://github.com/calaldees/KaraKara.git && ln -s . KaraKara/mediaserver/www/files && cd KaraKara/website && make install && make test && make import_tracks_dev && make run`
3. view <http://localhost:6543/> and <http://localhost:6543/player/player.html>
@@ -6,7 +6,7 @@ Vagrant.configure("2") do |config|
config.vm.box = "precise32"
config.vm.box_url = "http://files.vagrantup.com/precise32.box"
- config.vm.provision :shell, :path => "vagrant_bootstrap.sh"
+ config.vm.provision :shell, :path => "Vagrantfile_.sh"
config.vm.network :forwarded_port, host: 25, guest: 25
config.vm.network :forwarded_port, host: 80, guest: 80
@@ -44,7 +44,7 @@ fi
# Setup Website Python Project
cd $HOME/KaraKara/website
-make setup
+make install
make test
make ini_production
@@ -77,5 +77,3 @@ echo 'Start KaraKara daemon'
sudo -u vagrant sh << EOF
cd $HOME/KaraKara/website
make start_webapp_daemon
-
-EOF
View
@@ -16,10 +16,8 @@ STATIC_FILE_PATH = ../mediaserver/www/files
help:
# Usage: make <target>, where target is
- # setup -- setup python egg & install dependencys/env if needed
+ # install -- run after clean checkout to pull dependecys and setup
# test -- run all nosetests
- # init_db -- create a blank database
- # init_db_test -- create test db
# run -- run the site in development mode
# run_production -- run in production mode
# clean -- reset the folder to clean git checkout (removes virtual python env)
@@ -51,7 +49,7 @@ env:
virtualenv --no-site-packages -p python3 env
env/bin/easy_install pyramid
-setup: env
+KaraKara.egg-info: env
env/bin/python setup.py develop
dependency_downloader.py:
@@ -64,15 +62,13 @@ test.db:
env/bin/python -m$(PROJECT).model.setup --config_uri $(INI_DEV) --init_func $(PROJECT).model.init_data:init_data
#env/bin/populate_KaraKara development.ini
-install: env setup dependency_downloader.py externals test.db test
+install: env KaraKara.egg-info dependency_downloader.py externals test.db
#init_db_test: init_db
# env/bin/python -m$(PROJECT).model.setup --config_uri development.ini --init_func $(PROJECT).tests.init_data:init_random_data
-run: externals
- #$(MAKE) env_activate
+run: install
env/bin/pserve --reload $(INI_DEV)
- #$(MAKE) env_deactivate
run_production: ini_production
env/bin/pserve $(INI_PROD)
@@ -110,12 +106,12 @@ import_tracks_production: ini_production
#import_tracks_test: init_db
# env/bin/python -mkarakara.scripts.import_tracks 'http://calaldees.dreamhosters.com/test/' --config=development.ini
-test: ini_test
+test: install ini_test
env/bin/py.test $(PATH_EXTERNALS) -q --pdb
env/bin/py.test $(PROJECT) -q --pdb
#--pdb --capture=sys
-test_crawl: ini_test
+test_crawl: install ini_test
env/bin/py.test $(PROJECT) --runslow -k crawl -s
ini_test:

0 comments on commit ae9a51a

Please sign in to comment.