sinatra.patch

sinatra patches for bundler - John Dewey, 12/15/2010 01:50 AM

Download (1.06 KB)

View differences:

src/cloud/ec2/lib/econe-server.rb
39 39 
# Libraries
40 40 
###############################################################################
41 41 
require 'rubygems'
42 
begin
43 
  require 'bundler'
44 
  Bundler.setup :default, ENV['ONE_ENV']
45 
rescue LoadError
46 
  # Otherwise load the gems as usual.
47 
end
48 

  		




  42
  49
  
    
require 'sinatra'

  		




  43
  50
  
    

  		




  44
  51
  
    
require 'EC2QueryServer'

  		












  

    
      src/cloud/occi/lib/occi-server.rb
    
  





  42
  42
  
    
# Required libraries

  		




  43
  43
  
    
################################################

  		




  44
  44
  
    
require 'rubygems'

  		




  
  45
  
    
begin

  		




  
  46
  
    
  require 'bundler'

  		




  
  47
  
    
  Bundler.setup :default, ENV['ONE_ENV']

  		




  
  48
  
    
rescue LoadError

  		




  
  49
  
    
  # Otherwise load the gems as usual.

  		




  
  50
  
    
end

  		




  45
  51
  
    
require 'sinatra'

  		




  46
  52
  
    
require 'OCCIServer'

  		




  47
  53