From 35d24b3928a0905d23e8e33bbc9a89d33fa0a480 Mon Sep 17 00:00:00 2001
From: gitlabhq <m@gitlabhq.com>
Date: Fri, 21 Oct 2011 20:58:04 +0300
Subject: [PATCH] cleaning

---
 README.rdoc                          |  8 +++--
 db/fixtures/development/001_admin.rb | 10 ++++++-
 db/fixtures/production/001_admin.rb  |  9 ++++++
 install.rb                           | 32 --------------------
 update.rb                            | 44 ----------------------------
 5 files changed, 23 insertions(+), 80 deletions(-)
 delete mode 100644 install.rb
 delete mode 100644 update.rb

diff --git a/README.rdoc b/README.rdoc
index 5e47b269..3e604a0f 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -36,18 +36,19 @@ sqlite as default db
   echo "gitlabhq ALL = (git) NOPASSWD: /bin/rm" | sudo tee -a /etc/sudoers
 
   sudo gem install bundler
+
   bundle
 
-  RAILS_ENV=production rake db:setup
+  bundle exec rake db:setup RAILS_ENV=production
   
   # create admin user 
   # login....admin@local.host
   # pass.....5iveL!fe
-  RAILS_ENV=production rake db:seed_fu 
+  bundle exec rake db:seed_fu RAILS_ENV=production
 
 Install gitosis, edit conf/gitosis.yml & start server
 
-  rails s
+  rails s -e production
 
 == Install Gitosis
   sudo aptitude install gitosis
@@ -65,6 +66,7 @@ Install gitosis, edit conf/gitosis.yml & start server
   ssh-keygen -t rsa
 
   sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
+
   sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update
 
 
diff --git a/db/fixtures/development/001_admin.rb b/db/fixtures/development/001_admin.rb
index 9c5a6da0..cfff6bf8 100644
--- a/db/fixtures/development/001_admin.rb
+++ b/db/fixtures/development/001_admin.rb
@@ -1,4 +1,3 @@
-# Admin account
 admin = User.create(
   :email => "admin@local.host",
   :name => "Administrator",
@@ -9,3 +8,12 @@ admin = User.create(
 admin.projects_limit = 10000
 admin.admin = true
 admin.save!
+
+if admin.valid?
+puts %q[
+Administrator account created:
+
+login.........admin@local.host
+password......5iveL!fe
+]
+end
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index 94d1abe8..cfff6bf8 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -8,3 +8,12 @@ admin = User.create(
 admin.projects_limit = 10000
 admin.admin = true
 admin.save!
+
+if admin.valid?
+puts %q[
+Administrator account created:
+
+login.........admin@local.host
+password......5iveL!fe
+]
+end
diff --git a/install.rb b/install.rb
deleted file mode 100644
index a118cb5d..00000000
--- a/install.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-root_path = File.expand_path(File.dirname(__FILE__))
-require File.join(root_path, "lib", "color")
-include Color
-
-# 
-# ruby ./update.rb development # or test or production (default)
-#
-envs = ["production", "test", "development"]
-env = if envs.include?(ARGV[0])
-        ARGV[0]
-      else
-        "production"
-      end
-
-puts green " == Install for ENV=#{env} ..."
-
-# bundle install
-`bundle install`
-  
-# migrate db
-`bundle exec rake db:create RAILS_ENV=#{env}`
-`bundle exec rake db:schema:load RAILS_ENV=#{env}`
-`bundle exec rake db:seed_fu RAILS_ENV=#{env}`
-
-puts green %q[
-Administrator account created:
-
-login.........admin@local.host
-password......5iveL!fe
-]
-
-puts green " == Done! Now you can start server"
diff --git a/update.rb b/update.rb
deleted file mode 100644
index b81a4088..00000000
--- a/update.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-root_path = File.expand_path(File.dirname(__FILE__))
-require File.join(root_path, "lib", "color")
-include Color
-
-def version
-  File.read("VERSION")
-end
-
-# 
-# ruby ./update.rb development # or test or production (default)
-#
-envs = ["production", "test", "development"]
-env = if envs.include?(ARGV[0])
-        ARGV[0]
-      else
-        "production"
-      end
-
-puts yellow "== RAILS ENV | #{env}"
-current_version = version
-puts yellow "Your version is #{current_version}"
-puts yellow "Check for new version: $ git pull origin 1x"
-`git pull origin 1x` # pull from origin
-
-# latest version
-if version == current_version
-  puts yellow "You have a latest version"
-else
-  puts green "Update to #{version}"
-
-`bundle install`
-
-  # migrate db
-if env == "development"
-`bundle exec rake db:migrate RAILS_ENV=development`
-`bundle exec rake db:migrate RAILS_ENV=test`
-else
-`bundle exec rake db:migrate RAILS_ENV=#{env}`
-end
-
-  puts green "== Done! Now you can start/restart server"
-end
-
-