obelisk 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c847ea4d549f8d213b7107d9d7b712222bd0458a
-  data.tar.gz: 0f397ee7d0c430ad7f31837512b7431c7c83c652
+  metadata.gz: 18e420a4fdaa33cb7ae3a0178d90260005be6071
+  data.tar.gz: 6a8bcb0b9c5a5bea95f983f5465616ecf662038d
 SHA512:
-  metadata.gz: 41393c14c86b8cc4662f260b021cacc0dfa722a067792a568fb775ad21b86b427c30ad5d7f5946079bef29e8cc4414ccf9a09ac0b56c48889f03eaecae61f046
-  data.tar.gz: adb3540fd474e7a57fde7e3266c8f719e445f90b2bbf38a1abbaf8cbd4d5402e60e49b2ed95eb9bfe3009dfd9cf9c0d40f47c16ae63c85ab2cd3630e2ab692be
+  metadata.gz: afa63bdd1d323ebb87491a61d3ca046c092365e318b1be6c4fb483714a084605389d9cee98f7458d017947e0fa33db1143f4e9bd73c36c5733d0b6a3a28731c9
+  data.tar.gz: 7634d667b0a77d38bdd7476646647b6101647794facb8ca48a09360254b74691241a1c39b0593c684fd6deac3e5f3746df46b4fc546004bb2164a24f243044e7

data/bin/bundler

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bundler', 'bundler')

data/bin/obelisk_cli

@@ -1,55 +1,16 @@
 #!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'obelisk_cli' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-require "optparse"
-require "securerandom"
-require "obelisk"
+require 'rubygems'
+require 'bundler/setup'
 
-options = {}
-VALID_COMMANDS = %w{install generate update}
-
-op = OptionParser.new do |opts|
-  opts.banner = 
-%Q{Usage: obelisk_cli [options] command
-Commands:
-    install             Copy or merge configuration file for Obelisk
-    generate            Generate config files for Asterisk
-    update              Replace config files for Asterisk in case of any change
-Options:}
-  opts.on("-o", "--outdir [DIR]", "Output directory for generated config files") { |dir| options[:dir] = dir }
-  opts.on("-r", "--restart", "Restart Asterisk in case of config change") { options[:restart] = true }
-  opts.on("-c", "--config [FILE]", "Specify config FILE for Obelisk") { |file| options[:config] = file }
-  opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
-end
-
-op.parse!
-
-ARGV.select! { |arg| VALID_COMMANDS.include? arg }
-(puts op.help; exit 1) if ARGV.empty?
-
-Obelisk.load_conf options[:config]
-$conf[:asterisk_conf_dir] = options[:dir] if options[:dir]
-
-ARGV.each do |arg|
-  case arg
-  when "install"
-    if Obelisk.save_def_conf options[:config]
-      puts "Found and updated config file. Please, check it."
-    else
-      puts "Default configuration file's been saved. Change it accordingly."
-    end
-  when "generate"
-    Obelisk.make_erb_conf :force => true, :restart => options[:restart]
-    puts "All files has been generated."
-  when "update"
-    if Obelisk.make_erb_conf(:restart => options[:restart])
-      puts "Asterisk config files have been updated"
-    else
-      puts "Already up to date."
-    end
-  else
-    puts op
-  end
-end
+load Gem.bin_path('obelisk', 'obelisk_cli')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/erb/extensions.ad.erb

@@ -7,9 +7,9 @@
 [<%= current_context %>-ad-users]
 
 <% end -%>
-exten => <%= user[:extension] %>,1,Dial(SIP/<%= user[:peer] %>)
-exten => <%= user[:extension] %>,hint,SIP/<%= user[:peer] %>,CustomPresence:<%= user[:peer] %>
-exten => <%= user[:peer] %>,1,Dial(SIP/<%= user[:peer] %>)
-exten => <%= user[:peer] %>,hint,SIP/<%= user[:peer] %>,CustomPresence:<%= user[:peer] %>
+exten => <%= user[:extension] %>,1,Dial(SIP/<%= user[:login] %>)
+exten => <%= user[:extension] %>,hint,SIP/<%= user[:login] %>,CustomPresence:<%= user[:login] %>
+exten => <%= user[:login] %>,1,Dial(SIP/<%= user[:login] %>)
+exten => <%= user[:login] %>,hint,SIP/<%= user[:login] %>,CustomPresence:<%= user[:login] %>
 
 <% end -%>

data/erb/sip.ad.erb

@@ -2,7 +2,7 @@
 <% users.each do |user| -%>
 
 ; Name: <%= user[:name] %>
-  [<%= user[:peer] %>](ad-user)
+  [<%= user[:login] %>](ad-user)
   secret=<%= user[:secret] %>
   context=<%= user[:context] %>
 <% if user[:callgroup] -%>

data/lib/obelisk.rb

@@ -5,6 +5,8 @@ require "yaml"
 require "erb"
 require "logger"
 require "fileutils"
+require "curb"
+require "json"
 
 module Obelisk
   DEFAULT_CONFIG_PATH = "#{Dir.home}/.obelisk.conf"
@@ -16,7 +18,7 @@ module Obelisk
       bind_pass:                        "pass",
     },
     :mapping => {
-      samaccountname:                   :peer,
+      samaccountname:                   :login,
       info:                             :secret,
       facsimiletelephonenumber:         :context,
       ipphone:                          :extension,
@@ -34,6 +36,7 @@ module Obelisk
     },
     :asterisk_conf_dir =>               "/tmp/asterisk",
     :asterisk_restart_command =>        %q{asterisk -x "core restart gracefully"},
+    :obelisk_portal_update_url =>       "http://localhost:3000/contacts/updatedb",
     :erb_file_dir =>                    File.expand_path(File.dirname(__FILE__) + "/../erb")
   }
 
@@ -43,6 +46,7 @@ module Obelisk
     params[:conf_dir] ||= $conf[:asterisk_conf_dir]
     params[:force] ||= false
     params[:restart] ||= false
+    params[:updb] ||= false
     FileUtils.mkdir_p params[:conf_dir]
     b = binding
     up = false
@@ -60,9 +64,18 @@ module Obelisk
       end
     end
     system $conf[:asterisk_restart_command] if up && params[:restart]
+    update_rails_db users if up && 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 = {
@@ -78,7 +91,7 @@ module Obelisk
     ActiveDirectory::Base.setup(settings)
     ActiveDirectory::User.find(:all).select{ |u| u.valid_attribute? :info }.map do |u|
       k = $conf[:mapping].values
-      v = $conf[:mapping].keys.map { |attr| u.valid_attribute?(attr) ? u.send(attr) : $conf[:defaults][attr] }
+      v = $conf[:mapping].keys.map { |attr| u.valid_attribute?(attr) ? u.send(attr).force_encoding("UTF-8") : $conf[:defaults][attr] }
       Hash[k.zip v]
     end
   end

data/lib/obelisk/version.rb

@@ -1,3 +1,3 @@
 module Obelisk
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/obelisk.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  
+
   spec.add_runtime_dependency "active_directory"
+  spec.add_runtime_dependency "curb"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obelisk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,11 +52,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate Asterisk configs and provides integration of Rails app
 email:
 - goredar@gmail.com
 executables:
+- bundler
 - obelisk_cli
+- rake
 extensions: []
 extra_rdoc_files: []
 files:
@@ -65,7 +81,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bundler
 - bin/obelisk_cli
+- bin/rake
 - erb/extensions.ad.erb
 - erb/sip.ad.erb
 - lib/obelisk.rb