wol 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/wol

@@ -1,12 +1,12 @@
 #!/usr/bin/ruby -w
 
 require 'optparse'
-require 'wol'
-require 'parsefile'
+require 'lib/wol.rb'
+require 'lib/parsefile.rb'
 require 'pp'
 
 class Runner
-  SAMPLE_FILE = %{# File structure
+  @sample_file = %{# File structure
 # --------------
 # - blank lines are ignored
 # - comment lines are ignored (lines starting with a hash mark '#')
@@ -29,12 +29,12 @@ class Runner
     args = ["-h"] if args.empty?
     
     options = {}
-    options[:verbose] = true
+    options[:quiet] = false
     options[:address]  = "255.255.255.255"
     options[:port] = 9
     options[:interval] = 0.01
     options[:count] = 3
-    options[:macs] = []
+    options[:macs] = Array.new
     options[:file] = nil
 
     opts = OptionParser.new do |opts|
@@ -46,22 +46,22 @@ class Runner
       opts.separator "Specific options:"
 
       opts.on( '-q', '--quiet', 'No console output' ) do
-        options[:verbose] = false
+        options[:quiet] = true
       end
 
       opts.on( '-a', '--address 255.255.255.255', 'Set the destination address' ) do |address|
         options[:address] = address
       end
 
-      opts.on( '-p', '--port 9', 'Set the destination port' ) do |port|
+      opts.on( '-p', '--port 9', Integer, 'Set the destination port' ) do |port|
         options[:port] = port
       end
 
-      opts.on( '-i', '--interval 0.01', 'Interval between sending packets in seconds') do |interval|
+      opts.on( '-i', '--interval 0.01', Float, 'Interval between sending packets in seconds') do |interval|
         options[:interval] = interval
       end
 
-      opts.on( '-c', '--count 3', 'Number of packets to send. Default 3') do |count|
+      opts.on( '-c', '--count 3', Integer, 'Number of packets to send. Default 3') do |count|
         options[:count] = count
       end
 
@@ -78,7 +78,7 @@ class Runner
       end
 
       opts.on_tail( '-s', '--sample-file', 'Display a sample file') do
-        puts SAMPLE_FILE
+        puts @sample_file
         exit
       end
 
@@ -91,13 +91,15 @@ class Runner
     begin
       opts.parse!(args)
 
-      args.each do |arg|
-        options[:macs] << arg if /^(\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2})?$/.match(arg)
-      end
+      if options[:file].nil?
+        args.each do |arg|
+          options[:macs] << arg if /^(\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2}:\S{1,2})?$/.match(arg)
+        end
 
-      options[:macs].uniq!
+        options[:macs].uniq!
+      end
       
-      options
+      return options
     rescue OptionParser::InvalidOption => e
         STDERR.puts e.message, "\n", opts
         exit(-1)
@@ -108,33 +110,41 @@ class Runner
     "Ruby Wake-On-LAN version 0.1.0"
   end
 
-  def self.wake(options)
+  def self.wake(options = {})
     begin
-      if options[:file].nil?
+      if options[:file].empty?
         if !options[:macs].empty?
-          Wol.new(options).wake
+          puts Wol.new(options).wake unless options[:quiet]
         else
-          "You have to specify a file or MAC address"
+          puts "You have to specify a file or MAC address"
         end
       else
-        wake_from_file(options)
+        puts wake_from_file(options) unless options[:quiet]
       end
-    rescue
-      "An error occured. Please check your inputs.\nIf you used a file, please check that it is properly formatted."
+    rescue Exception => e
+      puts "An error occured. Please check your inputs."
+      puts "If you used a file, please check that it is properly formatted."
+      STDERR.puts e.message
+      exit(-1)
     end
   end
 
-  def self.wake_from_file(options)
+  def self.wake_from_file(options = {})
     message = ""
     hosts = ParseFile.parse(options[:file])
 
     for host in hosts
-      options[:host], options[:macs], options[:port] = host[:host], host[:mac], host[:port]
-      message << Wol.new(options).wake
+      options[:address], options[:macs], options[:port] = host[:address], host[:mac], host[:port]
+
+      unless options[:quiet]
+        message << Wol.new(options).wake
+      end
     end
 
-    return message
+    return options[:quiet] ? nil : message
   end
 end
 
-puts Runner.wake(Runner.parse(ARGV))
+options = Runner.parse(ARGV)
+
+Runner.wake(options)

data/lib/parsefile.rb

@@ -1,23 +1,24 @@
 class ParseFile
+
   def self.parse(file)
     hosts = []
     if File.exist?(file) && File.readable?(file)
       File.open(file) do |f|
         while (line = f.gets)
           unless line.match(/^#/) || line.strip.empty?
-            mac, host, port = line.strip.split
+            mac, address, port = line.strip.split
 
             port ||= 9
             host ||= "255.255.255.255"
 
-            if check_mac(mac) && check_host(host)
-              hosts << { :mac => mac, :host => host, :port => port.to_i}
+            if check_mac(mac) && check_host(address)
+              hosts << { :mac => mac, :address => address, :port => sanitize_port(port)}
             end
           end
         end
       end
     end
-    
+
     return hosts
   end
 
@@ -26,6 +27,11 @@ class ParseFile
   end
 
   def self.check_host(host)
-    /\A(?:25[0-5]|(?:2[0-4]|1\d|[1-9])?\d)(?:\.(?:25[0-5]|(?:2[0-4]|1\d|[1-9])?\d)){3}\z/.match(host)
+    /(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$)|(^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$)/.match(host)
+  end
+
+  def self.sanitize_port(port)
+    p = port.to_i
+    return (1..61000).include?(p) ? p : 9
   end
 end

data/lib/wol.rb

@@ -11,7 +11,7 @@ require "socket"
 
 # Ruby version of the WakeOnLan command.
 class Wol
-  attr_accessor :macs, :address, :port, :count, :interval, :verbose
+  attr_accessor :macs, :address, :port, :count, :interval, :quiet
   attr_reader :socket
 
   # Create a new instance
@@ -21,14 +21,14 @@ class Wol
   # * <tt>:port => 9</tt> - The destination port. Defaults to the discard port, 9
   # * <tt>:count => 1</tt> - How many times to send the MagicPacket.  Defaults to 1
   # * <tt>:interval => 0.01</tt> - How many seconds to wait between sending packets. Defaults to 0.01
-  # * <tt>:verbose => false</tt> - What to return?  Returns a string summary if true, else returns nil
+  # * <tt>:quiet => false</tt> - What to return?  Returns a string summary if false, else returns nil
   def initialize(options = {})
     @macs = options[:macs] ||= ["ff:ff:ff:ff:ff:ff"]
     @address = options[:address] ||= "255.255.255.255"
     @port = options[:port] ||= 9
     @count = options[:count] ||= 1
     @interval = options[:interval] ||= 0.01
-    @verbose = true unless options[:verbose] == false
+    @quiet = options[:quiet]
 
     @socket=UDPSocket.open()
 
@@ -49,10 +49,10 @@ class Wol
       messages << send_packet(mac) + "\n"
     end
 
-    if @verbose
-      return messages
-    else
+    if @quiet
       return nil
+    else
+      return messages
     end
   end
 

data/spec/wol_spec.rb

@@ -21,7 +21,7 @@ describe "Wake-On-LAN" do
     Wol.new(:macs => "00:08:a1:a9:58:f6", :address => "example.com", :port => 80).wake.should == "Sending magic packet to example.com:80 with 00:08:a1:a9:58:f6\n"
   end
 
-  it "should return nil if verbose is set to false" do
-    Wol.new(:verbose => false).wake.should == nil
+  it "should return nil if quiet is set to true" do
+    Wol.new(:quiet => true).wake.should == nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wol
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matias Korhonen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +02:00
+date: 2009-11-08 00:00:00 +02:00
 default_executable: wol
 dependencies: 
 - !ruby/object:Gem::Dependency