Makes everything work in a build

Gemfile.lock

@@ -6,7 +6,6 @@ GEM
     jruby-openssl (0.7.4)
       bouncy-castle-java
     jruby-rack (1.1.6)
-    json (1.5.3)
     json (1.5.3-java)
     rack (1.3.2)
     rmagick4j (0.3.7)

Rakefile

@@ -20,13 +20,13 @@ task :build do
   sh "jar cfm streamroller.jar Manifest.txt -C classes org/streamroller/"
   sh "mv streamroller.jar build/"
   sh "cp -r src/ build/"
+  sh "cp -r public/ build/"
 
   sh "bundle install --deployment"
   sh "cp -r vendor/ build/"
 
   sh "cp config.yml.example build/"
   sh "rm Manifest.txt"
-
 end
 
 desc "Cleans the build/ directory"

src/initialization_helper.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module StreamRoller
   module InitializationHelper
 

src/main.rb

@@ -1,9 +1,6 @@
 $:.push("src/")
 
 require 'rubygems'
-gem 'rmagick4j'
-require 'bundler/setup'
-Bundler.require(:default)
 require 'streamroller'
 require 'rackhacks'
 require 'java'

src/org/streamroller/Main.java

@@ -28,54 +28,14 @@ public static void main(String[] args) throws Exception
       JFrame frame = new JFrame("StreamRoller");
       MainUI mainui = new MainUI(frame);
     }
-    
+
     System.out.println("Now loading StreamRoller...");
-    
+
     RubyInstanceConfig config = new RubyInstanceConfig();
     config.setArgv(args);
     Ruby runtime = JavaEmbedUtils.initialize(new ArrayList(0), config);
-    String mainRubyFile = "main";
-
-    ArrayList<String> config_data = new ArrayList<String>();
-    try{
-      java.io.InputStream ins = Main.class.getClassLoader().getResourceAsStream("run_configuration");
-      if (ins == null ) {
-        System.err.println("Did not find configuration file 'run_configuration', using defaults.");
-      } else {
-        config_data = getConfigFileContents(ins);
-      }
-    }
-    catch(IOException ioe)
-    {
-      System.err.println("Error loading run configuration file 'run_configuration', using defaults: " + ioe);
-    }
-    catch(java.lang.NullPointerException npe)
-    {
-      System.err.println("Error loading run configuration file 'run_configuration', using defaults: " + npe );
-    }
 
-    for(String line : config_data) {
-      String[] parts = line.split(":");
-      if("main_ruby_file".equals(parts[0].replaceAll(" ", ""))) {
-        mainRubyFile = parts[1].replaceAll(" ", "");
-      }
-    }
+    runtime.evalScriptlet("ENV['GEM_HOME'] = 'vendor/bundle/jruby/1.8'");
     runtime.evalScriptlet("require 'src/main'");
   }
-
-  public static URL getResource(String path) {
-    return Main.class.getClassLoader().getResource(path);
-  }
-
-  private static ArrayList<String> getConfigFileContents(InputStream input) throws IOException, java.lang.NullPointerException {
-    BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-    String line;
-    ArrayList<String> contents = new ArrayList<String>();
-
-    while ((line = reader.readLine()) != null) {
-      contents.add(line);
-    }
-    reader.close();
-    return(contents);
-  }
 }

src/sequel_extensions.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 class Sequel::Dataset
   def to_json
     naked.all.to_json

src/streamroller.rb

@@ -1,10 +1,12 @@
+require 'sinatra'
 require 'initialization_helper'
 require 'utils'
 require 'library'
 require 'toolmanager'
 require 'requestrouter'
 require 'sequel_extensions'
 require 'timeout'
+require 'json'
 
 module StreamRoller
   class StreamRoller < Sinatra::Base