sixcore 0.3.3 → 0.3.4

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.name = 'sixcore'
   s.rubyforge_project = s.name
-  s.version = '0.3.3'
+  s.version = '0.3.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Basic Function Library for other six projects'
@@ -23,8 +23,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://6thsense.eu'
   # s.executables = ['your_executable_here']
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,lib,spec}/**/*.rb") + Dir.glob("{bin,lib,spec}/**/*.yaml")
-  s.require_path = "lib"
-  s.bindir = "bin"
+  s.require_path = 'lib'
+  s.bindir = 'bin'
 end
 
 Rake::GemPackageTask.new(spec) do |p|
@@ -36,8 +36,8 @@ end
 Rake::RDocTask.new do |rdoc|
   files =['README', 'LICENSE', 'lib/**/*.rb']
   rdoc.rdoc_files.add(files)
-  rdoc.main = "README" # page to start on
-  rdoc.title = "sixcore Docs"
+  rdoc.main = 'README' # page to start on
+  rdoc.title = 'sixcore Docs'
   rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
   rdoc.options << '--line-numbers'
 end

data/lib/sixcore/config/nsis.rb

@@ -1 +1 @@
-PROGRAM_NSIS = "C:\\Program Files (x86)\\NSIS\\makensis.exe"
+PROGRAM_NSIS = 'C:\\Program Files (x86)\\NSIS\\makensis.exe'

data/lib/sixcore/config/sixcore.rb

@@ -2,5 +2,4 @@ INFO = true
 DEBUG = false
 LOG = true
 VERBOSE = false
-CLEAN_LOG = true
-LOGFILE = "temp.log"
+CLEAN_LOG = true

data/lib/sixcore/config/svn.rb

@@ -1 +1 @@
-SVN_BIN = "svn"
+SVN_BIN = 'svn'

data/lib/sixcore/ftp.rb

@@ -12,8 +12,8 @@ module SixCore
     # host:: String, Hostname
     # user:: String, Username
     # pass:: String, Password
-    def initialize(host, user = "", pass = "")
-      SixCore::debugs "#{COMPONENT} Initialize"
+    def initialize(host, user = '', pass = '')
+      SixCore::debugs('Initialize', COMPONENT)
       SixCore::debug "Creating connection to ftp://#{user}:#{pass}@#{host} ..."
       @host = host
       @user = user
@@ -26,16 +26,16 @@ module SixCore
     # filename:: String, Filename
     # localpath:: String, Localpath
     # remotepath:: String, Remotepath
-    def get(filename = "", localpath = "", remotepath = "")
+    def get(filename = '', localpath = '', remotepath = '')
       SixCore::debug "Downloading #{filename} from #{@host}#{remotepath} ..."
-      @ftp.getbinaryfile("#{remotepath}#{filename}", "#{localpath}#{filename}", 1024) unless filename == ""
+      @ftp.getbinaryfile("#{remotepath}#{filename}", "#{localpath}#{filename}", 1024) unless filename == ''
     end
 
     # Renames file on FTP
     # filename:: String, Filename
     # newfn:: String, New Filename
     # remotepath:: String, Remotepath
-    def rename(filename = "", newfn = "", remotepath = "")
+    def rename(filename = '', newfn = '', remotepath = '')
       @ftp.rename("#{remotepath}#{filename}", "#{remotepath}#{newfn}")
     end
 
@@ -45,11 +45,11 @@ module SixCore
     # remotepath:: String, Remotepath
     # temp:: Boolean, When true, Uploads file as #{filename}_tmp
     # staytemp:: Boolean, When true, Uploaded file will remain as _tmp even after finishing
-    def put(filename = "", localpath = "", remotepath = "", temp = false, staytemp = false)
+    def put(filename = '', localpath = '', remotepath = '', temp = false, staytemp = false)
       file = filename
       file = "#{file}_tmp" if temp
       SixCore::debug "Uploading #{filename} to #{@host}#{remotepath} ..."
-      @ftp.putbinaryfile("#{localpath}#{filename}", "#{remotepath}#{file}", 1024) unless filename == ""
+      @ftp.putbinaryfile("#{localpath}#{filename}", "#{remotepath}#{file}", 1024) unless filename == ''
       @ftp.rename("#{remotepath}#{file}", "#{remotepath}#{filename}") if temp && !staytemp
     end
   end

data/lib/sixcore/nsis.rb

@@ -14,36 +14,36 @@ module SixCore
     def initialize(template, output)
       @template = template
       @output = output
-      SixCore::debug("Initialize", COMPONENT, [template, output])
+      SixCore::debug('Initialize', COMPONENT, [template, output])
     end
 
     # Creates the NSIS Setup output file
     # replace:: Array, Per Entry: [Search, Replace]
     def create_output(replace = [])
-      SixCore::debug("Build", COMPONENT, replace)
+      SixCore::debug('Build', COMPONENT, replace)
 
       # Read NSIS template file
-      nsis = File.open("#{@template}") do |file|
+      nsis = File.open(@template) do |file|
         file.read
       end
 
       # exchange regex for new strings
-      SixCore::debug("Replacing regex...", COMPONENT, [@output, replace])
+      SixCore::debug('Replacing regex...', COMPONENT, [@output, replace])
       nsis = SixCore::gsub_ar(nsis, replace) unless replace.empty?
 
       # write new nsis file
-      SixCore::debug("Creating new nsis file...", COMPONENT, @output)
-      newfile = File.new("#{@output}", "w")
-      newfile.write nsis
-      newfile.close
+      SixCore::debug('Creating new nsis file...', COMPONENT, @output)
+      File.new(@output, 'w') do |f|
+        f.write nsis
+      end
 
       # compile new nsis file
-      SixCore::debug("Creating output exe...", COMPONENT)
+      SixCore::debug('Creating output exe...', COMPONENT)
       r = SixCore::proc_cmd("\"#{PROGRAM_NSIS}\" \"#{@output}\"")
       r.each do |l|
         # TODO: Regex?
-        if l.gsub("Error - aborting creation process", "") != l
-          raise "Failed creating NSIS Installed"
+        if l =~ /Error \- aborting creation process/
+          raise 'Failed creating NSIS Installed'
         end
       end
 

data/lib/sixcore/svn.rb

@@ -12,7 +12,7 @@ module SixCore
     # repos:: String, Repository folder or URL
     # user:: String, Username
     # pass:: String, Password
-    def initialize(repos = "", user = "", pass = "")
+    def initialize(repos = '', user = '', pass = '')
       @repos = repos
       @user = user
       @pass = pass
@@ -21,7 +21,7 @@ module SixCore
     # Command Execution function
     # cmd:: Command to execute, excl repositor, username, password
     def cmd(cmd)
-      SixCore::debug("Command", COMPONENT, cmd)
+      SixCore::debug('Command', COMPONENT, cmd)
       cmd = "#{cmd} #{@repos}" unless @repos.empty?
       cmd = "#{cmd} --username #{@user}" unless @user.empty?
       cmd = "#{cmd} --password #{@pass}" unless @pass.empty?
@@ -34,26 +34,26 @@ module SixCore
     # old:: String or Integer, start revision number
     # new:: String or Integer, end revision number
     def diff(old, new)
-      r = cmd("diff -r #{old}:#{new} --summarize").split("\n")
+      r = cmd("diff -r #{old}:#{new} --summarize").split('\n')
       return r
     end
 
     # Fetches SVN info
     def info()
-      r = cmd("info").split("\n")
+      r = cmd('info').split('\n')
       return r
     end
 
     # Fetches SVN List
     def list()
-      r = cmd("list").split("/\n")
+      r = cmd('list').split('/\n')
       return r
     end
 
     # Executes SVN Update
     # Returns Array of Strings
     def update()
-      r = cmd("update").split("\n")
+      r = cmd('update').split('\n')
       return r
     end
 
@@ -62,7 +62,7 @@ module SixCore
     # new:: String or Integer, end revision number
     # Returns Array of Strings (log)
     def log(old, new)
-      r = cmd("log -r#{old}:#{new}").split("\n")
+      r = cmd("log -r#{old}:#{new}").split('\n')
       return r
     end
 
@@ -104,11 +104,9 @@ module SixCore
     # Returns revision number
     def read_rev()
       inf = info()
-      r = [nil, nil]
-      inf.each do |l|
-        r = /Revision\: (.*)/.match(l) if /Revision\: (.*)/.match(l) != nil
+      inf.each do |line|
+        return $1 if line[/Revision\: (.*)/]
       end
-      return r[1]
     end
 
 
@@ -117,18 +115,18 @@ module SixCore
     # folders:: Boolean, include folders?
     # slash:: String, what type of file system / \ should be used
     # Returns Array, Per Entry format: [integer, formatted entry string]
-    def parse_entry(entry, folders = true, slash = "\\")
+    def parse_entry(entry, folders = true, slash = '\\')
       # TODO: slash!
       # substract everything after first \
       if folders
-        entrymod = entry.gsub(/\\(.*)/, "")
+        entrymod = entry.gsub(/\\(.*)/, '')
       else
         entrymod = entry
       end
 
       case entrymod
       when /A      /
-        entrymod.gsub!(/A      /, "")
+        entrymod.gsub!(/A      /, '')
         if folders and entry =~ /(.*)\\(.*)/
           # subfolder, so it's a change
           return [1, entrymod]
@@ -136,10 +134,10 @@ module SixCore
           return [0, entrymod]
         end
       when /M      /
-        entrymod.gsub!(/M      /, "")
+        entrymod.gsub!(/M      /, '')
         return [1, entrymod]
       when /D      /
-        entrymod.gsub!(/D      /, "")
+        entrymod.gsub!(/D      /, '')
         if folders and entry =~ /(.*)\\(.*)/
           # subfolder, so it's a change
           if entry =~ /(.*)\.pbo(.*)/

data/lib/sixcore.rb

@@ -29,7 +29,7 @@ module SixCore
 
   @@log.outputters << o_out << o_err
 
-  # @@log = File.new(LOGFILE,  "a")
+  # @@log = File.new(LOGFILE,  'a')
   # @@log.sync = true
 
   module_function
@@ -41,7 +41,7 @@ module SixCore
   # Halts operation waiting for user input <enter>
   def halt()
     puts
-    puts "Press enter to continue"
+    puts 'Press enter to continue'
     gets
   end
 
@@ -63,10 +63,10 @@ module SixCore
     str = "#{component} - #{str}" unless component.empty?
     case type
     when 0
-      str += " - " + verbose.to_s if VERBOSE and verbose != ""
+      str += ' - ' + verbose.to_s if VERBOSE and verbose != ''
     when 1
       str = "(#{Time.now().strftime('%H:%M:%S')}) #{str}"
-      str += " - " + verbose.to_s if VERBOSE and verbose != ""
+      str += ' - ' + verbose.to_s if VERBOSE and verbose != ''
       str = "=== #{str} ==="     
     end
     return str
@@ -76,7 +76,7 @@ module SixCore
   # str:: String, Input
   # component:: String, Component
   # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def info(str, component = "", verbose = "")
+  def info(str, component = '', verbose = '')
     unless str.empty?
       @@log.info prep_msg(str, component, verbose, 0)
     end
@@ -86,7 +86,7 @@ module SixCore
   # str:: String, Input
   # component:: String, Component
   # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def infos(str, component = "", verbose = "")
+  def infos(str, component = '', verbose = '')
     unless str.empty?
       puts
       @@log.info prep_msg(str, component, verbose, 1)
@@ -97,7 +97,7 @@ module SixCore
   # str:: String, Input
   # component:: String, Component
   # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def debug(str, component = "", verbose = "")
+  def debug(str, component = '', verbose = '')
     unless str.empty? || !DEBUG
       puts
       @@log.debug prep_msg(str, component, verbose, 0)
@@ -108,7 +108,7 @@ module SixCore
   # str:: String, Input
   # component:: String, Component
   # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def debugs(str, component = "", verbose = "")
+  def debugs(str, component = '', verbose = '')
     unless str.empty? || !DEBUG
       puts
       @@log.debug prep_msg(str, component, verbose, 1)
@@ -136,7 +136,7 @@ module SixCore
   # cmd:: String, command to eval
   def eval_cmd(cmd)
     eval cmd unless DEBUG or cmd.empty?
-    SixCore::debug("Eval Command", COMPONENT, cmd)
+    SixCore::debug('Eval Command', COMPONENT, cmd)
   end
 
   # Executes system command and logs to debug if enabled
@@ -144,7 +144,7 @@ module SixCore
   def proc_cmd(cmd)
     unless DEBUG or cmd.empty?
       r = (%x[#{cmd}])
-      SixCore::debug("Proc Command", COMPONENT, [cmd, r])
+      SixCore::debug('Proc Command', COMPONENT, [cmd, r])
       return r
     end
   end
@@ -153,8 +153,8 @@ module SixCore
   # source:: String, Source folder
   # destination:: String, Destination folder
   # extra:: Extra parameters to supply to Robocopy
-  def fileupdate(source, destination, extra = "")
-    debug("Updating Files...", COMPONENT, [source, destination, extra])
+  def fileupdate(source, destination, extra = '')
+    debug('Updating Files...', COMPONENT, [source, destination, extra])
     proc_cmd("robocopy #{source} #{destination} /S /TIMFIX /ZB /R:5 /W:5 #{extra}")
   end
 	
@@ -162,8 +162,8 @@ module SixCore
   # source:: String, Source folder
   # destination:: String, Destination folder
   # extra:: Extra parameters to supply to Robocopy
-  def filemirror(source, destination, extra = "")
-    debug("Mirroring Files...", COMPONENT, [source, destination, extra])
+  def filemirror(source, destination, extra = '')
+    debug('Mirroring Files...', COMPONENT, [source, destination, extra])
     proc_cmd("robocopy #{source} #{destination} /MIR /TIMFIX /ZB /R:5 /W:5 #{extra}")
   end
 	
@@ -171,7 +171,7 @@ module SixCore
   # source:: String, Source folder
   # destination:: String, Destination folder
   def filecopy(source, destination)
-    debug("Copying Files...", COMPONENT, [source, destination])
+    debug('Copying Files...', COMPONENT, [source, destination])
     proc_cmd("copy /y \"#{source}\" \"#{destination}\\\"")
   end
 
@@ -179,18 +179,18 @@ module SixCore
   # source:: String, Source folder
   # destination:: String, Destination folder
   def filemove(source, destination)
-    debug("Moving Files...", COMPONENT, [source, destination])
+    debug('Moving Files...', COMPONENT, [source, destination])
     proc_cmd("move /y \"#{source}\" \"#{destination}\"")
   end
 	
   # Deletes files from source
   # source:: String, Source folder
   def filedel(source)
-    debug("Deleting Files...", COMPONENT, [source])
+    debug('Deleting Files...', COMPONENT, [source])
     proc_cmd("del /f /q #{source}")
   end
 end
 
 component = '6thSense.eu Core'
-version = '0.3.3'
+version = '0.3.4'
 SixCore::debugs "#{component} #{version} loaded"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixcore
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-29 00:00:00 +01:00
+date: 2008-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: []