spec/helpers/app_creator.rb in trackman-0.1.1 vs spec/helpers/app_creator.rb in trackman-0.1.2

@@ -1,38 +1,28 @@
 class AppCreator
-  def self.get_config
-    RemoteAsset.class_variables.inject({}) do |carry, e| 
-      carry.merge!({e => RemoteAsset.send(:class_variable_get, e)})
-    end
+  def self.get_config url
+    response = RestClient.post url, :plan => 'test', :heroku_id => 123 
+    json = JSON.parse response
+
+    trackman_url = json['config']['TRACKMAN_URL'].gsub('https', 'http')
+
+    [[:@@server_url, trackman_url], [:@@site, "#{trackman_url}/assets"]]
   end
 
   def self.create
     user = ENV['HEROKU_USERNAME']
     pass = ENV['HEROKU_PASSWORD']
-    
-    server = RemoteAsset.send(:class_variable_get, :@@server)
-    url = "http://#{user}:#{pass}@#{server}/heroku/resources"
+    server = ENV['TRACKMAN_SERVER_URL']
 
-    response = RestClient.post url, :plan => 'test', :heroku_id => 123 
-    json = JSON.parse response
+    @@config = get_config "http://#{user}:#{pass}@#{server}/heroku/resources"
 
-    user = json['config']['TRACKMAN_USER']
-    pass = json['config']['TRACKMAN_PASSWORD']
-    id = json['id']
-    site = "http://#{user}:#{pass}@#{server}/heroku/resources/#{id}/assets"
-    
-
-    [[:@@user,user], [:@@pass, pass], [:@@app_id, id], [:@@site, site]].each do |s, v| 
+    @@config.each do |s, v| 
       RemoteAsset.send(:class_variable_set, s, v)
     end
-
-    get_config
   end
 
   def self.reset
-    @@old_config.each do |k,v|
+    @@config.each do |k,v|
       RemoteAsset.send(:class_variable_set, k, v)
     end
   end
-
-  @@old_config = get_config
 end
\ No newline at end of file