s3archive 1.1.0 → 1.2.0

data/lib/s3archive/config.rb

@@ -7,7 +7,7 @@ module S3Archive
   end
 
   def self.config_path
-    @config_path || "/etc/s3archive.yml"
+    @config_path
   end
 
   def self.config

data/lib/tasks/s3archive.thor

@@ -1,22 +1,37 @@
 require 'thor'
 $:.unshift File.join(File.dirname(__FILE__), '..')
 require 's3archive/compress_and_upload'
+require 's3archive/logging'
 
 module S3Archive
   class Cli < Thor
+    include Logging
     namespace :s3archive
 
-    class_option "-c",
+    class_option :config,
       :desc => "Path to config file",
       :banner => "CONFIG_FILE",
       :type => :string,
-      :aliases => "--config",
+      :aliases => "-c",
       :default => "/etc/s3archive.yml"
 
-    desc "upload PATH [PATH...]", "Compresses PATH and uploads to s3://<bucket>/<year>/<month>/<day>/<filename>.gz"
+    desc "upload PATH [PATH...]", "Sleeps, compresses and uploads to s3://<bucket>/<year>/<month>/<day>/<filename>.gz"
+    method_option :sleep,
+                  :aliases => "-s",
+                  :default => 5,
+                  :banner => "SECONDS",
+                  :desc => "The number of seconds to sleep before uploading"
+
     def upload (*paths)
-      S3Archive.config_path = self.options["c"] if self.options["c"]
+      unless File.exists?(options[:config])
+        logger.error("Could not find config file #{options[:config]}")
+        exit(1)
+      end
+
+      S3Archive.config_path = options[:config]
       help(:upload) && exit if paths.empty?
+
+      logger.info("Sleeping for #{options[:sleep]} seconds") && sleep(options[:sleep])
       paths.each do |path|
         CompressAndUpload.run(path)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3archive
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: