sixcore 0.3.4 → 0.4.0

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.4'
+  s.version = '0.4.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Basic Function Library for other six projects'

data/lib/sixcore/config/core.yaml

@@ -0,0 +1,5 @@
+--- !ruby/struct:SixCore::ConfigCore 
+info: true
+debug: false
+log: true
+verbose: false

data/lib/sixcore/config/nsis.yaml

@@ -0,0 +1,2 @@
+--- !ruby/struct:SixCore::ConfigNsis 
+program: C:/Program Files (x86)/NSIS/makensis.exe

data/lib/sixcore/config/svn.yaml

@@ -0,0 +1,2 @@
+--- !ruby/struct:SixCore::ConfigSvn 
+program: svn

data/lib/sixcore/ftp.rb

@@ -7,14 +7,15 @@ module SixCore
   class Ftp
     attr :ftp
     COMPONENT = 'SixCore::Ftp'
+    @@log = SixCore.log
 
     require 'net/ftp'
     # host:: String, Hostname
     # user:: String, Username
     # pass:: String, Password
     def initialize(host, user = '', pass = '')
-      SixCore::debugs('Initialize', COMPONENT)
-      SixCore::debug "Creating connection to ftp://#{user}:#{pass}@#{host} ..."
+      @@log.debug SixCore::prep_msg 'Initialize', :component => COMPONENT
+      @@log.debug "Creating connection to ftp://#{user}:#{pass}@#{host} ..."
       @host = host
       @user = user
       @pass = pass
@@ -27,7 +28,7 @@ module SixCore
     # localpath:: String, Localpath
     # remotepath:: String, Remotepath
     def get(filename = '', localpath = '', remotepath = '')
-      SixCore::debug "Downloading #{filename} from #{@host}#{remotepath} ..."
+      @@log.debug "Downloading #{filename} from #{@host}#{remotepath} ..."
       @ftp.getbinaryfile("#{remotepath}#{filename}", "#{localpath}#{filename}", 1024) unless filename == ''
     end
 
@@ -48,7 +49,7 @@ module SixCore
     def put(filename = '', localpath = '', remotepath = '', temp = false, staytemp = false)
       file = filename
       file = "#{file}_tmp" if temp
-      SixCore::debug "Uploading #{filename} to #{@host}#{remotepath} ..."
+      @@log.debug "Uploading #{filename} to #{@host}#{remotepath} ..."
       @ftp.putbinaryfile("#{localpath}#{filename}", "#{remotepath}#{file}", 1024) unless filename == ''
       @ftp.rename("#{remotepath}#{file}", "#{remotepath}#{filename}") if temp && !staytemp
     end

data/lib/sixcore/nsis.rb

@@ -3,24 +3,31 @@
 =end
 require 'sixcore'
 module SixCore
+  ConfigNsis = Struct.new(:program)
+
   # Core Class for the Nullsoft Scriptable Install System
   class Nsis
     attr_reader(:template, :output)
     COMPONENT = 'SixCore::nsis'
 
-    require 'sixcore/config/nsis'
+    @@log = SixCore.log
+    @@config = SixCore::read_config('nsis', 'sixcore/config')
+    def config
+      @@config
+    end
+
     # template:: Name of template to use
     # output:: Name of output file to use
     def initialize(template, output)
       @template = template
       @output = output
-      SixCore::debug('Initialize', COMPONENT, [template, output])
+      @@log.debug SixCore::prep_msg 'Initialize', :component => COMPONENT, :verbose => [template, output]
     end
 
     # Creates the NSIS Setup output file
     # replace:: Array, Per Entry: [Search, Replace]
     def create_output(replace = [])
-      SixCore::debug('Build', COMPONENT, replace)
+      @@log.debug SixCore::prep_msg 'Build', :component => COMPONENT, :verbose => replace
 
       # Read NSIS template file
       nsis = File.open(@template) do |file|
@@ -28,26 +35,23 @@ module SixCore
       end
 
       # exchange regex for new strings
-      SixCore::debug('Replacing regex...', COMPONENT, [@output, replace])
+      @@log.debug SixCore::prep_msg 'Replacing regex...', :component => COMPONENT, :verbose => [@output, replace]
       nsis = SixCore::gsub_ar(nsis, replace) unless replace.empty?
 
       # write new nsis file
-      SixCore::debug('Creating new nsis file...', COMPONENT, @output)
-      File.new(@output, 'w') do |f|
-        f.write nsis
-      end
+      @@log.debug SixCore::prep_msg 'Creating new nsis file...', :component => COMPONENT, :verbose => @output
+      File.open(@output, 'w') do |file| file.write nsis end
 
       # compile new nsis file
-      SixCore::debug('Creating output exe...', COMPONENT)
-      r = SixCore::proc_cmd("\"#{PROGRAM_NSIS}\" \"#{@output}\"")
-      r.each do |l|
-        # TODO: Regex?
-        if l =~ /Error \- aborting creation process/
-          raise 'Failed creating NSIS Installed'
+      @@log.debug SixCore::prep_msg 'Creating output exe...', :component => COMPONENT
+      result = SixCore::proc_cmd("\"#{@@config.program}\" \"#{@output}\"")
+      result.each do |line|
+        if line =~ /Error \- aborting creation process/
+          raise 'Failed creating NSIS Installer'
         end
       end
 
-      return @output
+      @output
     end
   end
 end

data/lib/sixcore/svn.rb

@@ -3,12 +3,26 @@
 =end
 require 'sixcore'
 module SixCore
+  ConfigSvn = Struct.new(:program)
+
   # Core module for Subversion
   class Svn
     attr_accessor(:repos, :user, :pass)
+
     COMPONENT = 'SixCore::Svn'
+    REGEX_LINE = /------------------------------------------------------------------------/
+    REGEX_INFO = /r(.*) \| (.*) \| (.*) \| (.*) /
+    REGEX_REVISION = /Revision\: (.*)/
+    REGEX_MOD = /(^A      )|(^M      )|(^D      )/
+    REGEX_PBO = /(.*)\.pbo(.*)/
+    REGEX_FOLDER = /(.*)\\(.*)/
+
+    @@log = SixCore.log
+    @@config = SixCore::read_config('svn', 'sixcore/config')
+    def config
+      @@config
+    end
 
-    require 'sixcore/config/svn'
     # repos:: String, Repository folder or URL
     # user:: String, Username
     # pass:: String, Password
@@ -21,12 +35,11 @@ module SixCore
     # Command Execution function
     # cmd:: Command to execute, excl repositor, username, password
     def cmd(cmd)
-      SixCore::debug('Command', COMPONENT, cmd)
+      @@log.debug SixCore::prep_msg('Command', :component => COMPONENT, :verbose => cmd)
       cmd = "#{cmd} #{@repos}" unless @repos.empty?
       cmd = "#{cmd} --username #{@user}" unless @user.empty?
       cmd = "#{cmd} --password #{@pass}" unless @pass.empty?
-      r = SixCore::proc_cmd("#{SVN_BIN} #{cmd}")
-      return r
+      SixCore::proc_cmd("#{@@config.program} #{cmd}")
     end
 
     # Generates diff list between revisions
@@ -34,27 +47,23 @@ 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')
-      return r
+      cmd("diff -r #{old}:#{new} --summarize").split("\n")
     end
 
     # Fetches SVN info
     def info()
-      r = cmd('info').split('\n')
-      return r
+      cmd('info').split("\n")
     end
 
     # Fetches SVN List
     def list()
-      r = cmd('list').split('/\n')
-      return r
+      cmd('list').split("\n")
     end
 
     # Executes SVN Update
     # Returns Array of Strings
     def update()
-      r = cmd('update').split('\n')
-      return r
+      cmd('update').split("\n")
     end
 
     # Generates log between revisions
@@ -62,8 +71,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')
-      return r
+      cmd("log -r#{old}:#{new}").split("\n")
     end
 
     # Generates array list of log entry information
@@ -76,8 +84,8 @@ module SixCore
       i = -1
       entry = []
       com = []
-      ar.each do |l|
-        if /------------------------------------------------------------------------/.match(l) != nil
+      ar.each do |line|
+        if line =~ REGEX_LINE
           unless i == -1
             entry << com
             log << entry
@@ -88,12 +96,9 @@ module SixCore
         else
           i += 1
           if i == 1
-            m = /r(.*) \| (.*) \| (.*) \| (.*) line/.match(l)
-            if m != nil
-              entry << [m[1], m[2], m[3], m[4]]
-            end
+            entry << [$1, $2, $3, $4] if line =~ REGEX_INFO
           elsif i > 2
-            com << l unless l.size == 0
+            com << line unless line.empty?
           end
         end
       end
@@ -104,9 +109,7 @@ module SixCore
     # Returns revision number
     def read_rev()
       inf = info()
-      inf.each do |line|
-        return $1 if line[/Revision\: (.*)/]
-      end
+      inf.each do |line| return $1 if line[REGEX_REVISION] end
     end
 
 
@@ -115,7 +118,7 @@ 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
@@ -123,33 +126,34 @@ module SixCore
       else
         entrymod = entry
       end
-
+      id = -1
       case entrymod
-      when /A      /
-        entrymod.gsub!(/A      /, '')
-        if folders and entry =~ /(.*)\\(.*)/
-          # subfolder, so it's a change
-          return [1, entrymod]
-        else
-          return [0, entrymod]
-        end
-      when /M      /
-        entrymod.gsub!(/M      /, '')
-        return [1, entrymod]
-      when /D      /
-        entrymod.gsub!(/D      /, '')
-        if folders and entry =~ /(.*)\\(.*)/
-          # subfolder, so it's a change
-          if entry =~ /(.*)\.pbo(.*)/
-            return [2, entrymod]
+      when REGEX_MOD
+        unless $1.nil?
+          if folders and entry =~ REGEX_FOLDER
+            # subfolder, so it's a change
+            id = 1
           else
-            return [1, entrymod]
+            id = 0
+          end
+        end
+
+        unless $2.nil?
+          id = 1
+        end
+
+        unless $3.nil?
+          id = 2
+          unless entry =~ REGEX_PBO
+            if folders and entry =~ REGEX_FOLDER
+              # subfolder, so it's a change
+              id = 1
+            end
           end
-        else
-          return [2, entrymod]
         end
+        entrymod.gsub!(REGEX_MOD, '')
+        return [id, entrymod]
       end
-      return [-1, nil]
     end
   end
 end

data/lib/sixcore.rb

@@ -1,8 +1,7 @@
 =begin
   6thSense.eu Core Module, by Sickboy (sb_at_6thSense.eu)
 =end
-require 'sixcore/config/sixcore'
-
+require 'FileUtils'
 gem 'log4r'
 require 'log4r'
 
@@ -10,30 +9,49 @@ require 'log4r'
 module SixCore
   MAINDIR = Dir.pwd
   COMPONENT = 'SixCore'
+  TITLE = '6thSense.eu Core'
+  VERSION = '0.4.0'
+  ConfigCore = Struct.new(:info, :debug, :log, :verbose)
+
+  module_function
+  def read_config(config, path)
+    obj = nil
+    if FileTest.exist?("config/#{config}.yaml")
+      File.open("config/#{config}.yaml") { |yf| obj = YAML::load( yf ) }
+    else
+      File.open("#{File.dirname(__FILE__)}/#{path}/#{config}.yaml") { |yf| obj = YAML::load( yf ) }
+    end
+    obj
+  end
+  @@config = read_config('core', 'sixcore/config')
+
+  def config
+    @@config
+  end
+
   @@log = Log4r::Logger.new(COMPONENT)
+  format1 = Log4r::PatternFormatter.new(:pattern => "[%l] %d: %m", :date_pattern => '%H:%M:%S')
+  format2 = Log4r::PatternFormatter.new(:pattern => "[%l] %c %d: %m", :date_pattern => '%H:%M:%S')
 
   # Create Outputters
-  if LOG
+  if @@config.log
     o_file = Log4r::FileOutputter.new 'sixcore-file',
       'level' => 0, # All
-      :filename => "#{COMPONENT}.log"
+      :filename => "#{COMPONENT}.log",
+      'formatter' =>  format2
       #:maxsize => 1024
     @@log.outputters << o_file
   end
 
   o_out = Log4r::StdoutOutputter.new 'sixcore-stdout',
-    'level' => 2 # no DEBUG
+    'level' => 2, # no DEBUG
+    'formatter' =>  format1
 
   o_err = Log4r::StderrOutputter.new 'sixcore-stderr',
-    'level' => 4 # Error and Up
+    'level' => 4, # Error and Up
+    'formatter' =>  format1
 
   @@log.outputters << o_out << o_err
-
-  # @@log = File.new(LOGFILE,  'a')
-  # @@log.sync = true
-
-  module_function
-
   def log()
     @@log
   end
@@ -51,110 +69,67 @@ module SixCore
   def clean(str)
     str.chomp!
     str.strip!
-    return str
+    str
   end
 
   # Prepares string for output to logger
   # str:: String, Input
-  # component:: String, Component
-  # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  # type:: Integer, format types 0 or 1
-  def prep_msg(str, component, verbose, type = 0)
-    str = "#{component} - #{str}" unless component.empty?
-    case type
-    when 0
-      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 = "=== #{str} ==="     
-    end
-    return str
-  end
-
-  # Outputs string to info logger
-  # str:: String, Input
-  # component:: String, Component
-  # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def info(str, component = '', verbose = '')
+  # options:: Hash, :component, :verbose, :format
+  def prep_msg(str, options = {})
     unless str.empty?
-      @@log.info prep_msg(str, component, verbose, 0)
-    end
-  end
-
-  # Outputs string to info logger with extra formatting
-  # str:: String, Input
-  # component:: String, Component
-  # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def infos(str, component = '', verbose = '')
-    unless str.empty?
-      puts
-      @@log.info prep_msg(str, component, verbose, 1)
-    end
-  end
-
-  # Outputs string to debug logger
-  # str:: String, Input
-  # component:: String, Component
-  # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def debug(str, component = '', verbose = '')
-    unless str.empty? || !DEBUG
-      puts
-      @@log.debug prep_msg(str, component, verbose, 0)
-    end
-  end
-
-  # Outputs string to debug logger with extra formatting
-  # str:: String, Input
-  # component:: String, Component
-  # verbose:: String, Verbose (Only displayed when VERBOSE is true)
-  def debugs(str, component = '', verbose = '')
-    unless str.empty? || !DEBUG
-      puts
-      @@log.debug prep_msg(str, component, verbose, 1)
+      str = "#{options[:component]} - #{str}" if options[:component]
+      case options[:format]
+      when 'title'
+        str += ' - ' + options[:verbose].to_s if options[:verbose] and @@config.verbose
+        str = "=== #{str} ==="
+        puts # FIXME: NASTY!
+      else
+        str += ' - ' + options[:verbose].to_s if options[:verbose] and @@config.verbose
+      end
     end
+    str
   end
 
   # Replaces all search strings with replace strings from replace array
   # string:: String, Input
   # replace:: Array, per entry: [Search, Replace]
   def gsub_ar(string, replace)
-    replace.each do |r|
-      string.gsub!(r[0], r[1])
-    end
-    return string
+    replace.each do |r| string.gsub!(r[0], r[1]) end
+    string
   end
 
   # Put quotes around string
   # Returns quoted string
   # str:: String, Input
   def quote(str)
-    return "\"#{str}\""
+    "\"#{str}\""
   end
 
   # Evals command and logs to debug if enabled
   # cmd:: String, command to eval
   def eval_cmd(cmd)
-    eval cmd unless DEBUG or cmd.empty?
-    SixCore::debug('Eval Command', COMPONENT, cmd)
+    eval cmd unless @@config.debug or cmd.empty?
+    @@log.debug prep_msg('Eval Command', :component => COMPONENT, :verbose => cmd)
   end
 
   # Executes system command and logs to debug if enabled
   # cmd:: String, command to execute
   def proc_cmd(cmd)
-    unless DEBUG or cmd.empty?
+    unless @@config.debug or cmd.empty?
       r = (%x[#{cmd}])
-      SixCore::debug('Proc Command', COMPONENT, [cmd, r])
+      @@log.debug prep_msg('Proc Command', :component => COMPONENT, :verbose => [cmd, r])
       return r
     end
   end
 
+  # TODO: Find library or write Native Ruby 'robocopy' alike features
+
   # Uses Roboycopy to update folders from source to destination
   # 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])
+    @@log.debug prep_msg('Updating Files...', :component => COMPONENT, :verbose => [source, destination, extra])
     proc_cmd("robocopy #{source} #{destination} /S /TIMFIX /ZB /R:5 /W:5 #{extra}")
   end
 	
@@ -163,34 +138,8 @@ module SixCore
   # destination:: String, Destination folder
   # extra:: Extra parameters to supply to Robocopy
   def filemirror(source, destination, extra = '')
-    debug('Mirroring Files...', COMPONENT, [source, destination, extra])
+    @@log.debug prep_msg('Mirroring Files...', :component => COMPONENT, :verbose => [source, destination, extra])
     proc_cmd("robocopy #{source} #{destination} /MIR /TIMFIX /ZB /R:5 /W:5 #{extra}")
   end
-	
-  # Copies files from source to destination
-  # source:: String, Source folder
-  # destination:: String, Destination folder
-  def filecopy(source, destination)
-    debug('Copying Files...', COMPONENT, [source, destination])
-    proc_cmd("copy /y \"#{source}\" \"#{destination}\\\"")
-  end
-
-  # Moves files from source to destination
-  # source:: String, Source folder
-  # destination:: String, Destination folder
-  def filemove(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])
-    proc_cmd("del /f /q #{source}")
-  end
-end
-
-component = '6thSense.eu Core'
-version = '0.3.4'
-SixCore::debugs "#{component} #{version} loaded"
+  @@log.debug "#{TITLE} #{VERSION} loaded"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixcore
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 +01:00
+date: 2008-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +26,13 @@ files:
 - LICENSE
 - README
 - Rakefile
-- lib/sixcore/config/nsis.rb
-- lib/sixcore/config/sixcore.rb
-- lib/sixcore/config/svn.rb
 - lib/sixcore/ftp.rb
 - lib/sixcore/nsis.rb
 - lib/sixcore/svn.rb
 - lib/sixcore.rb
+- lib/sixcore/config/core.yaml
+- lib/sixcore/config/nsis.yaml
+- lib/sixcore/config/svn.yaml
 has_rdoc: true
 homepage: http://6thsense.eu
 post_install_message: 

data/lib/sixcore/config/nsis.rb

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

data/lib/sixcore/config/sixcore.rb

@@ -1,5 +0,0 @@
-INFO = true
-DEBUG = false
-LOG = true
-VERBOSE = false
-CLEAN_LOG = true

data/lib/sixcore/config/svn.rb

@@ -1 +0,0 @@
-SVN_BIN = 'svn'