From 5047c85ced4befbd4fb6468c76d335a9da96079d Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Wed, 18 Jul 2012 08:25:07 -0500 Subject: brew-test-bot: move html and css into subdirectory Also updates the bash-completion to ignore subdirectories, rather than specific filename patterns.--- Library/Contributions/brew_bash_completion.sh | 4 +- .../cmds/brew-test-bot.commit.html.erb | 24 ------- Library/Contributions/cmds/brew-test-bot.css | 75 ---------------------- .../cmds/brew-test-bot.index.html.erb | 23 ------- Library/Contributions/cmds/brew-test-bot.rb | 2 +- .../brew-test-bot/brew-test-bot.commit.html.erb | 24 +++++++ .../cmds/brew-test-bot/brew-test-bot.css | 75 ++++++++++++++++++++++ .../brew-test-bot/brew-test-bot.index.html.erb | 23 +++++++ 8 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 Library/Contributions/cmds/brew-test-bot.commit.html.erb delete mode 100644 Library/Contributions/cmds/brew-test-bot.css delete mode 100644 Library/Contributions/cmds/brew-test-bot.index.html.erb create mode 100644 Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb create mode 100644 Library/Contributions/cmds/brew-test-bot/brew-test-bot.css create mode 100644 Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb (limited to 'Library') diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh index 435116540..089872a15 100644 --- a/Library/Contributions/brew_bash_completion.sh +++ b/Library/Contributions/brew_bash_completion.sh @@ -375,9 +375,9 @@ _brew () done if [[ $i -eq $COMP_CWORD ]]; then - local ext=$(\ls $(brew --repository)/Library/Contributions/cmds \ + local ext=$(\ls -p $(brew --repository)/Library/Contributions/cmds \ 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \ - -e "s/.*\.css.*//g" -e "s/.*\.erb.*//g") + -e "s/.*\///g") __brewcomp " --cache --cellar --config --env --prefix --repository diff --git a/Library/Contributions/cmds/brew-test-bot.commit.html.erb b/Library/Contributions/cmds/brew-test-bot.commit.html.erb deleted file mode 100644 index c820263a7..000000000 --- a/Library/Contributions/cmds/brew-test-bot.commit.html.erb +++ /dev/null @@ -1,24 +0,0 @@ - - - - BrewBot: <%= @test.name %> - BrewBot - - - -

BrewBot

<%= @test.name %> <%= DateTime.now.strftime "%T %D" %>

- - <% for step in @test.steps %> - - - - - <% end %> -

$ <%= step.command %>

<%= step.status_upcase %>

- - diff --git a/Library/Contributions/cmds/brew-test-bot.css b/Library/Contributions/cmds/brew-test-bot.css deleted file mode 100644 index 3fcefa59a..000000000 --- a/Library/Contributions/cmds/brew-test-bot.css +++ /dev/null @@ -1,75 +0,0 @@ -body { - background: #27221a; - color: #f6e6cc; - font-family: Helvetica, Arial, sans-serif; - font-size: 1.5em; -} - -h1, h2 { - text-align: center; - font-weight: bold; -} - -h1 { - font-size: 3em; - padding-top: 0.5em; - padding-bottom: 0; - margin-bottom: 0; - text-shadow: 1px 1px 10px rgba(0,0,0,0.25); - color: #D7AF72; - letter-spacing: -3px; -} - -h2 { - font-size: 0.8em; - margin-top: 0; - padding-top: 0; - padding-bottom: 1em; - color: #A1804C; -} - -h1 a:link, h1 a:visited, h2 a:link, h2 a:visited { - text-decoration: none; -} - -table { - background-color: rgba(0, 0, 0, 0.30); - color: white; - border-radius: 0.4em; - padding-top: 1em; - padding-bottom: 1em; - font-size: inherit; - font-family: monospace; - list-style-type: none; - margin-left: auto; - margin-right: auto; -} - -td { - padding-left: 1em; - padding-right: 1em; -} - -.prompt { - color: #E3D796; -} - -.status { - text-align: right; -} - -.running a:link, .running a:visited { - color: orange; -} - -.passed a:link, .passed a:visited { - color: green; -} - -.failed a:link, .failed a:visited { - color: red; -} - -a:active, a:visited { - color: inherit; -} diff --git a/Library/Contributions/cmds/brew-test-bot.index.html.erb b/Library/Contributions/cmds/brew-test-bot.index.html.erb deleted file mode 100644 index d5c5d6913..000000000 --- a/Library/Contributions/cmds/brew-test-bot.index.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - BrewBot - - - -

BrewBot

- - <% dirs.each_with_index do |dir,index| %> - - - - - - <% end %> -

<%= dir %>

<%= dates[index] %>

<%= statuses[index].upcase %>

- - diff --git a/Library/Contributions/cmds/brew-test-bot.rb b/Library/Contributions/cmds/brew-test-bot.rb index f927333f8..dab91805a 100755 --- a/Library/Contributions/cmds/brew-test-bot.rb +++ b/Library/Contributions/cmds/brew-test-bot.rb @@ -108,7 +108,7 @@ class Test if ARGV.include? "--html" and not @@css require 'erb' - root = HOMEBREW_CONTRIBUTED_CMDS + root = HOMEBREW_CONTRIBUTED_CMDS/"brew-test-bot" @@css = IO.read root + "brew-test-bot.css" @@index_html = ERB.new IO.read root + "brew-test-bot.index.html.erb" @@commit_html = ERB.new IO.read root + "brew-test-bot.commit.html.erb" diff --git a/Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb new file mode 100644 index 000000000..c820263a7 --- /dev/null +++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb @@ -0,0 +1,24 @@ + + + + BrewBot: <%= @test.name %> + BrewBot + + + +

BrewBot

<%= @test.name %> <%= DateTime.now.strftime "%T %D" %>

+ + <% for step in @test.steps %> + + + + + <% end %> +

$ <%= step.command %>

<%= step.status_upcase %>

+ + diff --git a/Library/Contributions/cmds/brew-test-bot/brew-test-bot.css b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.css new file mode 100644 index 000000000..3fcefa59a --- /dev/null +++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.css @@ -0,0 +1,75 @@ +body { + background: #27221a; + color: #f6e6cc; + font-family: Helvetica, Arial, sans-serif; + font-size: 1.5em; +} + +h1, h2 { + text-align: center; + font-weight: bold; +} + +h1 { + font-size: 3em; + padding-top: 0.5em; + padding-bottom: 0; + margin-bottom: 0; + text-shadow: 1px 1px 10px rgba(0,0,0,0.25); + color: #D7AF72; + letter-spacing: -3px; +} + +h2 { + font-size: 0.8em; + margin-top: 0; + padding-top: 0; + padding-bottom: 1em; + color: #A1804C; +} + +h1 a:link, h1 a:visited, h2 a:link, h2 a:visited { + text-decoration: none; +} + +table { + background-color: rgba(0, 0, 0, 0.30); + color: white; + border-radius: 0.4em; + padding-top: 1em; + padding-bottom: 1em; + font-size: inherit; + font-family: monospace; + list-style-type: none; + margin-left: auto; + margin-right: auto; +} + +td { + padding-left: 1em; + padding-right: 1em; +} + +.prompt { + color: #E3D796; +} + +.status { + text-align: right; +} + +.running a:link, .running a:visited { + color: orange; +} + +.passed a:link, .passed a:visited { + color: green; +} + +.failed a:link, .failed a:visited { + color: red; +} + +a:active, a:visited { + color: inherit; +} diff --git a/Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb new file mode 100644 index 000000000..d5c5d6913 --- /dev/null +++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb @@ -0,0 +1,23 @@ + + + + BrewBot + + + +

BrewBot

+ + <% dirs.each_with_index do |dir,index| %> + + + + + + <% end %> +

<%= dir %>

<%= dates[index] %>

<%= statuses[index].upcase %>

+ + -- cgit v1.2.3