oration 0.0.3 → 0.0.4

data/doc/Generator.html

@@ -70,10 +70,6 @@
           
           <li><a href="#method-c-generate_python_app">::generate_python_app</a></li>
           
-          <li><a href="#method-c-get_go_function">::get_go_function</a></li>
-          
-          <li><a href="#method-c-get_python_function">::get_python_function</a></li>
-          
           <li><a href="#method-c-write_go_app_yaml_file">::write_go_app_yaml_file</a></li>
           
           <li><a href="#method-c-write_go_cicero_code">::write_go_cicero_code</a></li>
@@ -163,7 +159,7 @@ 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>
+<span class="ruby-comment"># File lib/generator.rb, line 164</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)
@@ -243,7 +239,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, 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>
+            class="method-args">(main_file, function_name, output_dir, app_id, 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), copy_app_files=Generator.method(:copy_app_files))</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -258,21 +254,20 @@ 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 65</span>
+<span class="ruby-comment"># File lib/generator.rb, line 63</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),
-  write_go_cicero_code=<span class="ruby-constant">Generator</span>.method(:write_go_cicero_code))
+  write_go_cicero_code=<span class="ruby-constant">Generator</span>.method(:write_go_cicero_code),
+  copy_app_files=<span class="ruby-constant">Generator</span>.method(:copy_app_files))
 
-  function = get_go_function.call(main_file, function_name)
   make_directory.call(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(app_id, output_dir)
-  write_go_cicero_code.call(function, function_name, go_code_folder)
+  write_go_cicero_code.call(main_file, function_name, go_code_folder)
+  copy_app_files.call(main_file, go_code_folder)
 end</pre>
           </div>
           
@@ -290,7 +285,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, 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>
+            class="method-args">(main_file, function_name, output_dir, app_id, 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>
         
@@ -310,13 +305,11 @@ function.</p>
 <pre>
 <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),
   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(app_id, output_dir)
   write_python_cicero_code.call(main_file, function_name, output_dir)
@@ -329,84 +322,6 @@ end</pre>
         
 
         
-      </div>
-
-    
-      <div id="get_go_function-method" class="method-detail ">
-        <a name="method-c-get_go_function"></a>
-
-        
-        <div class="method-heading">
-          <span class="method-name">get_go_function</span><span
-            class="method-args">(main_file, function_name, file=File)</span>
-          <span class="method-click-advice">click to toggle source</span>
-        </div>
-        
-
-        <div class="method-description">
-          
-          <p>Given a Go source code file to read, finds the named function and returns
-everything at and after that method’s definition. TODO(cgb): Parse just
-the function instead of everything in the file after where the function
-starts.</p>
-          
-
-          
-          <div class="method-source-code"
-            id="get_go_function-source">
-<pre>
-<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]
-  return function
-end</pre>
-          </div>
-          
-        </div>
-
-        
-
-        
-      </div>
-
-    
-      <div id="get_python_function-method" class="method-detail ">
-        <a name="method-c-get_python_function"></a>
-
-        
-        <div class="method-heading">
-          <span class="method-name">get_python_function</span><span
-            class="method-args">(main_file, function_name, file=File)</span>
-          <span class="method-click-advice">click to toggle source</span>
-        </div>
-        
-
-        <div class="method-description">
-          
-          <p>This method opens main_file and parses out the function named
-function_name, returning a string with the contents of that function. We
-assume that the user only has one function in their file right now after
-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 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]
-  return function
-end</pre>
-          </div>
-          
-        </div>
-
-        
-
-        
       </div>
 
     
@@ -433,7 +348,7 @@ 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 149</span>
+<span class="ruby-comment"># File lib/generator.rb, line 126</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>
 
@@ -458,7 +373,7 @@ end</pre>
         
         <div class="method-heading">
           <span class="method-name">write_go_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>
         
@@ -473,15 +388,17 @@ 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 169</span>
-def self.write_go_cicero_code(function, function_name, output_dir, file=<span class="ruby-constant">File</span>)
+<span class="ruby-comment"># File lib/generator.rb, line 146</span>
+def self.write_go_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;.go&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.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_contents.gsub!(<span class="ruby-regexp">/CICERO_PKG_NAME/</span>, package_name)
 
+  invokable_name = package_name + <span class="ruby-string">&quot;.&quot;</span> + function_name
+  main_go_contents.gsub!(<span class="ruby-regexp">/CICERO_PACKAGE_AND_FUNCTION_NAME/</span>, invokable_name)
   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>)
 
@@ -519,7 +436,7 @@ 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 94</span>
+<span class="ruby-comment"># File lib/generator.rb, line 81</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>
 
@@ -561,7 +478,7 @@ 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 116</span>
+<span class="ruby-comment"># File lib/generator.rb, line 103</span>
 def self.write_python_cicero_code(file_name, function_name, output_dir,
   file=<span class="ruby-constant">File</span>)
 

data/doc/created.rid

@@ -1,4 +1,4 @@
-Sun, 22 Jan 2012 17:45:26 -0800
+Thu, 02 Feb 2012 14:08:16 -0800
 bin/oration.rb	Sun, 22 Jan 2012 12:37:46 -0800
-lib/generator.rb	Sun, 22 Jan 2012 12:58:06 -0800
+lib/generator.rb	Thu, 02 Feb 2012 14:06:35 -0800
 bin/oration	Sun, 22 Jan 2012 12:37:46 -0800

data/doc/index.html

@@ -50,10 +50,6 @@
     
       <li><a href="Generator.html#method-c-generate_python_app">::generate_python_app &mdash; Generator</a></li>
     
-      <li><a href="Generator.html#method-c-get_go_function">::get_go_function &mdash; Generator</a></li>
-    
-      <li><a href="Generator.html#method-c-get_python_function">::get_python_function &mdash; Generator</a></li>
-    
       <li><a href="Generator.html#method-c-write_go_app_yaml_file">::write_go_app_yaml_file &mdash; Generator</a></li>
     
       <li><a href="Generator.html#method-c-write_go_cicero_code">::write_go_cicero_code &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">Sun Jan 22 12:58:06 -0800 2012</dd>
+      <dd class="modified-date">Thu Feb 02 14:06:35 -0800 2012</dd>
 
       
       <dt class="requires">Requires</dt>

data/lib/generator.rb

@@ -47,13 +47,11 @@ module Generator
   # 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, 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))
 
-    function = get_python_function.call(main_file, function_name)
     make_directory.call(output_dir)
     write_python_app_yaml.call(app_id, output_dir)
     write_python_cicero_code.call(main_file, function_name, output_dir)
@@ -63,29 +61,18 @@ module Generator
   # 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, 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))
+    write_go_cicero_code=Generator.method(:write_go_cicero_code),
+    copy_app_files=Generator.method(:copy_app_files))
 
-    function = get_go_function.call(main_file, function_name)
     make_directory.call(output_dir)
-
     go_code_folder = output_dir + File::Separator + function_name
     make_directory.call(go_code_folder)
 
     write_go_app_yaml.call(app_id, output_dir)
-    write_go_cicero_code.call(function, function_name, go_code_folder)
-  end
-
-  # This method opens main_file and parses out the function named
-  # function_name, returning a string with the contents of that
-  # function. We assume that the user only has one function in their
-  # file right now after zero or more import statements.
-  def self.get_python_function(main_file, function_name, file=File)
-    contents = file.open(main_file) { |f| f.read }
-    function = contents.scan(/(def #{function_name}(.|\n)*)/s).flatten[0]
-    return function
+    write_go_cicero_code.call(main_file, function_name, go_code_folder)
+    copy_app_files.call(main_file, go_code_folder)
   end
 
   # Writes an app.yaml file for use with Python Google App Engine applications.
@@ -132,16 +119,6 @@ YAML
     file.open(main_py_location, "w+") { |file| file.write(main_py_contents) }
   end
 
-  # Given a Go source code file to read, finds the named function and returns
-  # everything at and after that method's definition.
-  # TODO(cgb): Parse just the function instead of everything in the file after
-  # where the function starts.
-  def self.get_go_function(main_file, function_name, file=File)
-    contents = file.open(main_file) { |f| f.read }
-    function = contents.scan(/(func #{function_name}(.|\n)*)/s).flatten[0]
-    return function
-  end
-
   # Writes an app.yaml file for use with Go Google App Engine applications.
   # 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
@@ -166,14 +143,16 @@ YAML
 
   # Writes a main.go function that is a Go Google App Engine application with
   # the user's function in it.
-  def self.write_go_cicero_code(function, function_name, output_dir, file=File)
+  def self.write_go_cicero_code(file_name, function_name, output_dir, file=File)
+    package_name = File.basename(file_name, ".go")
     template_location = File.join(File.dirname(__FILE__), "..",
       "templates", "main.go")
     main_go_contents = file.open(template_location) { |f| f.read }
-    main_go_contents.gsub!(/CICERO_FUNCTION_CONTENTS/, function)
     main_go_contents.gsub!(/CICERO_FUNCTION_NAME/, function_name)
-    main_go_contents.gsub!(/CICERO_PKG_NAME/, function_name.downcase)
+    main_go_contents.gsub!(/CICERO_PKG_NAME/, package_name)
 
+    invokable_name = package_name + "." + function_name
+    main_go_contents.gsub!(/CICERO_PACKAGE_AND_FUNCTION_NAME/, invokable_name)
     main_go_location = file.expand_path(output_dir + File::Separator +
       "main.go")
 

data/templates/main.go

@@ -1,5 +1,5 @@
 // BEGIN CICERO-BOILERPLATE CODE
-package CICERO_PKG_NAME
+package "main"
 
 import (
 	"appengine"
@@ -11,6 +11,8 @@ import (
 	"time"
 )
 
+import "CICERO_PKG_NAME"
+
 type TaskInfo struct {
 	State     string
 	StartTime datastore.Time
@@ -181,7 +183,7 @@ func computeWorker(w http.ResponseWriter, r *http.Request) {
 	outputTextKeyName := outputDest
 	outputTextKey := datastore.NewKey(c, "Text", outputTextKeyName, 0, nil)
 	outputText := Text{
-		Content: CICERO_FUNCTION_NAME(),
+		Content: CICERO_PACKAGE_AND_FUNCTION_NAME(),
 	}
 	datastore.Put(c, outputTextKey, &outputText)
 
@@ -205,6 +207,3 @@ func mapToJson(mapToConvert map[string]string) []byte {
 }
 
 // END CICERO-BOILERPLATE CODE
-// BEGIN USER-PROVIDED FUNCTION
-CICERO_FUNCTION_CONTENTS
-// END USER-PROVIDED FUNCTION

data/templates/main.py

@@ -33,6 +33,7 @@ class Text(db.Model):
 class TaskRoute(webapp.RequestHandler):
   def get(self):
     key_name = self.request.get('task_id')
+    logging.debug("looking up task info for task id " + key_name)
     task_info = TaskInfo.get_by_key_name(key_name)
     result = {} # TODO - see if we can remove that
     try:
@@ -40,7 +41,9 @@ class TaskRoute(webapp.RequestHandler):
     except AttributeError:
       result = {'result':'failure', 'state':'not found'}
 
-    self.response.out.write(json.dumps(result))
+    str_result = json.dumps(result)
+    logging.debug("task info for task id " + key_name + " is " + str_result)
+    self.response.out.write(str_result)
 
   def put(self):
     allowed_routes = ['CICERO_FUNCTION_NAME']
@@ -61,7 +64,7 @@ class TaskRoute(webapp.RequestHandler):
       logging.debug('starting a request for url ' + url)
       new_task = taskqueue.add(url=url, params={'data': json.dumps(json_data)})
       # TODO - adding the task does not imply success - when does it not?
-      result = {'result':'success', 'task_id':new_task.name, 'output':output}
+      result = {'result':'success', 'task_id':new_task.name, 'output':output, 'id':new_task.name}
       logging.debug('result of job with input data' + str(json_data) + ' was ' + str(result))
       self.response.out.write(json.dumps(result))
     else:
@@ -116,22 +119,26 @@ class DataRoute(webapp.RequestHandler):
 
 class ComputeWorker(webapp.RequestHandler):
   def post(self):
+    logging.debug("starting a new task")
     raw_data = self.request.get('data')
     json_data = json.loads(raw_data)
     input_source = str(json_data['input1'])
     output_dest = str(json_data['output'])
+    task_id = output_dest  # TODO(cgb) - find a way to make me the task's id
 
-    # TODO - this should use the task id, not the output location
-    task_info = TaskInfo(key_name = output_dest)
+    logging.debug("adding info about new task, with id " + task_id)
+    task_info = TaskInfo(key_name = task_id)
     task_info.state = "started"
     task_info.start_time = datetime.datetime.now()
     task_info.put()
 
+    logging.debug("done adding task info, running task")
     output_text = Text(key_name = output_dest)
     output_text.content = str(CICERO_PACKAGE_AND_FUNCTION_NAME())
     output_text.put()
 
-    task_info = TaskInfo.get_by_key_name(output_dest)
+    logging.debug("done running task - updating task metadata")
+    task_info = TaskInfo.get_by_key_name(task_id)
     task_info.state = "finished"
     task_info.end_time = datetime.datetime.now()
     task_info.put()

data/test/test_generator.rb

@@ -149,21 +149,6 @@ class TestGenerator < Test::Unit::TestCase
     }
   end
 
-  def test_get_python_function
-    main_file1 = "test 1"
-    function_name = "print_hello_world"
-    assert_equal(PY_FUNCTION.strip, Generator.get_python_function(main_file1,
-      function_name, file=GetPythonFunctionFakeFile).strip)
-
-    main_file2 = "test 2"
-    assert_equal(TEST_PYTHON_FILE2.strip, Generator.get_python_function(
-      main_file2, function_name, file=GetPythonFunctionFakeFile).strip)
-
-    main_file3 = "test 3"
-    assert_equal(PY_FUNCTION.strip, Generator.get_python_function(main_file3,
-      function_name, file=GetPythonFunctionFakeFile).strip)
-  end
-
   def test_write_python_app_yaml
     assert_nothing_raised(SystemExit) {
       Generator.write_python_app_yaml_file("boo", "/tmp/boo", GeneratorFakeFile)
@@ -177,21 +162,6 @@ class TestGenerator < Test::Unit::TestCase
     }
   end
 
-  def test_get_go_function
-    main_file1 = "test 1"
-    function_name = "PrintHelloWorld"
-    assert_equal(GO_FUNCTION.strip, Generator.get_go_function(main_file1,
-      function_name, file=GetGoFunctionFakeFile).strip)
-
-    main_file2 = "test 2"
-    assert_equal(TEST_GO_FILE2.strip, Generator.get_go_function(main_file2,
-      function_name, file=GetGoFunctionFakeFile).strip)
-
-    main_file3 = "test 3"
-    assert_equal(GO_FUNCTION_3.strip, Generator.get_go_function(main_file3,
-      function_name, file=GetGoFunctionFakeFile).strip)
-  end
-
   def test_write_go_app_yaml
     assert_nothing_raised(SystemExit) {
       Generator.write_go_app_yaml_file("boo", "/tmp/boo", GeneratorFakeFile)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oration
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Bunch
@@ -15,7 +15,7 @@ autorequire: oration
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 -08:00
+date: 2012-02-02 00:00:00 -08:00
 default_executable: oration
 dependencies: 
 - !ruby/object:Gem::Dependency