lib/sdk_connection_harness.rb in videojuicer-vj-sdk-0.1.5 vs lib/sdk_connection_harness.rb in videojuicer-vj-sdk-0.1.12

@@ -1,6 +1,10 @@
-require 'mash'
+begin
+  require 'extlib/mash'
+rescue LoadError
+  require 'mash'
+end
 require 'yaml'
 class SDKConnectionHarness
   class << self
 
     attr_accessor :server_pid
@@ -14,11 +18,11 @@
       stop! if running?
       puts "Starting vj-core from #{core_directory}\n"
       Thread.new do
         cur_dir = Dir.pwd
         Dir.chdir(core_directory) do
-          `merb -d -p #{port} -e test --log .log/sdk-development.log`
+          `./bin/merb -d #{app_server} -p #{port} -e test --log ./log/sdk-development.log`
         end
         Dir.chdir(cur_dir)
       end
     end
     
@@ -43,11 +47,11 @@
       end
     end
     
     def load_fixtures
       Dir.chdir(core_directory) do
-        out = `rake videojuicer:sdk:setup MERB_ENV=test`
+        out = `./bin/rake videojuicer:sdk:setup MERB_ENV=test`
         out = out.match(/!!!([^!]+)!!!/m)
         self.fixtures = out[1]
       end
     end
     
@@ -56,31 +60,41 @@
       f.rewind
       f.write(self.fixtures)
       f.close
     end
     
+    def app_server
+     begin
+       require 'thin'
+       adapter = 'thin'
+     rescue LoadError
+       adapter = 'mongrel'
+     end
+     return "--adapter #{adapter}"
+    end
+    
     def port
-      5555
+      6666
     end
     
     def connect(overrides={})
       fixtures = Mash.new(YAML.load(load_fixtures)).merge(overrides)
-      configure_test_settings(overrides)
-      Videojuicer.enter_scope :seed_name => fixtures.seed.name, 
-                              :consumer_key=>fixtures["write-master"].consumer.consumer_key,
-                              :consumer_secret=>fixtures["write-master"].consumer.consumer_secret,
-                              :token=>fixtures["write-master"].authorized_token.oauth_token,
-                              :token_secret=>fixtures["write-master"].authorized_token.oauth_token_secret
+      configure_test_settings(fixtures)
+      Videojuicer.enter_scope :seed_name => fixtures[:seed][:name], 
+                              :consumer_key=>fixtures["write-master"][:consumer][:consumer_key],
+                              :consumer_secret=>fixtures["write-master"][:consumer][:consumer_secret],
+                              :token=>fixtures["write-master"][:authorized_token][:oauth_token],
+                              :token_secret=>fixtures["write-master"][:authorized_token][:oauth_token_secret]
     end
     
     def configure_test_settings(overrides={})
       Videojuicer.configure!({
         :consumer_key     => nil,
         :consumer_secret  => nil,
         :api_version      => 1,
         :protocol         => "http",
         :host             => "localhost",
-        :port             => 5555
+        :port             => port
       }.merge(overrides))
     end
     
   end
 end
\ No newline at end of file