oode 0.1.1 → 0.1.3

data/bin/oode

@@ -32,6 +32,11 @@ optparse = OptionParser.new do |opts|
     options[:printer] = printer
   end
   
+  options[:options] = {}
+  opts.on( "-n", "--number COPIES", "The number of copies of FILE you would like to print." ) do |copies|
+    options[:options][:copies] = copies
+  end
+  
   options[:user] = config[:user]
   opts.on( "-u", "--user USER", "The user to log into DICE with." ) do |user|
     options[:user] = user
@@ -60,7 +65,7 @@ if options[:password].nil?
   options[:password] = ask("Password: ") { |q| q.echo = false}
 end
 
-print_queue = Oode::OodeQueue.new options[:user], options[:password], options[:printer]
+print_queue = Oode::OodeQueue.new options[:user], options[:password], options[:printer], options[:options]
 
 ARGV.each do |filename|
   print_queue.enqueue filename

data/lib/oode/file.rb

@@ -2,23 +2,20 @@ module Oode
   class OodeFile
     def initialize filename
       @filename = filename
+      @remote_filename = @filename.gsub(" ", "-")
     end
     
     def upload session, destination
-      session.upload! File.expand_path(@filename), File.join(destination, @filename)
+      session.upload! File.expand_path(@filename), File.join(destination, @remote_filename)
     end
     
-    def print session, directory, printer
-      path = File.join directory, @filename
-      command = "lpr -P #{printer} #{path}"
+    def print session, directory, printer, args
+      path = File.join directory, @remote_filename
+      command = "lpr -P #{printer} #{args}#{path}"
       session.exec!("ssh student.login #{command}")
+      #puts command.blue
     end
-    
-    def clean session, directory
-      command = "rm -r #{directory}"
-      session.exec!("ssh student.login #{command}")
-    end
-    
+
     def remote_path
        File.join File.expand_path("/home/.oode/"), @filename
     end

data/lib/oode/queue.rb

@@ -2,11 +2,13 @@ module Oode
   class OodeQueue
     attr_reader :queue
   
-    def initialize(user, password, printer)
+    def initialize(user, password, printer, options = {})
       @queue = []
       @user = user
       @password = password
       @printer = printer
+      
+      args_from_options options
     end
   
     def print
@@ -25,28 +27,40 @@ module Oode
         
         puts "Printing files on #{@printer.red}...".yellow
         @queue.each do |file|
-          file.print ssh, remote_oode_path, @printer
+          file.print ssh, remote_oode_path, @printer, @args
         end
         
         # Make sure the job has been sent to the printer.
         sleep 1
         
         puts "Cleaning up this mess...".yellow
-        @queue.each do |file|
-          file.clean ssh, remote_oode_path
-        end
+        clean ssh, remote_oode_path
+      end
+    end
+    
+    def args_from_options options
+      @args = ""
+      @args if options.empty?
+      
+      if options.has_key? :copies
+        @args << "-# #{options[:copies]} "
       end
+      
+      @args
     end
     
     def remote_user_path
       "/home/#{@user}"
     end
     
-    def remote_oode_path
-      File.join remote_user_path, ".oode"
+    def clean session, directory
+      command = "rm -r #{directory}"
+      session.exec!("ssh student.login #{command}")
+      #puts command.blue
     end
     
-    def clean
+    def remote_oode_path
+      File.join remote_user_path, ".oode"
     end
   
     def length

data/lib/oode/version.rb

@@ -1,3 +1,3 @@
 module Oode
-  Version = VERSION = '0.1.1'
+  Version = VERSION = '0.1.3'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chris Brown
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +01:00
+date: 2010-04-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency