rhoconnect 3.2.0 → 3.2.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.1 (2012-06-21)
+* #30760809 - moved appserver url to redis
+
 ## 3.2.0 (2012-05-30)
 * #27555029 - support REDISTOGO_URL in addition to REDIS env vars as redis connection strings for Heroku
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.2.0)
+    rhoconnect (3.2.1)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -41,7 +41,7 @@ GEM
     crack (0.3.1)
     daemons (1.1.8)
     diff-lcs (1.1.3)
-    eventmachine (1.0.0.beta.4)
+    eventmachine (1.0.0.rc.1)
     excon (0.13.4)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -65,7 +65,7 @@ GEM
       cabin (~> 0.4.3)
       clamp (= 0.3.1)
       json (= 1.6.6)
-    highline (1.6.12)
+    highline (1.6.13)
     hike (1.2.1)
     jasmine (1.2.0)
       jasmine-core (>= 1.2.0)
@@ -82,12 +82,12 @@ GEM
     json (1.6.6)
     libwebsocket (0.1.3)
       addressable
-    mime-types (1.18)
+    mime-types (1.19)
     multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.5.2)
-    nokogiri (1.5.2)
+    nokogiri (1.5.4)
     rack (1.4.1)
     rack-fiber_pool (0.9.2)
     rack-protection (1.2.0)
@@ -112,14 +112,13 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.8)
-    selenium-webdriver (2.22.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.24.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
@@ -150,7 +149,7 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.6)
+    webmock (1.8.7)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)

data/installer/utils/verify_checksum.rb

@@ -25,8 +25,6 @@ cmd "ruby ./installer/utils/create_sha1.rb #{dir_to_compare} ."
 old_sha1 = File.open(checksum_file) { |f| f.readline }
 new_sha1 = File.open('./checksum')  { |f| f.readline }
 
-puts Dir.ls_la dir_to_compare
-
 if !new_sha1.eql?(old_sha1)
   puts "Checksums do not match!"
   exit 2

data/lib/rhoconnect/api/source/save_adapter.rb

@@ -1,3 +1,3 @@
 Server.api :save_adapter, :source do |params,user|
-  Rhoconnect.appserver = params['adapter_url']
+  Rhoconnect.appserver = params[:attributes]['adapter_url'] || params['adapter_url']
 end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/lib/rhoconnect.rb

@@ -64,7 +64,6 @@ module Rhoconnect
     Rhoconnect.blackberry_bulk_sync = get_setting(config,environment,:blackberry_bulk_sync,false)
     Rhoconnect.bulk_sync_poll_interval = get_setting(config,environment,:bulk_sync_poll_interval,3600)
     Rhoconnect.redis = get_setting(config,environment,:redis,false)
-    Rhoconnect.appserver ||= get_setting(config,environment,:appserver,false)
     Rhoconnect.api_token = ENV['API_TOKEN'] || get_setting(config,environment,:api_token,false)
     Rhoconnect.log_disabled = get_setting(config,environment,:log_disabled,false)
     Rhoconnect.raise_on_expired_lock = get_setting(config,environment,:raise_on_expired_lock,false)
@@ -296,6 +295,14 @@ module Rhoconnect
     puts "[#{now}] #{args.join}" unless Rhoconnect.log_disabled
   end
   
+  def self.appserver
+     Store.get_value("appserver_url")
+  end
+  
+  def self.appserver=(url)
+    Store.set_value("appserver_url",url)
+  end
+  
   # Base rhoconnect application class
   class Base    
     # Add everything in vendor to load path

data/spec/apps/rhotestapp/settings/settings.yml

@@ -19,7 +19,6 @@
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :appserver: http://test.com
   :api_token: b6f22608fa8b4acf84e844808845e2fe
 :test: 
   :licensefile: settings/license.key
@@ -30,7 +29,6 @@
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :appserver: http://test.com
   :api_token: b6f22608fa8b4acf84e844808845e2fe
   :cookie_expire: 9999999
   :poll_interval_default: 201

data/spec/client_sync_spec.rb

@@ -19,6 +19,7 @@ describe "ClientSync" do
     end
     
     it "should handle send cud for dynamic adapter" do
+      Rhoconnect.appserver = "http://test.com"
       data = {'1'=>@product1}
       expected = {'insert'=>data} 
       stub_request(:post, "http://test.com/rhoconnect/authenticate")

data/spec/rhoconnect_spec.rb

@@ -20,9 +20,8 @@ describe "Rhoconnect" do
     Rhoconnect.vendor_directory.should == 'foo'
     Rhoconnect.blackberry_bulk_sync.should == false
     Rhoconnect.bulk_sync_poll_interval.should == 3600
-    Rhoconnect.environment.should == :test  
+    Rhoconnect.environment.should == :test
     Rhoconnect.stats.should == false
-    Rhoconnect.appserver.should == 'http://test.com'
     Rhoconnect.cookie_expire.should == 9999999
     App.is_exist?(test_app_name).should be_true
   end