printsly 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f8ff8cb068d5c872fd0032f609cb3974082e8835
-  data.tar.gz: d46face78c4e39059a0f1bd64bbe7b8465511032
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWE1YTQ0MTdhNmMzYmEzMmEwODdjNmEwNjUxZjNiNzg3ODMxNWIzZA==
+  data.tar.gz: !binary |-
+    ZmIxZDRmM2EzMzE5MDlmYjMxZjBmZmIzNWY4NTEwZWVhZGViZGI4MA==
 SHA512:
-  metadata.gz: b910269dafb13132a9d3481399eefb9910569e9ace4c6c4691667afd846358e83426e93f5af2262278c3b544a99026d968b12b4df8e9022c42aac3762056e309
-  data.tar.gz: 23e0abbf1104d1cba54bc5b734200047932fba5122f49a1371d14bc53e875dea742779be311a896df48ad3617282f4dd2ab8a58dbc5b67dedd8cd8928dc73a89
+  metadata.gz: !binary |-
+    NWQyODdmZjFkODA4MjFlNWYxNDNlOTA4ZTI5OTI3MGYwYTU0ZWIyMDE1N2Q5
+    NDNlMzg5ZWEwM2ZjMDYzYjBjMzM3YTQ2NGU0YmY5OTg1MWQ4ZGQ3OTg3ZGEz
+    MjNkYzA4NTE1MGMwMmJmY2YyNjA1NjdjZjlhMWNiNWNkM2MxNDM=
+  data.tar.gz: !binary |-
+    ZTg1Zjk3NmIwZGM3Y2Q3OTkwNjUwYjA0ZDZmNmYxYWVhOThkNmQzNTYzNGM0
+    ODIyMWM2NWUxNWM5NGJjOTFmOTMxNmFlOWI5Y2ExY2VmOGQzNDA2MjM4NmVl
+    MjZhNmQyZWZmYWYxZTNhOGVkMzIzMGJmMjA3OGY0YTc2MDFkYTE=

data/bin/printsly

@@ -5,45 +5,49 @@ require 'printsly'
 v = ARGV
 case
 when v.empty? == true
+  puts
   puts bar_top.yellow
   puts " "*24 + "Helps you add printers to CUPS".yellow + " "*19
   puts bar_low.yellow
-  puts # formatting
+  puts # format
   puts "Selectable options will normally be enclosed in " + "[ ]".yellow + "'s."
-  puts # formatting
+  puts # format
   Menu.new.choices
-when v.count > 1
-  puts # formatting
-  puts "Please pass only one directory at a time!".red
-  puts # formatting
+when v.count > 2
+  help_text
   exit 1 #something went wrong
-when v.count < 2
-  v.each do |dirk|
+when v.count == 1
+  help_text
+  exit 1 #soemthing went wrong
+when v.count == 2
+  v.each do |dirk| #basic directory verification
     if /^\//.match(dirk) #does path start at root?
-      case Dir.exists?(dirk)
-      when false
-        puts # formatting
-        puts "That directory does not exist!".red
-        puts # formatting
+      unless Dir.exists?(dirk)
+        puts # format
+        puts "#{dirk} does not exist!".red
+        help_text
         exit 1 #something went wrong
-      when true
-        spreads = Dir.glob(File.join(dirk, '*.xls'))
-        case spreads.size > 0
-        when true
-          spreads.each do |sheety|
-            Printers.new.build(sheety)
-          end
-        when false
-          puts # formatting
-          puts "There are no spreadsheets in specified directory!".red
-          puts # formatting
-        end
       end
     else
-      puts # formatting
-      puts "Please pass the full path to the directory you wish to process and nothing else!".red
-      puts # formatting
+      help_text
       exit 1 #something went wrong
     end
   end
+  spreads = Dir.glob(File.join(v[0], '*.xls'))
+  case spreads.size > 0
+  when true
+    spreads.each do |sheety|
+      hosty = `hostname`.strip
+      sheet = sheety + "." + hosty
+      cur_conf = fill_hash sheety, "On", "On"
+      unless File.exists?(sheet)
+        Batch.new.process(cur_conf)
+        system "bash", "-c", "touch #{sheet}" if $green == true
+      end
+    end
+  when false
+    puts # formatting
+    puts "There are no spreadsheets in #{v[0]}!".red
+    puts # formatting
+  end
 end

