diff --git a/.travis.yml b/.travis.yml index 3bb7beeea31..c1b99405aa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ #pretending we're C because otherwise ruby will initialize, even with "language: dm". language: c +sudo: false env: global: @@ -9,18 +10,30 @@ env: - DM_MAPFILE="cyberiad" - DM_MAPFILE="metastation" -before_install: - - sudo apt-get update -qq - - sudo apt-get install libc6:i386 libgcc1:i386 libstdc++6:i386 -qq +cache: + directories: + - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR} + +addons: + apt: + packages: + - libc6-i386 + - libgcc1:i386 + - libstdc++6:i386 + - python + - python-pip install: - - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip - - unzip byond.zip - - cd byond - - sudo make install - - cd .. + - pip install --user PyYaml -q + - pip install --user beautifulsoup4 -q +before_script: + - chmod +x ./install-byond.sh + - ./install-byond.sh script: - shopt -s globstar - (! grep 'step_[xy]' _maps/map_files/**/*.dmm) + - md5sum -c - <<< "6dc1b6bf583f3bd4176b6df494caa5f1 *html/changelogs/example.yml" + - python tools/ss13_genchangelog.py html/changelog.html html/changelogs + - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup - bash dm.sh -M${DM_MAPFILE} paradise.dme diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index f9336c1cd1b..facf096b610 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -49,6 +49,11 @@ if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime M.mind.antag_hud_icon_state = new_icon_state +/datum/atom_hud/antag/proc/is_solo_antag(mob/M) + if(M.mind.special_role == "traitor" || M.mind.special_role == "vampire" || M.mind.special_role == "Changeling") + return 1 + return 0 + //MIND PROCS //these are called by mind.transfer_to() @@ -56,7 +61,10 @@ leave_all_huds() ticker.mode.set_antag_hud(current, antag_hud_icon_state) if(newhud) - newhud.join_hud(current) + if(newhud.is_solo_antag(current)) + newhud.join_solo_hud(current) + else + newhud.join_hud(current) /datum/mind/proc/leave_all_huds() for(var/datum/atom_hud/antag/hud in huds) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 73a9e6ebc7e..fa10ce2daf8 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -172,7 +172,7 @@ return /obj/item/weapon/weldingtool/examine(mob/user) - if(!..(user, 0)) + if(..(user, 0)) user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." /obj/item/weapon/weldingtool/suicide_act(mob/user) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index c4df2390160..983eaf696f0 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -32,6 +32,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 AIStatus = AI_OFF + var/summoned = FALSE var/animated_manifest = FALSE var/cooldown = 0 var/damage_transfer = 1 //how much damage from each attack we transfer to the owner @@ -59,6 +60,10 @@ src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]" visible_message("The [src] jumps back to its user.") Recall() + if(summoned && !summoner) + src << "You somehow lack a summoner! As a result, you dispel!" + ghostize() + qdel() /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range ..() @@ -679,6 +684,7 @@ var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user) G.summoner = user + G.summoned = TRUE G.key = key G << "You are a [mob_name] bound to serve [user.real_name]." G << "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there." diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 57a49b079f8..c2adcc783e3 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -622,7 +622,7 @@ datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume) var/turf/T = get_turf(holder.my_atom) for(var/mob/living/carbon/C in view(6, T)) C.Beam(T,icon_state="lightning[rand(1,12)]",icon='icons/effects/effects.dmi',time=5) //What? Why are we beaming from the mob to the turf? Turf to mob generates really odd results. - C.electrocute_act(1, "electrical blast") + C.electrocute_act(3.5, "electrical blast") holder.del_reagent("teslium") //Clear all remaining Teslium and Uranium, but leave all other reagents untouched. holder.del_reagent("uranium") return diff --git a/html/88x31.png b/html/88x31.png new file mode 100644 index 00000000000..0f2a0f10722 Binary files /dev/null and b/html/88x31.png differ diff --git a/html/bug-minus.png b/html/bug-minus.png new file mode 100644 index 00000000000..9934db406b1 Binary files /dev/null and b/html/bug-minus.png differ diff --git a/html/burn-exclamation.png b/html/burn-exclamation.png new file mode 100644 index 00000000000..b2a4f670a86 Binary files /dev/null and b/html/burn-exclamation.png differ diff --git a/html/changelog.css b/html/changelog.css new file mode 100644 index 00000000000..a287f98c577 --- /dev/null +++ b/html/changelog.css @@ -0,0 +1,35 @@ +.top{font-family:Tahoma,sans-serif;font-size:12px;} +h2{font-family:Tahoma,sans-serif;} +a img {border:none;} +.bgimages16 li { + padding:2px 10px 2px 30px; + background-position:6px center; + background-repeat:no-repeat; + border:1px solid #ddd; + border-left:4px solid #999; + margin-bottom:2px; +} +.bugfix {background-image:url(bug-minus.png)} +.wip {background-image:url(hard-hat-exclamation.png)} +.tweak {background-image:url(wrench-screwdriver.png)} +.soundadd {background-image:url(music-plus.png)} +.sounddel {background-image:url(music-minus.png)} +.rscdel {background-image:url(cross-circle.png)} +.rscadd {background-image:url(tick-circle.png)} +.imageadd {background-image:url(image-plus.png)} +.imagedel {background-image:url(image-minus.png)} +.spellcheck {background-image:url(spell-check.png)} +.experiment {background-image:url(burn-exclamation.png)} +.sansserif {font-family:Tahoma,sans-serif;font-size:12px;} +.commit {margin-bottom:20px;font-size:100%;font-weight:normal;} +.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;} +.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;} +.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;} +.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;} +.hidden {display:none;} +.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;} +.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;} +.indrop img {margin-right:5px;vertical-align:middle;} +.closed {background:url(chevron-expand.png) right center no-repeat;} +.open {background:url(chevron.png) right center no-repeat;} +.lic {font-size:9px;} \ No newline at end of file diff --git a/html/changelog.html b/html/changelog.html new file mode 100644 index 00000000000..4869aec91da --- /dev/null +++ b/html/changelog.html @@ -0,0 +1,75 @@ + + + + Paradise Station Changelog + + + + + + + +
+ + + + +
+
Paradise Station
+ +

+ Visit our IRC channel: #crew on neko.sneeza.me +
+ + + + + +
+ Current Project Maintainers: -Click Here-
 + Currently Active GitHub contributor list: -Click Here-
 + Coders: ZomgPonies, DaveTheHeadcrab, tigercat2000, FalseIncarnate, AuroraBlade, Tastyfish, Crazylemon64, KasparoVy
 + Spriters: FullOfSkittles
 + Sounds:
+ Main Testers: Anyone who has submitted a bug to the issue tracker
 + Thanks to: Baystation 12, /tg/station, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original SpaceStation developers and Radithor for the title image.
Also a thanks to anybody who has contributed who is not listed here :( Ask to be added here on irc. +
Have a bug to report? Visit our Issue Tracker.
 + Please ensure that the bug has not already been reported and be as descriptive as possible about the circumstances under which the bug occurred. +
+ + +
+

03 January 2016

+

TheDZD updated:

+
    +
  • Ports over changelog system from /tg/station.
    • +
+
+ +GoonStation 13 Development Team +
+ Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion
+ Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No
+
+
+

Creative Commons License
Except where otherwise noted, Goon Station 13 is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
Rights are currently extended to SomethingAwful Goons only.

+

Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License.

+
+ + diff --git a/html/changelog.js b/html/changelog.js new file mode 100644 index 00000000000..4146d0f094e --- /dev/null +++ b/html/changelog.js @@ -0,0 +1,87 @@ +/* +function dropdowns() { + var divs = document.getElementsByTagName('div'); + var headers = new Array(); + var links = new Array(); + for(var i=0;i=0) { + elem.className = elem.className.replace('visible','hidden'); + this.className = this.className.replace('open','closed'); + } + else { + elem.className = elem.className.replace('hidden','visible'); + this.className = this.className.replace('closed','open'); + } + return false; + } + })(links[i]); + } + } +} +*/ +/* +function filterchanges(type){ + var lists = document.getElementsByTagName('ul'); + for(var i in lists){ + if(lists[i].className && lists[i].className.search('changes')>=0) { + for(var j in lists[i].childNodes){ + if(lists[i].childNodes[j].nodeType == 1){ + if(!type){ + lists[i].childNodes[j].style.display = 'block'; + } + else if(lists[i].childNodes[j].className!=type) { + lists[i].childNodes[j].style.display = 'none'; + } + else { + lists[i].childNodes[j].style.display = 'block'; + } + } + } + } + } +} +*/ +function dropdowns() { + var drops = $('div.drop'); + var indrops = $('div.indrop'); + if(drops.length!=indrops.length){ + alert("Some coder fucked up with dropdowns"); + } + drops.each(function(index){ + $(this).toggleClass('closed'); + $(indrops[index]).hide(); + $(this).click(function(){ + $(this).toggleClass('closed'); + $(this).toggleClass('open'); + $(indrops[index]).toggle(); + }); + }); +} + +function filterchanges(type){ + $('ul.changes li').each(function(){ + if(!type || $(this).hasClass(type)){ + $(this).show(); + } + else { + $(this).hide(); + } + }); +} + +$(document).ready(function(){ + dropdowns(); +}); \ No newline at end of file diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml new file mode 100644 index 00000000000..94a90aa89b0 --- /dev/null +++ b/html/changelogs/.all_changelog.yml @@ -0,0 +1,5 @@ +DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. +--- +2016-01-03: + TheDZD: + - rscadd: Ports over changelog system from /tg/station. diff --git a/html/changelogs/__CHANGELOG_README.txt b/html/changelogs/__CHANGELOG_README.txt new file mode 100644 index 00000000000..8f610ee9acf --- /dev/null +++ b/html/changelogs/__CHANGELOG_README.txt @@ -0,0 +1,19 @@ +Changelogs are included with commits as text .yml files created individually by the committer. If you want to create a changelog entry you create a .yml file in the /changelogs directory; nothing else needs to be touched unless you are a maintainer. + +####################################################### + +TO MAKE A CHANGELOG .YML ENTRRY + +1. Make a copy of the file example.yml in html/changelogs and rename it to [YOUR USERNAME]-PR-[YOUR PR NUMBER].yml (the pr and pr number are organizational and can be ignored if you so wish) + +2. Change the author to yourself + +3. Replace the changes text with a description of the changes in your PR, keep the double quotes to avoid errors (your changelog can be written ICly or OOCly, it doesn't matter) + +4. (Optional) set the change prefix (rscadd) to a different one listed above in example.yml (this affects what icon is used for your changelog entry) + +5. When commiting make sure your .yml file is included in the commit (it will usually be unticked as an unversioned file) + +####################################################### + +If you have trouble ask for help in #codertrain on the Paradise Station IRC. diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml new file mode 100644 index 00000000000..cc7fab8225e --- /dev/null +++ b/html/changelogs/example.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: " + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." + - rscdel: "Killed innocent kittens." diff --git a/html/chevron-expand.png b/html/chevron-expand.png new file mode 100644 index 00000000000..f770e33d8ea Binary files /dev/null and b/html/chevron-expand.png differ diff --git a/html/chevron.png b/html/chevron.png new file mode 100644 index 00000000000..b83135b6908 Binary files /dev/null and b/html/chevron.png differ diff --git a/html/cross-circle.png b/html/cross-circle.png new file mode 100644 index 00000000000..e6f2d3228b8 Binary files /dev/null and b/html/cross-circle.png differ diff --git a/html/hard-hat-exclamation.png b/html/hard-hat-exclamation.png new file mode 100644 index 00000000000..e22eb61b8fe Binary files /dev/null and b/html/hard-hat-exclamation.png differ diff --git a/html/image-minus.png b/html/image-minus.png new file mode 100644 index 00000000000..b2bac2c45ab Binary files /dev/null and b/html/image-minus.png differ diff --git a/html/image-plus.png b/html/image-plus.png new file mode 100644 index 00000000000..308c1ae0a28 Binary files /dev/null and b/html/image-plus.png differ diff --git a/html/music-minus.png b/html/music-minus.png new file mode 100644 index 00000000000..1b9478f43e7 Binary files /dev/null and b/html/music-minus.png differ diff --git a/html/music-plus.png b/html/music-plus.png new file mode 100644 index 00000000000..ea7f36c6ba3 Binary files /dev/null and b/html/music-plus.png differ diff --git a/html/spell-check.png b/html/spell-check.png new file mode 100644 index 00000000000..70b066d12ae Binary files /dev/null and b/html/spell-check.png differ diff --git a/html/templates/footer.html b/html/templates/footer.html new file mode 100644 index 00000000000..5d98f73b159 --- /dev/null +++ b/html/templates/footer.html @@ -0,0 +1,13 @@ + + +GoonStation 13 Development Team +
+ Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion
+ Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No
+
+
+

Creative Commons License
Except where otherwise noted, Goon Station 13 is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
Rights are currently extended to SomethingAwful Goons only.

+

Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License.

+ + + diff --git a/html/templates/header.html b/html/templates/header.html new file mode 100644 index 00000000000..bcd9595f02b --- /dev/null +++ b/html/templates/header.html @@ -0,0 +1,57 @@ + + + + Paradise Station Changelog + + + + + + + +
+ + + + +
+
Paradise Station
+ +

+ Visit our IRC channel: #crew on neko.sneeza.me +
+ + + + + +
+ Current Project Maintainers: -Click Here-
 + Currently Active GitHub contributor list: -Click Here-
 + Coders: ZomgPonies, DaveTheHeadcrab, tigercat2000, FalseIncarnate, AuroraBlade, Tastyfish, Crazylemon64, KasparoVy
 + Spriters: FullOfSkittles
 + Sounds:
+ Main Testers: Anyone who has submitted a bug to the issue tracker
 + Thanks to: Baystation 12, /tg/station, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original SpaceStation developers and Radithor for the title image.
Also a thanks to anybody who has contributed who is not listed here :( Ask to be added here on irc. +
Have a bug to report? Visit our Issue Tracker.
 + Please ensure that the bug has not already been reported and be as descriptive as possible about the circumstances under which the bug occurred. +
+ + +
\ No newline at end of file diff --git a/html/tick-circle.png b/html/tick-circle.png new file mode 100644 index 00000000000..bcc4dc24b20 Binary files /dev/null and b/html/tick-circle.png differ diff --git a/html/wrench-screwdriver.png b/html/wrench-screwdriver.png new file mode 100644 index 00000000000..1a59de688d5 Binary files /dev/null and b/html/wrench-screwdriver.png differ diff --git a/install-byond.sh b/install-byond.sh new file mode 100644 index 00000000000..cca44342c60 --- /dev/null +++ b/install-byond.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +if [ -d "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin" ]; +then + echo "Using cached directory." +else + echo "Setting up BYOND." + mkdir -p "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}" + cd "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}" + curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip + unzip byond.zip + cd byond + make here +fi diff --git a/interface/interface.dm b/interface/interface.dm index bb7b26663ff..44f74a20e59 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -15,16 +15,29 @@ /client/verb/changes() set name = "Changelog" - set desc = "Visit our repository to check out the changes." + set desc = "View the changelog." set hidden = 1 - - if(config.repositoryurl) - if(alert("This will open the changelog in your browser. Are you sure?",,"Yes","No")=="No") - return - src << link("[config.repositoryurl]/pulls?q=is%3Apr+is%3Aclosed") - else - src << "The Repository URL is not set in the server configuration." - return + + getFiles( + 'html/88x31.png', + 'html/bug-minus.png', + 'html/cross-circle.png', + 'html/hard-hat-exclamation.png', + 'html/image-minus.png', + 'html/image-plus.png', + 'html/music-minus.png', + 'html/music-plus.png', + 'html/tick-circle.png', + 'html/wrench-screwdriver.png', + 'html/spell-check.png', + 'html/burn-exclamation.png', + 'html/chevron.png', + 'html/chevron-expand.png', + 'html/changelog.css', + 'html/changelog.js', + 'html/changelog.html' + ) + src << browse('html/changelog.html', "window=changes;size=675x650") /client/verb/forum() set name = "forum" @@ -79,7 +92,7 @@ Admin: if(check_rights(R_MOD|R_ADMIN,0)) src << adminhotkeys - + /mob/proc/hotkey_help() var/hotkey_mode = {" Hotkey-Mode: (hotkey-mode must be on) diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php new file mode 100644 index 00000000000..26a08418d69 --- /dev/null +++ b/tools/github_webhook_processor.php @@ -0,0 +1,345 @@ +getLine()}: " . htmlSpecialChars($e->getMessage()); + die(); +}); +$rawPost = NULL; +if ($hookSecret !== NULL) { + if (!isset($_SERVER['HTTP_X_HUB_SIGNATURE'])) { + throw new \Exception("HTTP header 'X-Hub-Signature' is missing."); + } elseif (!extension_loaded('hash')) { + throw new \Exception("Missing 'hash' extension to check the secret code validity."); + } + list($algo, $hash) = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + array('', ''); + if (!in_array($algo, hash_algos(), TRUE)) { + throw new \Exception("Hash algorithm '$algo' is not supported."); + } + $rawPost = file_get_contents('php://input'); + if ($hash !== hash_hmac($algo, $rawPost, $hookSecret)) { + throw new \Exception('Hook secret does not match.'); + } +} +if (!isset($_SERVER['HTTP_CONTENT_TYPE'])) { + throw new \Exception("Missing HTTP 'Content-Type' header."); +} elseif (!isset($_SERVER['HTTP_X_GITHUB_EVENT'])) { + throw new \Exception("Missing HTTP 'X-Github-Event' header."); +} +switch ($_SERVER['HTTP_CONTENT_TYPE']) { + case 'application/json': + $json = $rawPost ?: file_get_contents('php://input'); + break; + case 'application/x-www-form-urlencoded': + $json = $_POST['payload']; + break; + default: + throw new \Exception("Unsupported content type: $_SERVER[HTTP_CONTENT_TYPE]"); +} +# Payload structure depends on triggered event +# https://developer.github.com/v3/activity/events/types/ +$payload = json_decode($json, true); + +switch (strtolower($_SERVER['HTTP_X_GITHUB_EVENT'])) { + case 'ping': + echo 'pong'; + break; + case 'pull_request': + handle_pr($payload); + break; + default: + header('HTTP/1.0 404 Not Found'); + echo "Event:$_SERVER[HTTP_X_GITHUB_EVENT] Payload:\n"; + print_r($payload); # For debug only. Can be found in GitHub hook log. + die(); +} +function handle_pr($payload) { + $action = 'opened'; + switch ($payload["action"]) { + case 'opened': + case 'reopened': + $action = $payload['action']; + break; + case 'closed': + if (!$payload['pull_request']['merged']) { + $action = 'closed'; + } + else { + $action = 'merged'; + checkchangelog($payload, true); + } + break; + default: + return; + } + + if (strtolower(substr($payload['pull_request']['title'], 0, 3)) == '[s]') { + echo "PR Announcement Halted; Secret tag detected.\n"; + return; + } + + $msg = 'Pull Request '.$action.' by '.htmlSpecialChars($payload['sender']['login']).': '.htmlSpecialChars('#'.$payload['pull_request']['number'].' '.$payload['pull_request']['user']['login'].' - '.$payload['pull_request']['title']).''; + sendtoallservers('?announce='.urlencode($msg)); + +} + +function checkchangelog($payload, $merge = false) { + global $apiKey; + if (!$merge) + return; + if (!isset($payload['pull_request']) || !isset($payload['pull_request']['body'])) { + return; + } + if (!isset($payload['pull_request']['user']) || !isset($payload['pull_request']['user']['login'])) { + return; + } + $body = $payload['pull_request']['body']; + $body = str_replace("\r\n", "\n", $body); + $body = explode("\n", $body); + $username = $payload['pull_request']['user']['login']; + $incltag = false; + $changelogbody = array(); + $currentchangelogblock = array(); + $foundcltag = false; + foreach ($body as $line) { + $line = trim($line); + if (substr($line,0,4) == ':cl:') { + $incltag = true; + $foundcltag = true; + $pos = strpos($line, " "); + if ($pos) + $username = substr($line, $pos+1); + continue; + } else if (substr($line,0,5) == '/:cl:' || substr($line,0,6) == '/ :cl:' || substr($line,0,5) == ':/cl:') { + $incltag = false; + $changelogbody = array_merge($changelogbody, $currentchangelogblock); + continue; + } + if (!$incltag) + continue; + + $firstword = explode(' ', $line)[0]; + $pos = strpos($line, " "); + $item = ''; + if ($pos) { + $firstword = trim(substr($line, 0, $pos)); + $item = trim(substr($line, $pos+1)); + } else { + $firstword = $line; + } + + if (!strlen($firstword)) { + $currentchangelogblock[count($currentchangelogblock)-1]['body'] .= "\n"; + continue; + } + //not a prefix line. + //so we add it to the last changelog entry as a separate line + if (!strlen($firstword) || $firstword[strlen($firstword)-1] != ':') { + if (count($currentchangelogblock) <= 0) + continue; + $currentchangelogblock[count($currentchangelogblock)-1]['body'] .= "\n".$line; + continue; + } + $cltype = strtolower(substr($firstword, 0, -1)); + switch ($cltype) { + case 'fix': + case 'fixes': + case 'bugfix': + $currentchangelogblock[] = array('type' => 'bugfix', 'body' => $item); + break; + case 'wip': + $currentchangelogblock[] = array('type' => 'wip', 'body' => $item); + break; + case 'rsctweak': + case 'tweaks': + case 'tweak': + $currentchangelogblock[] = array('type' => 'tweak', 'body' => $item); + break; + case 'soundadd': + $currentchangelogblock[] = array('type' => 'soundadd', 'body' => $item); + break; + case 'sounddel': + $currentchangelogblock[] = array('type' => 'sounddel', 'body' => $item); + break; + case 'add': + case 'adds': + case 'rscadd': + $currentchangelogblock[] = array('type' => 'rscadd', 'body' => $item); + break; + case 'del': + case 'dels': + case 'rscdel': + $currentchangelogblock[] = array('type' => 'rscdel', 'body' => $item); + break; + case 'imageadd': + $currentchangelogblock[] = array('type' => 'imageadd', 'body' => $item); + break; + case 'imagedel': + $currentchangelogblock[] = array('type' => 'imagedel', 'body' => $item); + break; + case 'typo': + case 'spellcheck': + $currentchangelogblock[] = array('type' => 'spellcheck', 'body' => $item); + break; + case 'experimental': + case 'experiment': + $currentchangelogblock[] = array('type' => 'experiment', 'body' => $item); + break; + case 'tgs': + $currentchangelogblock[] = array('type' => 'tgs', 'body' => $item); + break; + default: + //we add it to the last changelog entry as a separate line + if (count($currentchangelogblock) > 0) + $currentchangelogblock[count($currentchangelogblock)-1]['body'] .= "\n".$line; + break; + } + } + + if (!count($changelogbody)) + return; + + $file = 'author: '.$username."\n"; + $file .= "delete-after: True\n"; + $file .= "changes: \n"; + foreach ($changelogbody as $changelogitem) { + $type = $changelogitem['type']; + $body = trim(str_replace(array("\\", '"'), array("\\\\", "\\\""), $changelogitem['body'])); + $file .= ' - '.$type.': "'.$body.'"'; + $file .= "\n"; + } + $content = array ( + 'message' => 'Automatic changelog generation for PR #'.$payload['pull_request']['number'], + 'content' => base64_encode($file) + ); + $scontext = array('http' => array( + 'method' => 'PUT', + 'header' => + "Content-type: application/json\r\n". + 'Authorization: token ' . $apiKey, + 'content' => json_encode($content), + 'ignore_errors' => true, + 'user_agent' => 'tgstation13.org-Github-Automation-Tools' + )); + $filename = '/html/changelogs/AutoChangeLog-pr-'.$payload['pull_request']['number'].'.yml'; + echo file_get_contents($payload['pull_request']['base']['repo']['url'].'/contents'.$filename, false, stream_context_create($scontext)); +} + +function sendtoallservers($str) { + global $servers; + foreach ($servers as $serverid => $server) { + if (isset($server['comskey'])) + $rtn = export($server['address'], $server['port'], $str.'&key='.$server['comskey']); + else + $rtn = export($server['address'], $server['port'], $str); + + echo "Server Number $serverid replied: $rtn\n"; + } +} + + + +function export($addr, $port, $str) { + global $error; + // All queries must begin with a question mark (ie "?players") + if($str{0} != '?') $str = ('?' . $str); + + /* --- Prepare a packet to send to the server (based on a reverse-engineered packet structure) --- */ + $query = "\x00\x83" . pack('n', strlen($str) + 6) . "\x00\x00\x00\x00\x00" . $str . "\x00"; + + /* --- Create a socket and connect it to the server --- */ + $server = socket_create(AF_INET,SOCK_STREAM,SOL_TCP) or exit("ERROR"); + socket_set_option($server, SOL_SOCKET, SO_SNDTIMEO, array('sec' => 2, 'usec' => 0)); //sets connect and send timeout to 2 seconds + if(!socket_connect($server,$addr,$port)) { + $error = true; + return "ERROR"; + } + + + /* --- Send bytes to the server. Loop until all bytes have been sent --- */ + $bytestosend = strlen($query); + $bytessent = 0; + while ($bytessent < $bytestosend) { + //echo $bytessent.'
'; + $result = socket_write($server,substr($query,$bytessent),$bytestosend-$bytessent); + //echo 'Sent '.$result.' bytes
'; + if ($result===FALSE) die(socket_strerror(socket_last_error())); + $bytessent += $result; + } + + /* --- Idle for a while until recieved bytes from game server --- */ + $result = socket_read($server, 10000, PHP_BINARY_READ); + socket_close($server); // we don't need this anymore + + if($result != "") { + if($result{0} == "\x00" || $result{1} == "\x83") { // make sure it's the right packet format + + // Actually begin reading the output: + $sizebytes = unpack('n', $result{2} . $result{3}); // array size of the type identifier and content + $size = $sizebytes[1] - 1; // size of the string/floating-point (minus the size of the identifier byte) + + if($result{4} == "\x2a") { // 4-byte big-endian floating-point + $unpackint = unpack('f', $result{5} . $result{6} . $result{7} . $result{8}); // 4 possible bytes: add them up together, unpack them as a floating-point + return $unpackint[1]; + } + else if($result{4} == "\x06") { // ASCII string + $unpackstr = ""; // result string + $index = 5; // string index + + while($size > 0) { // loop through the entire ASCII string + $size--; + $unpackstr .= $result{$index}; // add the string position to return string + $index++; + } + return $unpackstr; + } + } + } + //if we get to this point, something went wrong; + $error = true; + return "ERROR"; +} +?> diff --git a/tools/makeChangelog.bat b/tools/makeChangelog.bat new file mode 100644 index 00000000000..f0646caeca0 --- /dev/null +++ b/tools/makeChangelog.bat @@ -0,0 +1,4 @@ +@echo off +rem Cheridan asked for this. - N3X +call python ss13_genchangelog.py ../html/changelog.html ../html/changelogs +pause \ No newline at end of file diff --git a/tools/ss13_genchangelog.py b/tools/ss13_genchangelog.py new file mode 100644 index 00000000000..ed76aa9c6c6 --- /dev/null +++ b/tools/ss13_genchangelog.py @@ -0,0 +1,210 @@ +''' +Usage: + $ python ss13_genchangelog.py [--dry-run] html/changelog.html html/changelogs/ + +ss13_genchangelog.py - Generate changelog from YAML. + +Copyright 2013 Rob "N3X15" Nelson + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +''' + +from __future__ import print_function +import yaml, os, glob, sys, re, time, argparse +from datetime import datetime, date +from time import time + +today = date.today() + +dateformat = "%d %B %Y" + +opt = argparse.ArgumentParser() +opt.add_argument('-d', '--dry-run', dest='dryRun', default=False, action='store_true', help='Only parse changelogs and, if needed, the targetFile. (A .dry_changelog.yml will be output for debugging purposes.)') +opt.add_argument('targetFile', help='The HTML changelog we wish to update.') +opt.add_argument('ymlDir', help='The directory of YAML changelogs we will use.') + +args = opt.parse_args() + +all_changelog_entries = {} + +validPrefixes = [ + 'bugfix', + 'wip', + 'tweak', + 'soundadd', + 'sounddel', + 'rscdel', + 'rscadd', + 'imageadd', + 'imagedel', + 'spellcheck', + 'experiment', + 'tgs' +] + +def dictToTuples(inp): + return [(k, v) for k, v in inp.items()] + +changelog_cache = os.path.join(args.ymlDir, '.all_changelog.yml') + +failed_cache_read = True +if os.path.isfile(changelog_cache): + try: + with open(changelog_cache) as f: + (_, all_changelog_entries) = yaml.load_all(f) + failed_cache_read = False + + # Convert old timestamps to newer format. + new_entries = {} + for _date in all_changelog_entries.keys(): + ty = type(_date).__name__ + # print(ty) + if ty in ['str', 'unicode']: + temp_data = all_changelog_entries[_date] + _date = datetime.strptime(_date, dateformat).date() + new_entries[_date] = temp_data + else: + new_entries[_date] = all_changelog_entries[_date] + all_changelog_entries = new_entries + except Exception as e: + print("Failed to read cache:") + print(e, file=sys.stderr) + +if args.dryRun: + changelog_cache = os.path.join(args.ymlDir, '.dry_changelog.yml') + +if failed_cache_read and os.path.isfile(args.targetFile): + from bs4 import BeautifulSoup + from bs4.element import NavigableString + print(' Generating cache...') + with open(args.targetFile, 'r') as f: + soup = BeautifulSoup(f) + for e in soup.find_all('div', {'class':'commit'}): + entry = {} + date = datetime.strptime(e.h2.string.strip(), dateformat).date() # key + for authorT in e.find_all('h3', {'class':'author'}): + author = authorT.string + # Strip suffix + if author.endswith('updated:'): + author = author[:-8] + author = author.strip() + + # Find
    + ulT = authorT.next_sibling + while(ulT.name != 'ul'): + ulT = ulT.next_sibling + changes = [] + + for changeT in ulT.children: + if changeT.name != 'li': continue + val = changeT.decode_contents(formatter="html") + newdat = {changeT['class'][0] + '': val + ''} + if newdat not in changes: + changes += [newdat] + + if len(changes) > 0: + entry[author] = changes + if date in all_changelog_entries: + all_changelog_entries[date].update(entry) + else: + all_changelog_entries[date] = entry + +del_after = [] +print('Reading changelogs...') +for fileName in glob.glob(os.path.join(args.ymlDir, "*.yml")): + name, ext = os.path.splitext(os.path.basename(fileName)) + if name.startswith('.'): continue + if name == 'example': continue + fileName = os.path.abspath(fileName) + print(' Reading {}...'.format(fileName)) + cl = {} + with open(fileName, 'r') as f: + cl = yaml.load(f) + f.close() + if today not in all_changelog_entries: + all_changelog_entries[today] = {} + author_entries = all_changelog_entries[today].get(cl['author'], []) + if len(cl['changes']): + new = 0 + for change in cl['changes']: + if change not in author_entries: + (change_type, _) = dictToTuples(change)[0] + if change_type not in validPrefixes: + print(' {0}: Invalid prefix {1}'.format(fileName, change_type), file=sys.stderr) + author_entries += [change] + new += 1 + all_changelog_entries[today][cl['author']] = author_entries + if new > 0: + print(' Added {0} new changelog entries.'.format(new)) + + if cl.get('delete-after', False): + if os.path.isfile(fileName): + if args.dryRun: + print(' Would delete {0} (delete-after set)...'.format(fileName)) + else: + del_after += [fileName] + + if args.dryRun: continue + + cl['changes'] = [] + with open(fileName, 'w') as f: + yaml.dump(cl, f, default_flow_style=False) + +targetDir = os.path.dirname(args.targetFile) + +with open(args.targetFile.replace('.htm', '.dry.htm') if args.dryRun else args.targetFile, 'w') as changelog: + with open(os.path.join(targetDir, 'templates', 'header.html'), 'r') as h: + for line in h: + changelog.write(line) + + for _date in reversed(sorted(all_changelog_entries.keys())): + entry_htm = '\n' + entry_htm += '\t\t\t

    {date}

    \n'.format(date=_date.strftime(dateformat)) + write_entry = False + for author in sorted(all_changelog_entries[_date].keys()): + if len(all_changelog_entries[_date]) == 0: continue + author_htm = '\t\t\t

    {author} updated:

    \n'.format(author=author) + author_htm += '\t\t\t
      \n' + changes_added = [] + for (css_class, change) in (dictToTuples(e)[0] for e in all_changelog_entries[_date][author]): + if change in changes_added: continue + write_entry = True + changes_added += [change] + author_htm += '\t\t\t\t
    • {change}
      • \n'.format(css_class=css_class, change=change.strip()) + author_htm += '\t\t\t
    \n' + if len(changes_added) > 0: + entry_htm += author_htm + if write_entry: + changelog.write(entry_htm) + + with open(os.path.join(targetDir, 'templates', 'footer.html'), 'r') as h: + for line in h: + changelog.write(line) + + +with open(changelog_cache, 'w') as f: + cache_head = 'DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.' + yaml.dump_all([cache_head, all_changelog_entries], f, default_flow_style=False) + +if len(del_after): + print('Cleaning up...') + for fileName in del_after: + if os.path.isfile(fileName): + print(' Deleting {0} (delete-after set)...'.format(fileName)) + os.remove(fileName)