myasteriskconf 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1f52e8fe2987f02b5f6fc08739c96308175856fb5e6b8a32ba67fbd64bee0e
-  data.tar.gz: 00e0eedaa748d53c49678fdf7ef32910bb925129da29ca8bd2a07c427c2d49ff
+  metadata.gz: eae86592060a2f044d56b3cfe42fe18db519c04f8361a5ac29403db2739e36f3
+  data.tar.gz: ac85e45fab918c2a008fac0d34b93439660159bf34f3c1e52f82f2f40156a722
 SHA512:
-  metadata.gz: 18ea3c62a337f95d2ca77c963fc3b2e19cd334e3a184f97fea5e7df70299894ae65b1c7e1b764be37e603d2bf1e441d64ded45624c97326e5cc23be24dc8c598
-  data.tar.gz: 501bfdaa116d8ed63f57e756eec4ddb1103e2fa0a0399033b1873acd2aff47297ace630154f597940c6ff689aafcc60280c46e98284a3e3e7c609abd4bdcb93a
+  metadata.gz: 9225ab25f4e7bc4242443f52d2ed296e3daa8d8e70f5586495b3d82dd72009d6f63c56130a2e29347b88007f2838a57a283bda459f56d4100f22ec69fad15157
+  data.tar.gz: 7bc259832e5c9b0498823d97214e61fd4d32c536cfb5079a5b90e88ed335182201ac248fc436599f96ce9b477137ac19c583186fe4638cc8a945e5f8bcf7383f

data/lib/myasteriskconf.rb

@@ -50,11 +50,49 @@ tags: asterisk
 
   private
 
-  def build()
+  def build(default_ctx='my-phones')
 
+    puts 'h: ' + @h.inspect if @debug
     @sip << "[general]"
-    @sip << "localnet=" + @h[:sip][:localnet]
-    @sip << "externaddr = " + @h[:sip][:externaddr]
+    
+    if @h[:sip][:localnet] then
+      
+      localnet = if @h[:sip][:localnet].length < 2 then
+        localnet()
+      else
+        @h[:sip][:localnet]
+      end
+      
+      @sip << "localnet=" + localnet
+      
+    end
+
+    
+    if @h[:sip][:externaddr] then
+      
+      externaddr = if @h[:sip][:externaddr].length < 2 then
+        externaddr()
+      else
+        @h[:sip][:externaddr]
+      end
+      
+      @sip << "externaddr=" + externaddr
+      
+    end
+    
+    
+    if @h[:sip][:context] then
+      
+      localnet = if @h[:sip][:context].length < 2 then
+        'default'
+      else
+        @h[:sip][:context]
+      end
+      
+      @sip << "context=" + context
+      
+    end    
+         
     
     registers = @h.dig(*%i(sip register))
     register = nil
@@ -74,23 +112,51 @@ tags: asterisk
       
     end
     
-    extensions = []
+    extensions = {default_ctx => []}
 
     phones = @h[:phones].map do |x|
 
-      puts 'x: ' + x.inspect if @debug
-      x.match(/^([^:]+):([^\/]+)\/([^$]+)/).captures # id, secret, ext
+      puts 'x: ' + x.inspect if @debug      
+      
+      regex = %r{
+
+        (?<id>[^:]+){0}
+        (?<secret>[^\/]+){0}
+        (?<ext>[^@$]+){0}
+        (?:@(?<context>[^$]+)){0}
+
+      ^\g<id>:\g<secret>(?:\/)?\g<ext>?\g<context>?
+      }x
+
+      r = regex.match(x)      
+      r.named_captures.values
+      
     end
     
-    phones.each do |id, secret, ext|
+    puts 'phones: ' + phones.inspect if @debug
+    
+    phones.each do |id, secret, ext, context|
+
+      ctx = context || default_ctx      
+      @sip << sip_template(id.downcase, secret, ctx)
+
+      puts 'ctx: '  + ctx.inspect if @debug
+      puts 'extensions: ' + extensions.inspect if @debug
       
-      @sip << sip_template(id.downcase, secret)
-      extensions << ext_template(ext, id)
+      extensions[ctx] ||= []
+      extensions[ctx] << ext_template(ext, id)
 
     end
 
-    @extensions << "[my-phones]"
-    @extensions.concat extensions
+    extensions.map do |key, value|
+      
+      context = key
+      entries = value
+      @extensions << "\n[#{context}]"
+      @extensions.concat entries
+      @extensions << "\n"
+      
+    end
     
     a = phones.map {|x| "SIP/" + x[0].downcase }
     @extensions << "\nexten => 1009,1,Dial(%s,40)" % a.join('&')
@@ -130,7 +196,7 @@ source: https://www.asteriskguru.com/tutorials/extensions_conf.html
           
         else
           
-          dialout = value.sub(/\(EXTEN\)/,'${EXTEN}')      
+          dialout = value.sub(/\((EXTEN:?1?)\)/,'${\1}')      
           pattern = '_' + key.to_s        
           
         end      
@@ -164,6 +230,11 @@ exten => #{ext},n,Hangup()"
 
   end
   
+  def externaddr()
+    h = JSON.parse open('http://jsonip.com/').read
+    h['ip']    
+  end
+  
   def sip_provider_template(reg_label, userid, reg_secret, sip_host)
     
 "    
@@ -189,9 +260,14 @@ allow=gsm
 allow=g729"   
 
   end
+  
+  def localnet()
+    r = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
+    r.ip_address.sub(/\d+$/,'0')
+  end
 
 
-  def sip_template(deviceid, secret)
+  def sip_template(deviceid, secret, context='my-phones')
 
 "
 [#{deviceid}]
@@ -200,7 +276,7 @@ secret=#{secret}
 type=friend
 host=dynamic
 qualify=yes
-context=my-phones
+context=#{context}
 insecure=invite,port
 canreinvite=no
 disallow=all ; better for custom-tunning codec selection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myasteriskconf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -11,54 +11,54 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwMTAyMTA0NTA3WhcN
-  MjEwMTAxMTA0NTA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC8ZWDZ
-  yeRcgxFRTR0vJ3pKrtyK37LIuc60J9scLMANo/v6+CxgxZS6TADWZnmVSNhOljQD
-  /NyyaFj0LdSdaAvbS9z/lcPtKnWqyNY61WaQQ0rODua2WTpkWq64OSGy9frwwyHV
-  RMHoIgo/b2Q43g1hWHOqkvX/dxY8Mh1RbvgBJnGl80QU9ksRDgor0Z7PPnKVruR0
-  3tpDIy8HH/ziqf8wXGap6XMgoh6KuBCc3+yb3fcYBYmJYE1ugiQoNg9JJYt2LDgt
-  HLaVW2OuUmPE8psiQUFfndqkk3iMwxL2Jk2ExbMgyi2jf/UjxU9I1T0k6sAPDYOs
-  NwREFTogojl3hAcZ11zAS/pYXYf305DiK3vaVcOroAa5qGnhU2FXodTdCwdsmZF3
-  jsEyxJY7Vsxd0N0DC4RRM6kbQp+7K07aY/Z6qs3VOc+PmVzxE+yKoD9tTod2BVI1
-  OHaBnj0VSFs1MoAW14WNt+LV0weVkfRamKKAvb27jV/La+bfCUoR8R2wq/UCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQURMqAyIvX
-  3YJzBATnTPslO4PQtyEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNjE0MjI1MTAwWhcN
+  MjIwNjE0MjI1MTAwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEez/a
+  ecBnlOXIh5mRMZZqA2Yws1tadwtlBZrbS9kZz08D0V9DCvLcscBX564rnzyFkNyv
+  6jbw0dHbmpiGDkoZunmscBTtZ4sWWpU/32ngETaxQy6LDZ0y1Vq65vLr6WXxyinx
+  nLhxKHudEtWiuJ0uGlMsW6p7kdqIOKVv/gWdIjDr4mRMY+ttTXb3eD3j3e5/XDq7
+  0mB82lL0AT8UdXnWqF24LQnus8jIoszp5KMt/SqmLFzW9mzOwWRsikGZepsnGcfB
+  xotx1pb60BLXllqjSRcwlrRkC6RHRQ3VWEVqBSPo94B1tRKrjqGFgArKczawGwqA
+  gGaxOEi4orGk2fohhfsU89RwpbRKRKTwgCZNQC1ZdGNpTpSCQT6+Hmkgv8P55XkL
+  kVYFkozjZ99yRwcCjyFdDmXaQ0JotPH1Ic7PAhnNfa9zQNG+08XVqFCRh6E1wgmf
+  smQEXQDfs1zvgeLUfOKKtazVM7Hf4EL+f8bJiEtmXAUvsFQfAorn6dnu+zUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUC1DKhxyU
+  JnmNxHXjl0DZNCGb/HswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAmSOGe2u+rYxAL3K1gHZgtnKb2BdjrXjUhg8YgJYY
-  Are9+c0vRfLd46BoLHMz+dnYHVIefu5vMRqqcLvfaRhiQxSBKtn4LcpMZyDCUP3N
-  qUxZMqCGajVieI8KfuoK4BXZgABtZDKGcqndvvRob0MA/Oxiq4zkH4KpWHC+26LG
-  z6aNADnmA+aWYTNK3zApbBupIv2KxyUzsvFYq3Cy9Z0GlILs8rgaxa5ZDzO7KuBC
-  dsyYAggknKiHbicxPfRnaCYyDHehPeYm+E8EdnnwIFR6+Od/J0sG38dhphwjWOmg
-  CJcz6NPzOeAYzCXjKtRF3Bn6yjtwR0Ew4eXjZJfk/y8/UVu6ORTSNOaylDYxemPe
-  kkzcQy0Hv2Pmzdcswo2dJRL+NJ8SD4EXlO3VUXzY1GmR+H5m1Vt65XbpeXT/dcyi
-  f4kUndjKYbnXAYWJJKFYMEb5FUZq/BQPJk3hqn7FiOr/rZ+BgqoGiNdUvqFXV4pm
-  dJTSHDdF6Lr/TdVPMMJdRDg6
+  BgkqhkiG9w0BAQsFAAOCAYEALkIuTzYYICRq563UUx9xhZmYQcbDWc9Cy1aR4gdV
+  v7Q8Nh/qXx4W53LlvQd8TjRxOeiST7vtOGiOw6WR3QOeb1dSDykl6JbtaSfX6M2F
+  7nT/ybBXPlxmYzYNky1MBJngv7PSGfVeFRklWIEKPGnCDn0Y4Bzl/v5r/qvSlrY+
+  iWtF2a4i/aGiDc0fxdMSWVJLfr9kS1ciHs3/pv6rDhc5vJgNKGTUxFMgtbyDbknf
+  +9kfTzIGRikNU838xB2cqCAzOLpz8RfAek+JkcBX90KEB+V2ZhJ7STewG3eherTc
+  oHCV8mkOww2zE0PcfaZ6iTEkhaM3zjHQpnizgPLhEOEkki46lJcx2enJIDi5rWsu
+  KBzgFPZPl8MdVL+NFs3eYMx+2oBngfJQGIlZ+6eL2xRkpj5vQ8RA/FhsNKvi7HMM
+  gXva5IAwHqolqtT5iZI+ASdqxRoVliXQhQiKBACdXLq5Gqf5FLheSywSK1FgCS5T
+  TKTedjyqOJcFhUMAL8x1eESO
   -----END CERTIFICATE-----
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-headings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Generates basic Asterisk configurations from a high level config in Markdown