omf_rc 6.2.0 → 6.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWExNjdlOTM2YTM4MzIxMmU5M2ZlM2ZiYWQ0NjFhNmFmODdhZTMzOA==
+    YzY2ZTVhMmQ0NjQ0MDBmNjAxYjM1OTc0NWIyZDJlZjI0MzI0MGM5ZA==
   data.tar.gz: !binary |-
-    ZWU2YzExMzhhYWU4OTMwY2NjMjlmNGI2YjAwZmVhYTBmNDMyNGVkYw==
+    YTZlZDIxMTE0OTVjYmZhNzQ1ZGFlNmU0YmRmOTNjZTI5YjI2ZGNjMw==
 SHA512:
   metadata.gz: !binary |-
-    MjE4ZDhlOGM5MjlmZTU2NDZjYzdiNmQzYmRmMTIzZmEzZjY1ZWMyNjM1YzVk
-    NDlkNTNlMzQ5NWRjNjM5NjBiNDAwZWUzNjQ4MGFkNWM5OWJmMjM1YWE4YWRi
-    ZjA5MTk2YmUyMDExN2VhZmJiZGQzYWUyZDcyYjMzNWM5OGUwYjM=
+    Mjg5OTdkYzVhNTNiNzRiNTEwN2EyYjhmNjVjOGI3ZWM1ZjFkOTNmOWYxM2I1
+    NGVhNDdiYWExNThlNjVhOWYyMmIxNTYyMjM5YjUzMmNlODU4YjE3Y2RkYzgw
+    NTI2Y2VhYzljNDJmZmU3NzdiNjRiMmQ5YmU1OGY5MWQ3YWUwZmQ=
   data.tar.gz: !binary |-
-    YTA4MmFhMDQwZTY2M2E5ZjQ1ZGNiNzMwMzYzMzg1ZDhkNTBkMDNjODI4NWIw
-    OTM5OTI5MThiOTBmNTVkMDgwZGE5NDVjNmMzMWExYzkwYjEwNDZkNGI5ZmIz
-    ZDE5ODczZDhjZWVkMTY3MzJlMzA2NjkwNGY1NzA4NTIzNzY2Mjk=
+    OWM5MTJhNjJjODlkNGY5MTc4ZmEzNzlmNzc1ZDRkZDdmNjlmMzYxN2QzNGU2
+    YTljM2NiNzRiMzM4YjUwYzFkMDJiOWY4NDVjNThhMDU3ZDFmZDgxZTVmZDFm
+    MWMwNzUwZDgxMTljNzEyNWYxMjhkNDIzNDMyNGUyZjM0M2U5NGE=

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -184,7 +184,7 @@ class OmfRc::ResourceProxy::AbstractResource
           creation_callback.call(self) if creation_callback
         rescue => e
           error "Encountered exception: #{e.message}, returning ERROR message"
-          debug e.backtrace.join("\n")
+          error  e.backtrace.join("\n")
           t.inform(:creation_failed,
                    { reason: e.message },
                    { src: self.resource_address })

data/lib/omf_rc/util/hostapd.rb

@@ -41,9 +41,9 @@ module OmfRc::Util::Hostapd
       end
     end
 
-    CommandLine.new("hostapd", "-B -P :ap_pid :ap_conf",
-                    :ap_pid => device.property.ap_pid,
-                    :ap_conf => device.property.ap_conf).run
+    c=CommandLine.new("hostapd", "-B -P :ap_pid :ap_conf")
+    c.run({ :ap_pid => device.property.ap_pid,
+            :ap_conf => device.property.ap_conf })
   end
 
   # @!method stop_hostapd
@@ -51,12 +51,13 @@ module OmfRc::Util::Hostapd
     begin
       File.open(device.property.ap_pid,'r') do |f|
         logger.debug "Stopping hostapd process at PID: #{device.property.ap_pid}"
-        CommandLine.new("kill", "-9 :pid", :pid => f.read.chomp).run
+        c1=CommandLine.new("kill", "-9 :pid")
+        c1.run({ :pid => f.read.chomp })
       end
 
-      CommandLine.new("rm", "-f :ap_pid :ap_conf",
-                      :ap_pid => device.property.ap_pid,
-                      :ap_conf => device.property.ap_conf).run
+      c2=CommandLine.new("rm", "-f :ap_pid :ap_conf")
+      c2.run({         :ap_pid => device.property.ap_pid,
+                      :ap_conf => device.property.ap_conf})
     rescue => e
       logger.warn "Failed to clean hostapd and its related files '#{device.property.ap_pid}' and '#{device.property.ap_conf}'!"
       logger.warn e.message

