chef_fixie 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825da7433a38666e0611aa0a4a483f588fb5a960
-  data.tar.gz: 9d847319ee053fa87a1b227dc4a98be81c8607fe
+  metadata.gz: a2d39d757f223a6cf8f364906e91d8051ce19a61
+  data.tar.gz: 8cbc7287d4ec7ac58e9a800fd1dd76b23b674d10
 SHA512:
-  metadata.gz: d84e4c74eff5263bf5cb04b6c34cb685277b7e6b968171b57432add99536b9339bed1bbed9adf3cebf7697c171231dbd329160fdd184e21e4437776de642f188
-  data.tar.gz: ded9a2ada6cf314e19ddf44f666b25138ec4edb1cacf5cc9a55a10cec7d1e49c71382ccbc740c634ac08945bf3474e0f115e198c4eababdbc4bf01269cff00a7
+  metadata.gz: 6970a5ff33b2a6448b57584e5641a99c55837803a67d209b6246bbbe344466f51f445884f1c596f06429e30e27312c8755a93721b471b56043fc99c987b3545d
+  data.tar.gz: f1c93aba31fa3afc3cb3ba952539a052260a6a890b176bc45d0609aaa471182e74f4011b14a3e104b5def87a40c21562bf5a5eb6d777d3e016ef1835e13cdd6d

data/lib/chef_fixie/config.rb

@@ -112,9 +112,10 @@ module ChefFixie
       @superuser_id = authz_config['superuser_id']
 
       sql_config = config['private_chef']['postgresql']
+      erchef_config = config['private_chef']['opscode-erchef']
       
-      sql_user = sql_config['sql_user']
-      sql_pw = sql_config['sql_password']
+      sql_user = sql_config['sql_user'] || erchef_config['sql_user']
+      sql_pw = sql_config['sql_password'] || erchef_config['sql_password']
       sql_vip = sql_config['vip']
       sql_port = sql_config['port']
       

data/lib/chef_fixie/sql_objects.rb

@@ -70,7 +70,6 @@ module ChefFixie
       end
       def self.plural(name)
         name = self.to_name(name)
-        pp :name_plural=>name
         name.to_s.pluralize
       end
     end

data/lib/chef_fixie/version.rb

@@ -1,3 +1,3 @@
 module ChefFixie
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_fixie
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef