diff --git a/Gemfile b/Gemfile index 1676cb7..a4ca92c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'volt', '0.9.4' +gem 'volt', :path => "../volt" # volt uses mongo as the default data store. gem 'volt-mongo', '~> 0.1.0' @@ -16,7 +16,11 @@ gem 'uglifier', '>= 2.4.0', require: false gem 'opal-pixi' , :path => "../opal-pixi" #gem "salama" , "0.2" , :path => "../salama" -gem "salama" + +gem "parslet" , path: "../parslet" +gem "salama" , path: "../salama" +gem "salama-reader" , path: "../salama-reader" +gem "salama-object-file" , path: "../salama-object-file" group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 412e2b8..35feb20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,11 +4,50 @@ PATH opal-pixi (0.1.0) opal (~> 0.7.0) +PATH + remote: ../parslet + specs: + parslet (1.7.0) + +PATH + remote: ../salama + specs: + salama (0.2.0) + salama-object-file (~> 0.2) + salama-reader (~> 0.2) + +PATH + remote: ../salama-object-file + specs: + salama-object-file (0.2.0) + +PATH + remote: ../salama-reader + specs: + salama-reader (0.2.0) + parslet (~> 1.7.0) + +PATH + remote: ../volt + specs: + volt (0.9.4) + bcrypt (~> 3.1.9) + bundler (>= 1.5) + concurrent-ruby (= 0.8.0) + configurations (~> 2.0.0.pre) + faye-websocket (~> 0.9.2) + listen (~> 3.0.1) + opal (~> 0.7.2) + pry (~> 0.10.1) + rack (~> 1.5.0) + sass (~> 3.2.5) + sprockets-sass (~> 1.0.0) + thor (~> 0.19.0) + GEM remote: https://rubygems.org/ specs: bcrypt (3.1.10) - blankslate (3.1.3) bson (1.9.2) bson_ext (1.9.2) bson (~> 1.9.2) @@ -41,7 +80,7 @@ GEM ffi (1.9.10) hike (1.2.3) json (1.8.3) - listen (3.0.1) + listen (3.0.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) method_source (0.8.2) @@ -59,8 +98,6 @@ GEM tilt (~> 1.4) opal-rspec (0.4.3) opal (>= 0.7.0, < 0.9) - parslet (1.7.0) - blankslate (>= 2.0, <= 4.0) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) @@ -91,12 +128,6 @@ GEM rspec-support (~> 3.2.0) rspec-support (3.2.2) rubyzip (1.1.7) - salama (0.2.0) - salama-object-file (~> 0.2) - salama-reader (~> 0.2) - salama-object-file (0.2.0) - salama-reader (0.2.0) - parslet (~> 1.7.0) sass (3.2.19) selenium-webdriver (2.43.0) childprocess (~> 0.5) @@ -122,19 +153,6 @@ GEM uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) - volt (0.9.4) - bcrypt (~> 3.1.9) - bundler (>= 1.5) - concurrent-ruby (= 0.8.0) - configurations (~> 2.0.0.pre) - faye-websocket (~> 0.9.2) - listen (~> 3.0.1) - opal (~> 0.7.2) - pry (~> 0.10.1) - rack (~> 1.5.0) - sass (~> 3.2.5) - sprockets-sass (~> 1.0.0) - thor (~> 0.19.0) volt-bootstrap (0.0.10) volt-mongo (0.1.1) mongo (~> 1.9.0) @@ -156,12 +174,15 @@ DEPENDENCIES csso-rails (~> 0.3.4) opal-pixi! opal-rspec (~> 0.4.2) + parslet! poltergeist (~> 1.5.0) rspec (~> 3.2.0) - salama + salama! + salama-object-file! + salama-reader! selenium-webdriver (~> 2.43.0) thin (~> 1.6.0) uglifier (>= 2.4.0) - volt (= 0.9.4) + volt! volt-bootstrap (~> 0.0.10) volt-mongo (~> 0.1.0)