github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	bin/compass
This commit is contained in:
Chris Eppstein 2011-11-06 18:02:41 -08:00
commit ebd758a799
15 changed files with 160 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/compass
View File

@ -36,5 +36,5 @@ if ARGV.delete("--profile")
printer.print(STDERR, 0) printer.print(STDERR, 0)
exit exit_code exit exit_code
else else
exit runner.call || 0 exit runner.call || 1
end end

30
features/command_line.feature
View File

@ -277,21 +277,21 @@ Feature: Command Line
Given I am using the existing project in test/fixtures/stylesheets/compass Given I am using the existing project in test/fixtures/stylesheets/compass
When I run: compass stats When I run: compass stats
Then I am told statistics for each file: Then I am told statistics for each file:
| Filename | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties | | Filename | Rules | Properties | Mixins Defs | Mixins Used | CSS Selectors | CSS Properties |
| sass/border_radius.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/border_radius.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/box.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/box.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/fonts.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/fonts.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/gradients.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/gradients.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/image_size.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/image_size.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/images.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/images.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/layout.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/layout.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/legacy_clearfix.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/legacy_clearfix.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/lists.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/lists.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/print.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/print.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/reset.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/reset.sass | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| sass/utilities.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | sass/utilities.scss | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
| ------------------------- | ----- | ---------- | -------------- | ----------- | --------- | -------------- | | ------------------------- | ----- | ---------- | -------------- | ----------- | ------------- | -------------- |
| Total.* | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ | | Total.* | \d+ | \d+ | \d+ | \d+ | \d+ | \d+ |
@listframeworks @listframeworks
Scenario: List frameworks registered with compass Scenario: List frameworks registered with compass

6
features/extensions.feature
View File

@ -28,3 +28,9 @@ Feature: Extensions
And and I have a fake extension at ~/.compass/extensions/testing And and I have a fake extension at ~/.compass/extensions/testing
When I run: compass frameworks When I run: compass frameworks
Then the list of frameworks includes "testing" Then the list of frameworks includes "testing"
@listframeworks
Scenario: Frameworks without templates
Given I am using the existing project in test/fixtures/stylesheets/uses_only_stylesheets_ext
When I run: compass frameworks
Then the list of frameworks includes "only_stylesheets"

2
features/step_definitions/command_line_steps.rb
View File

@ -10,6 +10,8 @@ include Compass::RailsHelper
Before do Before do
Compass.reset_configuration! Compass.reset_configuration!
Compass::Frameworks::ALL.clear
Compass::Frameworks.discover :defaults
@cleanup_directories = [] @cleanup_directories = []
@original_working_directory = Dir.pwd @original_working_directory = Dir.pwd
end end

14
lib/compass/commands/project_stats.rb
View File

@ -34,13 +34,13 @@ module Compass
compiler = new_compiler_instance compiler = new_compiler_instance
sass_files = sorted_sass_files(compiler) sass_files = sorted_sass_files(compiler)
total_label = "Total (#{sass_files.size} files):" total_label = "Total (#{sass_files.size} files):"
rows = [[ :-, :-, :-, :-, :-, :-, :- ], rows = [[ :-, :-, :-, :-, :-, :-, :- ],
[ 'Filename', 'Rules', 'Properties', 'Mixins Defs', 'Mixins Used', 'CSS Rules', 'CSS Properties' ], [ 'Filename', 'Rules', 'Properties', 'Mixins Defs', 'Mixins Used', 'CSS Selectors', 'CSS Properties' ],
[ :-, :-, :-, :-, :-, :-, :- ]] [ :-, :-, :-, :-, :-, :-, :- ]]
maximums = [ total_label.length, 5, 10, 14, 11, 9, 14 ] maximums = [ total_label.length, 5, 10, 14, 11, 13, 14 ]
alignments = [ :left, :right, :right, :right, :right, :right, :right ] alignments = [ :left, :right, :right, :right, :right, :right, :right ]
delimiters = [ ['| ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'] ] delimiters = [ ['| ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'], [' ', ' |'] ]
totals = [ total_label, 0, 0, 0, 0, 0, 0 ] totals = [ total_label, 0, 0, 0, 0, 0, 0 ]
sass_files.each do |sass_file| sass_files.each do |sass_file|
css_file = compiler.corresponding_css_file(sass_file) unless sass_file[0..0] == '_' css_file = compiler.corresponding_css_file(sass_file) unless sass_file[0..0] == '_'

