chriseppstein-compass 0.4.2 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Manifest CHANGED
@@ -96,6 +96,8 @@ frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass
96
96
  frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass
97
97
  frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass
98
98
  frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass
99
+ frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass
100
+ frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass
99
101
  frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass
100
102
  frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass
101
103
  frameworks/compass/templates/project/ie.sass
@@ -119,6 +121,7 @@ lib/compass/commands/print_version.rb
119
121
  lib/compass/commands/project_base.rb
120
122
  lib/compass/commands/update_project.rb
121
123
  lib/compass/commands/watch_project.rb
124
+ lib/compass/commands/write_configuration.rb
122
125
  lib/compass/compiler.rb
123
126
  lib/compass/configuration.rb
124
127
  lib/compass/core_ext.rb
data/Rakefile CHANGED
@@ -1,3 +1,15 @@
1
+ if ENV['RUN_CODE_RUN']
2
+ # We need to checkout edge haml for the run>code>run test environment.
3
+ if File.directory?("haml")
4
+ Dir.chdir("haml") do
5
+ sh "git", "pull"
6
+ end
7
+ else
8
+ sh "git", "clone", "git://github.com/nex3/haml.git"
9
+ end
10
+ $LOAD_PATH.unshift "haml/lib"
11
+ end
12
+
1
13
  require 'rubygems'
2
14
  require 'rake'
3
15
  require 'lib/compass'
@@ -11,6 +23,7 @@ require 'fileutils'
11
23
 
12
24
  Rake::TestTask.new :run_tests do |t|
13
25
  t.libs << 'lib'
26
+ t.libs << 'haml/lib' if ENV["RUN_CODE_RUN"]
14
27
  test_files = FileList['test/**/*_test.rb']
15
28
  test_files.exclude('test/rails/*', 'test/haml/*')
16
29
  t.test_files = test_files
@@ -100,7 +113,7 @@ end
100
113
  namespace :git do
101
114
  desc "Perform normal operations required for pushing to github."
102
115
  task :push => [:manifest, :gem] do
103
- sh "git", "add", "Manifest", "compass.gemspec"
116
+ sh "git", "add", "Manifest", "compass.gemspec", "VERSION"
104
117
  sh "git", "commit", "-m", "Updated Manifest and gemspec."
105
118
  sh "git", "push", "origin", "master"
106
119
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.1
1
+ 0.5.0
data/compass.gemspec CHANGED
@@ -1,16 +1,16 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = %q{compass}
3
- s.version = "0.4.2"
3
+ s.version = "0.5.0"
4
4
 
5
5
  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
6
6
  s.authors = ["Chris Eppstein"]
7
- s.date = %q{2009-02-12}
7
+ s.date = %q{2009-02-21}
8
8
  s.default_executable = %q{compass}
9
9
  s.description = %q{Sass-Based CSS Meta-Framework. Semantic, Maintainable CSS.}
10
10
  s.email = %q{chris@eppsteins.net}
11
11
  s.executables = ["compass"]
12
- s.extra_rdoc_files = ["bin/compass", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validate.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "README.markdown"]
13
- s.files = ["bin/compass", "compass.gemspec", "examples/blueprint_default/index.html", "examples/blueprint_default/parts/elements.html", "examples/blueprint_default/parts/forms.html", "examples/blueprint_default/parts/grid.html", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/stylesheets/ie.sass", "examples/blueprint_default/stylesheets/images/grid.png", "examples/blueprint_default/stylesheets/print.sass", "examples/blueprint_default/stylesheets/screen.sass", "examples/blueprint_plugins/index.html", "examples/blueprint_plugins/parts/fancy_type.html", "examples/blueprint_plugins/parts/test-small.jpg", "examples/blueprint_plugins/parts/test.jpg", "examples/blueprint_plugins/parts/valid.png", "examples/blueprint_plugins/stylesheets/ie.sass", "examples/blueprint_plugins/stylesheets/images/grid.png", "examples/blueprint_plugins/stylesheets/print.sass", "examples/blueprint_plugins/stylesheets/screen.sass", "examples/blueprint_scoped/stylesheets/ie.sass", "examples/blueprint_scoped/stylesheets/print.sass", "examples/blueprint_scoped/stylesheets/screen.sass", "examples/blueprint_scoped_form/stylesheets/ie.sass", "examples/blueprint_scoped_form/stylesheets/print.sass", "examples/blueprint_scoped_form/stylesheets/screen.sass", "examples/blueprint_semantic/index.html", "examples/blueprint_semantic/parts/fancy_type.html", "examples/blueprint_semantic/parts/liquid.html", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/stylesheets/ie.sass", "examples/blueprint_semantic/stylesheets/images/grid.png", "examples/blueprint_semantic/stylesheets/liquid.sass", "examples/blueprint_semantic/stylesheets/print.sass", "examples/blueprint_semantic/stylesheets/screen.sass", "examples/compass/compass.html", "examples/compass/sticky_footer.html.haml", "examples/compass/stylesheets/compass.sass", "examples/compass/stylesheets/images/blue_arrow.gif", "examples/compass/stylesheets/sticky_footer.sass", "examples/compass/stylesheets/utilities.sass", "examples/compass/utilities.html.haml", "examples/yui/divisions.html.haml", "examples/yui/index.html.haml", "examples/yui/stylesheets/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "frameworks/blueprint/lib/blueprint/constants.rb", "frameworks/blueprint/lib/blueprint/grid_builder.rb", "frameworks/blueprint/stylesheets/_blueprint.sass", "frameworks/blueprint/stylesheets/blueprint/_ie.sass", "frameworks/blueprint/stylesheets/blueprint/_print.sass", "frameworks/blueprint/stylesheets/blueprint/_screen.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "frameworks/blueprint/templates/project/grid.png", "frameworks/blueprint/templates/project/ie.sass", "frameworks/blueprint/templates/project/manifest.rb", "frameworks/blueprint/templates/project/print.sass", "frameworks/blueprint/templates/project/screen.sass", "frameworks/blueprint.rb", "frameworks/compass/stylesheets/_compass.sass", "frameworks/compass/stylesheets/compass/_layout.sass", "frameworks/compass/stylesheets/compass/_reset.sass", "frameworks/compass/stylesheets/compass/_utilities.sass", "frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "frameworks/compass/stylesheets/compass/utilities/_general.sass", "frameworks/compass/stylesheets/compass/utilities/_links.sass", "frameworks/compass/stylesheets/compass/utilities/_lists.sass", "frameworks/compass/stylesheets/compass/utilities/_print.sass", "frameworks/compass/stylesheets/compass/utilities/_tables.sass", "frameworks/compass/stylesheets/compass/utilities/_text.sass", "frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass", "frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "frameworks/compass/templates/project/ie.sass", "frameworks/compass/templates/project/manifest.rb", "frameworks/compass/templates/project/print.sass", "frameworks/compass/templates/project/screen.sass", "frameworks/compass.rb", "frameworks/yui/COPYRIGHT", "frameworks/yui/stylesheets/_yui.sass", "frameworks/yui/stylesheets/yui/modules/_base.sass", "frameworks/yui/stylesheets/yui/modules/_fonts.sass", "frameworks/yui/stylesheets/yui/modules/_grids.sass", "frameworks/yui/templates/project/manifest.rb", "frameworks/yui/templates/project/screen.sass", "frameworks/yui.rb", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validate.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "Manifest", "Rakefile", "README.markdown", "test/command_line_test.rb", "test/compass_test.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/yui/css/mixins.css", "test/fixtures/stylesheets/yui/sass/base.sass", "test/fixtures/stylesheets/yui/sass/fonts.sass", "test/fixtures/stylesheets/yui/sass/grids.sass", "test/fixtures/stylesheets/yui/sass/mixins.sass", "test/sass_extensions_test.rb", "test/test_helper.rb", "VERSION", "test/configuration_test.rb"]
12
+ s.extra_rdoc_files = ["bin/compass", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validate.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "README.markdown"]
13
+ s.files = ["bin/compass", "compass.gemspec", "examples/blueprint_default/index.html", "examples/blueprint_default/parts/elements.html", "examples/blueprint_default/parts/forms.html", "examples/blueprint_default/parts/grid.html", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/stylesheets/ie.sass", "examples/blueprint_default/stylesheets/images/grid.png", "examples/blueprint_default/stylesheets/print.sass", "examples/blueprint_default/stylesheets/screen.sass", "examples/blueprint_plugins/index.html", "examples/blueprint_plugins/parts/fancy_type.html", "examples/blueprint_plugins/parts/test-small.jpg", "examples/blueprint_plugins/parts/test.jpg", "examples/blueprint_plugins/parts/valid.png", "examples/blueprint_plugins/stylesheets/ie.sass", "examples/blueprint_plugins/stylesheets/images/grid.png", "examples/blueprint_plugins/stylesheets/print.sass", "examples/blueprint_plugins/stylesheets/screen.sass", "examples/blueprint_scoped/stylesheets/ie.sass", "examples/blueprint_scoped/stylesheets/print.sass", "examples/blueprint_scoped/stylesheets/screen.sass", "examples/blueprint_scoped_form/stylesheets/ie.sass", "examples/blueprint_scoped_form/stylesheets/print.sass", "examples/blueprint_scoped_form/stylesheets/screen.sass", "examples/blueprint_semantic/index.html", "examples/blueprint_semantic/parts/fancy_type.html", "examples/blueprint_semantic/parts/liquid.html", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/stylesheets/ie.sass", "examples/blueprint_semantic/stylesheets/images/grid.png", "examples/blueprint_semantic/stylesheets/liquid.sass", "examples/blueprint_semantic/stylesheets/print.sass", "examples/blueprint_semantic/stylesheets/screen.sass", "examples/compass/compass.html", "examples/compass/sticky_footer.html.haml", "examples/compass/stylesheets/compass.sass", "examples/compass/stylesheets/images/blue_arrow.gif", "examples/compass/stylesheets/sticky_footer.sass", "examples/compass/stylesheets/utilities.sass", "examples/compass/utilities.html.haml", "examples/yui/divisions.html.haml", "examples/yui/index.html.haml", "examples/yui/stylesheets/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "frameworks/blueprint/lib/blueprint/constants.rb", "frameworks/blueprint/lib/blueprint/grid_builder.rb", "frameworks/blueprint/stylesheets/_blueprint.sass", "frameworks/blueprint/stylesheets/blueprint/_ie.sass", "frameworks/blueprint/stylesheets/blueprint/_print.sass", "frameworks/blueprint/stylesheets/blueprint/_screen.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "frameworks/blueprint/templates/project/grid.png", "frameworks/blueprint/templates/project/ie.sass", "frameworks/blueprint/templates/project/manifest.rb", "frameworks/blueprint/templates/project/print.sass", "frameworks/blueprint/templates/project/screen.sass", "frameworks/blueprint.rb", "frameworks/compass/stylesheets/_compass.sass", "frameworks/compass/stylesheets/compass/_layout.sass", "frameworks/compass/stylesheets/compass/_reset.sass", "frameworks/compass/stylesheets/compass/_utilities.sass", "frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "frameworks/compass/stylesheets/compass/utilities/_general.sass", "frameworks/compass/stylesheets/compass/utilities/_links.sass", "frameworks/compass/stylesheets/compass/utilities/_lists.sass", "frameworks/compass/stylesheets/compass/utilities/_print.sass", "frameworks/compass/stylesheets/compass/utilities/_tables.sass", "frameworks/compass/stylesheets/compass/utilities/_text.sass", "frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass", "frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass", "frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "frameworks/compass/templates/project/ie.sass", "frameworks/compass/templates/project/manifest.rb", "frameworks/compass/templates/project/print.sass", "frameworks/compass/templates/project/screen.sass", "frameworks/compass.rb", "frameworks/yui/COPYRIGHT", "frameworks/yui/stylesheets/_yui.sass", "frameworks/yui/stylesheets/yui/modules/_base.sass", "frameworks/yui/stylesheets/yui/modules/_fonts.sass", "frameworks/yui/stylesheets/yui/modules/_grids.sass", "frameworks/yui/templates/project/manifest.rb", "frameworks/yui/templates/project/screen.sass", "frameworks/yui.rb", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validate.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "Manifest", "Rakefile", "README.markdown", "test/command_line_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/yui/css/mixins.css", "test/fixtures/stylesheets/yui/sass/base.sass", "test/fixtures/stylesheets/yui/sass/fonts.sass", "test/fixtures/stylesheets/yui/sass/grids.sass", "test/fixtures/stylesheets/yui/sass/mixins.sass", "test/sass_extensions_test.rb", "test/test_helper.rb", "VERSION"]
14
14
  s.homepage = %q{http://github.com/chriseppstein/compass}
15
15
  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Compass", "--main", "README.markdown"]
16
16
  s.require_paths = ["lib"]
@@ -38,6 +38,7 @@ h2
38
38
  :border-color -moz-use-text-color
39
39
  :padding 2px
40
40
  :line-height 22px
41
+ :white-space nowrap
41
42
 
42
43
 
43
44
  #tag-cloud
@@ -62,4 +63,7 @@ h2
62
63
  +column(16)
63
64
  table.alternating
64
65
  :width 100%
65
- +alternating-rows-and-columns(#F9E5A7,#CEFBB3,#222)
66
+ +alternating-rows-and-columns(#F9E5A7,#CEFBB3,#222)
67
+ +table-scaffolding
68
+ +outer-table-borders(2px, #151A99)
69
+ +inner-table-borders(1px, #151A99)
@@ -96,10 +96,15 @@
96
96
  The first colors are the even/odd colors respectively
97
97
  and the last argument is a shade that is subtracted from those
98
98
  colors for the even columns.
99
- %table.alternating
99
+ %p
100
+ The borders are created using
101
+ %code.mixin +outer-table-borders(2px, #151A99)
102
+ and
103
+ %code.mixin +inner-table-borders(1px, #151A99)
104
+ %table.alternating{:cellspacing => 0, :cellpadding => 0, :border => 0}
100
105
  %thead
101
106
  %tr
102
- %td &nbsp;
107
+ %th &nbsp;
103
108
  %th.even Header #1
104
109
  %th.odd Header #2
105
110
  %th.even Header #3
@@ -123,7 +128,7 @@
123
128
  %td.numeric.even 4.1
124
129
  %td.numeric.odd 4.2
125
130
  %td.numeric.even 4.3
126
- %tr.odd
131
+ %tr.odd.last
127
132
  %th Row #5
128
133
  %td.numeric.even 5.1
129
134
  %td.numeric.odd 5.2
@@ -43,6 +43,7 @@
43
43
  :color= !loud_color
44
44
 
45
45
  =blueprint-typography-body
46
+ :line-height 1.5
46
47
  +normal-text
47
48
  :font-size 75%
48
49
 
@@ -1 +1,3 @@
1
- @import tables/alternating_rows_and_columns.sass
1
+ @import tables/alternating_rows_and_columns.sass
2
+ @import tables/borders.sass
3
+ @import tables/scaffolding.sass
@@ -13,8 +13,6 @@
13
13
  pre, a, abbr, acronym, address, code, del, dfn, em, img,
14
14
  dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr
15
15
  +reset
16
- body
17
- :line-height 1.5
18
16
  blockquote, q
19
17
  +reset-quotation
20
18
  th, td, caption
@@ -1,25 +1,20 @@
1
- =alternating-rows-and-columns(!even_row_color, !odd_row_color, !dark_intersection)
2
- td,
1
+ =alternating-rows-and-columns(!even_row_color, !odd_row_color, !dark_intersection, !header_color = #FFF, !footer_color = #FFF)
3
2
  th
4
- :padding 2px
5
- &.numeric
6
- :text-align right
7
- tbody
8
- th
9
- :text-align center
10
- thead
11
- :font-size .9em
12
- th.even
13
- :background-color= #fff - !dark_intersection
14
- tfoot
15
- :font-size .9em
16
- td.even
17
- :background-color= #fff - !dark_intersection
3
+ :background-color= !header_color
4
+ &.even
5
+ :background-color= !header_color - !dark_intersection
18
6
  tr.odd
19
- :background-color= !odd_row_color
20
- td.even
21
- :background-color= !odd_row_color - !dark_intersection
7
+ td
8
+ :background-color= !odd_row_color
9
+ &.even
10
+ :background-color= !odd_row_color - !dark_intersection
22
11
  tr.even
23
- :background-color= !even_row_color
24
- td.even
25
- :background-color= !even_row_color - !dark_intersection
12
+ td
13
+ :background-color= !even_row_color
14
+ &.even
15
+ :background-color= !even_row_color - !dark_intersection
16
+ tfoot
17
+ th, td
18
+ :background-color= !footer_color
19
+ &.even
20
+ :background-color= !footer_color - !dark_intersection
@@ -0,0 +1,27 @@
1
+ =outer-table-borders(!width = 2px, !color = black)
2
+ :border= !width "solid" !color
3
+ thead
4
+ th
5
+ :border-bottom= !width "solid" !color
6
+ tfoot
7
+ th, td
8
+ :border-top= !width "solid" !color
9
+ th
10
+ &:first-child
11
+ :border-right= !width "solid" !color
12
+
13
+ =inner-table-borders(!width = 2px, !color = black)
14
+ th, td
15
+ :border
16
+ :right= !width "solid" !color
17
+ :bottom= !width "solid" !color
18
+ :left-width 0px
19
+ :top-width 0px
20
+ &:last-child,
21
+ &.last
22
+ :border-right-width 0px
23
+ tbody, tfoot
24
+ tr:last-child,
25
+ tr.last
26
+ th, td
27
+ :border-bottom-width 0px
@@ -0,0 +1,9 @@
1
+ =table-scaffolding
2
+ th
3
+ :text-align center
4
+ :font-weight bold
5
+ td,
6
+ th
7
+ :padding 2px
8
+ &.numeric
9
+ :text-align right
@@ -18,6 +18,9 @@ module Compass
18
18
  protected
19
19
 
20
20
  def framework
21
+ unless Compass::Frameworks[options[:framework]]
22
+ raise Compass::Error.new("No such framework: #{options[:framework].inspect}")
23
+ end
21
24
  Compass::Frameworks[options[:framework]]
22
25
  end
23
26
 
@@ -42,6 +42,14 @@ module Compass
42
42
  end
43
43
  end
44
44
 
45
+ def assert_project_directory_exists!
46
+ if File.exists?(project_directory) && !File.directory?(project_directory)
47
+ raise Compass::FilesystemConflict.new("#{project_directory} is not a directory.")
48
+ elsif !File.directory?(project_directory)
49
+ raise Compass::Error.new("#{project_directory} does not exist.")
50
+ end
51
+ end
52
+
45
53
  private
46
54
 
47
55
  def determine_project_name(working_path, options)
@@ -12,48 +12,12 @@ module Compass
12
12
 
13
13
  def perform
14
14
  read_project_configuration
15
- default_options = { :style => default_output_style }
16
- compilation_options = default_options.merge(options).merge(:load_paths => sass_load_paths)
15
+ Compass.configuration.set_maybe(options)
16
+ Compass.configuration.set_defaults!
17
17
  Compass::Compiler.new(working_path,
18
- projectize(project_src_subdirectory),
19
- projectize(project_css_subdirectory),
20
- compilation_options).run
21
- end
22
-
23
- def default_output_style
24
- if options[:environment] == :development
25
- :expanded
26
- else
27
- :compact
28
- end
29
- end
30
-
31
- # where to load sass files from
32
- def sass_load_paths
33
- [project_src_directory] + Compass::Frameworks::ALL.map{|f| f.stylesheets_directory}
34
- end
35
-
36
- # The subdirectory where the sass source is kept.
37
- def project_src_subdirectory
38
- Compass.configuration.sass_dir ||= options[:src_dir] || "src"
39
- end
40
-
41
- # The subdirectory where the css output is kept.
42
- def project_css_subdirectory
43
- Compass.configuration.css_dir ||= options[:css_dir] || "stylesheets"
44
- end
45
-
46
- # The directory where the project source files are located.
47
- def project_src_directory
48
- @project_src_directory ||= separate("#{project_directory}/#{project_src_subdirectory}")
49
- end
50
-
51
- def assert_project_directory_exists!
52
- if File.exists?(project_directory) && !File.directory?(project_directory)
53
- raise Compass::FilesystemConflict.new("#{project_directory} is not a directory.")
54
- elsif !File.directory?(project_directory)
55
- raise Compass::Error.new("#{project_directory} does not exist.")
56
- end
18
+ projectize(Compass.configuration.sass_dir),
19
+ projectize(Compass.configuration.css_dir),
20
+ Compass.sass_engine_options).run
57
21
  end
58
22
 
59
23
  end
@@ -0,0 +1,37 @@
1
+ require File.join(File.dirname(__FILE__), 'project_base')
2
+
3
+ module Compass
4
+ module Commands
5
+ class WriteConfiguration < ProjectBase
6
+
7
+ def initialize(working_path, options)
8
+ super
9
+ assert_project_directory_exists!
10
+ end
11
+
12
+ def perform
13
+ read_project_configuration
14
+ Compass.configuration.set_maybe(options)
15
+ Compass.configuration.set_defaults!
16
+ config_file = projectize("config.rb")
17
+ if File.exists?(config_file)
18
+ if options[:force]
19
+ logger.record(:overwrite, config_file)
20
+ else
21
+ message = "#{config_file} already exists. Run with --force to overwrite."
22
+ raise Compass::FilesystemConflict.new(message)
23
+ end
24
+ else
25
+ logger.record(:create, basename(config_file))
26
+ end
27
+ project_path, Compass.configuration.project_path = Compass.configuration.project_path, nil
28
+ open(config_file,'w') do |config|
29
+ config.puts Compass.configuration.serialize
30
+ end
31
+ Compass.configuration.project_path = project_path
32
+ end
33
+
34
+
35
+ end
36
+ end
37
+ end
@@ -3,7 +3,20 @@ require 'singleton'
3
3
  module Compass
4
4
  class Configuration
5
5
  include Singleton
6
- attr_accessor :project_path, :css_dir, :sass_dir, :images_dir, :javascripts_dir, :required_libraries
6
+
7
+ ATTRIBUTES = [
8
+ :project_path,
9
+ :css_dir,
10
+ :sass_dir,
11
+ :images_dir,
12
+ :javascripts_dir,
13
+ :output_style,
14
+ :environment
15
+ ]
16
+
17
+ attr_accessor *ATTRIBUTES
18
+
19
+ attr_accessor :required_libraries
7
20
 
8
21
  def initialize
9
22
  self.required_libraries = []
@@ -19,28 +32,103 @@ module Compass
19
32
 
20
33
  def parse_string(contents, filename)
21
34
  eval(contents, binding, filename)
22
- [:css_dir, :sass_dir, :images_dir, :javascripts_dir].each do |prop|
35
+ ATTRIBUTES.each do |prop|
23
36
  value = eval(prop.to_s, binding) rescue nil
24
37
  self.send("#{prop}=", value) if value
25
38
  end
26
39
  end
27
40
 
41
+ def set_all(options)
42
+ ATTRIBUTES.each do |a|
43
+ self.send("#{a}=", options[a]) if options.has_key?(a)
44
+ end
45
+ end
46
+
47
+ def set_maybe(options)
48
+ ATTRIBUTES.each do |a|
49
+ self.send("#{a}=", options[a]) if options[a]
50
+ end
51
+ end
52
+
53
+ def default_all(options)
54
+ ATTRIBUTES.each do |a|
55
+ self.send("#{a}=", options[a]) unless self.send(a)
56
+ end
57
+ end
58
+
59
+ def set_defaults!
60
+ default_all(ATTRIBUTES.inject({}){|m, a| m[a] = default_for(a); m})
61
+ end
62
+
63
+ def default_for(attribute)
64
+ method = "default_#{attribute}".to_sym
65
+ self.send(method) if respond_to?(method)
66
+ end
67
+
68
+ def default_sass_dir
69
+ "src"
70
+ end
71
+
72
+ def default_css_dir
73
+ "stylesheets"
74
+ end
75
+
76
+ def default_output_style
77
+ if environment == :development
78
+ :expanded
79
+ else
80
+ :compact
81
+ end
82
+ end
83
+
28
84
  def serialize
29
85
  contents = ""
30
86
  required_libraries.each do |lib|
31
87
  contents << %Q{require '#{lib}'\n}
32
88
  end
89
+ contents << "# Require any additional compass plugins here.\n"
33
90
  contents << "\n" if required_libraries.any?
34
- [:css_dir, :sass_dir, :images_dir, :javascripts_dir].each do |prop|
91
+ ATTRIBUTES.each do |prop|
35
92
  value = send(prop)
36
- contents << %Q(#{prop} = "#{value}"\n) if value
93
+ unless value.nil?
94
+ contents << %Q(#{prop} = #{value.inspect}\n)
95
+ end
37
96
  end
38
97
  contents
39
98
  end
40
99
 
100
+ def to_sass_plugin_options
101
+ if project_path && sass_dir && css_dir
102
+ proj_sass_path = File.join(project_path, sass_dir)
103
+ proj_css_path = File.join(project_path, css_dir)
104
+ locations = {proj_sass_path => proj_css_path}
105
+ else
106
+ locations = {}
107
+ end
108
+ Compass::Frameworks::ALL.each do |framework|
109
+ locations[framework.stylesheets_directory] = proj_css_path || css_dir || "."
110
+ end
111
+ plugin_opts = {:template_location => locations}
112
+ plugin_opts[:style] = output_style if output_style
113
+ plugin_opts
114
+ end
115
+
116
+ def to_sass_engine_options
117
+ load_paths = []
118
+ if project_path && sass_dir
119
+ load_paths << File.join(project_path, sass_dir)
120
+ end
121
+ Compass::Frameworks::ALL.each do |framework|
122
+ load_paths << framework.stylesheets_directory
123
+ end
124
+ engine_opts = {:load_paths => load_paths}
125
+ engine_opts[:style] = output_style if output_style
126
+ engine_opts
127
+ end
128
+
41
129
  # Support for testing.
42
130
  def reset!
43
- [:project_path, :css_dir, :sass_dir, :images_dir, :javascripts_dir].each do |attr|
131
+ ATTRIBUTES.each do |attr|
44
132
  send("#{attr}=", nil)
45
133
  end
46
134
  self.required_libraries = []
@@ -62,13 +150,7 @@ module Compass
62
150
  end
63
151
 
64
152
  def sass_plugin_configuration
65
- proj_sass_path = File.join(configuration.project_path, configuration.sass_dir)
66
- proj_css_path = File.join(configuration.project_path, configuration.css_dir)
67
- locations = {proj_sass_path => proj_css_path}
68
- Compass::Frameworks::ALL.each do |framework|
69
- locations[framework.stylesheets_directory] = proj_css_path
70
- end
71
- {:template_location => locations}
153
+ configuration.to_sass_plugin_options
72
154
  end
73
155
 
74
156
  def configure_sass_plugin!
@@ -76,14 +158,7 @@ module Compass
76
158
  end
77
159
 
78
160
  def sass_engine_options
79
- load_paths = []
80
- if configuration.project_path && configuration.sass_dir
81
- load_paths << File.join(configuration.project_path, configuration.sass_dir)
82
- end
83
- Compass::Frameworks::ALL.each do |framework|
84
- load_paths << framework.stylesheets_directory
85
- end
86
- {:load_paths => load_paths}
161
+ configuration.to_sass_engine_options
87
162
  end
88
163
  end
89
164
 
data/lib/compass/exec.rb CHANGED
@@ -101,11 +101,11 @@ END
101
101
  self.options[:command] = :watch_project
102
102
  end
103
103
 
104
- opts.on('--source SRC_DIR', "The source directory (where you keep your sass stylesheets).") do |src_dir|
105
- self.options[:src_dir] = src_dir
104
+ opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
105
+ self.options[:sass_dir] = sass_dir
106
106
  end
107
107
 
108
- opts.on('--target CSS_DIR', "The target directory (where you keep your css stylesheets).") do |css_dir|
108
+ opts.on('--css-dir CSS_DIR', "The target directory where you keep your css stylesheets.") do |css_dir|
109
109
  self.options[:css_dir] = css_dir
110
110
  end
111
111
 
@@ -113,7 +113,11 @@ END
113
113
  self.options[:command] = :list_frameworks
114
114
  end
115
115
 
116
- opts.on('-f FRAMEWORK', '--framework FRAMEWORK', 'Set up a new project using the selected framework. Legal values: compass (default), blueprint') do |framework|
116
+ opts.on('-c', '--write-configuration', "Write the current configuration to the configuration file.") do
117
+ self.options[:command] = :write_configuration
118
+ end
119
+
120
+ opts.on('-f FRAMEWORK', '--framework FRAMEWORK', 'Set up a new project using the specified framework.') do |framework|
117
121
  self.options[:framework] = framework
118
122
  end
119
123
 
@@ -141,7 +145,7 @@ END
141
145
  self.options[:dry_run] = true
142
146
  end
143
147
 
144
- opts.on('--trace', :NONE, 'Show a full traceback on error') do
148
+ opts.on('--trace', :NONE, 'Show a full stacktrace on error') do
145
149
  self.options[:trace] = true
146
150
  end
147
151
 
@@ -10,6 +10,7 @@ module Compass
10
10
  eval(config.read, nil, configuration_file)
11
11
  end
12
12
  end
13
+ Compass.configuration.set_maybe(options)
13
14
  end
14
15
 
15
16
  def init
@@ -6,6 +6,7 @@ class ConfigurationTest < Test::Unit::TestCase
6
6
  contents = <<-CONFIG
7
7
  require 'compass'
8
8
  require 'sass'
9
+ # Require any additional compass plugins here.
9
10
 
10
11
  css_dir = "css"
11
12
  sass_dir = "sass"
@@ -1,6 +1,7 @@
1
1
 
2
2
 
3
3
  body {
4
+ line-height: 1.5;
4
5
  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
5
6
  color: #333333;
6
7
  font-size: 75%; }
@@ -21,9 +21,6 @@ dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, th
21
21
  font-family: inherit;
22
22
  vertical-align: baseline; }
23
23
 
24
- body {
25
- line-height: 1.5; }
26
-
27
24
  blockquote, q {
28
25
  margin: 0;
29
26
  padding: 0;
@@ -13,6 +13,8 @@
13
13
 
14
14
 
15
15
 
16
+
17
+
16
18
  .clearfix {
17
19
  overflow: auto;
18
20
  overflow: -moz-scrollbars-none;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chriseppstein-compass
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Eppstein
@@ -9,11 +9,12 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-02-12 00:00:00 -08:00
12
+ date: 2009-02-21 00:00:00 -08:00
13
13
  default_executable: compass
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: haml
17
+ type: :runtime
17
18
  version_requirement:
18
19
  version_requirements: !ruby/object:Gem::Requirement
19
20
  requirements:
@@ -23,6 +24,7 @@ dependencies:
23
24
  version:
24
25
  - !ruby/object:Gem::Dependency
25
26
  name: echoe
27
+ type: :runtime
26
28
  version_requirement:
27
29
  version_requirements: !ruby/object:Gem::Requirement
28
30
  requirements:
@@ -46,6 +48,7 @@ extra_rdoc_files:
46
48
  - lib/compass/commands/project_base.rb
47
49
  - lib/compass/commands/update_project.rb
48
50
  - lib/compass/commands/watch_project.rb
51
+ - lib/compass/commands/write_configuration.rb
49
52
  - lib/compass/compiler.rb
50
53
  - lib/compass/configuration.rb
51
54
  - lib/compass/core_ext.rb
@@ -173,6 +176,8 @@ files:
173
176
  - frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass
174
177
  - frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass
175
178
  - frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass
179
+ - frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass
180
+ - frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass
176
181
  - frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass
177
182
  - frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass
178
183
  - frameworks/compass/templates/project/ie.sass
@@ -196,6 +201,7 @@ files:
196
201
  - lib/compass/commands/project_base.rb
197
202
  - lib/compass/commands/update_project.rb
198
203
  - lib/compass/commands/watch_project.rb
204
+ - lib/compass/commands/write_configuration.rb
199
205
  - lib/compass/compiler.rb
200
206
  - lib/compass/configuration.rb
201
207
  - lib/compass/core_ext.rb
@@ -228,6 +234,7 @@ files:
228
234
  - README.markdown
229
235
  - test/command_line_test.rb
230
236
  - test/compass_test.rb
237
+ - test/configuration_test.rb
231
238
  - test/fixtures/stylesheets/blueprint/css/typography.css
232
239
  - test/fixtures/stylesheets/blueprint/sass/ie.sass
233
240
  - test/fixtures/stylesheets/blueprint/sass/print.sass
@@ -249,7 +256,6 @@ files:
249
256
  - test/sass_extensions_test.rb
250
257
  - test/test_helper.rb
251
258
  - VERSION
252
- - test/configuration_test.rb
253
259
  has_rdoc: false
254
260
  homepage: http://github.com/chriseppstein/compass
255
261
  post_install_message: