UNSWDC5H-441

Updated deploy script and README

README.md

@@ -1,2 +1,5 @@
-acdata
-======
+This is the ACData project. The ACData application is a Ruby on Rails application built by [Intersect Australia](http://www.intersect.org.au/) for the [Mark Wainwright Analytical Centre](http://analytical.unsw.edu.au) as part of an [ANDS-Funded Data Capture Project (DC5H)](http://www.ands.org.au).
+
+Head over to [the wiki](https://github.com/IntersectAustralia/acdata/wiki) for project documentation.
+
+This code is licensed under the GNU GPL v3 license - see LICENSE.txt

config/deploy.rb

@@ -9,17 +9,17 @@
 set :stages, %w(qa staging production)
 set :default_stage, "qa"
 set :application, 'acdata'
-set :repository, Proc.new { `svn info | grep URL | sed 's/URL: //'`.chomp }
-set :scm, :subversion
 set :rpms, %w{httpd-devel apr-devel apr-util-devel libxml2 libxml2-devel libxslt libxslt-devel libffi gd mod_ssl git mod_xsendfile postgresql84-devel}
 set :shared_children, shared_children + %w(log_archive)
 set :shell, '/bin/bash'
 set :rvm_ruby_string, 'ruby-1.9.3-p194@acdata'
 set :rvm_type, :user
 
-# Deploy using copy since the servers can't see our SVN server
+# Deploy using copy  for now
+set :scm, 'git'
+set :repository, 'https://github.com/IntersectAustralia/anznn.git'
 set :deploy_via, :copy
-set :copy_exclude, [".svn/*"]
+set :copy_exclude, [".git/*"]
 
 set(:user) { "#{defined?(user) ? user : 'devel'}" }
 set(:group) { "#{defined?(group) ? group : user}" }
@@ -195,12 +195,12 @@
   task :load_slide_guidelines, :roles => :db do
     run("cd #{current_path} && bundle exec rake data:slide_guidelines:load", :env => {'RAILS_ENV' => "#{stage}"})
   end
-
-  # Set the revision
-  desc "Set SVN revision on the server so that we can see it in the deployed application"
-  task :set_svn_revision, :roles => :app do
-    put("#{real_revision}", "#{release_path}/app/views/layouts/_revision.rhtml")
-  end
+  #
+  ## Set the revision
+  #desc "Set SVN revision on the server so that we can see it in the deployed application"
+  #task :set_svn_revision, :roles => :app do
+  #  put("#{real_revision}", "#{release_path}/app/views/layouts/_revision.rhtml")
+  #end
 
   desc "Full redeployment, it runs deploy:update, deploy:refresh_db, and deploy:restart"
   task :full_redeploy do
@@ -261,7 +261,7 @@
   generate_database_yml
   generate_initial_users_yml
   generate_deploy_config
-  deploy.set_svn_revision
+  #deploy.set_svn_revision
 end
 
 desc "After updating code we need to populate a new database.yml"

spec/lib/nmr_harvester_spec.rb

@@ -14,7 +14,7 @@
     @i1 = Factory(:instrument, :id => 100, :instrument_class => 'NMR', :name => 'aaa (Flip)')
     @i2 = Factory(:instrument, :id => 101, :instrument_class => 'Not NMR', :name => 'bbb (bar)')
     @i3 = Factory(:instrument, :id => 102, :instrument_class => 'NMR', :name => 'ccc (Gyro)')
-    FileUtils.cp_r FileList["spec/resources/nmr_backup/*"].exclude(".svn"), "spec/resources/"
+    FileUtils.cp_r FileList["spec/resources/nmr_backup/*"], "spec/resources/"
 
   end
 

spec/lib/nmr_importer_spec.rb

@@ -13,7 +13,7 @@
                     :name => 'ccc (Gyro)',
                     :instrument_file_types => [@nmr_file_type])
       @u1 = Factory(:user, :status => 'A', :nmr_username => 'aaa')
-      FileUtils.cp_r FileList["spec/resources/nmr_backup/*"].exclude(".svn"), "spec/resources/"
+      FileUtils.cp_r FileList["spec/resources/nmr_backup/*"], "spec/resources/"
 
       Instrument.should_receive(:find).with(102).and_return(@i1)
       User.should_receive(:find).with(50).and_return(@u1)
@@ -73,7 +73,7 @@ def import_samples_tests(project)
   describe "extracting title from NMR folder" do
 
     before :all do
-      FileUtils.cp_r FileList["spec/resources/nmr_backup/*"].exclude(".svn"), "spec/resources/"
+      FileUtils.cp_r FileList["spec/resources/nmr_backup/*"], "spec/resources/"
     end
 
     after :all do