data/lib/omf_rc/util/ip.rb

@@ -18,7 +18,8 @@ module OmfRc::Util::Ip
   # @!macro request
   # @!method request_ip_addr
   request :ip_addr do |resource|
-    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.property.if_name).run
+    c = CommandLine.new("ip", "addr show dev :device")
+    addr = c.run( { :device => resource.property.if_name })
     addr && addr.chomp.match(/inet ([[0-9]\:\/\.]+)/) && $1
   end
 
@@ -28,12 +29,14 @@ module OmfRc::Util::Ip
   # @!macro request
   # @!method request_mac_addr
   request :mac_addr do |resource|
-    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.property.if_name).run
+    c = CommandLine.new("ip", "addr show dev :device")
+    addr = c.run( { :device => resource.property.if_name })
     addr && addr.chomp.match(/link\/ether ([\d[a-f][A-F]\:]+)/) && $1
   end
 
   request :state do |device|
-    link = CommandLine.new("ip", "link show :device", :device => device.property.if_name).run
+    c = CommandLine.new("ip", "link show :device")
+    link = c.run({ :device => device.property.if_name })
     link && link.chomp.match(/state (\w+) /) && $1
   end
 
@@ -55,10 +58,10 @@ module OmfRc::Util::Ip
     end
     # Remove all ip addrs associated with the device
     resource.flush_ip_addrs
-    CommandLine.new("ip",  "addr add :ip_address dev :device",
-                    :ip_address => value,
-                    :device => resource.property.if_name
-                   ).run
+    c=CommandLine.new("ip",  "addr add :ip_address dev :device")
+    c.run({ :ip_address => value,
+            :device => resource.property.if_name })
+
     resource.interface_up
     resource.request_ip_addr
   end
@@ -69,11 +72,13 @@ module OmfRc::Util::Ip
   # @!macro work
   # @!method interface_up
   work :interface_up do |resource|
-    CommandLine.new("ip", "link set :dev up", :dev => resource.property.if_name).run
+    c=CommandLine.new("ip", "link set :dev up")
+    c.run({ :dev => resource.property.if_name })
   end
 
   work :interface_down do |device|
-    CommandLine.new("ip", "link set :dev down", :dev => device.property.if_name).run
+    c=CommandLine.new("ip", "link set :dev down")
+    c.run({ :dev => device.property.if_name })
   end
 
   # Remove IP addresses associated with the interface
@@ -81,8 +86,8 @@ module OmfRc::Util::Ip
   # @!macro work
   # @!method flush_ip_addrs
   work :flush_ip_addrs do |resource|
-    CommandLine.new("ip",  "addr flush dev :device",
-                    :device => resource.property.if_name).run
+    c=CommandLine.new("ip",  "addr flush dev :device")
+    c.run({ :device => resource.property.if_name })
   end
   # @!endgroup
 end

data/lib/omf_rc/util/iw.rb

@@ -28,10 +28,10 @@ module OmfRc::Util::Iw
     CommandLine.new("iw", "help").run.chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
       next if p == 'type'
       configure p do |device, value|
-        CommandLine.new("iw", "dev :dev set :property :value",
-                        :dev => device.property.if_name,
+        c=CommandLine.new("iw", "dev :dev set :property :value")
+        c.run ({        :dev => device.property.if_name,
                         :property => p,
-                        :value => value).run
+                        :value => value      })
       end
     end
   rescue Cocaine::CommandNotFoundError
@@ -53,9 +53,9 @@ module OmfRc::Util::Iw
   request :link do |device|
     known_properties = Mash.new
 
-    command = CommandLine.new("iw", "dev :dev link", :dev => device.property.if_name)
+    command = CommandLine.new("iw", "dev :dev link")
 
-    command.run.chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|
+    command.run({ :dev => device.property.if_name }).chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|
       v.match(/^(.+):\W*(.+)$/).tap do |m|
         m && known_properties[m[1].downcase.gsub(/\W+/, '_')] = m[2].gsub(/^\W+/, '')
       end
@@ -76,9 +76,9 @@ module OmfRc::Util::Iw
   request :info do |device|
     known_properties = Mash.new
 
-    command = CommandLine.new("iw", "dev :dev info", :dev => device.property.if_name)
+    command = CommandLine.new("iw", "dev :dev info")
 
-    command.run.chomp.split("\n").drop(1).each do |v|
+    command.run({ :dev => device.property.if_name }).chomp.split("\n").drop(1).each do |v|
       v.match(/^\W*(.+) (.+)$/).tap do |m|
         m && known_properties[m[1].downcase.gsub(/\W+/, '_')] = m[2].gsub(/^\W+/, '')
       end
@@ -167,7 +167,8 @@ module OmfRc::Util::Iw
   # @return [String] iw command output
   # @!macro work
   work :delete_interface do |device|
-    CommandLine.new("iw", "dev :dev del", :dev => device.property.if_name).run
+    c=CommandLine.new("iw", "dev :dev del")
+    c.run({  :dev => device.property.if_name })
   end
 
   # Add interface to device
@@ -175,10 +176,11 @@ module OmfRc::Util::Iw
   # @return [String] iw command output
   # @!macro work
   work :add_interface do |device, type|
-    CommandLine.new("iw", "phy :phy interface add :dev type :type",
+    c=CommandLine.new("iw", "phy :phy interface add :dev type :type")
+    c.run( {
                     :phy => device.property.phy,
                     :dev => device.property.if_name,
-                    :type => type.to_s).run
+                    :type => type.to_s })
   end
 
   # Set up or join a ibss network
@@ -186,10 +188,11 @@ module OmfRc::Util::Iw
   # @return [String] iw command output
   # @!macro work
   work :join_ibss do |device|
-    CommandLine.new("iw", "dev :device ibss join :essid :frequency",
+    c=CommandLine.new("iw", "dev :device ibss join :essid :frequency")
+    c.run( {
                       :device => device.property.if_name.to_s,
                       :essid => device.property.essid.to_s,
-                      :frequency => device.property.frequency.to_s).run
+                      :frequency => device.property.frequency.to_s  })
   end
 
   # Validate internal properties based on interface mode

data/lib/omf_rc/util/mod.rb

@@ -48,13 +48,15 @@ module OmfRc::Util::Mod
     end
 
     if value.unload
-      CommandLine.new("modprobe", "-r :mod_names", :mod_names => [value.unload].flatten.join(' ')).run
+      c=CommandLine.new("modprobe", "-r :mod_names")
+      c.run({ :mod_names => [value.unload].flatten.join(' ') })
     end
 
-    CommandLine.new("modprobe", ":flags :mod_name :module_parameters",
+    c=CommandLine.new("modprobe", ":flags :mod_name :module_parameters")
+    c.run({ 
                     :mod_name => value.name.to_s,
                     :flags => flags_string,
-                    :module_parameters => value.mod_params.to_s).run
+                    :module_parameters => value.mod_params.to_s  })
 
     "#{value.name} loaded"
   end

data/lib/omf_rc/util/wpa.rb

@@ -29,10 +29,10 @@ module OmfRc::Util::Wpa
     File.open(device.property.wpa_conf, "w") do |f|
       f << "network={\n  ssid=\"#{device.property.essid}\"\n  scan_ssid=1\n  key_mgmt=NONE\n}"
     end
-    CommandLine.new("wpa_supplicant", "-B -P :wpa_pid -i:dev -c:wpa_conf",
-                    :dev => device.property.if_name,
+    c=CommandLine.new("wpa_supplicant", "-B -P :wpa_pid -i:dev -c:wpa_conf")
+    c.run({         :dev => device.property.if_name,
                     :wpa_conf => device.property.wpa_conf,
-                    :wpa_pid => device.property.wpa_pid).run
+                    :wpa_pid => device.property.wpa_pid  })
   end
 
   # @!method stop_wpa
@@ -40,12 +40,13 @@ module OmfRc::Util::Wpa
     begin
       File.open(device.property.wpa_pid,'r') do |f|
         info "Stopping wpa supplicant at PID: #{device.property.wpa_pid}"
-        CommandLine.new("kill", "-9 :pid", :pid => f.read.chomp).run
+        c1=CommandLine.new("kill", "-9 :pid")
+        c1.run({ :pid => f.read.chomp })
       end
 
-      CommandLine.new("rm", "-f :wpa_pid :wpa_conf",
-                      :wpa_pid => device.property.wpa_pid,
-                      :wpa_conf => device.property.wpa_conf).run
+	  c2=CommandLine.new("rm", "-f :wpa_pid :wpa_conf")
+      c2.run({         :wpa_pid => device.property.wpa_pid,
+                      :wpa_conf => device.property.wpa_conf  })
     rescue => e
       logger.warn "Failed to clean wpa supplicant and its related files '#{device.property.wpa_pid}' and '#{device.property.wpa_conf}'!"
       logger.warn e.message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement