encbs 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/encbs

@@ -16,11 +16,12 @@ safe_require do
 end
 
 require 'backup'
+require 'encbsconfig'
 
 opts = Slop.parse :help => true do
   on :a, :add, "Add path to backup", true
   on :b, :bucket, "Set Amazon S3 bucket to backup", true
-  on :c, :config, "Use config file to upload backup", true #TODO
+  on :c, :config, "Use config file to upload backup", true
   on :colorize, "Colorize print to console"
   on :d, :date, "Date for backup restore (default: last)", true
   on :g, :generate, "Generate RSA keys (option: 4096, 2048)", true
@@ -34,20 +35,26 @@ opts = Slop.parse :help => true do
   on :s, :secret, "Set API secret to access Amazon S3", true
   on :t, :to, "Path to recovery (default: /)", true
   on :token, "RSA Key to encrypt/decrypt backup data", true
-  on :threads, "Set count of thread (default: 1)", true
   on :v, :verbose, "Verbose mode"
 
   banner "Usage:\n    $ encbs [options]\n\nOptions:"
 end
 
-if ARGV.empty?
-  puts opts.help
+@config = EncbsConfig.new
 
-  exit
+if ARGV.empty?
+  if File.exists?("#{Dir.getwd}/Encbsfile")
+    @config.load "#{Dir.getwd}/Encbsfile"
+  else
+    puts opts.help
+    exit
+  end
 end
 
-$PRINT_VERBOSE = opts.verbose?
-$COLORIZE = opts.colorize?
+@config.load opts[:config] if opts.config?
+
+$PRINT_VERBOSE = @config.verbose || opts.verbose?
+$COLORIZE = @config.colorize || opts.colorize?
 
 if opts.generate?
   bits = opts[:generate].to_i
@@ -68,18 +75,20 @@ if opts.local?
   @backup = Backup::Instance.new opts[:local]
 else
   [:key, :secret, :bucket].each do |arg|
-    puts_fail "Argument '--#{arg}' should not be empty" if opts[arg].nil?
+    if opts[arg].nil? and @config.send(arg).nil?
+      puts_fail "Argument '--#{arg}' should not be empty"
+    end
   end
   @backup = Backup::Instance.new(
     "backups",
     true,
-    :bucket => opts[:bucket],
-    :key => opts[:key],
-    :secret => opts[:secret]
+    :bucket => @config.bucket || opts[:bucket],
+    :key => @config.key || opts[:key],
+    :secret => @config.secret || opts[:secret]
   )
 end
 
-@backup.hostname = opts[:hostname] if opts.hostname?
+@backup.hostname = @config.hostname || (opts[:hostname] if opts.hostname?)
 
 if opts.list?
   jars_list = @backup.jars
@@ -96,7 +105,13 @@ if opts.list?
   exit
 end
 
-@backup.key = opts[:token] if opts.token?
+if @config.token || opts.token?
+  key = @config.token || opts[:token]
+
+  puts_fail "Key #{key.dark_green} not found" unless File.exists? key
+
+  @backup.key = key
+end
 
 if opts.date?
   date = opts[:date].split("-")
@@ -192,8 +207,8 @@ if opts.rescue?
   exit
 end
 
-if opts.add?
-  paths = opts[:add].split(" ")
+if @config.paths || opts.add?
+  paths = @config.paths.split(" ") || opts[:add].split(" ")
 
   paths = paths.map do |path|
     path = File.expand_path path

data/encbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Klim"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-13}
   s.default_executable = %q{encbs}
   s.description = %q{Simple backup system for pushing into cloud}
   s.email = %q{klimtimothy@gmail.com}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/backup/jar.rb",
     "lib/backup/timestamp.rb",
     "lib/crypto.rb",
+    "lib/encbsconfig.rb",
     "lib/helpers.rb",
     "test/fixtures/etc/.hide",
     "test/fixtures/etc/root/file",

data/lib/encbsconfig.rb

@@ -0,0 +1,48 @@
+class EncbsConfig
+  attr_reader :paths, :bucket, :colorize, :hostname, :increment, :key,
+              :secret, :token, :verbose
+
+  def initialize
+    @paths = ""
+  end
+
+  def load(path)
+    eval "#{open(path).read}"
+  end
+
+  def use_hostname(attr)
+    @hostname = attr
+  end
+
+  def add(attr)
+    @paths += " #{attr}"
+  end
+
+  def colorize!
+    @colorize = true
+  end
+
+  def public_key(attr)
+    @token = attr
+  end
+
+  def increment!
+    @increment = true
+  end
+
+  def aws_key(attr)
+    @key = attr
+  end
+
+  def aws_secret(attr)
+    @secret = attr
+  end
+
+  def aws_bucket(attr)
+    @bucket = attr
+  end
+
+  def verbose!
+    @verbose = true
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: encbs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Timothy Klim
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +04:00
+date: 2011-05-13 00:00:00 +04:00
 default_executable: encbs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,6 +104,7 @@ files:
 - lib/backup/jar.rb
 - lib/backup/timestamp.rb
 - lib/crypto.rb
+- lib/encbsconfig.rb
 - lib/helpers.rb
 - test/fixtures/etc/.hide
 - test/fixtures/etc/root/file
@@ -127,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2711619165124038743
+      hash: -215227041177013415
       segments: 
       - 0
       version: "0"