experiment 0.3.0 → 0.3.1

data/bin/experiment

@@ -8,7 +8,7 @@ require "rdoc/rdoc"
 require File.dirname(__FILE__) + "/../lib/experiment/runner"
 
 class App
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
   
   attr_reader :options
 
@@ -55,7 +55,7 @@ class App
       @opts = OptionParser.new 
       @opts.on('-v', '--version')    { output_version ; exit 0 }
       @opts.on('-h', '--help')       { output_help }
-      @opts.on('-V', '--verbose')    { @options.verbose = true }  
+      @opts.on('-V', '--verbose')    { @options.verbose = true; @options.summary = true }  
       @opts.on('-q', '--quiet')      { @options.quiet = true }
 			@opts.on('-e', '--env [ENV]', [:development, :compute], "Sets the environment to run in.")	{ |v| @options.env = v }
 			
@@ -65,7 +65,7 @@ class App
 			  @opts.on('-m', '--description M', String, "Description or hypothesis for the condition being generated.")      { |v| @options.description = v }
 			end
 			
-			if ARGV.first == 'run' || ARGV.first == "-h"
+			if ARGV.first == 'run' || ARGV.first == "-h" || ARGV.first == 'console'
 			  @opts.separator ""
         @opts.separator "Options for `run`:"
 			  @opts.on('-c', '--cv CV', Integer, "The number of cross validations to run.")	{ |v| @options.cv = v }

data/lib/experiment.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Experiment
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/experiment/config.rb

@@ -62,6 +62,7 @@ module Experiment
   				exp = YAML::load_file(expath)
   			  @config.merge! exp["experiment"][env.to_s] if exp["experiment"][env.to_s].is_a? Hash
   			end
+  			@config.merge! @override_options if @override_options
   			@config.merge! parse(options)
   		end
       
@@ -176,11 +177,8 @@ module Experiment
 	          num += 1
 	          cl = value.class == Fixnum ? Integer : value.class;
 	          o.on("--#{key} VALUE", cl, "Default value #{value.inspect}") do |v| 
-	            if options.opts == ""
-	              options.opts = "#{key}: #{v}"
-	            else
-	              options.opts += ", #{key}: #{v}"
-              end
+	            @override_options ||= {}
+	            @override_options[key] = v
             end
           end
         end

data/lib/experiment/notify.rb

@@ -24,7 +24,7 @@ module Experiment
         @previous_time = @start_time
         @growl = growl
         @mode = mode
-        show if @mode == :normal
+        show if @mode == :normal && @out
       end
     
       # Called when starting work on a particular experiment
@@ -95,6 +95,7 @@ module Experiment
       end
     
       def show_if_needed
+        return unless @out
         if @total.zero?
           cur_percentage = 100
           prev_percentage = 0
@@ -113,22 +114,22 @@ module Experiment
     
     
       def show
-        percent = @current  * 100 / @total
-        bar_width = percent * @terminal_width / 100
-        line = sprintf "%3d%% |%s%s| %s", percent, "=" * bar_width, "-" * (@terminal_width - bar_width), stat
+        percent = @current  * 100.0 / @total
+        bar_width = percent * @terminal_width / 100.0
+        line = sprintf "%3d%% |%s%s| %s", percent, "=" * bar_width.floor, "-" * (@terminal_width - bar_width.ceil), stat
       
 
-        width = get_width
-        if line.length == width - 1 
+        #width = get_width
+        #if line.length == width - 1 
           @out.print(line +  (@finished_p ? "\n" : "\r"))
           @out.flush
-        elsif line.length >= width
-          @terminal_width = [@terminal_width - (line.length - width + 1), 0].max
-          if @terminal_width == 0 then @out.print(line + eol) else show end
-        else # line.length < width - 1
-          @terminal_width += width - line.length + 1
-          show
-        end
+        #elsif line.length >= width
+        #  @terminal_width = [@terminal_width - (line.length - width + 1), 0].max
+        #  if @terminal_width == 0 then @out.print(line + (@finished_p ? "\n" : "\r")) else show end
+        #else # line.length < width - 1
+        #  @terminal_width += width - line.length + 1
+        #  show
+        #end
         @previous_time = Time.now
       end
     

data/lib/experiment/runner.rb

@@ -33,9 +33,10 @@ module Experiment
 			  req_file.puts "# The first contious block of comment will be included in your report."
 			  req_file.puts "# This includes the reference implementation."
 			  req_file.puts "# Override any desired files in this directory."
-			  Dir["./app/**/*.rb"].each do |f|
-			    p = f.split("/") - File.expand_path(".").split("/")
-			    req_file.puts "require File.dirname(__FILE__) + \"/../../#{p.join("/")}\""
+			  Dir["./app/**/*.{rb,o,dll,so,bundle}"].each do |f|
+			    next if File.basename(f) == 'extconfig.rb'
+			    p = File.expand_path(f).split("/") - File.expand_path(".").split("/")
+			    req_file.puts "require \"#{p.join("/").gsub(/\.(rb|o|dll|so|bundle)$/, "")}\""
 			  end
 			  req_file.puts "\nclass #{as_class_name @arguments.first} < MyExperiment\n\t\nend"
 			end
@@ -125,6 +126,7 @@ module Experiment
 		  require File.dirname(__FILE__) + "/base"
 
 		  require "./experiments/experiment"
+		  $: << "./"
       Experiment::Config::init @options.env
 		  @options.cv = Experiment::Config.get :cross_validations, 5 if @options.cv.nil?
 		  if @options.distributed
@@ -136,7 +138,7 @@ module Experiment
 		    Notify::done
 		    return true
   	  else
-  	    Notify::init @arguments.length * @options.cv, STDOUT, Experiment::Config::get(:growl_notifications, true)
+  	    Notify::init @arguments.length * @options.cv, @options.quiet ? false : STDERR, Experiment::Config::get(:growl_notifications, !@options.quiet)
 			  @arguments.each do |exp|
   			  require "./experiments/#{exp}/#{exp}"
   			  cla = eval(as_class_name(exp))
@@ -152,17 +154,17 @@ module Experiment
 		def console
 			cla = as_class_name(@arguments.first)	if @arguments.length == 1
 		  File.open("./tmp/irb-setup.rb", 'w') do |f|
+		    f.puts "# Initializes the environment for IRb."
 		    f.puts "Experiment::Config::init #{@options.env.inspect}"
-		    f.puts "def reload!"
-		    f.puts "  "
-		    f.puts "end"
+		    f.puts "$: << '#{File.expand_path(".")}/'"
 		    if @arguments.length == 1
+		      f.puts "require 'experiments/#{@arguments.first}/#{@arguments.first}'"
 		      f.puts "def experiment"
   		    f.puts "  @experiment ||= #{cla}.new :normal, #{@arguments.first.inspect}, OpenStruct.new(#{@options.marshal_dump})"
   		    f.puts "end"
   		    f.puts "experiment #load up the configs"
   		  else
-  		    f.puts 'Dir["./app/*.rb"].each{|e| require e }'
+  		    f.puts 'Dir["./app/**/*.{rb,o,so,dll,bundle}"].each{|e| require e.gsub(/\.(rb|so|o|dll|bundle)$/, "") }'
   		    f.puts "Experiment::Config::load '', #{options.opts.inspect}"
 		    end
 		    
@@ -171,7 +173,6 @@ module Experiment
       libs =  " -r irb/completion"
       libs <<  " -r #{File.dirname(__FILE__) + "/base"}"
       libs << " -r./experiments/experiment"
-      libs << " -r ./experiments/#{@arguments.first}/#{@arguments.first}" if @arguments.length == 1
       libs << " -r ./tmp/irb-setup.rb"
       puts "Loading #{@options.env} environment..."
       exec "#{irb} #{libs} --simple-prompt"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jakub Hampl
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +00:00
+date: 2010-12-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency