cwmp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTE2ODFiN2E1NjdlODEzNGE2OTMxYWRjOWQwMzNhNTZjZGQwNzgxMA==
+    YjZmMzY4NjIxNGFmMGMxYjA0ZTMyNzE5YTQ4ZjgwYjRkZTc2NGYzNQ==
   data.tar.gz: !binary |-
-    ODM5ZjNhZTQwNzU1MmU3Y2RiMmI4NmM1OGNlMzk3Njk1NDMwNGQ0Yw==
+    N2Y1ZjYwMjJmODE2ZDk2OTMxNjEwM2ZhMzU2MzIzNTVlYmE0MmY5Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZTMyOWNhNTQzYWE3YzJkY2FlMzcwNTNhZjRhNDA3YzlkMGVhZTBmMWRkZDg1
-    Yjg1YWM0NmJiOWI3YzI1OTcyMmQ0MWI0ODA3NDIyNDJiNTYxYzQyZDU3MjA2
-    YWQ2MmJkNzlkNTUxMGE5ZGJhZWVkNGM4M2QxNGYxZmMxYWZlYzY=
+    YjBmYjE3ZDg4NDVhODJiZDIyNDIwM2U1NzEyNzBiOTE3Y2UwNTNjOWFiMjAz
+    ZjgwYWI4MjliYzFiYjYxNzlkYTNjMjJhZjRlZDhkMmExNDczZDEzMTZlYzk2
+    ZWU0MjIwOGM5ZGIzMmI0ZjY3NmMxNTYxZmE5NDRjOGM1MDhiZDI=
   data.tar.gz: !binary |-
-    NmMzMjk2OTQwYzI3ODUyY2M4OGU0YzFjMjM4MWFkYTgzMzkwNTA2Y2NjNDk1
-    OWYzNTNmMmE1ZDBjYjIxNWY3NTY4YmNiOWQxOGU4YThlNDg2NmE4YjQyM2Mz
-    OTdmYjhmM2M1YTZkZjNlYjU1ODdiNDg0MDczMDJmNGFmNWMzZGU=
+    MjVhZjZlZGNmM2M2ZmNlYzAwYzkxYWI3NTk3ZjYyMTlmNGE5NTVmMDVhZmIy
+    Njc0MGQyMWIzMjMyNmNmOGJhOTgzM2NjOGY1Y2I5YzYwOTU0MDBmYWVjMDgz
+    NmMyMzEzMWVhNzQ1NjBjNjI2YTdlY2U0ZGRhMTYzMTlkYjRhMDQ=

data/README.md

@@ -23,7 +23,7 @@ $ acs
 
 and acs will be up, using thin
 
-## Running CPE simulatore
+## Running CPE simulator
 
 type `cpe` on your shell
 

data/bin/acs

@@ -5,27 +5,13 @@ require 'cwmp'
 
 options = {}
 o = OptionParser.new
-o.on('-d', '--daemon', "Start acs daemon") { |b| options['daemon'] = b }
 o.on('-p', '--port NUM', Integer, 'Server port') { |port| options['port'] = port }
-o.on('-r', '--reconnect', "Connects to remote daemon via CLI") { |b| options['reconnect'] = b }
-o.on('-H', '--host HOST', 'Specify host for remote CLI connection') { |host| options['host'] = host }
 o.on('-h', '--help', 'Server port') { puts o; exit }
 o.on('-v', '--version', 'Version') { puts "acs v#{Cwmp::VERSION}"; exit }
 o.parse!
 
+port = options['port'] || 9321
 
-# if options['daemon']
-#     port = options['port'] || 9292
-#     puts "Starting ACS Daemon on port #{port}"
-#     Cwmp::Acs.new(port).start
-# elsif options['reconnect']
-#     url = options['host'] || "http://localhost:9292/api"
-#     puts "Connecting to remote daemon on #{url}"
-# else
-#     puts o; exit
-# end
-
-port = ARGV[0] || 9321
 puts "Starting ACS Daemon on http://localhost:#{port}"
 Cwmp::Acs.new(port).start
 

data/bin/cpe

@@ -1,9 +1,21 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'cwmp'
 
-cpe = Cwmp::Cpe.new 'http://localhost:9292/acs', {:serial => "A54FD"}
-cpe.poweron
+options = {}
+o = OptionParser.new
+o.on('-u', '--url url', 'ACS url to connect') { |url| options['url'] = url}
+o.on('-p', '--periodic 60', Integer, 'Interval for periodic Inform (0=disable)') { |periodic| options['periodic'] = periodic}
+o.on('-h', '--help', 'Server port') { puts o; exit }
+o.on('-v', '--version', 'Version') { puts "cpe v#{Cwmp::VERSION}"; exit }
+o.parse!
+
+url = options['url'] || 'http://localhost:9292/acs'
+periodic_interval = options['periodic'] || 0
 
+cpe = Cwmp::Cpe.new url, periodic_interval, {:serial => "A54FD"}
+cpe.poweron
 cpe.loop
 
+

data/cwmp.gemspec

@@ -1,22 +1,21 @@
 require './lib/cwmp/version'
 
-Gem::Specification.new do |s|
-    s.name        = 'cwmp'
-    s.version     = Cwmp::VERSION
-    s.date        = '2014-07-14'
-    s.summary     = "A CWMP library"
-    s.description = "A ruby library to parse and generate CWMP messages. Includes a CPE simulator and a simple ACS server."
-    s.authors     = ["Luca Cervasio"]
-    s.email       = 'luca.cervasio@gmail.com'
-    s.files       = `git ls-files`.split($/)
-    s.homepage    = 'https://github.com/lucacervasio/ruby-cwmp'
-    s.license     = 'MIT'
+Gem::Specification.new do |spec|
+    spec.name         = 'cwmp'
+    spec.version      = Cwmp::VERSION
+    spec.date         = '2014-07-14'
+    spec.summary      = "A CWMP library"
+    spec.description  = "A ruby library to parse and generate CWMP messages. Includes an ACS server and a CPE simulator."
+    spec.authors      = ["Luca Cervasio"]
+    spec.email        = 'luca.cervasio@gmail.com'
+    spec.files        = `git ls-files`.split($/)
+    spec.executables  = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.homepage     = 'https://github.com/lucacervasio/ruby-cwmp'
+    spec.license      = 'MIT'
 
-    s.add_dependency('nokogiri', '~> 1.6', '>= 1.6.0')
-    s.add_dependency('rack', '~> 1.5', '>= 1.5.2')
-    s.add_dependency('thin', '~> 1.6', '>= 1.6.2')
-    s.add_dependency('http_router', '~> 0.11', '>= 0.11.1')
-    s.add_dependency('eventmachine', '~> 1.0', '>= 1.0.3')
-    s.add_dependency('faye-websocket', '~> 0.6', '>= 0.6.2')
-    s.add_dependency('httpclient', '~> 2.4', '>= 2.4.0')
+    spec.add_dependency('nokogiri', '~> 1.6', '>= 1.6.0')
+    spec.add_dependency('rack', '~> 1.5', '>= 1.5.2')
+    spec.add_dependency('thin', '~> 1.6', '>= 1.6.2')
+    spec.add_dependency('http_router', '~> 0.11', '>= 0.11.1')
+    spec.add_dependency('httpclient', '~> 2.4', '>= 2.4.0')
 end

data/lib/cwmp/acs.rb

@@ -3,11 +3,12 @@ require 'rack'
 require 'thin'
 require 'http_router'
 require 'nokogiri'
+require 'readline'
 
 
 module Cwmp
 
-    class WebApp
+    class Handler
 
         def call(env)
             req = Rack::Request.new(env)
@@ -56,15 +57,58 @@ module Cwmp
             @port = port
             @app = HttpRouter.new do
                 # add('/api').to(SocketApp.new)
-                add('/acs').to(WebApp.new)
+                add('/acs').to(Handler.new)
+            end
+        end
+
+        def start_cli
+
+            list = [
+                'GetParameterValues', 'SetParameterValues', 'Reboot', 'FactoryReset', 'Download', 'AddObject', 'DeleteObject',
+                'help', 'quit', "waitMessage"
+            ].sort
+
+            comp = proc { |s| list.grep(/^#{Regexp.escape(s)}/) }
+
+            ::Readline.completion_append_character = " "
+            ::Readline.completion_proc = comp
+
+            while line = ::Readline.readline('> ', true)
+                case line
+                    when "quit"
+                        puts "Bye"
+                        exit(0)
+                    when "help"
+                        help
+                    when "list"
+                        puts "list"
+                end
             end
         end
 
         def start
-            Thin::Logging.silent = true
-            Rack::Handler::Thin.run @app, :Port => @port
+            @web = Thread.new do
+                Thin::Logging.silent = true
+                Rack::Handler::Thin.run @app, :Port => @port
+            end
+
+            Thread.new do
+                while true do
+                    sleep 1
+                    Readline.clear_rl
+                    puts "i"
+                    Readline.restore
+                end
+            end
+            start_cli
         end
     end
 
 
-end
+
+
+end
+
+
+
+

data/lib/cwmp/cpe.rb

@@ -4,17 +4,16 @@ require 'socket'
 module Cwmp
 
     class Cpe
-
         attr_accessor :serial, :oui, :software_version, :manufacturer, :acs_url, :state
 
-        def initialize (acs_url, h = {})
+        def initialize (acs_url, periodic, h = {})
             @acs_url = acs_url
             @serial = h[:serial] || "23434ds"
             @oui = h[:oui] || "006754"
             @software_version = h[:software_version] || "0.1.1"
             @manufacturer = h[:manufacturer] || "Moonar"
             @state = 'off'
-            @periodic = Thread.new { periodic 30 }
+            @periodic = Thread.new { periodic periodic } if periodic > 0
             @conn_req = Thread.new { connection_request }
             @factory = true
         end
@@ -47,12 +46,13 @@ module Cwmp
         end
 
         def loop
-            @periodic.join
+            @conn_req.join
         end
 
         private
 
         def periodic time
+            puts "setting periodic inform every #{time} seconds"
             while true
                 sleep time
                 do_connection '2 PERIODIC'
@@ -80,31 +80,34 @@ module Cwmp
         end
 
         def do_connection(event)
-            c = HTTPClient.new
-
-            puts "sending Inform with event #{event}"
-            resp = c.post @acs_url, Cwmp::Message::inform(@manufacturer, @oui, @serial, event, @software_version)
-            doc = Nokogiri::XML(resp.body)
-            message_type = doc.css("soap|Body").children.map(&:name)[1]
-            puts "got #{message_type} message"
+            begin
+                c = HTTPClient.new
 
-            resp = c.post @acs_url, ""
-            while resp.status != 204
+                puts "sending Inform with event #{event}"
+                resp = c.post @acs_url, Cwmp::Message::inform(@manufacturer, @oui, @serial, event, @software_version), {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                 doc = Nokogiri::XML(resp.body)
-                message_type = doc.css("soap|Body").children.map(&:name)[1]
-                case message_type
-                    when "GetParameterValues"
-                        puts "got #{message_type}"
-                        resp = c.post @acs_url, Cwmp::Message::get_parameter_values_response
-                    when "GetParameterNames"
-                        puts "got #{message_type}"
-                        resp = c.post @acs_url, Cwmp::Message::get_parameter_names_response
-                    when "SetParameterValues"
-                        puts "got #{message_type}"
-                        resp = c.post @acs_url, Cwmp::Message::set_parameter_values_response
+                message_type = doc.css("soapenv|Body").children.map(&:name)[1]
+                puts "got #{message_type} message"
+                resp = c.post @acs_url, "", {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                while resp.status != 204
+                    doc = Nokogiri::XML(resp.body)
+                    message_type = doc.css("soapenv|Body").children.map(&:name)[1]
+                    puts "got #{message_type}"
+                    case message_type
+                        when "GetParameterValues"
+                            resp = c.post @acs_url, Cwmp::Message::get_parameter_values_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                        when "GetParameterNames"
+                            resp = c.post @acs_url, Cwmp::Message::get_parameter_names_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                        when "SetParameterValues"
+                            resp = c.post @acs_url, Cwmp::Message::set_parameter_values_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                    end
                 end
+                puts "got #{resp.status}, closing"
+                c.reset @acs_url
+            rescue Errno::ECONNREFUSED
+                puts "can't connect to #{@acs_url}"
+                exit(1)
             end
-            puts "got #{resp.status}, closing"
         end
 
     end

data/lib/cwmp/message.rb

@@ -101,7 +101,7 @@ module Cwmp
         end
 
         def self.get_parameter_values_response
-            return '<soap:Envelopeesacs.org:9292>
+            return '<soap:Envelope
 	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
 	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
 	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
@@ -176,7 +176,7 @@ module Cwmp
         end
 
         def self.get_parameter_names_response
-            return '<soap:Envelopeesacs.org:9292>
+            return '<soap:Envelope
 	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
 	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
 	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"

data/lib/cwmp/version.rb

@@ -1,3 +1,3 @@
 module Cwmp
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cwmp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Luca Cervasio
@@ -90,46 +90,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -150,10 +110,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
-description: A ruby library to parse and generate CWMP messages. Includes a CPE simulator
-  and a simple ACS server.
+description: A ruby library to parse and generate CWMP messages. Includes an ACS server
+  and a CPE simulator.
 email: luca.cervasio@gmail.com
-executables: []
+executables:
+- acs
+- cpe
 extensions: []
 extra_rdoc_files: []
 files: