knife-ec-backup 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fad4ec82781e7da3dd1840b1827f816a25f7960
-  data.tar.gz: 79264356094f42b1558b909d319d9f3987cd7f8b
+  metadata.gz: 8a281b55227d745f186c3c9a9a471d274e078585
+  data.tar.gz: cc3f0d8ed0a83f0e4b00eab7713c51f670fec1a7
 SHA512:
-  metadata.gz: 36efea0e1e19967126c6f3d5ab6e3cdd8e1d5dc63314bc6dfc5249e9a6f6fc5489b31d6036bc417c258039d2a8538ffa095ea54d7aeebee604e3a8bac6bdb906
-  data.tar.gz: bc35eeee11ab6064590f2366e89955361d4a2c588d870c74808e08e3ec943e662768640489a03973eee4b5478d66b03d89221faa4a3ea9ba271e713ec46c5747
+  metadata.gz: 0b58a4651be0b287f89ac2e2ec362db20f0193f17ce15dd6749591e26e71683b311933cf2a8ece1c1ba65be30398db844094dc6659344a570b0c60437b888133
+  data.tar.gz: 046df1b5018e9ff98cd44b47d7768df28de07562f166ab0d7c2962a6847f21b579c35189b1de777b9bb2277aa696673d1918cb466e59c26e201132f1d860e42f

data/lib/chef/knife/ec_key_base.rb

@@ -77,7 +77,7 @@ class Chef
         else
           running_config ||= JSON.parse(File.read("/etc/opscode/chef-server-running.json"))
           # Latest versions of chef server put the database info under opscode-erchef.sql_user
-          hash_key = if running_config['private_chef']['opscode-erchef'].has_key? sql_user
+          hash_key = if running_config['private_chef']['opscode-erchef'].has_key? 'sql_user'
                        'opscode-erchef'
                      else
                        'postgresql'

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/spec/chef/knife/ec_key_base_spec.rb

@@ -1,2 +1,37 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 require 'chef/knife/ec_key_base'
+
+class KeyBaseTester < Chef::Knife
+  include Chef::Knife::EcKeyBase
+end
+
+describe Chef::Knife::EcKeyBase do
+  let (:knife) { Chef::Knife::KeyBaseTester.new }
+
+  let(:running_server_postgresql_sql_config_json) {
+    '{"private_chef": { "opscode-erchef":{}, "postgresql": { "sql_user": "jiminy", "sql_password": "secret"} }}'
+  }
+
+
+  let(:running_server_erchef_config_json) {
+    '{"private_chef": { "opscode-erchef": { "sql_user": "cricket", "sql_password": "secrete"}, "postgresql" : {} }}'
+  }
+  describe "#load_config_from_file!" do
+    before(:each) do
+      allow(File).to receive(:exists?).and_return(true)
+    end
+    it "correctly sets sql options when they live under postgresql settings" do
+      allow(File).to receive(:read).and_return(running_server_postgresql_sql_config_json)
+      knife.load_config_from_file!
+      expect(knife.config[:sql_user]).to eq("jiminy")
+      expect(knife.config[:sql_password]).to eq("secret")
+    end
+    it "correctly sets sql options when they live under opscode-erchef settings" do
+      allow(File).to receive(:read).and_return(running_server_erchef_config_json)
+      knife.load_config_from_file!
+      expect(knife.config[:sql_user]).to eq("cricket")
+      expect(knife.config[:sql_password]).to eq("secrete")
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -102,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Backup and Restore of Enterprise Chef
 test_files: []
-has_rdoc: