appscale-tools 2.3.0

closes #38758

Closes #38775.

Signed-off-by: Xu Cheng <xucheng@me.com>

1 files changed, 46 insertions, 27 deletions

diff --git a/Library/Formula/appscale-tools.rb b/Library/Formula/appscale-tools.rb
index 6b36cbd90..dee78edb0 100644
--- a/Library/Formula/appscale-tools.rb
+++ b/Library/Formula/appscale-tools.rb
@@ -1,7 +1,7 @@
 class AppscaleTools < Formula
   homepage "https://github.com/AppScale/appscale-tools"
-  url "https://github.com/AppScale/appscale-tools/archive/2.2.0.tar.gz"
-  sha1 "74420507e21e14c780b020d487552964ecd1748f"
+  url "https://github.com/AppScale/appscale-tools/archive/2.3.0.tar.gz"
+  sha256 "f33beeded245625afce0c0736bd5c137f6fb1475b21c6e92c54cc8e749485cf2"
   head "https://github.com/AppScale/appscale-tools.git"
 
   bottle do
@@ -16,62 +16,81 @@ class AppscaleTools < Formula
 
   resource "termcolor" do
     url "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz"
-    sha1 "52045880a05c0fbd192343d9c9aad46a73d20e8c"
+    sha256 "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
   end
 
   resource "SOAPpy" do
-    url "https://pypi.python.org/packages/source/S/SOAPpy/SOAPpy-0.12.6.zip"
-    sha1 "72c384e9e43ce97c9cd0756567e745fcb5419430"
+    url "https://pypi.python.org/packages/source/S/SOAPpy/SOAPpy-0.12.22.zip"
+    sha256 "e70845906bb625144ae6a8df4534d66d84431ff8e21835d7b401ec6d8eb447a5"
+  end
+
+  # dependencies for soappy
+  resource "wstools" do
+    url "https://pypi.python.org/packages/source/w/wstools/wstools-0.4.3.tar.gz"
+    sha256 "578b53e98bc8dadf5a55dfd1f559fd9b37a594609f1883f23e8646d2d30336f8"
+  end
+  resource "defusedxml" do
+    url "https://pypi.python.org/packages/source/d/defusedxml/defusedxml-0.4.1.tar.gz"
+    sha256 "cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478"
   end
 
   resource "pyyaml" do
     url "https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.11.tar.gz"
-    sha1 "1a2d5df8b31124573efb9598ec6d54767f3c4cd4"
+    sha256 "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8"
   end
 
   resource "boto" do
-    url "https://pypi.python.org/packages/source/b/boto/boto-2.9.9.tar.gz"
-    sha1 "8f8bf47a9660d6886a73c65cd00243219b5f04c4"
+    url "https://pypi.python.org/packages/source/b/boto/boto-2.38.0.tar.gz"
+    sha256 "d9083f91e21df850c813b38358dc83df16d7f253180a1344ecfedce24213ecf2"
   end
 
   resource "argparse" do
-    url "https://argparse.googlecode.com/files/argparse-1.2.1.tar.gz"
-    sha1 "caadac82aa2576d6b445058c1fcf6ef0b14dbaa1"
+    url "https://pypi.python.org/packages/source/a/argparse/argparse-1.3.0.tar.gz"
+    sha256 "b3a79a23d37b5a02faa550b92cbbbebeb4aa1d77e649c3eb39c19abf5262da04"
   end
 
-  resource "oauth2client" do
-    url "https://pypi.python.org/packages/source/o/oauth2client/oauth2client-1.2.tar.gz"
-    sha1 "d38bf2d5392e4e4eea66b039a408079f6fe008d0"
+  resource "google-api-python-client" do
+    url "https://pypi.python.org/packages/source/g/google-api-python-client/google-api-python-client-1.4.0.tar.gz"
+    sha256 "695c046789540db5ce4deefe3836e78a2cc002d5e10a41b936c6907f4ec9c96c"
   end
 
-  resource "google-api-python-client" do
-    url "https://pypi.python.org/packages/source/g/google-api-python-client/google-api-python-client-1.2.tar.gz"
-    sha1 "31ddb6e125b0683d29493c9f486d48a4f63c913b"
+  # dependencies for google-api-python-client
+  resource "oauth2client" do
+    url "https://pypi.python.org/packages/source/o/oauth2client/oauth2client-1.4.7.tar.gz"
+    sha256 "b63550a242ea25ec027a261c2f5667d52de268f52c3f0c6ce60850ad45492031"
+  end
+  resource "six" do
+    url "https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz"
+    sha256 "e24052411fc4fbd1f672635537c3fc2330d9481b18c0317695b46259512c91d5"
+  end
+  resource "uritemplate" do
+    url "https://pypi.python.org/packages/source/u/uritemplate/uritemplate-0.6.tar.gz"
+    sha256 "a30e230aeb7ebedbcb5da9999a17fa8a30e512e6d5b06f73d47c6e03c8e357fd"
   end
 
   resource "httplib2" do
-    url "https://pypi.python.org/packages/source/h/httplib2/httplib2-0.9.tar.gz"
-    sha1 "1b9774a81136a222f02e711d81efb775dc87b70e"
+    url "https://pypi.python.org/packages/source/h/httplib2/httplib2-0.9.1.tar.gz"
+    sha256 "bc6339919a5235b9d1aaee011ca5464184098f0c47c9098001f91c97176583f5"
   end
 
   resource "python-gflags" do
     url "https://pypi.python.org/packages/source/p/python-gflags/python-gflags-2.0.tar.gz"
-    sha1 "1529a1102da2fc671f2a9a5e387ebabd1ceacbbf"
+    sha256 "0dff6360423f3ec08cbe3bfaf37b339461a54a21d13be0dd5d9c9999ce531078"
   end
 
   def install
-    ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages"
-
+    ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
     resources.each do |r|
-      r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" }
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
-    inreplace Dir["bin/appscale*"], /^  lib = os.*/, "  lib = '#{libexec}'"
-
-    prefix.install "bin", "templates", "LICENSE", "README.md"
-    libexec.install Dir["lib/*"]
+    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
+    system "python", *Language::Python.setup_install_args(libexec)
 
-    bin.env_script_all_files(libexec+"bin", :PYTHONPATH => "#{libexec}/lib/python2.7/site-packages")
+    bin.install Dir[libexec/"bin/*"]
+    bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end
 
   test do