data/lib/common_stuff.rb

@@ -1,12 +1,40 @@
 module CommonStuff
 
   @@config_file = File.join(Dir.home, "printsly.json")
+  @@prov_log = "/var/log/cups/provision_log"
 
-  def bar_both
-    puts # formatting
-    puts bar_top.yellow
-    puts bar_low.yellow
-    puts # formatting
+  def log_file
+    if Dir.exists?("/var/log/cups")
+      File.new(@@prov_log, "w+") unless File.exists?(@@prov_log)
+    end
+  end
+
+  def log_entry printerdata, status
+    if File.exists?(@@prov_log)
+      log_entry_write(printerdata, status)
+    end
+  end
+
+  def log_entry_write printerdata, status
+    File.open(@@prov_log, "a") do |f|
+      f.puts log_entry_data_woot(printerdata) if status == 0
+      f.puts log_entry_data_fail(printerdata) if status == 1
+    end
+  end
+
+  def log_entry_data_woot printerdata
+    timey = Time.new
+    "Add: " + timey.inspect + " " + printerdata[0] + " " + printerdata[2] + " IP: " + printerdata[1]
+  end
+
+  def log_entry_data_fail printerdata
+    timey = Time.new
+    "FAILED: " + timey.inspect + " " + printerdata[0] + " " + printerdata[2] + " IP: " + printerdata[1]
+  end
+
+  def mod_name namey, store
+    namey = "0" + store + namey if namey.include?('RT') || namey.include?('SIM')
+    namey
   end
 
   def prompt
@@ -28,14 +56,6 @@ module CommonStuff
     prompt; gets.chomp
   end
 
-  def bar_top
-    "_"*34 + " " + "Printsly" + " " + "_"*34
-  end
-
-  def bar_low
-    "-"*78
-  end
-
   def fill_hash work_dir, batchy, auto_mater
     cur_conf = Hash.new
     cur_conf[:work_dir]     = work_dir
@@ -56,27 +76,4 @@ module CommonStuff
     end
   end
 
-  def work_dir_text
-    puts #format
-    puts "The " + "working directory".yellow + " is the location " + "Printsly".yellow + " will look for"
-    puts "spreadsheets containing printers to add to " + "CUPS".yellow + "."
-  end
-
-  def batchy_text
-    puts #format
-    puts "Batch mode".yellow + " means all spreadsheets in the " + "working directory".yellow + " will be processed."
-  end
-
-  def auto_text
-    puts #format
-    puts "Auto provision".yellow + " means provisioning is done immediately with no"
-    puts "confirmation dialogue."
-  end
-
-  def welcome_text
-    puts "If this is the first time to run Printsly, please choose " + "[3]".yellow + " and configure."
-    puts #format
-    puts "The configuration file is stored in your home directory by default."
-  end
-
 end

data/lib/menu.rb

@@ -41,33 +41,15 @@ class Menu
   def actions move
     case
     when move == "1"
-      begin
-        spread = choose_file
-        puts #formatting
-        puts "You have chosen " + spread.yellow + ". Is this correct?"
-        yes_no
-      end while not (@yes_no == "yes")
-      Printers.new.build(spread)
+      singleton(@cur_conf)
     when move == "2"
       Batch.new.process(@cur_conf)
     when move == "3"
       @cur_conf = Configurator.new.choices(@cur_conf)
     when move == "4"
-      puts #format
-      puts "Current Working Directory:        " + @cur_conf[:work_dir].green
-      puts "Current Batch Mode Setting:       " + @cur_conf[:batchy].green
-      puts "Current Auto Provision Setting:   " + @cur_conf[:auto_mater].green
+      show_conf(@cur_conf)
     when move == "5"
-      puts #format
-      puts "Resetting to default configuration...".yellow
-      sleep(0.5)
-      puts "...".yellow
-      sleep(0.5)
-      puts "......".red
-      @cur_conf   = fill_hash("Not Set", "Off", "Off")
-      save_config(@cur_conf)
-      sleep(0.5)
-      puts ".........done!".green
+      @cur_conf = reset_conf(@cur_conf)
     when move == "6"
       # leave application
       puts #format
@@ -77,6 +59,41 @@ class Menu
     end
   end
 
+  def reset_conf cur_conf
+    puts #format
+    puts "Resetting to default configuration...".yellow
+    sleep(0.5)
+    puts "...".yellow
+    sleep(0.5)
+    puts "......".red
+    cur_conf   = fill_hash("Not Set", "Off", "Off")
+    save_config(cur_conf) if File.exists?(File.join(Dir.home, "printsly.json"))
+    sleep(0.5)
+    puts ".........done!".green
+    cur_conf
+  end
+
+  def show_conf cur_conf
+    puts #format
+    puts "Current Working Directory:        " + cur_conf[:work_dir].green
+    puts "Current Batch Mode Setting:       " + cur_conf[:batchy].green
+    puts "Current Auto Provision Setting:   " + cur_conf[:auto_mater].green
+  end
+
+  def singleton cur_conf
+    begin
+      spread = choose_file
+      puts #formatting
+      puts "You have chosen " + spread.yellow + ". Is this correct?"
+      yes_no
+    end while not (@yes_no == "yes")
+    book = Spreadsheet.open spread
+    sheet = book.worksheet 0
+    store = sheet.row(0)[0][6..8]
+    printers = Printers.new.hashy(sheet, store)
+    Printers.new.provision(printers, store)
+  end
+
 end
 
 class Batch
@@ -92,13 +109,12 @@ class Batch
     end
     puts "Processing " + cur_conf[:work_dir].yellow + ":"
     sleep(0.5)
-    #Printers.new.batch(cur_conf[:work_dir]) This will be used once Printers::Batch is built
     puts "...".yellow
     sleep(0.5)
     puts "......".red
     sleep(0.5)
     puts ".........done!".green
-    Printers.new.build(cur_conf[:work_dir])
+    Printers.new.batch(cur_conf[:work_dir])
   end
 
 end

data/lib/printers.rb

@@ -1,51 +1,65 @@
 class Printers
-  attr_accessor :store_printers
-
-  def initialize
-    puts
-    puts "Let's get started."
-    puts
-  end
-
-  def build spread
+  #attr_accessor :store_printers
 
+  def batch spread
     book = Spreadsheet.open spread
     sheet1 = book.worksheet 0
     store = sheet1.row(0)[0][6..8]
-    printers = Hash.new
-    sheet1.each 5 do |row|
+    printers = hashy(sheet1, store)
+    provision(printers, store)
+    printers
+  end
+
+  def initialize
+
+  end
+
+  def hashy sheet, store
+    store_printers = Hash.new
+    sheet.each 5 do |row|
       break if row[0].nil?
       printername = row[4]
       if printername != nil
-        if printername.include?(store) || printername.include?('RT') || printername.include?('SIM')
-          printer = Array.new
-          printer = printer.push row[4] # name
-          printer = printer.push row[5] # ip address
-          printer = printer.push row[3] # Model
-          printer = printer.push row[0] # Description
-          printers[printername] = printer
-        end
+        store_printers[printername] = printer(row, printername, store)
       end
     end
+    store_printers
+  end
 
+  def show_printers printers, store
     puts
-    puts "This is what I am planning on provisioning for store " + store + ":"
+    puts prov_text(store)
     puts
+    printers.each do | printername, printerdata |
+      printerdata[0] = mod_name(printerdata[0], store)
+      puts printer_puts(printerdata)
+    end
+  end
 
-    if Dir.exists?("/var/log/cups")
-      File.new("/var/log/cups/provision_log", "w+") unless File.exists?("/var/log/cups/provision_log")
+  def printer row, printername, store
+    if printername.include?(store) || printername.include?('RT') || printername.include?('SIM')
+      printer = Array.new
+      printer = printer.push row[4] # name
+      printer = printer.push row[5] # ip address
+      printer = printer.push row[3] # Model
+      printer = printer.push row[0] # Description
+      printer
     end
+  end
 
+  def provision printers, store
+    log_file
+    $green = true
     printers.each do | printername, printerdata |
