diff --git a/.gitignore b/.gitignore index 2505a996f2..c111b33137 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1 @@ -*.DS_Store -*.tmproj -*.lock -sync -tmp/* -devbin -examples/*/stylesheets/* -examples/*/*.html -examples/*/*/*.html -examples/*/extensions/* -examples/*/src/.sass-cache -.sass-cache -test/tmp -test/fixtures/stylesheets/*/tmp -test/fixtures/stylesheets/*/saved -test/fixtures/stylesheets/empty -test/fixtures/stylesheets/*/sass/.sass-cache -test/fixtures/stylesheets/valid/css/* -pkg/* -compass-*.gem -coverage* -docs -doc-src/tmp -doc-src/.bundle -.bundle -attic -devbin -.rvmrc -*.rbc -vendor/ruby -vendor -Gemfile.lock -*.pkg +*.gem diff --git a/.project b/.project deleted file mode 100644 index 5e279fc390..0000000000 --- a/.project +++ /dev/null @@ -1,492 +0,0 @@ -compass="/Users/chris/Projects/compass" filter="none"{ - bin="bin" filter="*" { - compass - } - frameworks="lib/compass/frameworks" { - compass="compass" { - stylesheets="stylesheets" filter="**/*" { - _compass.sass - compass/_css3.sass - compass/_layout.sass - compass/_misc.sass - compass/_reset.sass - compass/_utilities.sass - compass/css3/_background_clip.sass - compass/css3/_background_origin.sass - compass/css3/_background_size.sass - compass/css3/_border_radius.sass - compass/css3/_box_shadow.sass - compass/css3/_box_sizing.sass - compass/css3/_columns.sass - compass/css3/_font_face.sass - compass/css3/_gradient.sass - compass/css3/_inline_block.sass - compass/css3/_opacity.sass - compass/css3/_text_shadow.sass - compass/css3/_transform.sass - compass/css3/_transition.sass - compass/layout/_sticky_footer.sass - compass/utilities/_general.sass - compass/utilities/_links.sass - compass/utilities/_lists.sass - compass/utilities/_print.sass - compass/utilities/_sprites.sass - compass/utilities/_tables.sass - compass/utilities/_text.sass - compass/utilities/general/_clearfix.sass - compass/utilities/general/_float.sass - compass/utilities/general/_hacks.sass - compass/utilities/general/_reset.sass - compass/utilities/general/_tabs.sass - compass/utilities/general/_tag_cloud.sass - compass/utilities/links/_hover_link.sass - compass/utilities/links/_link_colors.sass - compass/utilities/links/_unstyled_link.sass - compass/utilities/lists/_bullets.sass - compass/utilities/lists/_horizontal_list.sass - compass/utilities/lists/_inline_list.sass - compass/utilities/sprites/_sprite_img.sass - compass/utilities/tables/_alternating_rows_and_columns.sass - compass/utilities/tables/_borders.sass - compass/utilities/tables/_scaffolding.sass - compass/utilities/text/_ellipsis.sass - compass/utilities/text/_nowrap.sass - compass/utilities/text/_replacement.sass - } - templates="templates" filter="**/*" { - ellipsis/ellipsis.sass - ellipsis/manifest.rb - ellipsis/xml/ellipsis.xml - extension/manifest.rb - extension/stylesheets/main.sass - extension/templates/project/manifest.rb - extension/templates/project/screen.sass - project/USAGE.markdown - project/ie.sass - project/manifest.rb - project/print.sass - project/screen.sass - } - } - blueprint="blueprint" { - stylesheets="stylesheets" filter="**/*" { - _blueprint.sass - blueprint/_buttons.sass - blueprint/_colors.sass - blueprint/_debug.sass - blueprint/_fancy_type.sass - blueprint/_form.sass - blueprint/_grid.sass - blueprint/_ie.sass - blueprint/_interaction.sass - blueprint/_link_icons.sass - blueprint/_liquid.sass - blueprint/_print.sass - blueprint/_reset.sass - blueprint/_rtl.sass - blueprint/_scaffolding.sass - blueprint/_screen.sass - blueprint/_typography.sass - blueprint/_utilities.sass - blueprint/modules/_buttons.sass - blueprint/modules/_colors.sass - blueprint/modules/_debug.sass - blueprint/modules/_fancy_type.sass - blueprint/modules/_form.sass - blueprint/modules/_grid.sass - blueprint/modules/_interaction.sass - blueprint/modules/_link_icons.sass - blueprint/modules/_liquid.sass - blueprint/modules/_reset.sass - blueprint/modules/_rtl.sass - blueprint/modules/_scaffolding.sass - blueprint/modules/_typography.sass - blueprint/modules/_utilities.sass - } - templates="templates" filter="**/*" { - buttons/buttons/cross.png - buttons/buttons/key.png - buttons/buttons/tick.png - buttons/buttons.sass - buttons/manifest.rb - link_icons/link_icons/doc.png - link_icons/link_icons/email.png - link_icons/link_icons/external.png - link_icons/link_icons/feed.png - link_icons/link_icons/im.png - link_icons/link_icons/pdf.png - link_icons/link_icons/visited.png - link_icons/link_icons/xls.png - link_icons/link_icons.sass - link_icons/manifest.rb - project/grid.png - project/ie.sass - project/manifest.rb - project/partials/_base.sass - project/print.sass - project/screen.sass - project/welcome.html.haml - } - } - } - app_integration="lib/compass/app_integration" filter="**/*.rb" { - merb/runtime.rb - merb.rb - rails/action_controller.rb - rails/configuration_defaults.rb - rails/installer.rb - rails/runtime.rb - rails/sass_plugin.rb - rails/templates/compass-install-rails.rb - rails/urls.rb - rails.rb - stand_alone/configuration_defaults.rb - stand_alone/installer.rb - stand_alone.rb - } - commands="lib/compass/commands" filter="**/*.rb" { - base.rb - create_project.rb - generate_grid_background.rb - help.rb - installer_command.rb - interactive.rb - list_frameworks.rb - print_version.rb - project_base.rb - project_stats.rb - registry.rb - stamp_pattern.rb - update_project.rb - validate_project.rb - watch_project.rb - write_configuration.rb - } - configration="lib/compass/configuration" filter="**/*.rb" { - adapters.rb - comments.rb - data.rb - defaults.rb - helpers.rb - inheritance.rb - serialization.rb - } - exec="lib/compass/exec" filter="**/*.rb" { - command_option_parser.rb - global_options_parser.rb - helpers.rb - project_options_parser.rb - sub_command_ui.rb - switch_ui.rb - } - installers="lib/compass/installers" filter="**/*.rb" { - bare_installer.rb - base.rb - manifest.rb - manifest_installer.rb - template_context.rb - } - sass_extensions="lib/compass/sass_extensions" filter="**/*.rb" { - functions/color_stop.rb - functions/display.rb - functions/enumerate.rb - functions/font_files.rb - functions/inline_image.rb - functions/selectors.rb - functions/urls.rb - functions.rb - monkey_patches/stylesheet_updating.rb - monkey_patches/traversal.rb - monkey_patches.rb - } - core="lib/compass" filter="*.rb" { - actions.rb - app_integration.rb - commands.rb - compiler.rb - configuration.rb - core_ext.rb - dependencies.rb - errors.rb - exec.rb - frameworks.rb - grid_builder.rb - installers.rb - logger.rb - sass_extensions.rb - stats.rb - test_case.rb - validator.rb - version.rb - } - misc="." filter="*" { - CHANGELOG.markdown - LICENSE.markdown - README.markdown - REVISION - Rakefile - TODO.md - VERSION.yml - compass.gemspec - deps.rip - } - features="features" filter="**/*" { - command_line.feature - configuration.feature - extensions.feature - step_definitions/command_line_steps.rb - step_definitions/extension_steps.rb - } - examples="examples" { - blueprint_default="blueprint_default" filter="**/*" { - config.rb - images/grid.png - index.html - index.html.haml - parts/elements.html - parts/elements.html.haml - parts/forms.html - parts/forms.html.haml - parts/grid.html - parts/grid.html.haml - parts/test-small.jpg - parts/test.jpg - parts/valid.png - src/ie.sass - src/images/grid.png - src/print.sass - src/screen.sass - stylesheets/ie.css - stylesheets/print.css - stylesheets/screen.css - } - blueprint_plugins="blueprint_plugins" filter="**/*" { - config.rb - images/buttons/cross.png - images/buttons/key.png - images/buttons/tick.png - images/grid.png - images/link_icons/doc.png - images/link_icons/email.png - images/link_icons/external.png - images/link_icons/feed.png - images/link_icons/im.png - images/link_icons/pdf.png - images/link_icons/visited.png - images/link_icons/xls.png - images/test-small.jpg - images/test.jpg - images/valid.png - index.html - index.html.haml - plugins/buttons.html - plugins/buttons.html.haml - plugins/fancy_type.html - plugins/fancy_type.html.haml - plugins/link_icons.html - plugins/link_icons.html.haml - plugins/rtl.html - plugins/rtl.html.haml - src/buttons.sass - src/ie.sass - src/images/grid.png - src/link_icons.sass - src/print.sass - src/rtl_screen.sass - src/screen.sass - stylesheets/buttons.css - stylesheets/ie.css - stylesheets/link_icons.css - stylesheets/print.css - stylesheets/rtl_screen.css - stylesheets/screen.css - } - blueprint_scoped="blueprint_scoped" filter="**/*" { - images/grid.png - src/ie.sass - src/print.sass - src/screen.sass - stylesheets/ie.css - stylesheets/print.css - stylesheets/screen.css - } - blueprint_scoped_form="blueprint_scoped_form" filter="**/*" { - images/grid.png - src/ie.sass - src/print.sass - src/screen.sass - stylesheets/ie.css - stylesheets/print.css - stylesheets/screen.css - } - blueprint_semantic="blueprint_semantic" filter="**/*" { - config.rb - images/grid.png - index.html - index.html.haml - parts/fancy_type.html - parts/fancy_type.html.haml - parts/liquid.html - parts/liquid.html.haml - parts/test-small.jpg - parts/test.jpg - parts/valid.png - src/ie.sass - src/images/grid.png - src/liquid.sass - src/print.sass - src/screen.sass - stylesheets/ie.css - stylesheets/liquid.css - stylesheets/print.css - stylesheets/screen.css - } - compass="compass" filter="**/*" { - bootstrap.rb - compass.html - compass.html.haml - config.rb - extensions/yui/COPYRIGHT - extensions/yui/stylesheets/_yui.sass - extensions/yui/stylesheets/yui/modules/_base.sass - extensions/yui/stylesheets/yui/modules/_fonts.sass - extensions/yui/stylesheets/yui/modules/_grids.sass - extensions/yui/stylesheets/yui/modules/_reset.sass - extensions/yui/templates/project/manifest.rb - extensions/yui/templates/project/screen.sass - images/blue_arrow.gif - src/compass.sass - src/images/blue_arrow.gif - src/sticky_footer.sass - src/utilities.sass - sticky_footer.html - sticky_footer.html.haml - stylesheets/compass.css - stylesheets/sticky_footer.css - stylesheets/utilities.css - utilities.html - utilities.html.haml - } - css3="css3" filter="**/*" { - config.rb - extensions/fancy-fonts/templates/project/Vtks Revolt.ttf - extensions/fancy-fonts/templates/project/angelina.ttf - extensions/fancy-fonts/templates/project/fancy-fonts.sass - extensions/fancy-fonts/templates/project/manifest.rb - index.html - index.html.haml - src/_base.sass - src/fancy-fonts.sass - src/gradient.sass - src/main.sass - stylesheets/fancy-fonts.css - stylesheets/fonts/Vtks Revolt.ttf - stylesheets/fonts/angelina.ttf - stylesheets/gradient.css - } - logo="logo" filter="**/*" { - logo.html - logo.html.haml - src/ie.sass - src/print.sass - src/screen.sass - stylesheets/ie.css - stylesheets/print.css - stylesheets/screen.css - } - ninesixty="ninesixty" filter="**/*" { - bootstrap.rb - config.rb - extensions/ninesixty/Manifest - extensions/ninesixty/README.mkdn - extensions/ninesixty/Rakefile - extensions/ninesixty/VERSION - extensions/ninesixty/compass-960-plugin.gemspec - extensions/ninesixty/lib/ninesixty/compass_plugin.rb - extensions/ninesixty/lib/ninesixty.rb - extensions/ninesixty/sass/960/_grid.sass - extensions/ninesixty/sass/960/_text.sass - extensions/ninesixty/templates/project/grid.sass - extensions/ninesixty/templates/project/manifest.rb - extensions/ninesixty/templates/project/text.sass - src/grid.sass - src/text.sass - stylesheets/grid.css - stylesheets/text.css - } - susy="susy" filter="**/*" { - bootstrap.rb - config.rb - extensions/susy/LICENSE.txt - extensions/susy/Manifest - extensions/susy/README.mkdn - extensions/susy/Rakefile - extensions/susy/VERSION - extensions/susy/compass-susy-plugin.gemspec - extensions/susy/docs/tutorial/build.sh - extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass - extensions/susy/docs/tutorial/code/01_target/src/screen.sass - extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass - extensions/susy/docs/tutorial/code/02_container/src/screen.sass - extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass - extensions/susy/docs/tutorial/code/03_structure/src/screen.sass - extensions/susy/docs/tutorial/code/_common/config.rb - extensions/susy/docs/tutorial/code/_common/images/grid.png - extensions/susy/docs/tutorial/code/_common/images/susy_logo.png - extensions/susy/docs/tutorial/code/_common/src/_base.sass - extensions/susy/docs/tutorial/code/_tools/Markdown.pl - extensions/susy/docs/tutorial/code/_tools/foot.tpl.html - extensions/susy/docs/tutorial/code/_tools/head.tpl.html - extensions/susy/docs/tutorial/code/_tools/home_content.html - extensions/susy/docs/tutorial/code/site/src/_defaults.sass - extensions/susy/docs/tutorial/code/site/src/screen.sass - extensions/susy/docs/tutorial/figures/susy_element.png - extensions/susy/docs/tutorial/figures/susy_grid.png - extensions/susy/docs/tutorial/index.mkdn - extensions/susy/lib/susy/compass_plugin.rb - extensions/susy/lib/susy/sass_extensions.rb - extensions/susy/lib/susy.rb - extensions/susy/sass/susy/_grid.sass - extensions/susy/sass/susy/_reset.sass - extensions/susy/sass/susy/_susy.sass - extensions/susy/sass/susy/_text.sass - extensions/susy/sass/susy/_utils.sass - extensions/susy/templates/project/_base.sass - extensions/susy/templates/project/_defaults.sass - extensions/susy/templates/project/ie.sass - extensions/susy/templates/project/manifest.rb - extensions/susy/templates/project/print.sass - extensions/susy/templates/project/screen.sass - index.html - src/_base.sass - src/_defaults.sass - src/screen.sass - stylesheets/screen.css - } - yui="yui" filter="**/*" { - bootstrap.rb - divisions.html - divisions.html.haml - extensions/yui/COPYRIGHT - extensions/yui/stylesheets/_yui.sass - extensions/yui/stylesheets/yui/modules/_base.sass - extensions/yui/stylesheets/yui/modules/_fonts.sass - extensions/yui/stylesheets/yui/modules/_grids.sass - extensions/yui/stylesheets/yui/modules/_reset.sass - extensions/yui/templates/project/manifest.rb - extensions/yui/templates/project/screen.sass - index.html - index.html.haml - src/screen.sass - stylesheets/screen.css - sub_divisions.html - sub_divisions.html.haml - templates.html - templates.html.haml - test.jpg - typography.html - typography.html.haml - } - downloader.rb - } -} diff --git a/.travis.yml b/.travis.yml index 3d85b60cfd..4fc8ae831f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +language: ruby + rvm: - 1.8.7 - 1.9.2 @@ -7,7 +9,123 @@ rvm: - rbx - ree - 2.0.0 + - 2.1.0 + - 2.2.0 + +sudo: false + +env: + - CI_TEST=core + - CI_TEST=cli + gemfile: - - gemfiles/sass_3_3.gemfile - - gemfiles/sass_master.gemfile -script: "bundle exec rake" + - core/Gemfile + - cli/gemfiles/sass_3_3.gemfile + - cli/gemfiles/listen_2.gemfile + +script: cd $CI_TEST && bundle exec rake + +matrix: + exclude: + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: 1.8.7 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: 1.8.7 + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: 1.8.7 + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: 1.9.2 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: 1.9.2 + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: 1.9.2 + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: 1.9.3 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: 1.9.3 + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: 1.9.3 + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: jruby-18mode + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: jruby-18mode + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: jruby-18mode + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: jruby-19mode + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: jruby-19mode + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: jruby-19mode + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: rbx + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: rbx + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: rbx + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: ree + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: ree + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: ree + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: 2.0.0 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: 2.0.0 + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: 2.0.0 + - gemfile: cli/gemfiles/sass_3_3.gemfile + env: CI_TEST=core + rvm: 2.1.0 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=core + rvm: 2.1.0 + - gemfile: core/Gemfile + env: CI_TEST=cli + rvm: 2.1.0 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=cli + rvm: 1.8.7 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=cli + rvm: 1.9.2 + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=cli + rvm: jruby-18mode + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=cli + rvm: jruby-19mode + - gemfile: cli/gemfiles/listen_2.gemfile + env: CI_TEST=cli + rvm: ree + +notifications: + irc: {channels: "irc.freenode.org#compass"} + campfire: + rooms: + secure: GXnvuoZ8BVMv+JwJIBb0Ey1ARbfeypmCvpmynykD5taooedTqwyTeT32jw1YTQAOuBewgeWW1H4bF10ySz0GWmu6X2sNx9CVYT1dFudoMvLtnvEmAe0JyyRuSCBFj45jP21eRUAACltxzyX4q/gh+zRIlaRin9YBo/Xv84gDzLw= diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13e11013ed..984cb2e997 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,7 +161,6 @@ devbin/ - development scripts after installing the bundle doc-src/ - source for documentation docs/ - generated documentation - examples/ - fully working compass projects that you can explore features/ - tests for compass frameworks/ - All frameworks in this directory are loaded automatically compass/ - The compass framework @@ -289,8 +288,11 @@ the error was. Here's an example:
environment :production, can also be :development
+ Defaults to :development, can also be :production
sourcemap disable_warnings -r to the compass command line tool.)
|
|- my_extension
|
@@ -261,6 +262,11 @@ The big advantages of using rubygems to distribute your extension is that
it allows your extension to be a dependency for other projects and that each
install is versioned, which makes supporting your extension easier.
+If distributing as a rubygem, it is a good idea to have a file
+`compass-