Merge pull request #87 from rusikf/patch-5

update appraisal to 1.0

Author: indirect

.travis.yml

@@ -8,7 +8,9 @@ rvm:
 gemfile:
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
 matrix:
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_4_1.gemfile
+script: "bundle exec rake test"

Appraisals

@@ -1,13 +1,11 @@
 appraise "rails_4_0" do
   gem "rails", "~> 4.0.1"
-
-  gem 'rubysl', '~> 2.0', platforms: :rbx
-  gem 'minitest', platforms: :rbx
 end
 
 appraise "rails_4_1" do
-  gem "rails", "4.1.0.beta1"
+  gem "rails", "4.1"
+end
 
-  gem 'rubysl', '~> 2.0', platforms: :rbx
-  gem 'minitest', platforms: :rbx
+appraise "rails_4_2" do
+  gem "rails", "4.2"
 end

Rakefile

@@ -1,11 +1,7 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-begin
-  require 'appraisal'
-rescue LoadError
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

gemfiles/rails_4_0.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
 gem "rails", "~> 4.0.1"
 
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
-
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_4_1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.0.beta1"
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
+gem "rails", "4.1"
 
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
-
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_4_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
+gem "rails", "4.2"
+
+gemspec :path => "../"

haml-rails.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails",   [">= 4.0.1"]
   s.add_development_dependency "bundler", "~> 1.2"
   s.add_development_dependency "rake"
-  s.add_development_dependency 'appraisal', '>= 0.3.8'
+  s.add_development_dependency 'appraisal', '~> 1.0'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}