Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo #49

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Demo #49

Changes from 6 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c64045f
[CAPISTRANO] made changes to the capistrano task for deployment to st…
Jan 27, 2011
74e1615
[BUNDLER] removed the development and test groups from the Gemfile
Jan 27, 2011
4bc8a4c
Merge branch 'master' into demo
Jan 27, 2011
0a47bc0
[CAPISTRNO] demo.xrono.com should be demo.xrono.org
Jan 28, 2011
9a785e6
Merge branch 'master' into demo
Jan 31, 2011
e82aedc
Merge branch 'demo' of github.com:isotope11/xrono into isotope_demo
benolee Feb 1, 2011
58eb6e2
Merge branch 'isotope_master' into isotope_demo
benolee Feb 1, 2011
06de9a2
[CAPISTRANO] capify project again
benolee Feb 1, 2011
037b97c
[DEPLOY] remove rvm stuff from deploy script
benolee Feb 1, 2011
a4b6742
Merge branch 'master' into demo
benolee Feb 2, 2011
1460c8d
[SEEDS] empty log file and remove public/system
benolee Feb 2, 2011
518c229
Merge branch 'master' into demo
benolee Feb 2, 2011
665368a
[CAPISTRANO] remove bundler line from deploy script temporarily
benolee Feb 2, 2011
33aacc4
Merge branch 'master' into demo
benolee Feb 2, 2011
1204552
[MERGE] merged in changes in Gemfile
adamdill Feb 24, 2011
0df6207
[MERGE] fixed conflict in seeds
adamdill Apr 13, 2011
1869c1a
merged master into demo
Nov 16, 2011
2822c49
fix error in deploy script
Nov 16, 2011
2cfc255
bump README
Nov 16, 2011
d0eb578
remove compass initializer, it has a railtie now.
Nov 16, 2011
11ab3b6
lock versions of uglifier and less-rails
Nov 16, 2011
67e7404
Merge branch 'master' into demo
Nov 16, 2011
1b19d5a
Merge branch 'master' into demo
Dec 28, 2011
801a051
add machinist to production for the demo
Dec 28, 2011
bd864ff
add faker to production group for demo
Dec 28, 2011
9224624
Merge remote-tracking branch 'origin/master' into demo
Feb 26, 2012
e2f4302
Merge branch 'master' into demo
Feb 27, 2012
f04f84d
Merge branch 'master' into demo
Oct 2, 2012
fb3139a
Merge branch 'master' into demo
Mar 21, 2013
0c7c0ea
Precompile screen.css
Mar 21, 2013
5a597ab
Fix deploy for demo
Mar 25, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -14,29 +14,5 @@ gem 'rails', '3.0.3'
gem 'thin', '~> 1.2.7'
gem 'uuid', '~> 2.3.1'
gem 'jquery-rails'

group :development do
gem 'awesome_print', :require => 'ap'
gem 'ruby-debug19'
end

group :test do
gem 'awesome_print', :require => 'ap'
gem 'capybara', '~> 0.3.9'
gem 'cucumber', '~> 0.9.2'
gem 'cucumber-rails', '~> 0.3.2'
gem 'database_cleaner', '~> 0.5.2'
gem 'escape_utils', '~> 0.1.9'
gem 'faker', '~> 0.3.1'
gem 'forgery', '~> 0.3.5'
gem 'launchy', '~> 0.3.7'
gem 'machinist', '~> 1.0.6'
gem 'pickle', '~> 0.4.2'
gem 'ruby-debug19'
gem 'rspec', '= 2.0.0'
gem 'rspec-rails', '= 2.0.1'
gem 'shoulda', '~> 2.11.3'
gem 'simplecov', '~> 0.3.6'
gem 'spork', '~> 0.8.4'
gem 'yajl-ruby', '~> 0.7.8'
end
gem 'faker', '~> 0.3.1'
gem 'machinist', '~> 1.0.6'
96 changes: 0 additions & 96 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -29,9 +29,7 @@ GEM
activemodel (= 3.0.3)
activesupport (= 3.0.3)
activesupport (3.0.3)
archive-tar-minitar (0.5.2)
arel (2.0.6)
awesome_print (0.3.1)
bcrypt-ruby (2.1.2)
builder (2.1.2)
capistrano (2.5.19)
@@ -40,66 +38,30 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.0.0)
capybara (0.3.9)
culerity (>= 0.2.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
childprocess (0.1.4)
ffi (~> 0.6.3)
chunky_png (0.12.0)
columnize (0.3.2)
compass (0.10.6)
haml (>= 3.0.4)
compass-susy-plugin (0.8.1)
compass (>= 0.10.0)
configuration (1.2.0)
cucumber (0.9.4)
builder (~> 2.1.2)
diff-lcs (~> 1.1.2)
gherkin (~> 2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.12)
daemons (1.1.0)
database_cleaner (0.5.2)
devise (1.1.5)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
escape_utils (0.1.9)
eventmachine (0.12.10)
faker (0.3.1)
ffi (0.6.3)
rake (>= 0.8.7)
forgery (0.3.6)
gherkin (2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
gravtastic (3.1.0)
haml (3.0.24)
highline (1.6.1)
i18n (0.5.0)
jquery-rails (0.2.6)
rails (~> 3.0)
thor (~> 0.14.4)
json (1.4.6)
json_pure (1.4.6)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
lemonade (0.3.4)
chunky_png (>= 0.8.0)
compass (>= 0.10.0)
haml (>= 3.0.0)
linecache19 (0.5.11)
ruby_core_source (>= 0.1.4)
macaddr (1.0.0)
machinist (1.0.6)
mail (2.2.12)
@@ -116,15 +78,9 @@ GEM
net-ssh (2.0.23)
net-ssh-gateway (1.0.1)
net-ssh (>= 1.99.1)
nokogiri (1.4.4)
paperclip (2.3.8)
activerecord
activesupport
pickle (0.4.4)
cucumber (>= 0.8)
rake
rspec (>= 1.3)
yard
polyglot (0.3.1)
rack (1.2.1)
rack-mount (0.6.13)
@@ -145,40 +101,6 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
rspec (2.0.0)
rspec-core (= 2.0.0)
rspec-expectations (= 2.0.0)
rspec-mocks (= 2.0.0)
rspec-core (2.0.0)
rspec-expectations (2.0.0)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.0)
rspec-core (= 2.0.0)
rspec-expectations (= 2.0.0)
rspec-rails (2.0.1)
rspec (~> 2.0.0)
ruby-debug-base19 (0.11.24)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.4)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
selenium-webdriver (0.1.1)
childprocess (= 0.1.4)
ffi (~> 0.6.3)
json_pure
rubyzip
shoulda (2.11.3)
simplecov (0.3.7)
simplecov-html (>= 0.3.7)
simplecov-html (0.3.9)
spork (0.8.4)
term-ansicolor (1.0.5)
thin (1.2.7)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -191,42 +113,24 @@ GEM
macaddr (~> 1.0)
warden (1.0.3)
rack (>= 1.0.0)
yajl-ruby (0.7.8)
yard (0.6.3)

PLATFORMS
ruby

DEPENDENCIES
acl9 (~> 0.12.0)
awesome_print
capistrano (~> 2.5.19)
capybara (~> 0.3.9)
compass (~> 0.10.4)
compass-susy-plugin (~> 0.8.1)
cucumber (~> 0.9.2)
cucumber-rails (~> 0.3.2)
database_cleaner (~> 0.5.2)
devise (~> 1.1.3)
escape_utils (~> 0.1.9)
faker (~> 0.3.1)
forgery (~> 0.3.5)
gravtastic
haml (~> 3.0.18)
jquery-rails
launchy (~> 0.3.7)
lemonade (~> 0.3.4)
machinist (~> 1.0.6)
mysql (~> 2.8.1)
paperclip (~> 2.3)
pickle (~> 0.4.2)
rails (= 3.0.3)
rspec (= 2.0.0)
rspec-rails (= 2.0.1)
ruby-debug19
shoulda (~> 2.11.3)
simplecov (~> 0.3.6)
spork (~> 0.8.4)
thin (~> 1.2.7)
uuid (~> 2.3.1)
yajl-ruby (~> 0.7.8)
32 changes: 8 additions & 24 deletions config/deploy.rb
Original file line number Diff line number Diff line change
@@ -3,30 +3,30 @@
# RVM bootstrap
$:.unshift(File.expand_path("~/.rvm/lib"))
require 'rvm/capistrano'
set :rvm_ruby_string, '1.9.2-head@asset-tracker'
set :rvm_ruby_string, '1.9.2-head@xrono'
set :rvm_type, :user

# Bundler bootstrap
require 'bundler/capistrano'

# main details
set :application, "asshats.isotope11.com"
role :web, "asshats.isotope11.com"
role :app, "asshats.isotope11.com"
role :db, "asshats.isotope11.com", :primary => true
set :application, "demo.xrono.org"
role :web, "demo.xrono.org"
role :app, "demo.xrono.org"
role :db, "demo.xrono.org", :primary => true

# server details
default_run_options[:pty] = true
ssh_options[:forward_agent] = true
set :deploy_to, "/home/deployer/asset_tracker_tutorial_pre"
set :deploy_to, "/home/deployer/xrono_demo"
set :user, "deployer"
set :use_sudo, false

# repo details
set :scm, :git
#set :git_username, "knewter"
set :repository, "git://github.com/altrux/asset_tracker_tutorial_pre.git"
set :branch, "production"
set :repository, "git://github.com/isotope11/xrono.git"
set :branch, "demo"
set :git_enable_submodules, 1

# runtime dependencies
@@ -55,21 +55,5 @@
end
end

namespace :db do
desc "Create database yaml in shared path"
task :default do
db_config = ERB.new <<-EOF
production:
database: asset_tracker_tutorial_production
adapter: mysql
username: root
password: isotope_bang
EOF

run "mkdir -p #{shared_path}/config"
put db_config.result, "#{shared_path}/config/database.yml"
end
end

after 'deploy:update_code', 'deploy:symlink_shared'