obelisk 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf222f8fb3da4ac9c3d4d21b0e09279b1b8fbe7
-  data.tar.gz: 38e54fa9c9f08d7c2a403544577013c2e343147d
+  metadata.gz: 7e19232e251e92483db63c5f53f5233f61244e6a
+  data.tar.gz: 154d1d8edc71f655ac822b152ba29bf7d2f36213
 SHA512:
-  metadata.gz: 77afe9c808414caac1087bc3550d9ff535ddd2e10c3e91b0ff4a290575598a9f80ad55105c985925f4b88bca886a0226694a2bc866e5533212cc6977ff3b9983
-  data.tar.gz: 76505380856b9e2560abb0d01cfd3a98476393e7a1fa160d1b19dee7ab0eb5d5d2c13e86991c7e13b3075d8045a716ffac40ea5e238f73d1bd5b9e61a27fadff
+  metadata.gz: 6674fa7644ef8d921777c03b202f422bcdc9cc5b71d5418d272eee1d715d8517c09391e88d7ef03d080467f10ed93e0efb2234057ee68c0286e32dec1b788fc7
+  data.tar.gz: df3553de411898362c1277e57ac94df58750b866bfb014184c8838786df998621d4983699257de6d1be4d97b2fd0d6034972e28bb7346d1c2cd459a54eada3f5

data/lib/obelisk.rb

@@ -43,6 +43,7 @@ module Obelisk
   $conf = {}
 
   def self.make_erb_conf(params = {})
+    load_conf
     params[:conf_dir] ||= $conf[:asterisk_conf_dir]
     params[:force] ||= false
     params[:restart] ||= false
@@ -50,7 +51,8 @@ module Obelisk
     FileUtils.mkdir_p params[:conf_dir]
     b = binding
     up = false
-    users = get_ad_users
+    all_users = get_ad_users
+    users = all_users.select{ |u| u[:secret] && u[:extension] }
     Dir[File.expand_path "*.erb", $conf[:erb_file_dir]].each do |erb|
       conf_file = File.expand_path File.basename(erb, ".erb"), params[:conf_dir]
       File.open(conf_file, File.exists?(conf_file) ? "r+" : "w+") do |file|
@@ -64,7 +66,7 @@ module Obelisk
       end
     end
     system $conf[:asterisk_restart_command] if up && params[:restart]
-    update_rails_db users if up && params[:updb]
+    update_rails_db all_users if up && params[:updb]
     up
   end
 
@@ -89,7 +91,7 @@ module Obelisk
       }
     }
     ActiveDirectory::Base.setup(settings)
-    ActiveDirectory::User.find(:all).select{ |u| u.valid_attribute? :info }.map do |u|
+    ActiveDirectory::User.find(:all).map do |u|
       k = $conf[:mapping].values
       v = $conf[:mapping].keys.map { |attr| u.valid_attribute?(attr) ? u.send(attr).force_encoding("UTF-8") : $conf[:defaults][attr] }
       Hash[k.zip v]

data/lib/obelisk/version.rb

@@ -1,3 +1,3 @@
 module Obelisk
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obelisk
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler