chef_fixie 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chef_fixie/config.rb +3 -2
  3. data/lib/chef_fixie/sql_objects.rb +0 -1
  4. data/lib/chef_fixie/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 825da7433a38666e0611aa0a4a483f588fb5a960
4
- data.tar.gz: 9d847319ee053fa87a1b227dc4a98be81c8607fe
3
+ metadata.gz: a2d39d757f223a6cf8f364906e91d8051ce19a61
4
+ data.tar.gz: 8cbc7287d4ec7ac58e9a800fd1dd76b23b674d10
5
5
  SHA512:
6
- metadata.gz: d84e4c74eff5263bf5cb04b6c34cb685277b7e6b968171b57432add99536b9339bed1bbed9adf3cebf7697c171231dbd329160fdd184e21e4437776de642f188
7
- data.tar.gz: ded9a2ada6cf314e19ddf44f666b25138ec4edb1cacf5cc9a55a10cec7d1e49c71382ccbc740c634ac08945bf3474e0f115e198c4eababdbc4bf01269cff00a7
6
+ metadata.gz: 6970a5ff33b2a6448b57584e5641a99c55837803a67d209b6246bbbe344466f51f445884f1c596f06429e30e27312c8755a93721b471b56043fc99c987b3545d
7
+ data.tar.gz: f1c93aba31fa3afc3cb3ba952539a052260a6a890b176bc45d0609aaa471182e74f4011b14a3e104b5def87a40c21562bf5a5eb6d777d3e016ef1835e13cdd6d
data/lib/chef_fixie/config.rb CHANGED
@@ -112,9 +112,10 @@ module ChefFixie
112
112
  @superuser_id = authz_config['superuser_id']
113
113
 
114
114
  sql_config = config['private_chef']['postgresql']
115
+ erchef_config = config['private_chef']['opscode-erchef']
115
116
 
116
- sql_user = sql_config['sql_user']
117
- sql_pw = sql_config['sql_password']
117
+ sql_user = sql_config['sql_user'] || erchef_config['sql_user']
118
+ sql_pw = sql_config['sql_password'] || erchef_config['sql_password']
118
119
  sql_vip = sql_config['vip']
119
120
  sql_port = sql_config['port']
120
121
 
data/lib/chef_fixie/sql_objects.rb CHANGED
@@ -70,7 +70,6 @@ module ChefFixie
70
70
  end
71
71
  def self.plural(name)
72
72
  name = self.to_name(name)
73
- pp :name_plural=>name
74
73
  name.to_s.pluralize
75
74
  end
76
75
  end
data/lib/chef_fixie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ChefFixie
2
- VERSION = "0.2.1"
2
+ VERSION = "0.3.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef_fixie
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mark Anderson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-11 00:00:00.000000000 Z
11
+ date: 2015-11-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef