oration 0.0.1 → 0.0.2

data/bin/oration

@@ -2,9 +2,31 @@
 
 # Programmer: Chris Bunch
 
+require 'rubygems'
+require 'optiflag'
+
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
  require 'generator'
 
+  
+module OrationFlags extend OptiFlagSet
+  flag "file" do
+    description "The name of the file containing the function to execute."
+  end
+
+  flag "function" do
+    description "The name of the function that should be remotely executed."
+  end
+
+  flag "output" do
+    description "Where the newly constructed app should be written to."
+  end
+
+  flag "appid" do
+    description "The Google App Engine appid that should be used for this app."
+  end
+end
+
 
 # This method takes in the arguments given to oration and validates them.
 # Right now it's just three arguments: the name of the main code file to
@@ -13,15 +35,7 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 # We validate that the file specified exists and has a function
 # with that name, and that the directory they specified doesn't exist (so
 # that we don't overwrite anything already there).
-def validate_arguments(arguments, file=File)
-  if arguments.length != 3
-    abort("Usage: oration path-to-file function-name output-location")
-  end
-
-  main_file = arguments[0]
-  function_name = arguments[1]
-  output_dir = arguments[2]
-
+def validate_arguments(main_file, function_name, output_dir, app_id, file=File)
   if !file.exists?(main_file)
     abort("#{main_file} didn't exist.")
   end
@@ -50,7 +64,11 @@ end
 # RubyGems is exec'ing this file, so instead just check if the thing we're
 # executing ends in /bin/oration, the relative location of this file.
 if $0.match(/\/bin\/oration\Z/)
-  validate_arguments(ARGV)
-  Generator.generate_app(ARGV[0], ARGV[1], ARGV[2])
-  puts "Done! Your application can be found at #{ARGV[2]}"
+  OrationFlags.and_process!
+
+  validate_arguments(ARGV.flags.file, ARGV.flags.function, ARGV.flags.output, 
+    ARGV.flags.appid)
+  Generator.generate_app(ARGV.flags.file, ARGV.flags.function, 
+    ARGV.flags.output, ARGV.flags.appid)
+  puts "Done! Your application can be found at #{ARGV.flags.output}"
 end

data/bin/oration.rb

@@ -2,9 +2,31 @@
 
 # Programmer: Chris Bunch
 
+require 'rubygems'
+require 'optiflag'
+
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
  require 'generator'
 
+  
+module OrationFlags extend OptiFlagSet
+  flag "file" do
+    description "The name of the file containing the function to execute."
+  end
+
+  flag "function" do
+    description "The name of the function that should be remotely executed."
+  end
+
+  flag "output" do
+    description "Where the newly constructed app should be written to."
+  end
+
+  flag "appid" do
+    description "The Google App Engine appid that should be used for this app."
+  end
+end
+
 
 # This method takes in the arguments given to oration and validates them.
 # Right now it's just three arguments: the name of the main code file to
@@ -13,15 +35,7 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 # We validate that the file specified exists and has a function
 # with that name, and that the directory they specified doesn't exist (so
 # that we don't overwrite anything already there).
-def validate_arguments(arguments, file=File)
-  if arguments.length != 3
-    abort("Usage: oration path-to-file function-name output-location")
-  end
-
-  main_file = arguments[0]
-  function_name = arguments[1]
-  output_dir = arguments[2]
-
+def validate_arguments(main_file, function_name, output_dir, app_id, file=File)
   if !file.exists?(main_file)
     abort("#{main_file} didn't exist.")
   end
@@ -50,7 +64,11 @@ end
 # RubyGems is exec'ing this file, so instead just check if the thing we're
 # executing ends in /bin/oration, the relative location of this file.
 if $0.match(/\/bin\/oration\Z/)
-  validate_arguments(ARGV)
-  Generator.generate_app(ARGV[0], ARGV[1], ARGV[2])
-  puts "Done! Your application can be found at #{ARGV[2]}"
+  OrationFlags.and_process!
+
+  validate_arguments(ARGV.flags.file, ARGV.flags.function, ARGV.flags.output, 
+    ARGV.flags.appid)
+  Generator.generate_app(ARGV.flags.file, ARGV.flags.function, 
+    ARGV.flags.output, ARGV.flags.appid)
+  puts "Done! Your application can be found at #{ARGV.flags.output}"
 end

data/doc/Generator.html

@@ -62,6 +62,8 @@
         <h3 class="section-header">Methods</h3>
         <ul class="link-list">
           
+          <li><a href="#method-c-copy_app_files">::copy_app_files</a></li>
+          
           <li><a href="#method-c-generate_app">::generate_app</a></li>
           
           <li><a href="#method-c-generate_go_app">::generate_go_app</a></li>
@@ -111,6 +113,8 @@
         
           <li><a href="./Object.html">Object</a></li>
         
+          <li><a href="./OrationFlags.html">OrationFlags</a></li>
+        
         </ul>
         <div id="no-class-search-results" style="display: none;">No matching classes.</div>
       </div>
@@ -138,13 +142,49 @@
       <h3 class="section-header">Public Class Methods</h3>
 
     
+      <div id="copy_app_files-method" class="method-detail ">
+        <a name="method-c-copy_app_files"></a>
+
+        
+        <div class="method-heading">
+          <span class="method-name">copy_app_files</span><span
+            class="method-args">(main_file, output_dir, fileutils=FileUtils)</span>
+          <span class="method-click-advice">click to toggle source</span>
+        </div>
+        
+
+        <div class="method-description">
+          
+          <p>Copies over any files in the directory the user has given us over to the
+new directory we are making for their App Engine app.</p>
+          
+
+          
+          <div class="method-source-code"
+            id="copy_app_files-source">
+<pre>
+<span class="ruby-comment"># File lib/generator.rb, line 185</span>
+def self.copy_app_files(main_file, output_dir, fileutils=<span class="ruby-constant">FileUtils</span>)
+  source_dir = <span class="ruby-constant">File</span>.dirname(main_file) + <span class="ruby-string">&quot;/.&quot;</span>
+  <span class="ruby-constant">FileUtils</span>.cp_r(source_dir, output_dir)
+end</pre>
+          </div>
+          
+        </div>
+
+        
+
+        
+      </div>
+
+    
       <div id="generate_app-method" class="method-detail ">
         <a name="method-c-generate_app"></a>
 
         
         <div class="method-heading">
           <span class="method-name">generate_app</span><span
-            class="method-args">(main_file, function_name, output_dir, generate_python_app=Generator.method(:generate_python_app), generate_go_app=Generator.method(:generate_go_app))</span>
+            class="method-args">(main_file, function_name, output_dir, app_id, generate_python_app=Generator.method(:generate_python_app), generate_go_app=Generator.method(:generate_go_app))</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -165,6 +205,7 @@ supported languages.</p>
 def self.generate_app(main_file,
     function_name,
     output_dir,
+    app_id,
     generate_python_app=<span class="ruby-constant">Generator</span>.method(:generate_python_app),
     generate_go_app=<span class="ruby-constant">Generator</span>.method(:generate_go_app))
 
@@ -181,9 +222,9 @@ def self.generate_app(main_file,
 
   case file_suffix
   when <span class="ruby-string">&quot;py&quot;</span>
-    generate_python_app.call(main_file, function_name, output_dir)
+    generate_python_app.call(main_file, function_name, output_dir, app_id)
   when <span class="ruby-string">&quot;go&quot;</span>
-    generate_go_app.call(main_file, function_name, output_dir)
+    generate_go_app.call(main_file, function_name, output_dir, app_id)
   end
 end</pre>
           </div>
@@ -202,7 +243,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">generate_go_app</span><span
-            class="method-args">(main_file, function_name, output_dir, get_go_function=Generator.method(:get_go_function), make_directory=FileUtils.method(:mkdir_p), write_go_app_yaml=Generator.method(:write_go_app_yaml_file), write_go_cicero_code=Generator.method(:write_go_cicero_code))</span>
+            class="method-args">(main_file, function_name, output_dir, app_id, get_go_function=Generator.method(:get_go_function), make_directory=FileUtils.method(:mkdir_p), write_go_app_yaml=Generator.method(:write_go_app_yaml_file), write_go_cicero_code=Generator.method(:write_go_cicero_code))</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -217,8 +258,8 @@ function that the user specified.</p>
           <div class="method-source-code"
             id="generate_go_app-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 62</span>
-def self.generate_go_app(main_file, function_name, output_dir,
+<span class="ruby-comment"># File lib/generator.rb, line 65</span>
+def self.generate_go_app(main_file, function_name, output_dir, app_id,
   get_go_function=<span class="ruby-constant">Generator</span>.method(:get_go_function),
   make_directory=<span class="ruby-constant">FileUtils</span>.method(:mkdir_p),
   write_go_app_yaml=<span class="ruby-constant">Generator</span>.method(:write_go_app_yaml_file),
@@ -230,7 +271,7 @@ def self.generate_go_app(main_file, function_name, output_dir,
   go_code_folder = output_dir + <span class="ruby-constant">File</span>::<span class="ruby-constant">Separator</span> + function_name
   make_directory.call(go_code_folder)
 
-  write_go_app_yaml.call(function_name, output_dir)
+  write_go_app_yaml.call(app_id, output_dir)
   write_go_cicero_code.call(function, function_name, go_code_folder)
 end</pre>
           </div>
@@ -249,7 +290,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">generate_python_app</span><span
-            class="method-args">(main_file, function_name, output_dir, get_python_function=Generator.method(:get_python_function), make_directory=FileUtils.method(:mkdir_p), write_python_app_yaml=Generator.method(:write_python_app_yaml_file), write_python_cicero_code=Generator.method(:write_python_cicero_code))</span>
+            class="method-args">(main_file, function_name, output_dir, app_id, get_python_function=Generator.method(:get_python_function), make_directory=FileUtils.method(:mkdir_p), write_python_app_yaml=Generator.method(:write_python_app_yaml_file), write_python_cicero_code=Generator.method(:write_python_cicero_code), copy_app_files=Generator.method(:copy_app_files))</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -267,17 +308,19 @@ function.</p>
           <div class="method-source-code"
             id="generate_python_app-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 48</span>
-def self.generate_python_app(main_file, function_name, output_dir,
+<span class="ruby-comment"># File lib/generator.rb, line 49</span>
+def self.generate_python_app(main_file, function_name, output_dir, app_id,
   get_python_function=<span class="ruby-constant">Generator</span>.method(:get_python_function),
   make_directory=<span class="ruby-constant">FileUtils</span>.method(:mkdir_p),
   write_python_app_yaml=<span class="ruby-constant">Generator</span>.method(:write_python_app_yaml_file),
-  write_python_cicero_code=<span class="ruby-constant">Generator</span>.method(:write_python_cicero_code))
+  write_python_cicero_code=<span class="ruby-constant">Generator</span>.method(:write_python_cicero_code),
+  copy_app_files=<span class="ruby-constant">Generator</span>.method(:copy_app_files))
 
   function = get_python_function.call(main_file, function_name)
   make_directory.call(output_dir)
-  write_python_app_yaml.call(function_name, output_dir)
-  write_python_cicero_code.call(function, function_name, output_dir)
+  write_python_app_yaml.call(app_id, output_dir)
+  write_python_cicero_code.call(main_file, function_name, output_dir)
+  copy_app_files.call(main_file, output_dir)
 end</pre>
           </div>
           
@@ -312,7 +355,7 @@ starts.</p>
           <div class="method-source-code"
             id="get_go_function-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 131</span>
+<span class="ruby-comment"># File lib/generator.rb, line 139</span>
 def self.get_go_function(main_file, function_name, file=<span class="ruby-constant">File</span>)
   contents = file.open(main_file) { |f| f.read }
   function = contents.scan(/(func #{function_name}(.|\n)*)/).flatten[0]
@@ -351,7 +394,7 @@ zero or more import statements.</p>
           <div class="method-source-code"
             id="get_python_function-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 82</span>
+<span class="ruby-comment"># File lib/generator.rb, line 85</span>
 def self.get_python_function(main_file, function_name, file=<span class="ruby-constant">File</span>)
   contents = file.open(main_file) { |f| f.read }
   function = contents.scan(/(def #{function_name}(.|\n)*)/).flatten[0]
@@ -373,7 +416,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">write_go_app_yaml_file</span><span
-            class="method-args">(function_name, output_dir, file=File)</span>
+            class="method-args">(app_id, output_dir, file=File)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -390,9 +433,9 @@ automatically put a nice UI on the / url.</p>
           <div class="method-source-code"
             id="write_go_app_yaml_file-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 141</span>
-def self.write_go_app_yaml_file(function_name, output_dir, file=<span class="ruby-constant">File</span>)
-  app_yaml_contents = <span class="ruby-string">application: #{function_name}version: 1runtime: goapi_version: 3handlers:- url: /.*  script: _go_app</span>
+<span class="ruby-comment"># File lib/generator.rb, line 149</span>
+def self.write_go_app_yaml_file(app_id, output_dir, file=<span class="ruby-constant">File</span>)
+  app_yaml_contents = <span class="ruby-string">application: #{app_id.downcase}version: 1runtime: goapi_version: 3handlers:- url: /.*  script: _go_app</span>
 
   app_yaml_location = file.expand_path(output_dir + <span class="ruby-constant">File</span>::<span class="ruby-constant">Separator</span> +
     <span class="ruby-string">&quot;app.yaml&quot;</span>)
@@ -430,13 +473,14 @@ the user’s function in it.</p>
           <div class="method-source-code"
             id="write_go_cicero_code-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 161</span>
+<span class="ruby-comment"># File lib/generator.rb, line 169</span>
 def self.write_go_cicero_code(function, function_name, output_dir, file=<span class="ruby-constant">File</span>)
   template_location = <span class="ruby-constant">File</span>.join(<span class="ruby-constant">File</span>.dirname(__FILE__), <span class="ruby-string">&quot;..&quot;</span>,
     <span class="ruby-string">&quot;templates&quot;</span>, <span class="ruby-string">&quot;main.go&quot;</span>)
   main_go_contents = file.open(template_location) { |f| f.read }
   main_go_contents.gsub!(<span class="ruby-regexp">/CICERO_FUNCTION_CONTENTS/</span>, function)
   main_go_contents.gsub!(<span class="ruby-regexp">/CICERO_FUNCTION_NAME/</span>, function_name)
+  main_go_contents.gsub!(<span class="ruby-regexp">/CICERO_PKG_NAME/</span>, function_name.downcase)
 
   main_go_location = file.expand_path(output_dir + <span class="ruby-constant">File</span>::<span class="ruby-constant">Separator</span> +
     <span class="ruby-string">&quot;main.go&quot;</span>)
@@ -459,7 +503,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">write_python_app_yaml_file</span><span
-            class="method-args">(function_name, output_dir, file=File)</span>
+            class="method-args">(app_id, output_dir, file=File)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -475,9 +519,9 @@ write those files in the given directory.</p>
           <div class="method-source-code"
             id="write_python_app_yaml_file-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 91</span>
-def self.write_python_app_yaml_file(function_name, output_dir, file=<span class="ruby-constant">File</span>)
-  app_yaml_contents = <span class="ruby-string">application: #{function_name}version: 1runtime: pythonapi_version: 1- url: .*  script: main.py</span>
+<span class="ruby-comment"># File lib/generator.rb, line 94</span>
+def self.write_python_app_yaml_file(app_id, output_dir, file=<span class="ruby-constant">File</span>)
+  app_yaml_contents = <span class="ruby-string">application: #{app_id}version: 1runtime: pythonapi_version: 1handlers:- url: .*  script: main.py</span>
 
   app_yaml_location = file.expand_path(output_dir + <span class="ruby-constant">File</span>::<span class="ruby-constant">Separator</span> +
     <span class="ruby-string">&quot;app.yaml&quot;</span>)
@@ -500,7 +544,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">write_python_cicero_code</span><span
-            class="method-args">(function, function_name, output_dir, file=File)</span>
+            class="method-args">(file_name, function_name, output_dir, file=File)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -517,16 +561,20 @@ placing them in as well.</p>
           <div class="method-source-code"
             id="write_python_cicero_code-source">
 <pre>
-<span class="ruby-comment"># File lib/generator.rb, line 112</span>
-def self.write_python_cicero_code(function, function_name, output_dir,
+<span class="ruby-comment"># File lib/generator.rb, line 116</span>
+def self.write_python_cicero_code(file_name, function_name, output_dir,
   file=<span class="ruby-constant">File</span>)
 
+  package_name = <span class="ruby-constant">File</span>.basename(file_name, <span class="ruby-string">&quot;.py&quot;</span>)
   template_location = <span class="ruby-constant">File</span>.join(<span class="ruby-constant">File</span>.dirname(__FILE__), <span class="ruby-string">&quot;..&quot;</span>,
     <span class="ruby-string">&quot;templates&quot;</span>, <span class="ruby-string">&quot;main.py&quot;</span>)
   main_py_contents = file.open(template_location) { |f| f.read }
-  main_py_contents.gsub!(<span class="ruby-regexp">/CICERO_FUNCTION_CONTENTS/</span>, function)
+  main_py_contents.gsub!(<span class="ruby-regexp">/CICERO_PACKAGE_NAME/</span>, package_name)
   main_py_contents.gsub!(<span class="ruby-regexp">/CICERO_FUNCTION_NAME/</span>, function_name)
 
+  invokable_name = package_name + <span class="ruby-string">&quot;.&quot;</span> + function_name
+  main_py_contents.gsub!(<span class="ruby-regexp">/CICERO_PACKAGE_AND_FUNCTION_NAME/</span>, invokable_name)
+
   main_py_location = file.expand_path(output_dir + <span class="ruby-constant">File</span>::<span class="ruby-constant">Separator</span> +
     <span class="ruby-string">&quot;main.py&quot;</span>)
 

data/doc/Object.html

@@ -108,6 +108,8 @@
         
           <li><a href="./Object.html">Object</a></li>
         
+          <li><a href="./OrationFlags.html">OrationFlags</a></li>
+        
         </ul>
         <div id="no-class-search-results" style="display: none;">No matching classes.</div>
       </div>
@@ -154,7 +156,7 @@ now it’s just Python and Go. TODO(cgb): Add Java support</p></dd>
         
         <div class="method-heading">
           <span class="method-name">validate_arguments</span><span
-            class="method-args">(arguments, file=File)</span>
+            class="method-args">(main_file, function_name, output_dir, app_id, file=File)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -174,16 +176,8 @@ already there).</p>
           <div class="method-source-code"
             id="validate_arguments-source">
 <pre>
-<span class="ruby-comment"># File bin/oration, line 16</span>
-def validate_arguments(arguments, file=<span class="ruby-constant">File</span>)
-  if arguments.length != 3
-    abort(<span class="ruby-string">&quot;Usage: oration path-to-file function-name output-location&quot;</span>)
-  end
-
-  main_file = arguments[0]
-  function_name = arguments[1]
-  output_dir = arguments[2]
-
+<span class="ruby-comment"># File bin/oration, line 38</span>
+def validate_arguments(main_file, function_name, output_dir, app_id, file=<span class="ruby-constant">File</span>)
   if !file.exists?(main_file)
     abort(&quot;#{main_file} didn't exist.&quot;)
   end

data/doc/OrationFlags.html

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+
+  <title>Module: OrationFlags</title>
+
+  <link rel="stylesheet" href="./rdoc.css" type="text/css" media="screen" />
+
+  <script src="./js/jquery.js" type="text/javascript"
+    charset="utf-8"></script>
+  <script src="./js/thickbox-compressed.js" type="text/javascript"
+    charset="utf-8"></script>
+  <script src="./js/quicksearch.js" type="text/javascript"
+    charset="utf-8"></script>
+  <script src="./js/darkfish.js" type="text/javascript"
+    charset="utf-8"></script>
+
+</head>
+<body class="module">
+
+  <div id="metadata">
+    <div id="home-metadata">
+      <div id="home-section" class="section">
+        <h3 class="section-header">
+          <a href="./index.html">Home</a>
+          <a href="./index.html#classes">Classes</a>
+          <a href="./index.html#methods">Methods</a>
+        </h3>
+      </div>
+    </div>
+
+    <div id="file-metadata">
+      <div id="file-list-section" class="section">
+        <h3 class="section-header">In Files</h3>
+        <div class="section-body">
+          <ul>
+          
+            <li><a href="./bin/oration.html?TB_iframe=true&amp;height=550&amp;width=785"
+              class="thickbox" title="bin/oration">bin/oration</a></li>
+          
+            <li><a href="./bin/oration_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
+              class="thickbox" title="bin/oration.rb">bin/oration.rb</a></li>
+          
+          </ul>
+        </div>
+      </div>
+
+      
+    </div>
+
+    <div id="class-metadata">
+
+      <!-- Parent Class -->
+      
+
+      <!-- Namespace Contents -->
+      
+
+      <!-- Method Quickref -->
+      
+
+      <!-- Included Modules -->
+      
+    </div>
+
+    <div id="project-metadata">
+      
+      
+
+      <div id="classindex-section" class="section project-section">
+        <h3 class="section-header">Class/Module Index
+          <span class="search-toggle"><img src="./images/find.png"
+            height="16" width="16" alt="[+]"
+            title="show/hide quicksearch" /></span></h3>
+        <form action="#" method="get" accept-charset="utf-8" class="initially-hidden">
+        <fieldset>
+          <legend>Quicksearch</legend>
+          <input type="text" name="quicksearch" value=""
+            class="quicksearch-field" />
+        </fieldset>
+        </form>
+
+        <ul class="link-list">
+        
+          <li><a href="./Generator.html">Generator</a></li>
+        
+          <li><a href="./Object.html">Object</a></li>
+        
+          <li><a href="./OrationFlags.html">OrationFlags</a></li>
+        
+        </ul>
+        <div id="no-class-search-results" style="display: none;">No matching classes.</div>
+      </div>
+
+      
+    </div>
+  </div>
+
+  <div id="documentation">
+    <h1 class="module">OrationFlags</h1>
+
+    <div id="description">
+      
+    </div>
+
+    <!-- Constants -->
+    
+
+    <!-- Attributes -->
+    
+
+    <!-- Methods -->
+    
+
+  </div>
+
+  <div id="validator-badges">
+    <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+    <p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+      Rdoc Generator</a> 2</small>.</p>
+  </div>
+
+</body>
+</html>
+

data/doc/bin/oration.html

@@ -24,13 +24,17 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Wed Nov 30 22:35:43 -0800 2011</dd>
+      <dd class="modified-date">Sun Jan 22 12:37:46 -0800 2012</dd>
 
       
       <dt class="requires">Requires</dt>
       <dd class="requires">
         <ul>
         
+          <li>rubygems</li>
+        
+          <li>optiflag</li>
+        
           <li>generator</li>
         
         </ul>

data/doc/bin/oration_rb.html

@@ -24,13 +24,17 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Wed Nov 30 22:35:43 -0800 2011</dd>
+      <dd class="modified-date">Sun Jan 22 12:37:46 -0800 2012</dd>
 
       
       <dt class="requires">Requires</dt>
       <dd class="requires">
         <ul>
         
+          <li>rubygems</li>
+        
+          <li>optiflag</li>
+        
           <li>generator</li>
         
         </ul>

data/doc/created.rid

@@ -1,4 +1,4 @@
-Thu, 01 Dec 2011 12:44:41 -0800
-bin/oration.rb	Wed, 30 Nov 2011 22:35:43 -0800
-lib/generator.rb	Thu, 01 Dec 2011 12:38:03 -0800
-bin/oration	Wed, 30 Nov 2011 22:35:43 -0800
+Sun, 22 Jan 2012 17:45:26 -0800
+bin/oration.rb	Sun, 22 Jan 2012 12:37:46 -0800
+lib/generator.rb	Sun, 22 Jan 2012 12:58:06 -0800
+bin/oration	Sun, 22 Jan 2012 12:37:46 -0800

data/doc/index.html

@@ -35,11 +35,15 @@
     
     <li class="class"><a href="Object.html">Object</a></li>
     
+    <li class="module"><a href="OrationFlags.html">OrationFlags</a></li>
+    
   </ul>
 
   <h2 id="methods">Methods</h2>
   <ul>
     
+      <li><a href="Generator.html#method-c-copy_app_files">::copy_app_files &mdash; Generator</a></li>
+    
       <li><a href="Generator.html#method-c-generate_app">::generate_app &mdash; Generator</a></li>
     
       <li><a href="Generator.html#method-c-generate_go_app">::generate_go_app &mdash; Generator</a></li>

data/doc/lib/generator_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Thu Dec 01 12:38:03 -0800 2011</dd>
+      <dd class="modified-date">Sun Jan 22 12:58:06 -0800 2012</dd>
 
       
       <dt class="requires">Requires</dt>

data/lib/generator.rb

@@ -18,6 +18,7 @@ module Generator
   def self.generate_app(main_file,
       function_name,
       output_dir,
+      app_id,
       generate_python_app=Generator.method(:generate_python_app),
       generate_go_app=Generator.method(:generate_go_app))
 
@@ -34,9 +35,9 @@ module Generator
 
     case file_suffix
     when "py"
-      generate_python_app.call(main_file, function_name, output_dir)
+      generate_python_app.call(main_file, function_name, output_dir, app_id)
     when "go"
-      generate_go_app.call(main_file, function_name, output_dir)
+      generate_go_app.call(main_file, function_name, output_dir, app_id)
     end
   end
 
@@ -45,21 +46,23 @@ module Generator
   # code for the actual function, make a directory for their app, write
   # an app.yaml for the app, and a Python file containing our Cicero
   # interface and their function.
-  def self.generate_python_app(main_file, function_name, output_dir,
+  def self.generate_python_app(main_file, function_name, output_dir, app_id,
     get_python_function=Generator.method(:get_python_function),
     make_directory=FileUtils.method(:mkdir_p),
     write_python_app_yaml=Generator.method(:write_python_app_yaml_file),
-    write_python_cicero_code=Generator.method(:write_python_cicero_code))
+    write_python_cicero_code=Generator.method(:write_python_cicero_code),
+    copy_app_files=Generator.method(:copy_app_files))
 
     function = get_python_function.call(main_file, function_name)
     make_directory.call(output_dir)
-    write_python_app_yaml.call(function_name, output_dir)
-    write_python_cicero_code.call(function, function_name, output_dir)
+    write_python_app_yaml.call(app_id, output_dir)
+    write_python_cicero_code.call(main_file, function_name, output_dir)
+    copy_app_files.call(main_file, output_dir)
   end
 
   # This method generates a Go Google App Engine application containing
   # the function that the user specified.
-  def self.generate_go_app(main_file, function_name, output_dir,
+  def self.generate_go_app(main_file, function_name, output_dir, app_id,
     get_go_function=Generator.method(:get_go_function),
     make_directory=FileUtils.method(:mkdir_p),
     write_go_app_yaml=Generator.method(:write_go_app_yaml_file),
@@ -71,7 +74,7 @@ module Generator
     go_code_folder = output_dir + File::Separator + function_name
     make_directory.call(go_code_folder)
 
-    write_go_app_yaml.call(function_name, output_dir)
+    write_go_app_yaml.call(app_id, output_dir)
     write_go_cicero_code.call(function, function_name, go_code_folder)
   end
 
@@ -88,13 +91,14 @@ module Generator
   # Writes an app.yaml file for use with Python Google App Engine applications.
   # TODO(cgb): Add support for jquery and bootstrap? If so, also be sure to
   # write those files in the given directory.
-  def self.write_python_app_yaml_file(function_name, output_dir, file=File)
+  def self.write_python_app_yaml_file(app_id, output_dir, file=File)
     app_yaml_contents = <<YAML
-application: #{function_name}
+application: #{app_id}
 version: 1
 runtime: python
 api_version: 1
 
+handlers:
 - url: .*
   script: main.py
 YAML
@@ -109,15 +113,19 @@ YAML
   # Sets up a standard set of routes according to the Cicero API.
   # TODO(cgb): The user may have their own imports in the code - consider
   # automatically placing them in as well.
-  def self.write_python_cicero_code(function, function_name, output_dir,
+  def self.write_python_cicero_code(file_name, function_name, output_dir,
     file=File)
 
+    package_name = File.basename(file_name, ".py")
     template_location = File.join(File.dirname(__FILE__), "..",
       "templates", "main.py")
     main_py_contents = file.open(template_location) { |f| f.read }
-    main_py_contents.gsub!(/CICERO_FUNCTION_CONTENTS/, function)
+    main_py_contents.gsub!(/CICERO_PACKAGE_NAME/, package_name)
     main_py_contents.gsub!(/CICERO_FUNCTION_NAME/, function_name)
 
+    invokable_name = package_name + "." + function_name
+    main_py_contents.gsub!(/CICERO_PACKAGE_AND_FUNCTION_NAME/, invokable_name)
+
     main_py_location = file.expand_path(output_dir + File::Separator +
       "main.py")
 
@@ -138,9 +146,9 @@ YAML
   # Right now, we direct all URL requests to the Go app we are about to
   # construct, but in the future we may add support for jQuery and Bootstrap
   # to automatically put a nice UI on the / url.
-  def self.write_go_app_yaml_file(function_name, output_dir, file=File)
+  def self.write_go_app_yaml_file(app_id, output_dir, file=File)
     app_yaml_contents = <<YAML
-application: #{function_name.downcase}
+application: #{app_id.downcase}
 version: 1
 runtime: go
 api_version: 3
@@ -171,4 +179,11 @@ YAML
 
     file.open(main_go_location, "w+") { |file| file.write(main_go_contents) }
   end
+
+  # Copies over any files in the directory the user has given us over to the
+  # new directory we are making for their App Engine app.
+  def self.copy_app_files(main_file, output_dir, fileutils=FileUtils)
+    source_dir = File.dirname(main_file) + "/."
+    FileUtils.cp_r(source_dir, output_dir)
+  end
 end

data/test/test_generator.rb

@@ -8,7 +8,7 @@ require 'test/unit'
 
 
 class DoNothingGenerator
-  def self.does_nothing(a, b, c)
+  def self.does_nothing(a, b, c, d)
   end
 end
 
@@ -121,30 +121,31 @@ class TestGenerator < Test::Unit::TestCase
     # Python or Go application.
     function = "blarg"
     output_dir = "output_dir"
+    app_id = "myappid"
     do_nothing_method = DoNothingGenerator.method(:does_nothing)
 
     # c files aren't supported, so this should fail
     assert_raise(SystemExit) {
-      Generator.generate_app("boo.c", function, output_dir, do_nothing_method,
-        do_nothing_method)
+      Generator.generate_app("boo.c", function, output_dir, app_id,
+        do_nothing_method, do_nothing_method)
     }
 
     # files with no extension aren't supported, so this should fail
     assert_raise(SystemExit) {
-      Generator.generate_app("boo", function, output_dir, do_nothing_method,
-        do_nothing_method)
+      Generator.generate_app("boo", function, output_dir, app_id,
+        do_nothing_method, do_nothing_method)
     }
 
     # python files are supported, so this should succeed
     assert_nothing_raised(SystemExit) {
-      Generator.generate_app("boo.py", function, output_dir, do_nothing_method,
-        do_nothing_method)
+      Generator.generate_app("boo.py", function, output_dir, app_id,
+        do_nothing_method, do_nothing_method)
     }
 
     # go files are supported, so this should succeed
     assert_nothing_raised(SystemExit) {
-      Generator.generate_app("boo.go", function, output_dir, do_nothing_method,
-        do_nothing_method)
+      Generator.generate_app("boo.go", function, output_dir, app_id,
+        do_nothing_method, do_nothing_method)
     }
   end
 

data/test/test_oration.rb

@@ -23,31 +23,28 @@ end
 
 class TestOration < Test::Unit::TestCase
   def test_validate_arguments
-    # test when there are the wrong number of args
-    bad_args_1 = %w{}
-    bad_args_2 = %w{boo.go}
-    bad_args_3 = %w{boo.go boo}
-    bad_args_4 = %w{boo.go boo boo boo}
-    [bad_args_1, bad_args_2, bad_args_3, bad_args_4].each { |args|
-      assert_raise(SystemExit) { validate_arguments(args, FakeFile) }
-    }
-
     # test when the file in question doesn't exist
-    bad_args_5 = %w{doesnt-exist.go boo output-dir}
-    assert_raise(SystemExit) { validate_arguments(bad_args_5, FakeFile) }
+    assert_raise(SystemExit) { 
+      validate_arguments('doesnt-exist.go', 'boo', 'output-dir', 'appid', 
+        FakeFile) 
+    }
     
     # test when the function to be used doesn't exist in that file
-    bad_args_6 = %w{good-file.go bad-function-name output-dir}
-    assert_raise(SystemExit) { validate_arguments(bad_args_6, FakeFile) }
+    assert_raise(SystemExit) { 
+      validate_arguments('good-file.go', 'bad-function-name', 'output-dir', 
+        'appid', FakeFile)
+    }
 
     # test when the output-dir specified already exists
-    bad_args_7 = %w{good-file.go good-function-name output-dir-exists}
-    assert_raise(SystemExit) { validate_arguments(bad_args_7, FakeFile) }
+    assert_raise(SystemExit) { 
+      validate_arguments('good-file.go', 'good-function-name',
+        'output-dir-exists', 'appid', FakeFile) 
+    }
 
     # test when the user gives us a file that exists with the named function
-    good_args = %w{good-file.go good-function-name output-dir}
     assert_nothing_raised(SystemExit) {
-      validate_arguments(good_args, FakeFile)
+      validate_arguments('good-file.go', 'good-function-name', 'output-dir', 
+        'appid', FakeFile)
     }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oration
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Bunch
@@ -15,10 +15,24 @@ autorequire: oration
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 -08:00
+date: 2012-01-22 00:00:00 -08:00
 default_executable: oration
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: optiflag
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
+  type: :runtime
+  version_requirements: *id001
 description: "    Oration converts a function written in Python or Go into a Google App Engine\n    application that conforms to the Cicero API, allowing the given function to\n    be automatically executed over Google App Engine or AppScale in an\n    embarrassingly parallel fashion.\n"
 email: appscale_community@googlegroups.com
 executables: 
@@ -30,6 +44,7 @@ extra_rdoc_files:
 files: 
 - bin/oration
 - bin/oration.rb
+- doc/OrationFlags.html
 - doc/Object.html
 - doc/js/jquery.js
 - doc/js/darkfish.js