rhoconnect 3.2.0 → 3.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +3 -0
- data/Gemfile.lock +9 -10
- data/installer/utils/verify_checksum.rb +0 -2
- data/lib/rhoconnect/api/source/save_adapter.rb +1 -1
- data/lib/rhoconnect/version.rb +1 -1
- data/lib/rhoconnect.rb +8 -1
- data/spec/apps/rhotestapp/settings/settings.yml +0 -2
- data/spec/client_sync_spec.rb +1 -0
- data/spec/rhoconnect_spec.rb +1 -2
- metadata +628 -617
- data/examples/simple/Gemfile.lock +0 -97
- data/examples/simple/dump.rdb +0 -0
data/CHANGELOG.md
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
rhoconnect (3.2.
|
4
|
+
rhoconnect (3.2.1)
|
5
5
|
bundler (~> 1.0)
|
6
6
|
json (~> 1.6.0)
|
7
7
|
rake (~> 0.9.2)
|
@@ -41,7 +41,7 @@ GEM
|
|
41
41
|
crack (0.3.1)
|
42
42
|
daemons (1.1.8)
|
43
43
|
diff-lcs (1.1.3)
|
44
|
-
eventmachine (1.0.0.
|
44
|
+
eventmachine (1.0.0.rc.1)
|
45
45
|
excon (0.13.4)
|
46
46
|
execjs (1.4.0)
|
47
47
|
multi_json (~> 1.0)
|
@@ -65,7 +65,7 @@ GEM
|
|
65
65
|
cabin (~> 0.4.3)
|
66
66
|
clamp (= 0.3.1)
|
67
67
|
json (= 1.6.6)
|
68
|
-
highline (1.6.
|
68
|
+
highline (1.6.13)
|
69
69
|
hike (1.2.1)
|
70
70
|
jasmine (1.2.0)
|
71
71
|
jasmine-core (>= 1.2.0)
|
@@ -82,12 +82,12 @@ GEM
|
|
82
82
|
json (1.6.6)
|
83
83
|
libwebsocket (0.1.3)
|
84
84
|
addressable
|
85
|
-
mime-types (1.
|
85
|
+
mime-types (1.19)
|
86
86
|
multi_json (1.3.6)
|
87
87
|
net-scp (1.0.4)
|
88
88
|
net-ssh (>= 1.99.1)
|
89
89
|
net-ssh (2.5.2)
|
90
|
-
nokogiri (1.5.
|
90
|
+
nokogiri (1.5.4)
|
91
91
|
rack (1.4.1)
|
92
92
|
rack-fiber_pool (0.9.2)
|
93
93
|
rack-protection (1.2.0)
|
@@ -112,14 +112,13 @@ GEM
|
|
112
112
|
rspec-expectations (~> 2.9.0)
|
113
113
|
rspec-mocks (~> 2.9.0)
|
114
114
|
rspec-core (2.9.0)
|
115
|
-
rspec-expectations (2.9.
|
115
|
+
rspec-expectations (2.9.0)
|
116
116
|
diff-lcs (~> 1.1.3)
|
117
117
|
rspec-mocks (2.9.0)
|
118
118
|
ruby-hmac (0.4.0)
|
119
|
-
rubyzip (0.9.
|
120
|
-
selenium-webdriver (2.
|
119
|
+
rubyzip (0.9.9)
|
120
|
+
selenium-webdriver (2.24.0)
|
121
121
|
childprocess (>= 0.2.5)
|
122
|
-
ffi (~> 1.0)
|
123
122
|
libwebsocket (~> 0.1.3)
|
124
123
|
multi_json (~> 1.0)
|
125
124
|
rubyzip
|
@@ -150,7 +149,7 @@ GEM
|
|
150
149
|
uuidtools (2.1.2)
|
151
150
|
vegas (0.1.11)
|
152
151
|
rack (>= 1.0.0)
|
153
|
-
webmock (1.8.
|
152
|
+
webmock (1.8.7)
|
154
153
|
addressable (>= 2.2.7)
|
155
154
|
crack (>= 0.1.7)
|
156
155
|
xml-simple (1.1.1)
|
@@ -25,8 +25,6 @@ cmd "ruby ./installer/utils/create_sha1.rb #{dir_to_compare} ."
|
|
25
25
|
old_sha1 = File.open(checksum_file) { |f| f.readline }
|
26
26
|
new_sha1 = File.open('./checksum') { |f| f.readline }
|
27
27
|
|
28
|
-
puts Dir.ls_la dir_to_compare
|
29
|
-
|
30
28
|
if !new_sha1.eql?(old_sha1)
|
31
29
|
puts "Checksums do not match!"
|
32
30
|
exit 2
|
data/lib/rhoconnect/version.rb
CHANGED
data/lib/rhoconnect.rb
CHANGED
@@ -64,7 +64,6 @@ module Rhoconnect
|
|
64
64
|
Rhoconnect.blackberry_bulk_sync = get_setting(config,environment,:blackberry_bulk_sync,false)
|
65
65
|
Rhoconnect.bulk_sync_poll_interval = get_setting(config,environment,:bulk_sync_poll_interval,3600)
|
66
66
|
Rhoconnect.redis = get_setting(config,environment,:redis,false)
|
67
|
-
Rhoconnect.appserver ||= get_setting(config,environment,:appserver,false)
|
68
67
|
Rhoconnect.api_token = ENV['API_TOKEN'] || get_setting(config,environment,:api_token,false)
|
69
68
|
Rhoconnect.log_disabled = get_setting(config,environment,:log_disabled,false)
|
70
69
|
Rhoconnect.raise_on_expired_lock = get_setting(config,environment,:raise_on_expired_lock,false)
|
@@ -296,6 +295,14 @@ module Rhoconnect
|
|
296
295
|
puts "[#{now}] #{args.join}" unless Rhoconnect.log_disabled
|
297
296
|
end
|
298
297
|
|
298
|
+
def self.appserver
|
299
|
+
Store.get_value("appserver_url")
|
300
|
+
end
|
301
|
+
|
302
|
+
def self.appserver=(url)
|
303
|
+
Store.set_value("appserver_url",url)
|
304
|
+
end
|
305
|
+
|
299
306
|
# Base rhoconnect application class
|
300
307
|
class Base
|
301
308
|
# Add everything in vendor to load path
|
@@ -19,7 +19,6 @@
|
|
19
19
|
:bulk_sync_poll_interval: 3600
|
20
20
|
:redis: localhost:6379
|
21
21
|
:syncserver: http://localhost:9292/application/
|
22
|
-
:appserver: http://test.com
|
23
22
|
:api_token: b6f22608fa8b4acf84e844808845e2fe
|
24
23
|
:test:
|
25
24
|
:licensefile: settings/license.key
|
@@ -30,7 +29,6 @@
|
|
30
29
|
:bulk_sync_poll_interval: 3600
|
31
30
|
:redis: localhost:6379
|
32
31
|
:syncserver: http://localhost:9292/application/
|
33
|
-
:appserver: http://test.com
|
34
32
|
:api_token: b6f22608fa8b4acf84e844808845e2fe
|
35
33
|
:cookie_expire: 9999999
|
36
34
|
:poll_interval_default: 201
|
data/spec/client_sync_spec.rb
CHANGED
data/spec/rhoconnect_spec.rb
CHANGED
@@ -20,9 +20,8 @@ describe "Rhoconnect" do
|
|
20
20
|
Rhoconnect.vendor_directory.should == 'foo'
|
21
21
|
Rhoconnect.blackberry_bulk_sync.should == false
|
22
22
|
Rhoconnect.bulk_sync_poll_interval.should == 3600
|
23
|
-
Rhoconnect.environment.should == :test
|
23
|
+
Rhoconnect.environment.should == :test
|
24
24
|
Rhoconnect.stats.should == false
|
25
|
-
Rhoconnect.appserver.should == 'http://test.com'
|
26
25
|
Rhoconnect.cookie_expire.should == 9999999
|
27
26
|
App.is_exist?(test_app_name).should be_true
|
28
27
|
end
|