aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wilmott <p@p8952.info>2015-08-16 18:03:16 +0100
committerPeter Wilmott <p@p8952.info>2015-08-16 18:03:16 +0100
commit2c092ae8be416204ac2dffc1481093e5c6af32a0 (patch)
tree23a7573ce2be94529e3096fcbfe846df11c3bd6b
parentMove routes out of app.rb and into their own directory (diff)
downloadruby-tinderbox-2c092ae8be416204ac2dffc1481093e5c6af32a0.tar.gz
ruby-tinderbox-2c092ae8be416204ac2dffc1481093e5c6af32a0.tar.bz2
ruby-tinderbox-2c092ae8be416204ac2dffc1481093e5c6af32a0.zip
Restructure views to match the layout of the routes directory
-rw-r--r--web/routes/build_status.rb6
-rw-r--r--web/routes/outdated_gems.rb2
-rw-r--r--web/routes/repoman_checks.rb6
-rw-r--r--web/routes/ruby_targets.rb2
-rw-r--r--web/routes/tasks.rb2
-rw-r--r--web/routes/visualizations.rb2
-rw-r--r--web/views/build_status.erb (renamed from web/views/build/build_status.erb)0
-rw-r--r--web/views/build_status_sha1.erb (renamed from web/views/build/build_history.erb)0
-rw-r--r--web/views/build_status_sha1_timestamp.erb (renamed from web/views/build/build_logs.erb)0
-rw-r--r--web/views/new_targets.erb (renamed from web/views/bumps/new_targets.erb)0
-rw-r--r--web/views/outdated_gems.erb (renamed from web/views/package/outdated_gems.erb)0
-rw-r--r--web/views/repoman_checks.erb (renamed from web/views/repoman/repoman_checks.erb)0
-rw-r--r--web/views/repoman_checks_sha1.erb (renamed from web/views/repoman/repoman_history.erb)0
-rw-r--r--web/views/repoman_checks_sha1_timestamp.erb (renamed from web/views/repoman/repoman_logs.erb)0
-rw-r--r--web/views/ruby_targets.erb (renamed from web/views/package/ruby_targets.erb)0
-rw-r--r--web/views/visualizations.erb (renamed from web/views/overview/visualizations.erb)0
16 files changed, 10 insertions, 10 deletions
diff --git a/web/routes/build_status.rb b/web/routes/build_status.rb
index 178787b..edc0f32 100644
--- a/web/routes/build_status.rb
+++ b/web/routes/build_status.rb
@@ -7,18 +7,18 @@ class RubyTinderbox < Sinatra::Base
builds << package.build_dataset.where(target: 'current').reverse_order(:timestamp).first
end
builds = builds.compact.sort_by { |build| build.package[:identifier] }
- erb :'build/build_status', locals: { builds: builds, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
+ erb :build_status, locals: { builds: builds, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
end
get '/build_status/:sha1' do
package = Package.where(sha1: params[:sha1]).first
builds = package.build_dataset.where(target: 'current').reverse_order(:timestamp)
- erb :'build/build_history', locals: { builds: builds }
+ erb :build_status_sha1, locals: { builds: builds }
end
get '/build_status/:sha1/:timestamp' do
package = Package.where(sha1: params[:sha1]).first
build = package.build_dataset.where(timestamp: params[:timestamp]).first
- erb :'build/build_logs', locals: { package: package, build: build }
+ erb :build_status_sha1_timestamp, locals: { package: package, build: build }
end
end
diff --git a/web/routes/outdated_gems.rb b/web/routes/outdated_gems.rb
index a2c2334..0ce9dee 100644
--- a/web/routes/outdated_gems.rb
+++ b/web/routes/outdated_gems.rb
@@ -3,6 +3,6 @@ class RubyTinderbox < Sinatra::Base
update_timestamp = Package.first[:update_timestamp]
portage_timestamp = Package.first[:portage_timestamp]
packages = Package.distinct(:category, :name).order(:category, :name, Sequel.desc(:version), Sequel.desc(:revision)).exclude(gem_version: 'nil')
- erb :'package/outdated_gems', locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
+ erb :outdated_gems, locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
end
end
diff --git a/web/routes/repoman_checks.rb b/web/routes/repoman_checks.rb
index a85f8ce..dcb36f7 100644
--- a/web/routes/repoman_checks.rb
+++ b/web/routes/repoman_checks.rb
@@ -7,18 +7,18 @@ class RubyTinderbox < Sinatra::Base
repomans << package.repoman_dataset.where(target: 'current').reverse_order(:timestamp).first
end
repomans = repomans.compact.sort_by { |repoman| repoman.package[:identifier] }
- erb :'repoman/repoman_checks', locals: { repomans: repomans, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
+ erb :repoman_checks, locals: { repomans: repomans, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
end
get '/repoman_checks/:sha1' do
package = Package.where(sha1: params[:sha1]).first
repomans = package.repoman_dataset.where(target: 'current').reverse_order(:timestamp)
- erb :'repoman/repoman_history', locals: { repomans: repomans }
+ erb :repoman_checks_sha1, locals: { repomans: repomans }
end
get '/repoman_checks/:sha1/:timestamp' do
package = Package.where(sha1: params[:sha1]).first
repoman = package.repoman_dataset.where(timestamp: params[:timestamp]).first
- erb :'repoman/repoman_logs', locals: { package: package, repoman: repoman }
+ erb :repoman_checks_sha1_timestamp, locals: { package: package, repoman: repoman }
end
end
diff --git a/web/routes/ruby_targets.rb b/web/routes/ruby_targets.rb
index 653f199..e710467 100644
--- a/web/routes/ruby_targets.rb
+++ b/web/routes/ruby_targets.rb
@@ -7,6 +7,6 @@ class RubyTinderbox < Sinatra::Base
update_timestamp = Package.first[:update_timestamp]
portage_timestamp = Package.first[:portage_timestamp]
packages = Package.distinct(:sha1, :identifier).order(:identifier)
- erb :'package/ruby_targets', locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
+ erb :ruby_targets, locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
end
end
diff --git a/web/routes/tasks.rb b/web/routes/tasks.rb
index 4f189aa..9cf3597 100644
--- a/web/routes/tasks.rb
+++ b/web/routes/tasks.rb
@@ -21,6 +21,6 @@ class RubyTinderbox < Sinatra::Base
end
end
packages = packages.compact.sort_by { |package| package[0][:identifier] }
- erb :'bumps/new_targets', locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
+ erb :new_targets, locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp }
end
end
diff --git a/web/routes/visualizations.rb b/web/routes/visualizations.rb
index 6b617ff..1ec845b 100644
--- a/web/routes/visualizations.rb
+++ b/web/routes/visualizations.rb
@@ -25,7 +25,7 @@ class RubyTinderbox < Sinatra::Base
failed = Build.distinct(:package_id).order(:package_id, Sequel.desc(:timestamp)).where(result: "failed\n").count
timed_out = Build.distinct(:package_id).order(:package_id, Sequel.desc(:timestamp)).where(result: "timed out\n").count
- erb :'overview/visualizations', locals: {
+ erb :visualizations, locals: {
portage_timestamp: portage_timestamp,
update_timestamp: update_timestamp,
ruby_1_9_amd64: ruby_1_9_amd64,
diff --git a/web/views/build/build_status.erb b/web/views/build_status.erb
index ede45cc..ede45cc 100644
--- a/web/views/build/build_status.erb
+++ b/web/views/build_status.erb
diff --git a/web/views/build/build_history.erb b/web/views/build_status_sha1.erb
index 96f3fe4..96f3fe4 100644
--- a/web/views/build/build_history.erb
+++ b/web/views/build_status_sha1.erb
diff --git a/web/views/build/build_logs.erb b/web/views/build_status_sha1_timestamp.erb
index fb5bf3d..fb5bf3d 100644
--- a/web/views/build/build_logs.erb
+++ b/web/views/build_status_sha1_timestamp.erb
diff --git a/web/views/bumps/new_targets.erb b/web/views/new_targets.erb
index c2084dc..c2084dc 100644
--- a/web/views/bumps/new_targets.erb
+++ b/web/views/new_targets.erb
diff --git a/web/views/package/outdated_gems.erb b/web/views/outdated_gems.erb
index f583d95..f583d95 100644
--- a/web/views/package/outdated_gems.erb
+++ b/web/views/outdated_gems.erb
diff --git a/web/views/repoman/repoman_checks.erb b/web/views/repoman_checks.erb
index 573c8c3..573c8c3 100644
--- a/web/views/repoman/repoman_checks.erb
+++ b/web/views/repoman_checks.erb
diff --git a/web/views/repoman/repoman_history.erb b/web/views/repoman_checks_sha1.erb
index 459ee9d..459ee9d 100644
--- a/web/views/repoman/repoman_history.erb
+++ b/web/views/repoman_checks_sha1.erb
diff --git a/web/views/repoman/repoman_logs.erb b/web/views/repoman_checks_sha1_timestamp.erb
index 52faecc..52faecc 100644
--- a/web/views/repoman/repoman_logs.erb
+++ b/web/views/repoman_checks_sha1_timestamp.erb
diff --git a/web/views/package/ruby_targets.erb b/web/views/ruby_targets.erb
index e8c0db5..e8c0db5 100644
--- a/web/views/package/ruby_targets.erb
+++ b/web/views/ruby_targets.erb
diff --git a/web/views/overview/visualizations.erb b/web/views/visualizations.erb
index 9b22e6e..9b22e6e 100644
--- a/web/views/overview/visualizations.erb
+++ b/web/views/visualizations.erb