-      printerdata[0] = "0" + store + printerdata[0] if printerdata[0].include?('RT')
-      printerdata[0] = "0" + store + printerdata[0] if printerdata[0].include?('SIM')
-      puts "lpadmin -p " + printerdata[0] + " -L \"" + printerdata[3] + "\" -D \"" + printerdata[2] + "\" -E -v socket://" + printerdata[1] + ":9100 -m raw"
-      #puts "Name: ".yellow + printerdata[0] + " " + "Type: ".yellow + printerdata[2] + " " + "IP: ".yellow + printerdata[1] + " " + "Desc: ".yellow + printerdata[3]
-      if File.exists?("/var/log/cups/provision_log")
-        timey = Time.new
-        File.open("/var/log/cups/provision_log", "a") do |f|
-          f.puts "Added: " + timey.inspect + " lpadmin -p " + printerdata[0] + " -L \"" + printerdata[3] + "\" -D \"" + printerdata[2] + "\" -E -v socket://" + printerdata[1] + ":9100 -m raw"
-        end
+      printerdata[0] = mod_name(printerdata[0], store)
+      lp_command = lpadmin_puts(printerdata)
+      system "bash", "-c", lp_command
+      if $?.exitstatus > 0
+        puts "I failed to add #{printerdata[0]}!" # for CLI output
+        $green = false
+        log_entry(printerdata, 1)
+      else
+        log_entry(printerdata, 0)
       end
     end
   end

data/lib/printsly.rb

@@ -1,10 +1,12 @@
 require 'choice'
 require 'colorize'
 require 'common_stuff'
+require 'show_text'
 require 'json'
 require 'menu'
 require 'printers'
 require 'spreadsheet'
 Spreadsheet.client_encoding = 'UTF-8'
 
+include ShowText
 include CommonStuff

data/lib/show_text.rb

@@ -0,0 +1,62 @@
+module ShowText
+
+  def auto_text
+    puts #format
+    puts "Auto provision".yellow + " means provisioning is done immediately with no"
+    puts "confirmation dialogue."
+  end
+
+  def bar_both
+    puts # format
+    puts bar_top.yellow
+    puts bar_low.yellow
+    puts # format
+  end
+
+  def bar_low
+    "-"*78
+  end
+
+  def bar_top
+    "_"*34 + " " + "Printsly" + " " + "_"*34
+  end
+
+  def batchy_text
+    puts #format
+    puts "Batch mode".yellow + " means all spreadsheets in the " + "working directory".yellow + " will be processed."
+  end
+
+  def help_text
+    puts # format
+    puts "Please pass the FULL PATH for two directories separated by a space!".red
+    puts "Pending files in the first directory and done in the second.".red
+    puts # format
+    puts "EXAMPLE: printsly /u01/app/cups/pending /u01/app/cups/done".green
+    puts # format
+  end
+
+  def lpadmin_puts printerdata
+    "lpadmin -p " + printerdata[0] + " -L \"" + printerdata[3] + "\" -D \"" + printerdata[2] + "\" -E -v socket://" + printerdata[1] + ":9100 -m raw"
+  end
+
+  def prov_text store
+    "This is what I am planning on provisioning for store " + store + ":"
+  end
+
+  def printer_puts printerdata
+    "Name: ".yellow + printerdata[0] + " " + "Type: ".yellow + printerdata[2] + " " + "IP: ".yellow + printerdata[1] + " " + "Desc: ".yellow + printerdata[3]
+  end
+
+  def welcome_text
+    puts "If this is the first time to run Printsly, please choose " + "[3]".yellow + " and configure."
+    puts #format
+    puts "The configuration file is stored in your home directory by default."
+  end
+
+  def work_dir_text
+    puts #format
+    puts "The " + "working directory".yellow + " is the location " + "Printsly".yellow + " will look for"
+    puts "spreadsheets containing printers to add to " + "CUPS".yellow + "."
+  end
+
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: printsly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kody Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
-    - - ">="
+    - - ! '>='
       - !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.3
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
-    - - ">="
+        version: 0.7.7
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
-    - - ">="
+        version: 0.7.7
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
 description: Helps you add printers to CUPS
 email: kodywilson@gmail.com
 executables:
@@ -63,6 +63,7 @@ files:
 - lib/menu.rb
 - lib/printers.rb
 - lib/printsly.rb
+- lib/show_text.rb
 homepage: https://github.com/kodywilson/printsly
 licenses:
 - MIT
@@ -73,17 +74,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Printer management software