Skip to content

Commit 1f071c4

Browse files
catmandocatmando
committed
resolved merge conflicts
2 parents f6649b9 + 7856168 commit 1f071c4

File tree

23 files changed

+103
-94
lines changed

23 files changed

+103
-94
lines changed

‎install/rails-webpacker.rb‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
# ----------------------------------- Add the gems
1010

1111
gem 'webpacker'
12-
gem 'rails-hyperstack', '~> 1.0.alpha' # github: 'hyperstack-org/hyperstack', branch: 'edge', glob: 'ruby/*/*.gemspec'
12+
gem 'rails-hyperstack', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/rails-hyperstack" #github: 'hyperstack-org/hyperstack', branch: 'edge', glob: 'ruby/*/*.gemspec'
13+
gem 'hyperstack-config', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/hyperstack-config"
14+
gem 'hyper-component', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/hyper-component"
15+
gem 'hyper-store', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/hyper-store"
16+
gem 'hyper-model', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/hyper-model"
17+
gem 'hyper-router', '~> 1.0.alpha', path: "/Users/d067570/src/privat/hyperstack/ruby/hyper-router"
1318

1419
gem_group :development do
1520
gem 'foreman'

‎ruby/hyper-component/Gemfile.lock‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PATH
44
hyper-spec (1.0.alpha1.2)
55
capybara
66
chromedriver-helper (= 1.2.0)
7-
libv8 (~> 6.7.0)
7+
libv8
88
method_source
99
mini_racer (~> 0.2.4)
1010
opal (>= 0.11.0, < 0.12.0)
@@ -36,7 +36,6 @@ PATH
3636
remote: ../hyperstack-config
3737
specs:
3838
hyperstack-config (1.0.alpha1.2)
39-
libv8 (~> 6.7.0)
4039
listen (~> 3.0)
4140
mini_racer (~> 0.2.4)
4241
opal (>= 0.11.0, < 0.12.0)
@@ -336,7 +335,7 @@ PLATFORMS
336335
ruby
337336

338337
DEPENDENCIES
339-
bundler
338+
bundler (>= 1.17.3, < 2.1)
340339
chromedriver-helper
341340
hyper-component!
342341
hyper-spec!

‎ruby/hyper-component/hyper-component.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.add_dependency 'opal-activesupport', '~> 0.3.1'
3030
spec.add_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
3131

32-
spec.add_development_dependency 'bundler' #, '~> 1.16'
32+
spec.add_development_dependency 'bundler', ['>= 1.17.3', '< 2.1']
3333
spec.add_development_dependency 'chromedriver-helper'
3434
spec.add_development_dependency 'hyper-spec', Hyperstack::Component::VERSION
3535
spec.add_development_dependency 'jquery-rails'

‎ruby/hyper-console/Gemfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source 'https://rubygems.org'
22
#gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
3-
gem 'hyper-spec', path: '../hyper-spec'
4-
gem 'hyperloop-config', path: '../hyperloop-config'
5-
gem 'hyper-store', path: '../hyper-store'
6-
gem 'hyper-component', path: '../hyper-component'
7-
gem 'hyper-operation', path: '../hyper-operation'
3+
gem 'hyper-spec', path: '../hyper-spec'
4+
gem 'hyperstack-config', path: '../hyperstack-config'
5+
gem 'hyper-store', path: '../hyper-store'
6+
gem 'hyper-component', path: '../hyper-component'
7+
gem 'hyper-operation', path: '../hyper-operation'
88
# Specify your gem's dependencies in hyper-console.gemspec
99
gemspec

‎ruby/hyper-console/Gemfile.lock‎

Lines changed: 60 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
1-
GIT
2-
remote: https://github.com/opal/opal-jquery.git
3-
revision: f47a9b42da366cea270f743b05acf529f3077d35
4-
branch: master
5-
specs:
6-
opal-jquery (0.4.2)
7-
opal (>= 0.10.0, < 0.12.0)
8-
91
PATH
102
remote: ../hyper-component
113
specs:
12-
hyper-component (1.0.0.lap28)
13-
hyper-store (= 1.0.0.lap28)
14-
hyperloop-config (= 1.0.0.lap28)
4+
hyper-component (1.0.alpha1.2)
5+
hyper-state (= 1.0.alpha1.2)
6+
hyperstack-config (= 1.0.alpha1.2)
157
libv8 (~> 6.3.0)
16-
mini_racer (~> 0.1.15)
8+
mini_racer (~> 0.2.4)
179
opal (>= 0.11.0, < 0.12.0)
1810
opal-activesupport (~> 0.3.1)
1911
react-rails (>= 2.4.0, < 2.5.0)
2012

2113
PATH
2214
remote: ../hyper-operation
2315
specs:
24-
hyper-operation (1.0.0.lap28)
16+
hyper-operation (1.0.alpha1.2)
2517
activerecord (>= 4.0.0)
26-
hyper-component (= 1.0.0.lap28)
18+
hyper-component (= 1.0.alpha1.2)
2719
mutations
2820
opal-activesupport (~> 0.3.1)
2921

3022
PATH
3123
remote: ../hyper-spec
3224
specs:
33-
hyper-spec (1.0.0.lap28)
25+
hyper-spec (1.0.alpha1.2)
3426
capybara
35-
chromedriver-helper
36-
libv8 (~> 6.3.0)
27+
chromedriver-helper (= 1.2.0)
28+
libv8
3729
method_source
38-
mini_racer (~> 0.1.15)
30+
mini_racer (~> 0.2.4)
3931
opal (>= 0.11.0, < 0.12.0)
4032
parser (>= 2.3.3.1)
4133
pry
@@ -49,26 +41,28 @@ PATH
4941
PATH
5042
remote: ../hyper-store
5143
specs:
52-
hyper-store (1.0.0.lap28)
53-
hyperloop-config (= 1.0.0.lap28)
44+
hyper-store (1.0.alpha1.2)
45+
hyper-state (= 1.0.alpha1.2)
46+
hyperstack-config (= 1.0.alpha1.2)
5447
opal (>= 0.11.0, < 0.12.0)
5548

5649
PATH
57-
remote: ../hyperloop-config
50+
remote: ../hyperstack-config
5851
specs:
59-
hyperloop-config (1.0.0.lap28)
60-
libv8 (~> 6.3.0)
61-
mini_racer (~> 0.1.15)
52+
hyperstack-config (1.0.alpha1.2)
53+
listen (~> 3.0)
54+
mini_racer (~> 0.2.4)
6255
opal (>= 0.11.0, < 0.12.0)
6356
opal-browser (~> 0.2.0)
6457
uglifier
58+
websocket
6559

6660
PATH
6761
remote: .
6862
specs:
69-
hyper-console (1.0.0.lap28)
70-
hyper-operation (= 1.0.0.lap28)
71-
hyper-store (= 1.0.0.lap28)
63+
hyper-console (1.0.alpha1.2)
64+
hyper-operation (= 1.0.alpha1.2)
65+
hyper-store (= 1.0.alpha1.2)
7266

7367
GEM
7468
remote: https://rubygems.org/
@@ -125,13 +119,14 @@ GEM
125119
babel-source (>= 4.0, < 6)
126120
execjs (~> 2.0)
127121
builder (3.2.3)
128-
capybara (3.7.2)
122+
capybara (3.12.0)
129123
addressable
130124
mini_mime (>= 0.1.3)
131125
nokogiri (~> 1.8)
132126
rack (>= 1.6.0)
133127
rack-test (>= 0.6.3)
134-
xpath (~> 3.1)
128+
regexp_parser (~> 1.2)
129+
xpath (~> 3.2)
135130
childprocess (0.9.0)
136131
ffi (~> 1.0, >= 1.0.11)
137132
chromedriver-helper (1.2.0)
@@ -152,6 +147,9 @@ GEM
152147
globalid (0.4.1)
153148
activesupport (>= 4.2.0)
154149
hike (1.2.3)
150+
hyper-state (1.0.alpha1.2)
151+
hyperstack-config (= 1.0.alpha1.2)
152+
opal (>= 0.11.0, < 0.12.0)
155153
i18n (0.9.5)
156154
concurrent-ruby (~> 1.0)
157155
ice_nine (0.11.2)
@@ -160,7 +158,11 @@ GEM
160158
rails-dom-testing (>= 1, < 3)
161159
railties (>= 4.2.0)
162160
thor (>= 0.14, < 2.0)
163-
libv8 (6.3.292.48.1-x86_64-darwin-15)
161+
libv8 (6.3.292.48.1)
162+
listen (3.1.5)
163+
rb-fsevent (~> 0.9, >= 0.9.4)
164+
rb-inotify (~> 0.9, >= 0.9.7)
165+
ruby_dep (~> 1.2)
164166
loofah (2.2.2)
165167
crass (~> 1.0.2)
166168
nokogiri (>= 1.5.9)
@@ -170,15 +172,16 @@ GEM
170172
thread_safe (~> 0.3, >= 0.3.1)
171173
method_source (0.9.0)
172174
mini_mime (1.0.0)
173-
mini_portile2 (2.3.0)
174-
mini_racer (0.1.15)
175-
libv8 (~> 6.3)
175+
mini_portile2 (2.4.0)
176+
mini_racer (0.2.4)
177+
libv8 (>= 6.3)
176178
minitest (5.11.3)
177179
mutations (0.8.3)
178180
activesupport
181+
net_http_ssl_fix (0.0.10)
179182
nio4r (2.3.0)
180-
nokogiri (1.8.2)
181-
mini_portile2 (~> 2.3.0)
183+
nokogiri (1.9.1)
184+
mini_portile2 (~> 2.4.0)
182185
opal (0.11.0)
183186
ast (>= 2.3.0)
184187
hike (~> 1.2)
@@ -189,6 +192,8 @@ GEM
189192
opal-browser (0.2.0)
190193
opal
191194
paggio
195+
opal-jquery (0.4.3)
196+
opal (>= 0.10.0, < 0.12.0)
192197
opal-rails (0.9.4)
193198
jquery-rails
194199
opal (>= 0.10.0, < 0.12)
@@ -205,7 +210,7 @@ GEM
205210
parser (2.3.3.1)
206211
ast (~> 2.2)
207212
procto (0.0.3)
208-
pry (0.11.3)
213+
pry (0.12.2)
209214
coderay (~> 1.1.0)
210215
method_source (~> 0.9.0)
211216
public_suffix (3.0.3)
@@ -236,21 +241,25 @@ GEM
236241
rake (>= 0.8.7)
237242
thor (>= 0.18.1, < 2.0)
238243
rake (10.5.0)
244+
rb-fsevent (0.10.3)
245+
rb-inotify (0.10.0)
246+
ffi (~> 1.0)
239247
react-rails (2.4.7)
240248
babel-transpiler (>= 0.7.0)
241249
connection_pool
242250
execjs
243251
railties (>= 3.2)
244252
tilt
253+
regexp_parser (1.3.0)
245254
rspec-core (3.8.0)
246255
rspec-support (~> 3.8.0)
247-
rspec-expectations (3.8.1)
256+
rspec-expectations (3.8.2)
248257
diff-lcs (>= 1.2.0, < 2.0)
249258
rspec-support (~> 3.8.0)
250259
rspec-mocks (3.8.0)
251260
diff-lcs (>= 1.2.0, < 2.0)
252261
rspec-support (~> 3.8.0)
253-
rspec-rails (3.8.0)
262+
rspec-rails (3.8.1)
254263
actionpack (>= 3.0)
255264
activesupport (>= 3.0)
256265
railties (>= 3.0)
@@ -259,10 +268,11 @@ GEM
259268
rspec-mocks (~> 3.8.0)
260269
rspec-support (~> 3.8.0)
261270
rspec-support (3.8.0)
271+
ruby_dep (1.5.0)
262272
rubyzip (1.2.2)
263-
selenium-webdriver (3.14.0)
273+
selenium-webdriver (3.141.0)
264274
childprocess (~> 0.5)
265-
rubyzip (~> 1.2)
275+
rubyzip (~> 1.2, >= 1.2.2)
266276
sourcemap (0.1.1)
267277
sprockets (3.7.1)
268278
concurrent-ruby (~> 1.0)
@@ -279,42 +289,45 @@ GEM
279289
thread_safe (~> 0.1)
280290
uglifier (4.1.6)
281291
execjs (>= 0.3.0, < 3)
282-
unparser (0.2.8)
292+
unparser (0.4.2)
283293
abstract_type (~> 0.0.7)
284294
adamantium (~> 0.2.0)
285295
concord (~> 0.1.5)
286296
diff-lcs (~> 1.3)
287297
equalizer (~> 0.0.9)
288298
parser (>= 2.3.1.2, < 2.6)
289299
procto (~> 0.0.2)
290-
webdrivers (3.4.0)
300+
webdrivers (3.5.2)
301+
net_http_ssl_fix
291302
nokogiri (~> 1.6)
292303
rubyzip (~> 1.0)
293304
selenium-webdriver (~> 3.0)
305+
websocket (1.2.8)
294306
websocket-driver (0.6.5)
295307
websocket-extensions (>= 0.1.0)
296308
websocket-extensions (0.1.3)
297-
xpath (3.1.0)
309+
xpath (3.2.0)
298310
nokogiri (~> 1.8)
299311

300312
PLATFORMS
301313
ruby
302314

303315
DEPENDENCIES
304-
bundler (~> 1.12)
316+
bundler (>= 1.17.3, < 2.0)
317+
chromedriver-helper
305318
hyper-component!
306319
hyper-console!
307320
hyper-operation!
308321
hyper-spec!
309322
hyper-store!
310-
hyperloop-config!
323+
hyperstack-config!
311324
opal (>= 0.11.0, < 0.12.0)
312325
opal-browser
313-
opal-jquery!
326+
opal-jquery
314327
opal-rails (~> 0.9.4)
315328
rails
316329
rake (~> 10.0)
317330
uglifier (= 4.1.6)
318331

319332
BUNDLED WITH
320-
1.16.0
333+
1.17.3

‎ruby/hyper-console/hyper-console.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
2121
spec.add_dependency 'hyper-operation', Hyperloop::Console::VERSION
2222
spec.add_dependency 'hyper-store', Hyperloop::Console::VERSION
2323

24-
spec.add_development_dependency 'bundler', '~> 1.12'
24+
spec.add_development_dependency 'bundler', ['>= 1.17.3', '< 2.1']
2525
spec.add_development_dependency 'chromedriver-helper'
2626
spec.add_development_dependency 'hyper-component', Hyperloop::Console::VERSION
2727
spec.add_development_dependency 'hyper-operation', Hyperloop::Console::VERSION
2828
spec.add_development_dependency 'hyper-store', Hyperloop::Console::VERSION
29-
spec.add_development_dependency 'hyperloop-config', Hyperloop::Console::VERSION
29+
spec.add_development_dependency 'hyperstack-config', Hyperloop::Console::VERSION
3030
spec.add_development_dependency 'opal', '>= 0.11.0', '< 0.12.0'
3131
spec.add_development_dependency 'opal-browser'
3232
spec.add_development_dependency 'opal-jquery'

‎ruby/hyper-console/lib/hyperloop/console/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Hyperloop
22
module Console
3-
VERSION = '0.99.3'
3+
VERSION = '1.0.alpha1.2'
44
end
55
end

‎ruby/hyper-i18n/Gemfile.lock‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PATH
3535
hyper-spec (1.0.alpha1.2)
3636
capybara
3737
chromedriver-helper (= 1.2.0)
38-
libv8 (~> 6.7.0)
38+
libv8
3939
method_source
4040
mini_racer (~> 0.2.4)
4141
opal (>= 0.11.0, < 0.12.0)
@@ -67,7 +67,6 @@ PATH
6767
remote: ../hyperstack-config
6868
specs:
6969
hyperstack-config (1.0.alpha1.2)
70-
libv8 (~> 6.7.0)
7170
listen (~> 3.0)
7271
mini_racer (~> 0.2.4)
7372
opal (>= 0.11.0, < 0.12.0)

‎ruby/hyper-model/Gemfile.lock‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ PATH
3131
remote: ../hyperstack-config
3232
specs:
3333
hyperstack-config (1.0.alpha1.2)
34-
libv8 (~> 6.7.0)
3534
listen (~> 3.0)
3635
mini_racer (~> 0.2.4)
3736
opal (>= 0.11.0, < 0.12.0)
@@ -395,7 +394,7 @@ PLATFORMS
395394
ruby
396395

397396
DEPENDENCIES
398-
bundler
397+
bundler (>= 1.17.3, < 2.1)
399398
capybara
400399
chromedriver-helper (= 1.2.0)
401400
database_cleaner
@@ -405,7 +404,7 @@ DEPENDENCIES
405404
hyper-operation!
406405
hyper-state!
407406
hyperstack-config!
408-
libv8 (~> 6.7.0)
407+
libv8
409408
mini_racer (~> 0.2.4)
410409
mysql2
411410
opal-activesupport (~> 0.3.1)
@@ -438,4 +437,4 @@ DEPENDENCIES
438437
unparser
439438

440439
BUNDLED WITH
441-
1.17.1
440+
2.0.1

0 commit comments

Comments
 (0)