bin/kiosk in service_kiosk-0.5.2 vs bin/kiosk in service_kiosk-0.5.3

- old
+ new

@@ -10,36 +10,39 @@ def config file = File.read('Kioskfile.json') JSON.parse file end +def vagrant_exec(command) + exec "env KIOSK_GEM_DIR=#{gem_dir} #{command}" +end + case ARGV[0] when 'plaza:init', 'init' - boxes = `vagrant box list` + boxes = `env KIOSK_GEM_DIR=#{gem_dir} vagrant box list` if(/precise32/m.match boxes) puts 'plaza already initialized' else - system 'vagrant init precise32 http://files.vagrantup.com/precise32.box' + vagrant_exec 'vagrant init precise32 http://files.vagrantup.com/precise32.box' end when 'plaza:up', 'up' - puts "KIOSK_GEM_DIR=#{gem_dir}" - system "env KIOSK_GEM_DIR=#{gem_dir} vagrant up" + vagrant_exec "vagrant up" when 'plaza:down', 'down' - system 'vagrant destroy' + vagrant_exec "vagrant destroy" when 'plaza:ssh', 'ssh' - system 'vagrant ssh' + vagrant_exec 'vagrant ssh' when 'mall:open', 'open' - exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:start'" + vagrant_exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:start'" when 'mall:close', 'close' - exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:stop'" + vagrant_exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:stop'" when 'mall:log', 'log' - exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:log'" + vagrant_exec "vagrant ssh -c 'cd /vagrant/mall; /usr/local/bin/rake kiosk:log'" when 'kiosk:run', 'run' env = config['kiosks'][ARGV[1]]['env'] mall = gem_dir + "/lib/mall.rb" dir = Dir.pwd + '/kiosks/' + ARGV[1]