Hello community,
here is the log from the commit of package rubygem-haml-rails for
openSUSE:Factory checked in at 2017-06-08 15:01:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-haml-rails (Old)
and /work/SRC/openSUSE:Factory/.rubygem-haml-rails.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-haml-rails"
Thu Jun 8 15:01:42 2017 rev:3 rq:497714 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-haml-rails/rubygem-haml-rails.changes
2015-03-19 21:17:52.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-haml-rails.new/rubygem-haml-rails.changes
2017-06-08 15:01:43.481848782 +0200
@@ -1,0 +2,6 @@
+Tue May 23 09:57:24 UTC 2017 - [email protected]
+
+- updated to version 1.0.0
+ no changelog found
+
+-------------------------------------------------------------------
Old:
----
haml-rails-0.9.0.gem
New:
----
haml-rails-1.0.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-haml-rails.spec ++++++
--- /var/tmp/diff_new_pack.DmCZqd/_old 2017-06-08 15:01:44.189748876 +0200
+++ /var/tmp/diff_new_pack.DmCZqd/_new 2017-06-08 15:01:44.189748876 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-haml-rails
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-haml-rails
-Version: 0.9.0
+Version: 1.0.0
Release: 0
%define mod_name haml-rails
%define mod_full_name %{mod_name}-%{version}
++++++ haml-rails-0.9.0.gem -> haml-rails-1.0.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2015-03-11 08:21:34.000000000 +0100
+++ new/.travis.yml 2017-04-27 18:50:18.000000000 +0200
@@ -1,17 +1,30 @@
+sudo: false
language: ruby
+cache: bundler
+before_install: "gem install bundler"
rvm:
+ - 2.4.1
+ - 2.3.1
+ - 2.2.5
+ - 2.1
+ - 2.0
- 1.9.3
- - 2.0.0
- - 2.1.0
- - 2.2.0
- jruby-19mode
- - rbx
gemfile:
- - gemfiles/rails_4_0.gemfile
- - gemfiles/rails_4_1.gemfile
+ - gemfiles/rails_5_0.gemfile
- gemfiles/rails_4_2.gemfile
+ - gemfiles/rails_4_1.gemfile
+ - gemfiles/rails_4_0.gemfile
matrix:
exclude:
+ - rvm: 2.1
+ gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: 2.0
+ gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: 1.9.3
+ gemfile: gemfiles/rails_5_0.gemfile
+ - rvm: jruby-19mode
+ gemfile: gemfiles/rails_5_0.gemfile
- rvm: 1.9.3
gemfile: gemfiles/rails_4_1.gemfile
-script: "bundle exec rake test"
\ No newline at end of file
+script: "bundle exec rake test"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Appraisals new/Appraisals
--- old/Appraisals 2015-03-11 08:21:34.000000000 +0100
+++ new/Appraisals 2017-04-27 18:50:18.000000000 +0200
@@ -8,4 +8,8 @@
appraise "rails_4_2" do
gem "rails", "4.2"
-end
\ No newline at end of file
+end
+
+appraise "rails_5_0" do
+ gem "rails", "5.0"
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2015-03-11 08:21:34.000000000 +0100
+++ new/README.md 2017-04-27 18:50:18.000000000 +0200
@@ -52,7 +52,7 @@
### Code Status
-[](https://travis-ci.org/indirect/haml-rails)
+[](https://travis-ci.org/indirect/haml-rails)
### License
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails_5_0.gemfile
new/gemfiles/rails_5_0.gemfile
--- old/gemfiles/rails_5_0.gemfile 1970-01-01 01:00:00.000000000 +0100
+++ new/gemfiles/rails_5_0.gemfile 2017-04-27 18:50:18.000000000 +0200
@@ -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", "5.0"
+
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haml-rails.gemspec new/haml-rails.gemspec
--- old/haml-rails.gemspec 2015-03-11 08:21:34.000000000 +0100
+++ new/haml-rails.gemspec 2017-04-27 18:50:18.000000000 +0200
@@ -15,7 +15,7 @@
s.rubyforge_project = "haml-rails"
s.required_rubygems_version = ">= 1.3.6"
- s.add_dependency "haml", [">= 4.0.6", "< 5.0"]
+ s.add_dependency "haml", [">= 4.0.6", "< 6.0"]
s.add_dependency "activesupport", [">= 4.0.1"]
s.add_dependency "actionpack", [">= 4.0.1"]
s.add_dependency "railties", [">= 4.0.1"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/haml/mailer/mailer_generator.rb
new/lib/generators/haml/mailer/mailer_generator.rb
--- old/lib/generators/haml/mailer/mailer_generator.rb 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/mailer/mailer_generator.rb 2017-04-27
18:50:18.000000000 +0200
@@ -6,31 +6,38 @@
source_root File.expand_path("../templates", __FILE__)
def copy_view_files
- view_base_path = File.join("app/views", class_path, file_name)
- empty_directory view_base_path
-
- if self.behavior == :invoke
- formats.each do |format|
- layout_path = File.join("app/views/layouts",
filename_with_extensions("mailer", format))
- template filename_with_extensions(:layout, format), layout_path
+ if ::Rails.version.to_s >= "4.2.0"
+ view_base_path = File.join("app/views", class_path, file_name)
+ empty_directory view_base_path
+
+ if self.behavior == :invoke
+ formats.each do |format|
+ layout_path = File.join("app/views/layouts",
filename_with_extensions("mailer", format))
+ template filename_with_extensions(:layout, format), layout_path
+ end
end
- end
- actions.each do |action|
- @action = action
+ actions.each do |action|
+ @action = action
- formats.each do |format|
- @path = File.join(view_base_path, filename_with_extensions(action,
format))
- template filename_with_extensions(:view, format), @path
+ formats.each do |format|
+ @path = File.join(view_base_path,
filename_with_extensions(action, format))
+ template filename_with_extensions(:view, format), @path
+ end
end
+ else
+ super
end
end
protected
+ def format
+ :text
+ end
+
def formats
[:text, :html]
end
-
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/mailer/templates/layout.html.haml
new/lib/generators/haml/mailer/templates/layout.html.haml
--- old/lib/generators/haml/mailer/templates/layout.html.haml 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/layout.html.haml 2017-04-27
18:50:18.000000000 +0200
@@ -1,3 +1,3 @@
-%hmtl
+%html
%body
- = yield
\ No newline at end of file
+ = yield
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/mailer/templates/layout.text.haml
new/lib/generators/haml/mailer/templates/layout.text.haml
--- old/lib/generators/haml/mailer/templates/layout.text.haml 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/layout.text.haml 2017-04-27
18:50:18.000000000 +0200
@@ -1 +1 @@
-= yield
\ No newline at end of file
+= yield
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/haml/mailer/templates/view.html.haml
new/lib/generators/haml/mailer/templates/view.html.haml
--- old/lib/generators/haml/mailer/templates/view.html.haml 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/view.html.haml 2017-04-27
18:50:18.000000000 +0200
@@ -1,4 +1,4 @@
%h1= class_name + "#" + @action
%p
- = @greeting + ", find me in <%= @path %>"
\ No newline at end of file
+ = @greeting + ", find me in <%= @path %>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/scaffold/templates/_form.html.haml
new/lib/generators/haml/scaffold/templates/_form.html.haml
--- old/lib/generators/haml/scaffold/templates/_form.html.haml 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/scaffold/templates/_form.html.haml 2017-04-27
18:50:18.000000000 +0200
@@ -3,8 +3,8 @@
#error_explanation
%h2= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")}
prohibited this <%= singular_table_name %> from being saved:"
%ul
- - @<%= singular_table_name %>.errors.full_messages.each do |msg|
- %li= msg
+ - @<%= singular_table_name %>.errors.full_messages.each do |message|
+ %li= message
<% for attribute in attributes -%>
.field
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/scaffold/templates/index.html.haml
new/lib/generators/haml/scaffold/templates/index.html.haml
--- old/lib/generators/haml/scaffold/templates/index.html.haml 2015-03-11
08:21:34.000000000 +0100
+++ new/lib/generators/haml/scaffold/templates/index.html.haml 2017-04-27
18:50:18.000000000 +0200
@@ -18,7 +18,7 @@
<% end -%>
%td= link_to 'Show', <%= singular_table_name %>
%td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%=
singular_table_name %>)
- %td= link_to 'Destroy', <%= singular_table_name %>, :method =>
:delete, :data => { :confirm => 'Are you sure?' }
+ %td= link_to 'Destroy', <%= singular_table_name %>, method: :delete,
data: { confirm: 'Are you sure?' }
%br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/haml-rails/version.rb
new/lib/haml-rails/version.rb
--- old/lib/haml-rails/version.rb 2015-03-11 08:21:34.000000000 +0100
+++ new/lib/haml-rails/version.rb 2017-04-27 18:50:18.000000000 +0200
@@ -1,5 +1,5 @@
module Haml
module Rails
- VERSION = "0.9.0"
+ VERSION = "1.0.0"
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/haml-rails.rb new/lib/haml-rails.rb
--- old/lib/haml-rails.rb 2015-03-11 08:21:34.000000000 +0100
+++ new/lib/haml-rails.rb 2017-04-27 18:50:18.000000000 +0200
@@ -42,7 +42,7 @@
end
end
- # Configure source annoatation on haml files (support for HAML was
+ # Configure source annotation on haml files (support for HAML was
# provided directly by railties 3.2..4.1 but was dropped in 4.2.
if Gem::Requirement.new(">=
4.2").satisfied_by?(Gem::Version.new(::Rails.version))
initializer 'haml_rails.configure_source_annotation' do
@@ -54,7 +54,7 @@
rake_tasks do
load 'tasks/erb2haml.rake'
- end
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/rails/generators/haml/application_layout/application_layout_generator.rb
new/lib/rails/generators/haml/application_layout/application_layout_generator.rb
---
old/lib/rails/generators/haml/application_layout/application_layout_generator.rb
2015-03-11 08:21:34.000000000 +0100
+++
new/lib/rails/generators/haml/application_layout/application_layout_generator.rb
2017-04-27 18:50:18.000000000 +0200
@@ -1,20 +1,24 @@
require 'rails'
+require 'shellwords'
module Haml
module Generators
class ApplicationLayoutGenerator < ::Rails::Generators::Base
+ HTML_LAYOUT_PATH = 'app/views/layouts/application.html.erb'
+ HAML_LAYOUT_PATH = 'app/views/layouts/application.html.haml'
+
# Converts existing application.html.erb to haml format,
# and creates app/views/layouts/application.html.haml
# with some error checking.
def convert
- app_layout_from =
::Rails.root.join('app/views/layouts/application.html.erb')
- app_layout_to =
::Rails.root.join('app/views/layouts/application.html.haml')
+ app_layout_from = ::Rails.root.join(HTML_LAYOUT_PATH).to_s
+ app_layout_to = ::Rails.root.join(HAML_LAYOUT_PATH).to_s
if File.exist?(app_layout_from)
if !File.exist?(app_layout_to)
- `html2haml #{app_layout_from} #{app_layout_to}`
+ `html2haml #{app_layout_from.shellescape}
#{app_layout_to.shellescape}`
puts "Success! app/views/layouts/application.html.haml is
created.\n" \
"Please remove the erb file:
app/views/layouts/application.html.erb"
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/tasks/erb2haml.rake new/lib/tasks/erb2haml.rake
--- old/lib/tasks/erb2haml.rake 2015-03-11 08:21:34.000000000 +0100
+++ new/lib/tasks/erb2haml.rake 2017-04-27 18:50:18.000000000 +0200
@@ -64,7 +64,7 @@
if should_delete == 'y'
puts "Deleting original .erb files."
- File.delete *erb_files
+ File.delete(*erb_files)
else
puts "Please remember to delete your .erb files once you have ensured
they were translated correctly."
end
@@ -72,4 +72,4 @@
puts '-'*80
puts "Task complete!"
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-03-11 08:21:34.000000000 +0100
+++ new/metadata 2017-04-27 18:50:18.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: haml-rails
version: !ruby/object:Gem::Version
- version: 0.9.0
+ version: 1.0.0
platform: ruby
authors:
- André Arko
autorequire:
bindir: bin
cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: haml
@@ -19,7 +19,7 @@
version: 4.0.6
- - "<"
- !ruby/object:Gem::Version
- version: '5.0'
+ version: '6.0'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@
version: 4.0.6
- - "<"
- !ruby/object:Gem::Version
- version: '5.0'
+ version: '6.0'
- !ruby/object:Gem::Dependency
name: activesupport
requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
- haml-rails.gemspec
- lib/generators/haml/controller/controller_generator.rb
- lib/generators/haml/controller/templates/view.html.haml
@@ -206,7 +207,7 @@
version: 1.3.6
requirements: []
rubyforge_project: haml-rails
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
signing_key:
specification_version: 4
summary: let your Gemfile do the configuring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/lib/generators/haml/mailer_generator_test.rb
new/test/lib/generators/haml/mailer_generator_test.rb
--- old/test/lib/generators/haml/mailer_generator_test.rb 2015-03-11
08:21:34.000000000 +0100
+++ new/test/lib/generators/haml/mailer_generator_test.rb 2017-04-27
18:50:18.000000000 +0200
@@ -12,12 +12,25 @@
test "should invoke template engine" do
run_generator
- assert_file "app/views/layouts/mailer.text.haml" do |view|
- assert_match /\= yield/, view
- end
+ if ::Rails.version.to_s >= '4.2'
- assert_file "app/views/layouts/mailer.html.haml" do |view|
- assert_match /\= yield/, view
+ assert_file "app/views/layouts/mailer.text.haml" do |view|
+ assert_match /\= yield/, view
+ end
+
+ assert_file "app/views/layouts/mailer.html.haml" do |view|
+ assert_match /\= yield/, view
+ end
+
+ assert_file "app/views/notifier/foo.html.haml" do |view|
+ assert_match %r(app/views/notifier/foo\.html\.haml), view
+ assert_match /\= @greeting/, view
+ end
+
+ assert_file "app/views/notifier/bar.html.haml" do |view|
+ assert_match %r(app/views/notifier/bar\.html\.haml), view
+ assert_match /\= @greeting/, view
+ end
end
assert_file "app/views/notifier/foo.text.haml" do |view|
@@ -25,19 +38,9 @@
assert_match /\= @greeting/, view
end
- assert_file "app/views/notifier/foo.html.haml" do |view|
- assert_match %r(app/views/notifier/foo\.html\.haml), view
- assert_match /\= @greeting/, view
- end
-
assert_file "app/views/notifier/bar.text.haml" do |view|
assert_match %r(app/views/notifier/bar\.text\.haml), view
assert_match /\= @greeting/, view
end
-
- assert_file "app/views/notifier/bar.html.haml" do |view|
- assert_match %r(app/views/notifier/bar\.html\.haml), view
- assert_match /\= @greeting/, view
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/lib/generators/haml/testing_helper.rb
new/test/lib/generators/haml/testing_helper.rb
--- old/test/lib/generators/haml/testing_helper.rb 2015-03-11
08:21:34.000000000 +0100
+++ new/test/lib/generators/haml/testing_helper.rb 2017-04-27
18:50:18.000000000 +0200
@@ -1 +1 @@
-require_generators :haml => ['scaffold', 'controller', 'mailer']
\ No newline at end of file
+require_generators :haml => ['scaffold', 'controller', 'mailer']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/test_helper.rb new/test/test_helper.rb
--- old/test/test_helper.rb 2015-03-11 08:21:34.000000000 +0100
+++ new/test/test_helper.rb 2017-04-27 18:50:18.000000000 +0200
@@ -70,4 +70,10 @@
end
alias :require_generator :require_generators
-require_generators generator_list
\ No newline at end of file
+require_generators generator_list
+
+# Remove tmp directory when test suite is completed
+MiniTest::Unit.after_tests do
+ tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
+ FileUtils.rm_r(tmp_dir)
+end
