rails-backup-migrate 0.0.9 → 0.0.10

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.DS_Store
+.idea/

data/CHANGELOG

@@ -1,3 +1,11 @@
+*0.0.9 (2011-08-18)*
+
+* Improvements to help with character set issues in Ruby 1.9.2
+
+*0.0.8 (2011-07-25)*
+
+* Added check to only include 'files' directory if it is used by the rails app.
+
 *0.0.7 (2011-07-17)*
 
 * Removed wildcard path when using `tar` to load database files as this required an option for GnuTar but not on BSD Tar. [Matt Connolly]

data/README.textile

@@ -25,7 +25,7 @@ h2. More info
 
 The backup file can be specified with a command line argument in rake's (wierd) format:
 
-<pre></code>  $ rake site:backup[/path/to/file.tgz]</code></pre>
+<pre><code>  $ rake site:backup[/path/to/file.tgz]</code></pre>
 
 h2. Compatibility
 

data/lib/rails-backup-migrate.rb

@@ -20,12 +20,13 @@ module RailsBackupMigrate
   @archive_file = nil
   @files_to_archive = []
   
-  if ENV['verbose'] || ENV['VERBOSE']
-    VERBOSE = true
-  else
-    VERBOSE = false
-  end
-  
+  VERBOSE =
+      if ENV['verbose'] || ENV['VERBOSE']
+        true
+      else
+        false
+      end
+
   # singleton methods for Module `RailsBackupMigrate`
   class << self
     attr_accessor :backup_file
@@ -37,19 +38,21 @@ module RailsBackupMigrate
       end
     end
     
-    # add a path to be archived. Expected path to be relative to RAILS_ROOT. This is where the archive
+    # add a path to be archived. Expected path to be relative to Rails.root. This is where the archive
     # will be created so that uploaded files (the 'files' dir) can be reference in place without needing to be copied.
     def add_to_archive path
-      # check it's relative to RAILS_ROOT
-      raise "File '#{path}' does not exist" unless File::exist? path
+      # check it's relative to Rails.root
+      raise "File '#{path}' does not exist" unless File.exist? path
       
-      if File::expand_path(path).start_with? RAILS_ROOT
-        # remove RAILS_ROOT from absolute path
-        relative = File::expand_path(path).sub(RAILS_ROOT,'')
-        # remove leading slash
-        relative.gsub! /^#{File::SEPARATOR}/,''
+      expanded_path = File.expand_path(path)
+      if expanded_path.start_with?(rails_root.to_s)
+        # remove rails_root from absolute path
+        relative = expanded_path.sub(rails_root + File::SEPARATOR,'')
         # add to list
+        puts "Adding relative path: '#{relative}'" if VERBOSE
         @files_to_archive << relative
+      else
+        raise "Cannot add a file that is not under Rails root directory. (#{expanded_path} not under #{rails_root})"
       end
     end
   
@@ -87,14 +90,14 @@ module RailsBackupMigrate
     def create_archive backup_file
       puts "creating archive..." if VERBOSE
       absolute = File::expand_path backup_file
-      Dir::chdir RAILS_ROOT
+      Dir::chdir rails_root
       `tar -czf #{absolute} #{files_to_archive.join ' '}`
     end
     
     
     # save the required database tables to .yml files in a folder 'yml' and add them to the backup
     def save_db_to_yml
-      FileUtils.chdir RAILS_ROOT
+      FileUtils.chdir rails_root
       FileUtils.mkdir_p 'db/backup'
       FileUtils.chdir 'db/backup'
       
@@ -107,7 +110,7 @@ module RailsBackupMigrate
       end
       
       # simply add the whole yml folder to the archive
-      FileUtils.chdir RAILS_ROOT
+      FileUtils.chdir rails_root
       add_to_archive 'db/backup'
     end
     
@@ -126,6 +129,12 @@ module RailsBackupMigrate
         end
       end
     end
+    
+    def rails_root
+      # in ruby 1.9.3, `Rails.root` is a Pathname object, that plays mess with string comparisons
+      # so we'll ensure we have a string
+      Rails.root.to_s
+    end
   end
 end
 

data/lib/rails-backup-migrate/version.rb

@@ -1,3 +1,3 @@
 module RailsBackupMigrate
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/tasks/rails-backup-migrate.rake

@@ -17,7 +17,11 @@ namespace :site do
     # private task: save the db/schema.rb file, calls 'db:schema:dump' as a dependency
     task :_save_db_schema, [:backup_file] => [:environment, 'db:schema:dump'] do |t, args|
       puts "adding db/schema.rb to archive list." if RailsBackupMigrate::VERBOSE
-      Dir::chdir RAILS_ROOT
+      Dir::chdir Rails.root
+      if RailsBackupMigrate::VERBOSE
+        puts "Checking if the db/schema file exists: " + (File.exist?('db/schema.rb') ? 'YES' : 'NO')
+        puts "Full path expands to: " + File.expand_path('db/schema.rb')
+      end
       RailsBackupMigrate.add_to_archive 'db/schema.rb'
     end
     
@@ -81,7 +85,7 @@ namespace :site do
     # private task: restore db/schema.rb, expected to be a dependency before 'db:schema:load'
     task :_restore_db_schema, [:backup_file] => [:_set_backup_file] do |t, args|[]
       puts "restoring db/schema.rb from archive." if RailsBackupMigrate::VERBOSE
-      Dir::chdir RAILS_ROOT
+      Dir::chdir Rails.root
       # extract the schema.rb file in place
       options = RailsBackupMigrate::VERBOSE ? '-xvzf' : '-xzf'
       `tar #{options} #{RailsBackupMigrate.backup_file} db/schema.rb`
@@ -98,7 +102,7 @@ namespace :site do
     
     # private task: restore 'files' directory. Should we delete the contents of it?? not for now...
     task :_restore_files_directory, [:backup_file] => [:_set_backup_file] do |t, args|
-      Dir::chdir RAILS_ROOT
+      Dir::chdir Rails.root
       # extract the 'files' directory in place
       
       # check if there is 'files/' in the archive file (perhaps this app doesn't have downloads)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-backup-migrate
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000 +10:00
-default_executable: 
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153793800 !ruby/object:Gem::Requirement
+  requirement: &70155964458440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153793800
+  version_requirements: *70155964458440
 description: ! "Creates a directory db/backup in the rails app and creates / loads
   YML files from there. \n    After a backup, the db/backups directory is archived
   into a .tgz file and then deleted.\n    When restoring, the db/backup directory
@@ -51,7 +50,6 @@ files:
 - lib/rails-backup-migrate/version.rb
 - lib/tasks/rails-backup-migrate.rake
 - rails-backup-migrate.gemspec
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -72,8 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails-backup-migrate
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Backup and restore a rails application including database data and files
 test_files: []
+has_rdoc: