obelisk 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4986444eb31f4e8e6cd29150d70e40e206e9c8ab
-  data.tar.gz: 0b63597964c9aef1659d7e1c15219756921ad81f
+  metadata.gz: c847ea4d549f8d213b7107d9d7b712222bd0458a
+  data.tar.gz: 0f397ee7d0c430ad7f31837512b7431c7c83c652
 SHA512:
-  metadata.gz: ee4f6de9fabb817572a1a65a960cc4a721f5eb0da21255b7651899872d0b44198171993efc60cf42fe8de842b51e3cd56b8d59c2bffba89ef01c3af5dd83e228
-  data.tar.gz: 00665d0131a3f9c1587308ff8998c09c89e5763ba9dfb763142b1847474238975d83b01dcae623bac4b1c40c5ceb205cec3c17daf8514517a297308375114662
+  metadata.gz: 41393c14c86b8cc4662f260b021cacc0dfa722a067792a568fb775ad21b86b427c30ad5d7f5946079bef29e8cc4414ccf9a09ac0b56c48889f03eaecae61f046
+  data.tar.gz: adb3540fd474e7a57fde7e3266c8f719e445f90b2bbf38a1abbaf8cbd4d5402e60e49b2ed95eb9bfe3009dfd9cf9c0d40f47c16ae63c85ab2cd3630e2ab692be

data/bin/obelisk_cli

@@ -3,31 +3,53 @@
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-require 'obelisk'
-Obelisk.load_conf
-
-ARGV << "help" if ARGV.empty?
-
-if ARGV.include? "install"
-  Obelisk.save_def_conf
-  puts "Default configuration file's been saved as #{Obelisk::DEFAULT_CONFIG_PATH}. Change it according to your needs."
-  exit
-else
-  ARGV.each do |arg|
-    case arg
-    when "conf"
-      Obelisk.make_erb_conf
-      puts "All files has been generated."
-    when "updb"
-      puts "Not implemented yet"
-    else
-      puts %{Usage: obelisk_cli install
-       obelisk_cli conf [updb]
+require "optparse"
+require "securerandom"
+require "obelisk"
+
+options = {}
+VALID_COMMANDS = %w{install generate update}
+
+op = OptionParser.new do |opts|
+  opts.banner = 
+%Q{Usage: obelisk_cli [options] command
 Commands:
-install - save default config file for obelisk to #{Obelisk::DEFAULT_CONFIG_PATH}
-conf - generate config files for Asterisk and place it to #{$conf[:asterisk_conf_dir]}
-updb - update Rails database for Asterisk Portal [NOT implemented yet]}
-      exit
+    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

data/erb/extensions.ad.erb

@@ -1,5 +1,4 @@
 ; This file is generated by Obelisk <%=Obelisk::VERSION %>
-; Date: <%= DateTime.now %>
 
 <% current_context = nil -%>
 <% users.sort { |a, b| a[:context] <=> b[:context] }.each do |user| -%>

data/erb/sip.ad.erb

@@ -1,5 +1,4 @@
 ; This file is generated by Obelisk <%=Obelisk::VERSION %>
-; Date: <%= DateTime.now %>
 <% users.each do |user| -%>
 
 ; Name: <%= user[:name] %>

data/lib/obelisk.rb

@@ -10,42 +10,57 @@ module Obelisk
   DEFAULT_CONFIG_PATH = "#{Dir.home}/.obelisk.conf"
   DEFAULT_CONFIG = {
     :ad_settings => {
-      ldap_host:                "localhost",
-      base_dn:                  "ou=STAFF,dc=CORP,dc=LOCAL",
-      bind_name:                "user",
-      bind_pass:                "pass",
+      ldap_host:                        "localhost",
+      base_dn:                          "ou=STAFF,dc=CORP,dc=LOCAL",
+      bind_name:                        "user",
+      bind_pass:                        "pass",
     },
     :mapping => {
-      samaccountname:           :peer,
-      info:                     :secret,
-      facsimiletelephonenumber: :context,
-      ipphone:                  :extension,
-      pager:                    :callgroup,
+      samaccountname:                   :peer,
+      info:                             :secret,
+      facsimiletelephonenumber:         :context,
+      ipphone:                          :extension,
+      pager:                            :callgroup,
       # Used for AdressBook generation
-      displayname:              :name,
-      mobile:                   :mobile,
-      homephone:                :home,
-      company:                  :company,
-      department:               :department,
-      title:                    :title,
+      displayname:                      :name,
+      mobile:                           :mobile,
+      homephone:                        :home,
+      company:                          :company,
+      department:                       :department,
+      title:                            :title,
     },
     :defaults => {
-      facsimiletelephonenumber: "from-internal"
+      facsimiletelephonenumber:         "from-internal"
     },
-    :asterisk_conf_dir =>       "/tmp/asterisk",
-    :erb_file_dir =>            File.expand_path(File.dirname(__FILE__) + "/../erb")
+    :asterisk_conf_dir =>               "/tmp/asterisk",
+    :asterisk_restart_command =>        %q{asterisk -x "core restart gracefully"},
+    :erb_file_dir =>                    File.expand_path(File.dirname(__FILE__) + "/../erb")
   }
 
   $conf = {}
 
-  def self.make_erb_conf
-    FileUtils.mkdir_p $conf[:asterisk_conf_dir]
+  def self.make_erb_conf(params = {})
+    params[:conf_dir] ||= $conf[:asterisk_conf_dir]
+    params[:force] ||= false
+    params[:restart] ||= false
+    FileUtils.mkdir_p params[:conf_dir]
     b = binding
+    up = false
     users = get_ad_users
     Dir[File.expand_path "*.erb", $conf[:erb_file_dir]].each do |erb|
-      conf_file = File.expand_path File.basename(erb, ".erb"), $conf[:asterisk_conf_dir]
-      File.open(conf_file, "w") { |file| file.write ERB.new(IO.read(erb), nil, "-").result(b) }
+      conf_file = File.expand_path File.basename(erb, ".erb"), params[:conf_dir]
+      File.open(conf_file, File.exists?(conf_file) ? "r+" : "w+") do |file|
+        content = ERB.new(IO.read(erb), nil, "-").result(b)
+        if content != file.read || params[:force]
+          file.seek 0
+          file.truncate 0
+          file.write content
+          up = true
+        end
+      end
     end
+    system $conf[:asterisk_restart_command] if up && params[:restart]
+    up
   end
 
   def self.get_ad_users(ou = nil)
@@ -68,16 +83,21 @@ module Obelisk
     end
   end
 
-  def self.save_def_conf(file_name = DEFAULT_CONFIG_PATH)
+  def self.save_def_conf(file_name = nil)
+    file_name ||= DEFAULT_CONFIG_PATH
     conf = DEFAULT_CONFIG
+    updated = false
     if File.exists? file_name
       merge_proc = proc { |k, o, n| o.is_a?(Hash) && n.is_a?(Hash) ? o.merge(n, &merge_proc) : n }
       conf.merge! YAML.load(IO.read(file_name)), &merge_proc
+      updated = true
     end
     File.open(file_name, 'w') { |f| f.write YAML.dump conf }
+    updated
   end
 
-  def self.load_conf(file_name = DEFAULT_CONFIG_PATH)
+  def self.load_conf(file_name = nil)
+    file_name ||= DEFAULT_CONFIG_PATH
     return unless $conf.empty?
     begin
       $conf = YAML.load IO.read file_name

data/lib/obelisk/version.rb

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

data/test/test_erb.rb

@@ -4,13 +4,18 @@ require "securerandom"
 
 class ErbTestCase < Test::Unit::TestCase
   def test_make_erb_conf
-    dir = "/tmp/#{SecureRandom.hex}"
-    $conf[:asterisk_conf_dir] = dir
-    Obelisk.make_erb_conf
-    assert Dir.exists? dir
-    assert_equal Dir[File.expand_path "*.erb", $conf[:erb_file_dir]].count, Dir[File.expand_path "*", dir].count
-    puts %x(cat #{dir}/*)
-    File.delete *Dir[File.expand_path "*", dir]
-    Dir.rmdir dir
+    begin
+      dir = "/tmp/#{SecureRandom.hex}"
+      assert Obelisk.make_erb_conf :conf_dir => dir
+      assert Dir.exists? dir
+      assert_equal Dir[File.expand_path "*.erb", $conf[:erb_file_dir]].count, Dir[File.expand_path "*", dir].count
+      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}/*)
+    ensure
+      File.delete *Dir[File.expand_path "*", dir]
+      Dir.rmdir dir
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obelisk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler