From 0824b0ecaa8a3a611cf4cc71cf2821292d5788a7 Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Sun, 30 Dec 2018 00:20:24 +0100
Subject: [PATCH] Rework utils

---
 utils/clean_all.rb         | 22 ++++++++++++----------
 utils/clippy_all.rb        | 18 ++++++++++++------
 utils/fmt_all.rb           | 16 +++++++++++-----
 utils/make_all.rb          | 24 +++++++++++++++---------
 utils/make_panic_test.rb   | 20 +++++++++++++-------
 utils/ready_for_publish.rb | 17 +++++++++++++++++
 utils/sanity_checks.rb     | 16 ++++++++++++++++
 7 files changed, 96 insertions(+), 37 deletions(-)
 create mode 100644 utils/ready_for_publish.rb
 create mode 100644 utils/sanity_checks.rb

diff --git a/utils/clean_all.rb b/utils/clean_all.rb
index 28895371..ad976811 100644
--- a/utils/clean_all.rb
+++ b/utils/clean_all.rb
@@ -2,19 +2,21 @@
 
 require 'fileutils'
 
-crates = Dir["**/Cargo.toml"].sort!
+def clean_all
+  crates = Dir["**/Cargo.toml"].sort!
 
-crates.each do |x|
-  next if x.include?('raspi3_boot')
+  crates.each do |x|
+    next if x.include?('raspi3_boot')
 
-  x = File.dirname(x)
-  puts "\n\n" + x.to_s + "\n\n"
-  Dir.chdir(x) do
-    unless system('make clean')
-      puts "\n\nBuild failed!"
-      exit(1) # Exit with error code
+    x = File.dirname(x)
+    Dir.chdir(x) do
+      system('make clean') or exit(1)
     end
   end
+
+  FileUtils.rm_rf('xbuild_sysroot')
 end
 
-FileUtils.rm_rf('xbuild_sysroot')
+if __FILE__ == $0
+  clean_all()
+end
diff --git a/utils/clippy_all.rb b/utils/clippy_all.rb
index 65e675f6..345469d6 100644
--- a/utils/clippy_all.rb
+++ b/utils/clippy_all.rb
@@ -1,12 +1,18 @@
 #!/usr/bin/env ruby
 
-crates = Dir["*/Cargo.toml"]
-crates.delete_if { |x| x.include?('bareminimum') }
+def clippy_all
+  crates = Dir["*/Cargo.toml"].sort!
+  crates.delete_if { |x| x.include?('bareminimum') }
 
-crates.each do |x|
-  x = File.dirname(x)
+  crates.each do |x|
+    x = File.dirname(x)
 
-  Dir.chdir(x) do
-    `make clippy`
+    Dir.chdir(x) do
+      system('make clippy')
+    end
   end
 end
+
+if __FILE__ == $0
+  clippy_all()
+end
diff --git a/utils/fmt_all.rb b/utils/fmt_all.rb
index 29f31b03..bec10f21 100644
--- a/utils/fmt_all.rb
+++ b/utils/fmt_all.rb
@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
 
-crates = Dir["**/Cargo.toml"]
+def fmt_all
+  crates = Dir["**/Cargo.toml"].sort!
 
-crates.each do |x|
-  x = File.dirname(x)
+  crates.each do |x|
+    x = File.dirname(x)
 
-  Dir.chdir(x) do
-    `cargo fmt`
+    Dir.chdir(x) do
+      system('cargo fmt')
+    end
   end
 end
+
+if __FILE__ == $0
+  fmt_all()
+end
diff --git a/utils/make_all.rb b/utils/make_all.rb
index ddafe8d5..3890f124 100644
--- a/utils/make_all.rb
+++ b/utils/make_all.rb
@@ -1,16 +1,22 @@
 #!/usr/bin/env ruby
 
-crates = Dir["**/Cargo.toml"].sort!
+def make_all
+  crates = Dir["**/Cargo.toml"].sort!
 
-crates.each do |x|
-  next if x.include?('raspi3_boot')
+  crates.each do |x|
+    next if x.include?('raspi3_boot')
 
-  x = File.dirname(x)
-  puts "\n\n" + x.to_s + "\n\n"
-  Dir.chdir(x) do
-    unless system('make')
-      puts "\n\nBuild failed!"
-      exit(1) # Exit with error code
+    x = File.dirname(x)
+    puts "\n\n" + x.to_s + "\n\n"
+    Dir.chdir(x) do
+      unless system('make')
+        puts "\n\nBuild failed!"
+        exit(1) # Exit with error code
+      end
     end
   end
 end
+
+if __FILE__ == $0
+  make_all()
+end
diff --git a/utils/make_panic_test.rb b/utils/make_panic_test.rb
index f5176335..553aab65 100644
--- a/utils/make_panic_test.rb
+++ b/utils/make_panic_test.rb
@@ -1,13 +1,19 @@
 #!/usr/bin/env ruby
 
-crates = Dir["**/Cargo.toml"].sort!
+def make_panic_test
+  crates = Dir["**/Cargo.toml"].sort!
 
-crates.each do |x|
-  next if x.include?('raspi3_boot')
+  crates.each do |x|
+    next if x.include?('raspi3_boot')
 
-  x = File.dirname(x)
-  puts "\n" + x.to_s + ':'
-  Dir.chdir(x) do
-     system('make nm | grep panic_fmt')
+    x = File.dirname(x)
+    puts "\n" + x.to_s + ':'
+    Dir.chdir(x) do
+      system('make nm | grep panic_fmt')
+    end
   end
 end
+
+if __FILE__ == $0
+  make_panic_test()
+end
diff --git a/utils/ready_for_publish.rb b/utils/ready_for_publish.rb
new file mode 100644
index 00000000..62295fef
--- /dev/null
+++ b/utils/ready_for_publish.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require_relative 'clean_all'
+require_relative 'clippy_all'
+require_relative 'fmt_all'
+require_relative 'make_all'
+require_relative 'make_panic_test'
+require_relative 'sanity_checks'
+
+clean_all()
+clippy_all()
+
+clean_all()
+fmt_all()
+make_all()
+make_panic_test()
+sanity_checks()
diff --git a/utils/sanity_checks.rb b/utils/sanity_checks.rb
new file mode 100644
index 00000000..65780136
--- /dev/null
+++ b/utils/sanity_checks.rb
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+def sanity_checks
+  crates = Dir["**/Cargo.toml"].sort!
+
+  crates.each do |x|
+    if File.readlines(x).grep(/patch.crates-io/).size > 0
+      puts "#{x} contains patch.crates-io!"
+      exit(1)
+    end
+  end
+end
+
+if __FILE__ == $0
+  sanity_checks()
+end