backupii 0.1.0.pre.alpha.1 → 0.1.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db08b57a1783a56efe5583ab413bf42721a5d2c7c5a4567fe523ddc0068e7874
-  data.tar.gz: 4858c38e6c35d3c80429bb8a9311f3f152f632551a80eeebbbc27a8aab6c3087
+  metadata.gz: 55acc142a5a0af7888183a87cc376d1173c3b0bf2224c87cc01e0213c4e9797b
+  data.tar.gz: 9692e585f0b0df923376828f06322b5ddace900dca10b4bbea41b203e8d4c8cd
 SHA512:
-  metadata.gz: 9e2361e3b6afd6cc9e34b766fdd4eb4744b47492b97ce9763efb02ed2f60a89abc2c6c2dda95adf9b26ada65dae2286e6c2f9322feffe95d0bfd7c4ccbc3cb7d
-  data.tar.gz: ee8027246ecb416e99ca09066789b5437a1ff147f29020fe78206e267ffa7389330f374ffc13aca1147b2c900a862c09d451246064c56d6e3dccf2c4844ca71b
+  metadata.gz: abb4a36ef5df6770034a83b8583f74564b84d41ae964a6de533fc35cddf6c73f7bbca091c5689404d5e0604d96d6049b6362dd4a854d2ff48260b31e240bc91f
+  data.tar.gz: 5679a81cde608d32c62adbc0be6492d2532e9e5aff86c0bd772ffd1a65aeb0c5614f7f1b0ef5b6327c859cff2e0a472c2c89a39a4b0d09c375a758c12060a3b1

data/lib/backup/config.rb

@@ -18,6 +18,32 @@ module Backup
 
       attr_reader :user, :root_path, :config_file, :data_path, :tmp_path
 
