mongolly 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697b8dc29e9aa15f0d51614ffd5627bcf67c6bf9
-  data.tar.gz: 82095fdcee43fcd4bad769b70b79cacecd2b1210
+  metadata.gz: 0e5dfd7e55a93db2f0ab03b50b7676d97b25a212
+  data.tar.gz: 26304958d35572763588aeb6521f6f86037caa9f
 SHA512:
-  metadata.gz: 8b6c010ff0096ce2febec13f8c850507ef7628852cd96a7356660cf0c6e06457f51c644f3ea5394d66cea0a8b6e3129dbc41f6c6de0d0aaa0ea7c218545d126b
-  data.tar.gz: 43ef7d581b4a28513a17a77893ac0f0ecc432c3499231c7c170ef4a08e0258967969696a9ea39219cbf46b2dca2145cdbfa1e78c224527e2a7ef90dffa59c98e
+  metadata.gz: 19cfd8db4e216c2789aeb4e4099ab7c1e6e7812631ee2c0f64b032cf0537cd9b871f9188b286d89f98258dab9e362c5fdfdb87f43c16172c1e5893a6ee8fba48
+  data.tar.gz: d9538c0a1fcd46158a1bee43a662174191347f8f0661316a896b3916326382095a411508fdb327682a87e1317009b794fab0b4d8f1dd92959cf93f6c25f98869

data/bin/mongolly

@@ -6,19 +6,12 @@ require 'mongolly'
 
 module Mongolly
   class Runner < Thor
-
-    CONFIG_PATH = File.expand_path '~/.mongolly'
-
-    def initialize(*args)
-      super
-      @config = read_config
-      exit unless @config && valid_config?
-    end
+    class_option :config, :type => :string, aliases: '-c', default: '~/.mongolly', desc: 'Path to config file'
 
     desc "backup", "Snapshots the Database EBS Volumes"
     method_option :dry_run, type: :boolean, desc: 'Step through command without changes'
     def backup
-      Shepherd.new({dry_run: options[:dry_run]}.merge(@config)).backup
+      Shepherd.new({dry_run: options[:dry_run]}.merge(config)).backup
     end
 
     desc "clean", "Removes old Database EBS Snapshots"
@@ -26,13 +19,31 @@ module Mongolly
     method_option :dry_run, type: :boolean, desc: 'Step through command without changes'
     def clean
       age = Time.parse(options[:age])
-      Shepherd.new({dry_run: options[:dry_run]}.merge(@config)).cleanup(age)
+      Shepherd.new({dry_run: options[:dry_run]}.merge(config)).cleanup(age)
     end
 
   private
-    def seed_config
-      return true if File.exists? CONFIG_PATH
+    def config
+      @config ||= read_config
+    end
+
+    def read_config
+      unless File.exists? config_path
+        seed_config
+        exit 1
+      end
+
+      begin
+        cfg = YAML::load( File.read( config_path ) )
+      rescue e
+        puts " ** Unable to read config at #{config_path}"
+        raise e
+      end
 
+      validated_config cfg
+    end
+
+    def seed_config
       empty_config = {
         database: [],
         db_username: nil,
@@ -47,35 +58,26 @@ module Mongolly
         config_server_ssh_keypath: nil
       }
 
-      File.open( CONFIG_PATH, "w" ) do |f|
+      File.open( config_path, "w" ) do |f|
         f.write( empty_config.to_yaml )
       end
 
-      puts " ** An empty configuration file has been written to #{CONFIG_PATH}."
+      puts " ** An empty configuration file has been written to #{config_path}."
       puts " ** you must now edit this configuration file with your AWS Credentials,"
       puts " ** MongoDB Connection Details, and the array of volume IDs that you wish"
       puts " ** to snapshot"
-
-      return false
-    end
-
-    def read_config
-      return false unless seed_config
-      begin
-        return YAML::load( File.read( CONFIG_PATH ) )
-      rescue e
-        puts " ** Unable to read config at #{CONFIG_PATH}"
-        raise e
-      end
     end
 
-    def valid_config?
+    def validated_config(cfg)
       %w(database access_key_id secret_access_key).each do |arg|
-        raise ArgumentError.new("#{arg} cannot be empty") if @config[arg.to_sym].to_s.strip.empty?
+        raise ArgumentError.new("#{arg} cannot be empty") if cfg[arg.to_sym].to_s.strip.empty?
       end
-      return true
+      cfg
     end
 
+    def config_path
+      config_path ||= File.expand_path(options[:config])
+    end
   end
 end
 

data/lib/mongolly/extensions/mongo/mongo_client.rb

@@ -195,7 +195,7 @@ protected
 
   def replica_set_connection(hosts, options)
     db = Mongo::MongoReplicaSetClient.new(hosts)
-    db['admin'].authenticate(options[:db_username], options[:db_password])
+    db['admin'].authenticate(options[:db_username], options[:db_password])  if options[:db_username]
     return db
   end
 

data/lib/mongolly/version.rb

@@ -1,3 +1,3 @@
 module Mongolly
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongolly
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Michael Saffitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor