openMSX-builder 1.4.2 → 1.5.1

data/README.markdown

@@ -60,7 +60,6 @@ Current list of tasks is:
 
 + Integrate with CIA.vc / Ruby-Rbot
 + Add tests
-+ Refactor `#archive_for_revision` and `#dmg_for_revision` into a single method
 + Create a simple Sinatra App for [openMSX.FiXato.net][5]
 + Allow for automatic setup of the oAuth tokens.
 + Add documentation on the YAML configuration files.

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.5.1

data/lib/openmsx_builder.rb

@@ -38,12 +38,10 @@ class OpenmsxBuilder
     },
   }
 
-  attr_accessor :type
+  attr_accessor :type,:build_outputs
   def initialize(options,type=:openmsx)
-    @type = type
-    @current_revision = `svnversion -n #{setting(:source_dir)}`.to_i
     @options = options
-    @fails = 0
+    @type = type
     @log = Logger.new(STDOUT)
     @log.level = Logger::FATAL
     @log.level = Logger::ERROR if @options.include?('--log-errors')
@@ -51,6 +49,9 @@ class OpenmsxBuilder
     @log.level = Logger::INFO if @options.include?('--verbose')
     @log.level = Logger::DEBUG if @options.include?('--debug')
     @log.debug("Logger created with level #{@log.level}")
+    @current_revision = `svnversion -n #{setting(:source_dir)}`.to_i
+    @fails = 0
+    @build_outputs = []
     config
   rescue NotConfigured => e
     @log.fatal e.message
@@ -71,186 +72,176 @@ class OpenmsxBuilder
     end
   end
 
+  def publish_all
+    @log.info "Publishing all #{@type} builds found"
+    if openmsx?
+      regexp = /openmsx-.+-(\d+)-mac-univ-bin.dmg$/
+    elsif openmsx_debugger?
+      regexp = /openMSX-debugger-(\d+)-mac-x86.tbz$/
+    end
+    Dir.glob(filemask_for_revision('*')).sort.each do |file|
+      publish_revision($1,file) if file =~ regexp
+    end
+    nil
+  end
+
+  def publish_revision(revision,archive_name=nil)
+    if archive_name.nil?
+      if openmsx?
+        archive_name = Dir.glob(filemask_for_revision(revision)).first
+      elsif openmsx_debugger?
+        archive_name = filemask_for_revision(revision)
+        archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
+      end
+    end
+
+    destination = File.join(setting(:publish_location),File.basename(archive_name))
+    @log.info "Publishing '#{archive_name}' to '#{destination}'."
+    @log.debug `scp -p "#{archive_name}" #{destination}`
+
+    return nil unless @options.include?('--tweet')
+    url = File.join(setting(:site_path),File.basename(archive_name))
+    message = "[#{setting(:nice_name)}] Revision #{revision} is now available:\r\n #{url}"
+    tweetmsx.update(message)
+  rescue TweetMsx::NotConfigured => e
+    @log.error e.message
+  end
+
   def setting(key)
     config[:projects][type][key]
   end
 
   def run
-    if @options.include?('--publish-all')
-      publish_all
-      return
-    end
-    if @options.include?('--publish-current')
-      publish_current
+    return publish_all if @options.include?('--publish-all')
+    return publish_revision(@current_revision) if @options.include?('--publish-current')
+    if @options.include?('--dont-update')
+      @new_revision = @current_revision
+      @log.info "Update skipped. Still at revision #{@new_revision}"
       return
+    else
+      update_svn
     end
-    @log.info "openMSX is currently at #{@current_revision}."
-    update_svn
+
     if @new_revision >= @current_revision
       @log.info "Revision #{@new_revision} is not older than #{@current_revision}. Proceeding with build."
-      build
+      build unless already_built?(@new_revision)
     end
   end
 
+  def update_svn
+    @log.info "openMSX is currently at #{@current_revision}. Proceeding with `svn update`"
+    @log.debug `cd #{setting(:source_dir)} && svn up`
+    @new_revision = `svnversion -n #{setting(:source_dir)}`.to_i
+    @log.info "Now at revision #{@new_revision}"
+    nil
+  end
+
 private
+  def already_built?(revision)
+    if openmsx?
+      files = Dir.glob(filemask_for_revision(revision))
+      if files.size == 0
+        @log.debug "Revision #{revision} has not yet been built."
+        return false
+      end
+      @log.debug "The following file(s) were found for revision #{revision}: #{files.join(",")}"
+      filename = files.first
+    elsif openmsx_debugger?
+      filename = filemask_for_revision(revision)
+      return false unless File.exist?(filename)
+    else
+      @log.fatal "Unsupported config type #{@type}."
+      exit
+    end
+    @log.info "Revision #{revision} already built as: #{filename}"
+    filename
+  end
+
   def archive(infile,outfile)
     `cd #{File.dirname(infile)} && tar --bzip2 -cf #{outfile} #{File.basename(infile)}`
   end
 
-  def dmg_for_revision?(revision)
-    return false unless openmsx?
-    files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-univ-bin.dmg"))
-    @log.debug files.to_yaml unless files.size == 0
-    files.size > 0
+  def build
+    cleanup_dmg_locks if openmsx?
+    @log.info("Will attempt to build revision #{@new_revision}.")
+    @build_outputs << `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist OPENMSX_TARGET_CPU=univ' if openmsx?} 2>&1`
+    if $?.success?
+      handle_build_success
+      return nil
+    end
+    handle_build_error
+    nil
   end
 
-  def archive_for_revision?(revision)
-    return false unless openmsx_debugger?
-    filename = File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{revision}-mac-x86.tbz")
-    @log.debug filename
-    File.exist?(filename)
+  def build_output
+    build_outputs.last
   end
 
-  def publish_build(revision,infile,outfile='',location=setting(:publish_location))
-    @log.debug "\n#publish_build"
-    outfile = File.basename(infile) if outfile == ''
-    destination = File.join(location,outfile)
-    @log.info "Will publish #{infile} to #{setting(:publish_location)} now."
-    publish_output = `scp -p "#{infile}" #{destination}`
-    @log.debug publish_output unless publish_output.nil? || publish_output.strip == ''
-    url = File.join(setting(:site_path),File.basename(destination))
-    twitter_update = tweetmsx.update("[#{setting(:nice_name)}] Revision #{revision} is now available:\r\n #{url}") if @options.include?('--tweet')
-    @log.info(twitter_update) unless twitter_update.nil?
-    nil
-  rescue TweetMsx::NotConfigured => e
-    @log.error e.message
+  def cleanup_dmg_locks
+    @log.info("Checking for existing filelocks on DMGs.")
+    locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-univ-bin.dmg`
+    @log.debug locks
+    locks.each_line do |lock_line|
+      pid = lock_line.split[1].to_i
+      @log.info "Killing pid #{pid} from lock '#{lock_line}'"
+      kill_output = `kill -9 #{pid}`
+      @log.debug kill_output
+    end
   end
 
-  def publish
+  def filemask_for_revision(revision)
     if openmsx?
-      archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-univ-bin.dmg")).first
+      File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-univ-bin.dmg")
     elsif openmsx_debugger?
-      archive_name = File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{@new_revision}-mac-x86.tbz")
-      archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
+      File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{revision}-mac-x86.tbz")
     end
-    publish_build(@new_revision, archive_name)
-    nil
   end
 
-  def publish_all
-    @log.info "Publishing all #{@type} builds found"
-    if openmsx?
-      files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-mac-univ-bin.dmg")).sort.map do |f|
-        if f =~ /openmsx-.+-(\d+)-mac-x86-bin.dmg$/
-          rev = $1
-        else
-          rev = 'unknown'
-        end
-        [rev,f]
-      end
-    elsif openmsx_debugger?
-      files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX-debugger-*-mac-x86.tbz')).sort.map do |f|
-        if f =~ /openMSX-debugger-(\d+)-mac-x86.tbz$/
-          rev = $1
-        else
-          rev = 'unknown'
-        end
-        [rev,f]
-      end
-    end
-    files.each do |rev,file|
-      publish_build(rev,file)
+  def handle_build_error
+    if handle_build_hdiutil_error?
+      build
+      return nil
     end
-    nil
-  end
-  
-  def publish_current
-    if openmsx?
-      archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@current_revision}-mac-univ-bin.dmg")).first
-    elsif openmsx_debugger?
-      archive_name = File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{@current_revision}-mac-x86.tbz")
-      archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
+    @log.error "!!!!!!FAILED!!!!!!"
+    build_output.each_line do |line|
+      @log.error "     %s" % line
     end
-    publish_build(@current_revision, archive_name)
-    nil
-  end
-  
-  def update_svn
-    if @options.include?('--dont-update')
-      update = 'Update skipped'
-    else
-      @log.info "Proceeding with update."
-      update = `cd #{setting(:source_dir)} && svn up` 
+    if @options.include?('--report-build-failure')
+      report_build_failure
     end
-    @new_revision = `svnversion -n #{setting(:source_dir)}`.to_i
-    @log.debug update
-    @log.info "Now at revision #{@new_revision}"
-    nil
   end
 
-  def tweetmsx
-    @tweetmsx ||= TweetMsx.new(@log.level)
+  #Capture the weird random build error that seems to be more OSX related than openMSX related.
+  def handle_build_hdiutil_error?
+    return false unless build_output.include?('hdiutil: create failed - error 49168')
+    @fails += 1
+    @log.error build_output
+    @log.error "Weird bug (attempt #{@fails}/3)"
+    return true if @fails < 3
+    @log.fatal "Encountered the weird 'hdiutil error 49168'-bug #{@fails} times; failing."
+    exit
   end
 
-  def build
-    if openmsx?
-      if dmg_for_revision?(@new_revision)
-        @log.info "Revision already build as #{Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-univ-bin.dmg")).first}"
-        return nil
-      end
-      cleanup_dmg_locks
-    elsif openmsx_debugger?
-      if archive_for_revision?(@new_revision)
-        @log.info "Revision already build as #{File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{@new_revision}-mac-x86.tbz")}"
-        return nil
-      end
-    end
-    @log.info("Will attempt to build revision #{@new_revision}.")
-    build_output = `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist OPENMSX_TARGET_CPU=univ' if openmsx?} 2>&1`
-    if $?.success?
-      @log.info "++++++SUCCESS++++++"
+  def handle_build_success
+    @log.info "++++++SUCCESS++++++"
+    if @log.debug?
       build_output.each_line do |line|
         @log.debug "     %s" % line
       end
-      publish if @options.include?('--publish')
-      nil
-    else
-      #Capture the weird random build error that seems to be more OSX related than openMSX related.
-      if build_output.include?('hdiutil: create failed - error 49168')
-        @fails += 1
-        @log.error build_output
-        @log.error "Weird bug (attempt #{@fails}/3)"
-        if @fails == 3
-          @log.fatal "Encountered the weird 'hdiutil error 49168'-bug #{@fails} times; failing."
-          exit
-        else
-          return build
-        end
-      end
-      @log.error "!!!!!!FAILED!!!!!!"
-      build_output.each_line do |line|
-        @log.error "     %s" % line
-      end
-      if @options.include?('--report-build-failure')
-        report_build_failure(build_output)
-      end
     end
+    publish_revision(@new_revision) if @options.include?('--publish')
     nil
   end
 
-  def cleanup_dmg_locks
-    @log.info("Checking for existing filelocks on DMGs.")
-    locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-univ-bin.dmg`
-    @log.debug locks
-    locks.each_line do |lock_line|
-      pid = lock_line.split[1].to_i
-      @log.info "Killing pid #{pid} from lock '#{lock_line}'"
-      kill_output = `kill -9 #{pid}`
-      @log.debug kill_output
-    end
+  def openmsx?
+    @type == :openmsx
+  end
+
+  def openmsx_debugger?
+    @type == :openmsx_debugger
   end
 
-  def report_build_failure(build_output)
+  def report_build_failure
     #TODO: Find out why I have to set these local vars due to problems with scope within Mail
     revision = @new_revision
     project_name = setting(:nice_name)
@@ -267,15 +258,15 @@ private
       subject "[FAIL] #{project_name} revision #{revision} failed to build"
       content_type 'text/plain; charset=UTF-8'
       content_transfer_encoding '8bit'
-      body "While trying to build revision #{revision} of #{project_name}, the daily auto-builder encountered an error. Below you will find the entire build report:\r\n\r\n" << build_output
+      body <<-EOS
+        While trying to build revision #{revision} of #{project_name}, the daily auto-builder encountered an error.
+        Below you will find the entire build report:\r\n
+        #{build_output}
+      EOS
     end
   end
-  
-  def openmsx?
-    @type == :openmsx
-  end
 
-  def openmsx_debugger?
-    @type == :openmsx_debugger
+  def tweetmsx
+    @tweetmsx ||= TweetMsx.new(@log.level)
   end
 end

data/lib/tweet_msx.rb

@@ -55,7 +55,8 @@ class TweetMsx
       @log.error "You've exceeded your rate limit"
       return nil
     end
-    @client.update(message.to_s)
+    ret = @client.update(message.to_s)
+    @log.info(ret.to_yaml) unless ret.nil?
     nil
   rescue SocketError
     @log.error "Could not send '#{message}'. Twitter or your connection might be down."

data/openMSX-builder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openMSX-builder}
-  s.version = "1.4.2"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Filip H.F. \"FiXato\" Slagter"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 2
-  version: 1.4.2
+  - 5
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Filip H.F. "FiXato" Slagter