+      def check_config_version!(config)
+        version = Backup::VERSION.split(".").first
+
+        return if config =~ %r{^# backupii_config_version: #{version}$}
+
+        if config =~ %r{^# Backup v\d\.x Configuration$}
+          raise Error, <<-ERROR_MSG
+            Invalid Configuration File.
+            The configuration file at '#{config_file}'
+            appears to be a Backup 3/4/5 configuration file.
+            In order to use it with BackupII, you need to upgrade it.
+            Please refer to the BackupII documentation for upgrade instructions.
+          ERROR_MSG
+        elsif !(config =~ %r{^# backupii_config_version: #{version}$})
+          raise Error, <<-ERROR_MSG
+            Invalid Configuration File
+            The configuration file at '#{config_file}'
+            does not appear to be a BackupII v#{version}.x configuration file.
+            If you have upgraded to v#{version}.x from a previous version,
+            you need to upgrade your configuration file.
+            Please see the instructions for upgrading in the BackupII
+            documentation.
+          ERROR_MSG
+        end
+      end
+
       # Loads the user's +config.rb+ and all model files.
       def load(options = {})
         update(options) # from the command line
@@ -27,17 +53,7 @@ module Backup
         end
 
         config = File.read(config_file)
-        version = Backup::VERSION.split(".").first
-        unless config =~ %r{^# Backup v#{version}\.x Configuration$}
-          raise Error, <<-EOS
-            Invalid Configuration File
-            The configuration file at '#{config_file}'
-            does not appear to be a Backup v#{version}.x configuration file.
-            If you have upgraded to v#{version}.x from a previous version,
-            you need to upgrade your configuration file.
-            Please see the instructions for upgrading in the Backup documentation.
-          EOS
-        end
+        check_config_version!(config)
 
         dsl = DSL.new
         dsl.instance_eval(config, config_file)
@@ -112,7 +128,7 @@ module Backup
 
       def reset!
         @user      = ENV["USER"] || Etc.getpwuid.name
-        @root_path = File.join(File.expand_path(ENV["HOME"] || ""), "Backup")
+        @root_path = File.join(File.expand_path(ENV["HOME"] || ""), "BackupII")
         update(root_path: @root_path)
       end
     end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Backup
-  VERSION = "0.1.0-alpha.1"
+  VERSION = "0.1.0-alpha.2"
 end

data/templates/cli/archive

@@ -10,7 +10,7 @@
   #   archive.exclude "/path/to/an/excluded_directory
   #
   # By default, relative paths will be relative to the directory
-  # where `backup perform` is executed, and they will be expanded
+  # where `backupii perform` is executed, and they will be expanded
   # to the root of the filesystem when added to the archive.
   #
   # If a `root` path is set, relative paths will be relative to the

data/templates/cli/config

@@ -1,10 +1,11 @@
 # encoding: utf-8
+# backupii_config_version: <%= Backup::VERSION.split('.').first %>
 
 ##
-# Backup v<%= Backup::VERSION.split('.').first %>.x Configuration
+# BackupII v<%= Backup::VERSION.split('.').first %>.x Configuration
 #
-# Documentation: http://backup.github.io/backup
-# Issue Tracker: https://github.com/backup/backup/issues
+# Documentation: http://backupii.github.io/backupii
+# Issue Tracker: https://github.com/backupii/backupii/issues
 
 ##
 # Config Options
@@ -38,7 +39,7 @@
 # tmp_path  'my/tmp'
 #
 # Sets the path where backup stores persistent information.
-# When Backup's Cycler is used, small YAML files are stored here.
+# When BackupII's Cycler is used, small YAML files are stored here.
 # May be an absolute path, or relative to the current directory or +root_path+.
 #
 # data_path 'my/data'
@@ -46,7 +47,7 @@
 ##
 # Utilities
 #
-# If you need to use a utility other than the one Backup detects,
+# If you need to use a utility other than the one BackupII detects,
 # or a utility can not be found in your $PATH.
 #
 #   Utilities.configure do
@@ -70,7 +71,7 @@
 # Command line options will override those set here.
 # For example, the following would override the example settings above
 # to disable syslog and enable console output.
-#   backup perform --trigger my_backup --no-syslog --no-quiet
+#   backupii perform --trigger my_backup --no-syslog --no-quiet
 
 ##
 # Component Defaults

data/templates/cli/model

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
 ##
-# Backup Generated: <%= @options[:trigger] %>
+# BackupII Generated: <%= @options[:trigger] %>
 # Once configured, you can run the backup with the following command:
 #
-# $ backup perform -t <%= @options[:trigger] %> [-c <path_to_configuration_file>]
+# $ backupii perform -t <%= @options[:trigger] %> [-c <path_to_configuration_file>]
 #
-# For more information about Backup's components, see the documentation at:
-# http://backup.github.io/backup
+# For more information about BackupII's components, see the documentation at:
+# http://backupii.github.io/backupii
 #
 Model.new(:<%= @options[:trigger] %>, 'Description for <%= @options[:trigger] %>') do
 <% if @options[:splitter] %>

data/templates/cli/storages/dropbox

@@ -9,7 +9,7 @@
     db.api_key     = "my_api_key"
     db.api_secret  = "my_api_secret"
     # Sets the path where the cached authorized session will be stored.
-    # Relative paths will be relative to ~/Backup, unless the --root-path
+    # Relative paths will be relative to ~/.backupii, unless the --root-path
     # is set on the command line or within your configuration file.
     db.cache_path  = ".cache"
     # :app_folder (default) or :dropbox

data/templates/general/links

@@ -1,3 +1,3 @@
-Project Home:  https://github.com/backup/backup
-Documentation: http://backup.github.io/backup
-Issue Tracker: https://github.com/backup/backup/issues
+Project Home:  https://github.com/backupii/backupii
+Documentation: http://backupii.github.io/backupii
+Issue Tracker: https://github.com/backupii/backupii/issues

data/templates/general/version.erb

@@ -1,2 +1,2 @@
-Backup v<%= Backup::VERSION %>
+BackupII v<%= Backup::VERSION %>
 Ruby: <%= RUBY_DESCRIPTION %>

data/templates/storage/dropbox/authorization_url.erb

@@ -1,5 +1,5 @@
 
-Visit the following URL to authorize your Dropbox App with Backup:
+Visit the following URL to authorize your Dropbox App with BackupII:
 
   <%= @session.get_authorize_url %>
 

data/templates/storage/dropbox/authorized.erb

@@ -1,4 +1,4 @@
 
-Backup has successfully been authorized!
+BackupII has successfully been authorized!
 Writing session cache file to:
 <%= @cached_file %>

data/templates/storage/dropbox/cache_file_written.erb

@@ -2,7 +2,7 @@
 Cache data written! You will no longer need to manually authorize this
 Dropbox account via an authorization URL on this machine.
 
-Note: If you run Backup with this Dropbox account in another location,
+Note: If you run BackupII with this Dropbox account in another location,
 or on other machines, you will need to either authorize them the same
 way, or simply copy over the cache file from:
 <%= @cached_file %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backupii
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.1
+  version: 0.1.0.pre.alpha.2
 platform: ruby
 authors:
 - Michael van Rooijen
@@ -284,16 +284,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -336,12 +336,12 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: Backup is a RubyGem, written for UNIX-like operating systems, that allows
-  you to easily perform backup operations on both your remote and local environments.
-  It provides you with an elegant DSL in Ruby for modeling your backups. Backup has
-  built-in support for various databases, storage protocols/services, syncers, compressors,
-  encryptors and notifiers which you can mix and match. It was built with modularity,
-  extensibility and simplicity in mind.
+description: BackupII is a RubyGem, written for UNIX-like operating systems, that
+  allows you to easily perform backup operations on both your remote and local environments.
+  It provides you with an elegant DSL in Ruby for modeling your backups. BackupII
+  has built-in support for various databases, storage protocols/services, syncers,
+  compressors, encryptors and notifiers which you can mix and match. It was built
+  with modularity, extensibility and simplicity in mind.
 email: contact@lta.io
 executables:
 - backupii
@@ -484,7 +484,9 @@ files:
 homepage: https://github.com/backupii/backupii
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/backupii/backupii/issues
+  source_code_uri: https://github.com/backupii/backupii
 post_install_message: 
 rdoc_options: []
 require_paths: