transcriptic 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ee5e633ccf6090da9f9c302ed28d5ebcb51a91
-  data.tar.gz: 082a53ce0fea38126c1ab6e3d2c1a8e88d568c94
+  metadata.gz: 0432633be6dbce9d58f6eac8a542dd286234aa5c
+  data.tar.gz: 11a6daf5e72c5410c84841e4c11940434b327feb
 SHA512:
-  metadata.gz: d547dcbf5cd749034f0a053dd5ce9e54db318bb2b084777e91c044c3db8343a3f64813ba7946cb004e61c40c964a84b63b1b516f934d6e76923ad5813962764c
-  data.tar.gz: 2a601e5d2f5dc0f3b78a9906b14d78978ac76904b4eb5a6853755596b67db115de69233f6ab02ad3d9c2acd3cb1bf321cb49e78b8a850e683558ee238d01037b
+  metadata.gz: 3a7e8dedbb8e5bdce6b0dd93b5432377051295884d0f0da7ab8b92eca590803b1919fdbdac0a834a822ed1284ee281f7569565f394f95641303032c271e65e51
+  data.tar.gz: a1f06b8c5a81d2ce06edd201dfe09cf85b870bab37406b8d4d1fcb0fd483fd9309a130a85bcfb892465f1669077c7581c012d1c7b457ab46d8c80291588466a2

data/lib/transcriptic/cli.rb

@@ -121,7 +121,6 @@ module Transcriptic
         output_with_arrow "Updating dependencies..."
         labfile = Transcriptic::Labfile.from_file(Transcriptic.find_labfile)
         Transcriptic::DependenciesGenerator.new([Dir.pwd, labfile.dependencies], options).invoke_all
-        Transcriptic::SBT.update
       end
 
       desc "compile", "Compile the project"
@@ -133,17 +132,20 @@ module Transcriptic
 
       desc "analyze OBJECTPATH", "Analyze a protocol.  Object path is of the form edu.foo.bar where bar is the name of your Protocol object."
       method_options :raw => :boolean, :iterations => :numeric, :linearize => :boolean
-      def analyze(object_path)
+      def analyze(object_path, *params)
         raw = options.raw ? "--raw" : ""
         linearize = options.linearize ? "--linearize" : ""
         iterations = options.iterations ? options.iterations : 5
         require_labfile!
         update
         Transcriptic::SBT.stage
-        data = `target/start #{object_path} --verify #{raw} #{linearize} --iterations #{iterations}`
+        data = `target/start #{object_path} --verify #{raw} #{linearize} --iterations #{iterations} #{params.join(" ")}`
         if not options.raw
+          File.open("logs/#{object_path}", 'w') { |file| file.write(data) }
+          data = data.split("\n")[-1]
           json = json_decode(data)
           output_with_arrow "Verification successful for #{object_path}"
+          output_with_arrow "Logged output during verification to logs/#{object_path}"
           output_with_indent "Expected cost: $#{json["price_avg"]}, maximum observed cost: $#{json["price_max"]}"
         else
           say data

data/lib/transcriptic/project_generator.rb

@@ -20,6 +20,7 @@ module Transcriptic
     def generate
       empty_directory target.join('app')
       empty_directory target.join('project')
+      empty_directory target.join('logs')
 
       template 'app/Main.erb', target.join('app/Main.scala')
       template 'project/Build.erb', target.join('project/Build.scala')
@@ -32,6 +33,10 @@ module Transcriptic
       Transcriptic::DependenciesGenerator.new([File.join(Dir.pwd, name), []], options).invoke_all
     end
 
+    def autoprotocol_version
+      Transcriptic::AUTOPROTOCOL_VERSION
+    end
+
     def description
       options[:description]
     end

data/lib/transcriptic/templates/app/Main.erb

@@ -1,10 +1,12 @@
 package <%= package %>
 
 import org.autoprotocol.measures._
-import org.autoprotocol.core.{Sample, Protocol, ProtocolConfig}
+import org.autoprotocol.core.{Aliquot, Resource, Protocol, ProtocolConfig}
 
 object <%= name.camelize %> extends Protocol {
 
+  val params = Map[String, String]()
+
   def run(config: ProtocolConfig): Unit = {
     // Your code goes here.
   }

data/lib/transcriptic/templates/project/Build.erb

@@ -49,7 +49,7 @@ object AutoprotocolBuild extends Build {
     "<%= name %>",
     file("."),
     settings =
-      buildSettings ++ Seq (libraryDependencies ++= (Seq("org.autoprotocol" %% "autoprotocol-library" % "0.1.1-SNAPSHOT") ++
+      buildSettings ++ Seq (libraryDependencies ++= (Seq("org.autoprotocol" %% "autoprotocol-library" % "<%= autoprotocol_version %>") ++
         dependencies), resolvers ++= Seq(transcriptic, autoprotocol, typesafe)) ++ Defaults.defaultSettings ++ 
         StartScriptPlugin.startScriptForClassesSettings
   ) settings (

data/lib/transcriptic/version.rb

@@ -1,4 +1,4 @@
 module Transcriptic
-  VERSION = "0.2.3"
-  AUTOPROTOCOL_VERSION = "0.1.0"
+  VERSION = "0.2.4"
+  AUTOPROTOCOL_VERSION = "0.1.1-SNAPSHOT"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transcriptic
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Transcriptic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc