obelisk 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a619dba560b040a28d4ed9f73a5ff5b424c6d851
-  data.tar.gz: c9a3e06b5ac8e017b6dd72aa4cd2887706e7a274
+  metadata.gz: e6ea51bc91fc69ada708a251d986a9663d59e51c
+  data.tar.gz: 10be28be4338ff91baa3579c43c7de4c82a4e0d5
 SHA512:
-  metadata.gz: 04e5aeca2a7bba77becd166e77d99935ecc98fa76246813a0930822d306819645084f6bc64a452979d7c7f23dfd016d19cafddb5ca2a5826d446ae1c744ae861
-  data.tar.gz: ed4234835a139953299d028a5d2bb3c6cbf24fb76cf03792e78c5f6bcecd72144c8907aee4eac525a70cb175f323b5f96a37a38a3d5cf5f9c05d6625965fbb32
+  metadata.gz: 75a30608ad3de13b49d6739f5246b643b9eae2ea5d0bc85dfeb726bdb387277908239ff5c3f2f842b0b5b8aa1256f08750c88d88414bca7ca642fe9f9d3408ca
+  data.tar.gz: b4b2df0172b915077214facaeae4e347e9a639e22f446d8ad5bd68d8476b3ff9f913eb50fb94d3a6864d0ff6831f2e3a5c5d8c55a2fb3999e0068304502799b2

data/erb/extensions.ad.erb

@@ -1,14 +1,16 @@
 ; This file is generated by Obelisk <%=Obelisk::VERSION %>
 
 <% current_context = nil -%>
-<% users.sort { |a, b| a[:context] <=> b[:context] }.each do |user| -%>
+<% users.sort_by{ |v| v[:context] }.each do |user| -%>
 <% if current_context != user[:context] -%>
 <% current_context = user[:context] -%>
 [<%= current_context %>-ad-users]
 
 <% end -%>
+<% if user[:extension] -%>
 exten => <%= user[:extension] %>,1,Dial(SIP/<%= user[:login] %>)
 exten => <%= user[:extension] %>,hint,SIP/<%= user[:login] %>,CustomPresence:<%= user[:login] %>
+<% end -%>
 exten => <%= user[:login] %>,1,Dial(SIP/<%= user[:login] %>)
 exten => <%= user[:login] %>,hint,SIP/<%= user[:login] %>,CustomPresence:<%= user[:login] %>
 

data/lib/obelisk.rb

@@ -19,7 +19,7 @@ module Obelisk
     },
     :mapping => {
       samaccountname:                   :login,
-      info:                             :secret,
+      admindescription:                 :secret,
       facsimiletelephonenumber:         :context,
       ipphone:                          :extension,
       pager:                            :callgroup,
@@ -66,18 +66,10 @@ module Obelisk
       end
     end
     system $conf[:asterisk_restart_command] if up && params[:restart]
-    update_rails_db all_users.reject { |u| u[:name].include? "Test User" } if up && params[:updb]
+    puts("Update database is deprecated") if params[:updb]
     up
   end
 
-  def self.update_rails_db(users)
-    users.each { |u| u.delete :secret }
-    c = Curl::Easy.http_post $conf[:obelisk_portal_update_url], JSON.dump(users) do |curl|
-      curl.headers['Accept'] = 'application/json'
-      curl.headers['Content-Type'] = 'application/json'
-    end
-  end
-
   def self.get_ad_users(ou = nil)
     load_conf
     settings = {

data/lib/obelisk/version.rb

@@ -1,3 +1,3 @@
 module Obelisk
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/test/test_erb.rb

@@ -12,7 +12,7 @@ class ErbTestCase < Test::Unit::TestCase
       assert ! Obelisk.make_erb_conf(:conf_dir => dir)
       assert Obelisk.make_erb_conf :conf_dir => dir, :force => true
       assert ! Obelisk.make_erb_conf(:conf_dir => dir)
-      #puts %x(cat #{dir}/*)
+      puts %x(cat #{dir}/*)
     ensure
       File.delete *Dir[File.expand_path "*", dir]
       Dir.rmdir dir

metadata

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