Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac9f0389bb90
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e83760642223
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on May 18, 2015

  1. Make sprockets a development dependency instead of runtime, allow tilt 2 

    Now that you can build complex opal projects using tilt instead of
sprockets, it doesn't make sense to require sprockets.

As sprockets 3+ doesn't require tilt, it doesn't really make sense
to keep tilt as a runtime dependency, since you should be able to
use sprockets without using tilt. However, Opal::Processor is
currently a subclass of Opal::TiltTemplate, so it doesn't matter
if you are using opal with tilt or sprockets, in either case tilt
is still required for using opal.

If Opal::Processor can be made to run without tilt, I think we
should make both tilt and sprockets development dependencies
instead of runtime dependencies.

The tilt/opal tests run fine with tilt 2, so I don't think we
should restrict people to using tilt 1.4, as then users of opal
can't use the new useful features in tilt 2, such as multiple
mappings, and they will miss out on useful bug fixes in tilt 2
that will not get backported to tilt 1.4, such as the sorting of
locals when caching templates.
    @jeremyevans
    jeremyevans committed May 18, 2015
    Copy the full SHA
    1117d8b View commit details

  2. Make sprockets a runtime dependency again

    @jeremyevans
    jeremyevans committed May 18, 2015
    Copy the full SHA
    ce72db4 View commit details

  3. Add travis rspec run using tilt 2.0.1

    @jeremyevans
    jeremyevans committed May 18, 2015
    Copy the full SHA
    307c8ed View commit details

Commits on May 21, 2015

  1. Merge pull request #872 from jeremyevans/dev_sprockets 

    Allow tilt 2
    @elia
    elia committed May 21, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e837606 View commit details
Showing with 7 additions and 1 deletion.
  1. +3 −0 .travis.yml
  2. +3 −0 Gemfile
  3. +1 −1 opal.gemspec
3 changes: 3 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,9 @@ matrix:
- rvm: 2.2
env: RUN=default TZ="/usr/share/zoneinfo/Pacific/Fiji"

- rvm: 2.2
env: RUN=rspec TILT_VERSION=2.0.1

- rvm: 2.1
env: RUN=rspec

3 changes: 3 additions & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ group :repl do
gem 'therubyrhino', :platform => :jruby
end

tilt_version = ENV['TILT_VERSION']
gem 'tilt', tilt_version if tilt_version

unless ENV['CI']
gem 'rb-fsevent'
gem 'guard', require: false
2 changes: 1 addition & 1 deletion opal.gemspec
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency 'sourcemap', '~> 0.1.0'
s.add_dependency 'sprockets', '~> 3.1'
s.add_dependency 'hike', '~> 1.2'
s.add_dependency 'tilt', '~> 1.4'
s.add_dependency 'tilt', '>= 1.4'

s.add_development_dependency 'mspec', '1.5.20'
s.add_development_dependency 'rake'