14
lib/compass/frameworks.rb
View File

@ -13,11 +13,17 @@ module Compass
options = arguments.last.is_a?(Hash) ? arguments.pop : {} options = arguments.last.is_a?(Hash) ? arguments.pop : {}
self.path = path = options[:path] || arguments.shift self.path = path = options[:path] || arguments.shift
@name = name @name = name
@templates_directory = options[:templates_directory] || File.join(path, 'templates') @templates_directory = options[:templates_directory]
@stylesheets_directory = options[:stylesheets_directory] || File.join(path, 'stylesheets') @templates_directory ||= File.join(path, 'templates') if path
@stylesheets_directory = options[:stylesheets_directory]
@stylesheets_directory ||= File.join(path, 'stylesheets') if path
end end
def template_directories def template_directories
Dir.glob(File.join(templates_directory, "*")).map{|f| File.basename(f)} if templates_directory
Dir.glob(File.join(templates_directory, "*")).map{|f| File.basename(f)}
else
[]
end
end end
def manifest_file(pattern) def manifest_file(pattern)
File.join(templates_directory, pattern.to_s, "manifest.rb") File.join(templates_directory, pattern.to_s, "manifest.rb")
@ -76,7 +82,7 @@ module Compass
def template_exists?(template) def template_exists?(template)
framework_name, template = template.split(%r{/}, 2) framework_name, template = template.split(%r{/}, 2)
template ||= "project" template ||= "project"
if framework = self[framework_name] if (framework = self[framework_name]) && framework.templates_directory
return File.directory?(File.join(framework.templates_directory, template)) return File.directory?(File.join(framework.templates_directory, template))
end end
false false

1
test/fixtures/extensions/only_stylesheets/compass_init.rb vendored Normal file
View File

@ -0,0 +1 @@
Compass::Frameworks.register("only-stylesheets", :stylesheets_dir => File.join(File.dirname(__FILE__),"scss"))

3
test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss vendored Normal file
View File

@ -0,0 +1,3 @@
@mixin only-stylesheets {
color: red;
}

25
test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb vendored Normal file
View File

@ -0,0 +1,25 @@
# Require any additional compass plugins here.
load '../../extensions/only_stylesheets/'
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "stylesheets"
sass_dir = "sass"
images_dir = "images"
javascripts_dir = "javascripts"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

5
test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss vendored Normal file
View File

@ -0,0 +1,5 @@
/* Welcome to Compass. Use this file to write IE specific override styles.
* Import this file using the following HTML or equivalent:
* <!--[if IE]>
* <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
* <![endif]--> */

3
test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss vendored Normal file
View File

@ -0,0 +1,3 @@
/* Welcome to Compass. Use this file to define print styles.
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */

6
test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/screen.scss vendored Normal file
View File

@ -0,0 +1,6 @@
/* Welcome to Compass.
* In this file you should write your main styles. (or centralize your imports)
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
@import "compass/reset";

5
test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/ie.css vendored Normal file
View File

@ -0,0 +1,5 @@
/* Welcome to Compass. Use this file to write IE specific override styles.
* Import this file using the following HTML or equivalent:
* <!--[if IE]>
* <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
* <![endif]--> */

3
test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css vendored Normal file
View File

@ -0,0 +1,3 @@
/* Welcome to Compass. Use this file to define print styles.
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */

68
test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css vendored Normal file
View File

@ -0,0 +1,68 @@
/* Welcome to Compass.
* In this file you should write your main styles. (or centralize your imports)
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
/* line 17, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* line 20, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
body {
line-height: 1;
}
/* line 22, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none;
}
/* line 24, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: collapse;
border-spacing: 0;
}
/* line 26, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle;
}
/* line 28, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: none;
}
/* line 101, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none;
}
/* line 30, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
a img {
border: none;
}
/* line 114, ../../../../../../../.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems/compass-0.12.alpha.0/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
display: block;
}