wol 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/wol

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.push File.join(File.dirname(__FILE__), "/../lib")
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'wol'
 
-Wol::Runner.run!
-
+exit Wol::Runner.run!(ARGV)

data/lib/wol/runner.rb

@@ -43,7 +43,7 @@ module Wol
       opts = OptionParser.new do |opts|
         # Set a banner, displayed at the top
         # of the help screen.
-        opts.banner = "#{version}\nUsage: wol -a ADDRESS ff:ff:ff:ff:ff:ff"
+        opts.banner = "#{version}\nUsage: wol -i ADDRESS ff:ff:ff:ff:ff:ff"
 
         opts.separator ""
         opts.separator "Specific options:"
@@ -117,36 +117,41 @@ module Wol
 
     # Send WOL MagicPackets based on the parsed options
     def self.wake(options = {})
-      begin
-        if options[:file]
-          hosts = ParseFile.read_and_parse_file(options[:file])
+      if options[:file]
+        hosts = ParseFile.read_and_parse_file(options[:file])
 
-          for host in hosts
-            options[:address], options[:macs], options[:port] = host[:address], host[:mac], host[:port]
+        for host in hosts
+          options[:address], options[:macs], options[:port] = host[:address], host[:mac], host[:port]
 
-            puts WakeOnLan.new(options).wake
-          end
-        elsif options[:macs]
-          options[:macs].each do |mac|
-            options[:mac] = mac
-            puts WakeOnLan.new(options).wake
-          end
-        else
-          puts "You have to specify a file or MAC address"
+          message = WakeOnLan.new(options).wake.to_s
+          puts message unless options[:quiet]
+          return 0
         end
-      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)
+      elsif !options[:macs].empty?
+        options[:macs].each do |mac|
+          options[:mac] = mac
+          message = WakeOnLan.new(options).wake.to_s
+          puts message unless options[:quiet]
+          return 0
+        end
+      else
+        puts "You have to specify a file or MAC address"
       end
     end
 
     # Parse the command line options, then use them to wake up any given hosts.
-    def self.run!
-      options = parse(ARGV)
+    def self.run!(argv)
+      begin
+        options = parse(argv)
 
-      wake(options)
+        wake(options)
+        return 0
+      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
+        return -1
+      end
     end
   end
 end

metadata

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