RubyGems - compass - Versions diffs - 0.11.5 → 0.11.6 - Mend

compass 0.11.5 → 0.11.6

Files changed (151) hide show

data/VERSION.yml +1 -1
data/bin/compass +5 -1
data/bin/compass.compiled.rbc +707 -0
data/examples/compass/compass_app_log.txt +6 -0
data/features/command_line.feature +16 -16
data/features/extensions.feature +6 -0
data/features/step_definitions/command_line_steps.rb +2 -0
data/frameworks/compass/stylesheets/compass/css3/_images.scss +6 -6
data/frameworks/compass/stylesheets/compass/css3/_user-interface.scss +19 -0
data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +12 -3
data/frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss +1 -1
data/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss +14 -11
data/frameworks/compass/templates/pie/PIE.htc +83 -64
data/lib/compass.rbc +42 -36
data/lib/compass/actions.rbc +244 -85
data/lib/compass/app_integration.rbc +28 -20
data/lib/compass/app_integration/merb.rbc +8 -4
data/lib/compass/app_integration/rails.rbc +664 -148
data/lib/compass/app_integration/rails/configuration_defaults.rbc +1089 -332
data/lib/compass/app_integration/rails/installer.rbc +145 -61
data/lib/compass/app_integration/stand_alone.rbc +15 -15
data/lib/compass/app_integration/stand_alone/configuration_defaults.rbc +23 -23
data/lib/compass/app_integration/stand_alone/installer.rbc +52 -32
data/lib/compass/browser_support.rbc +35 -23
data/lib/compass/commands.rbc +307 -0
data/lib/compass/commands/base.rbc +1044 -0
data/lib/compass/commands/clean_project.rbc +1856 -0
data/lib/compass/commands/create_project.rbc +2691 -0
data/lib/compass/commands/default.rbc +1677 -0
data/lib/compass/commands/generate_grid_background.rbc +1939 -0
data/lib/compass/commands/help.rbc +1921 -0
data/lib/compass/commands/imports.rbc +969 -0
data/lib/compass/commands/installer_command.rbc +807 -0
data/lib/compass/commands/interactive.rbc +1341 -0
data/lib/compass/commands/list_frameworks.rbc +1111 -0
data/lib/compass/commands/print_version.rbc +2478 -0
data/lib/compass/commands/project_base.rbc +2085 -0
data/lib/compass/commands/project_stats.rb +7 -7
data/lib/compass/commands/project_stats.rbc +4202 -0
data/lib/compass/commands/registry.rbc +1350 -0
data/lib/compass/commands/sprite.rbc +2212 -0
data/lib/compass/commands/stamp_pattern.rbc +2011 -0
data/lib/compass/commands/unpack_extension.rbc +2348 -0
data/lib/compass/commands/update_project.rbc +3002 -0
data/lib/compass/commands/validate_project.rbc +1686 -0
data/lib/compass/commands/watch_project.rbc +4155 -0
data/lib/compass/commands/write_configuration.rbc +2896 -0
data/lib/compass/compiler.rbc +591 -398
data/lib/compass/configuration.rbc +134 -78
data/lib/compass/configuration/adapters.rbc +98 -40
data/lib/compass/configuration/comments.rbc +132 -51
data/lib/compass/configuration/data.rbc +541 -551
data/lib/compass/configuration/defaults.rbc +764 -189
data/lib/compass/configuration/file_data.rbc +37 -125
data/lib/compass/configuration/helpers.rb +7 -2
data/lib/compass/configuration/helpers.rbc +433 -153
data/lib/compass/configuration/inheritance.rbc +412 -165
data/lib/compass/configuration/paths.rbc +9 -9
data/lib/compass/configuration/serialization.rbc +151 -84
data/lib/compass/dependencies.rbc +16 -4
data/lib/compass/errors.rbc +5 -5
data/lib/compass/exec.rbc +500 -0
data/lib/compass/exec/command_option_parser.rbc +676 -0
data/lib/compass/exec/global_options_parser.rbc +1306 -0
data/lib/compass/exec/helpers.rbc +758 -0
data/lib/compass/exec/project_options_parser.rbc +1515 -0
data/lib/compass/exec/sub_command_ui.rbc +1191 -0
data/lib/compass/frameworks.rb +10 -4
data/lib/compass/frameworks.rbc +118 -66
data/lib/compass/grid_builder.rbc +0 -0
data/lib/compass/installers.rbc +152 -0
data/lib/compass/installers/bare_installer.rbc +939 -0
data/lib/compass/installers/base.rbc +4427 -0
data/lib/compass/installers/manifest.rbc +3335 -0
data/lib/compass/installers/manifest_installer.rbc +1591 -0
data/lib/compass/installers/template_context.rbc +1030 -0
data/lib/compass/logger.rbc +2317 -0
data/lib/compass/quick_cache.rbc +12 -8
data/lib/compass/sass_extensions.rbc +8 -4
data/lib/compass/sass_extensions/functions.rbc +90 -57
data/lib/compass/sass_extensions/functions/colors.rbc +22 -18
data/lib/compass/sass_extensions/functions/constants.rbc +45 -25
data/lib/compass/sass_extensions/functions/cross_browser_support.rbc +48 -36
data/lib/compass/sass_extensions/functions/display.rbc +341 -107
data/lib/compass/sass_extensions/functions/enumerate.rbc +9 -9
data/lib/compass/sass_extensions/functions/env.rbc +299 -0
data/lib/compass/sass_extensions/functions/font_files.rbc +540 -123
data/lib/compass/sass_extensions/functions/gradient_support.rbc +379 -167
data/lib/compass/sass_extensions/functions/image_size.rbc +715 -400
data/lib/compass/sass_extensions/functions/inline_image.rbc +152 -98
data/lib/compass/sass_extensions/functions/lists.rb +5 -0
data/lib/compass/sass_extensions/functions/lists.rbc +75 -39
data/lib/compass/sass_extensions/functions/selectors.rbc +36 -28
data/lib/compass/sass_extensions/functions/sprites.rbc +255 -233
data/lib/compass/sass_extensions/functions/trig.rbc +53 -51
data/lib/compass/sass_extensions/functions/urls.rbc +3151 -1044
data/lib/compass/sass_extensions/monkey_patches.rbc +5 -5
data/lib/compass/sass_extensions/monkey_patches/browser_support.rbc +63 -47
data/lib/compass/sass_extensions/monkey_patches/traversal.rbc +36 -16
data/lib/compass/sass_extensions/sprites.rbc +93 -13
data/lib/compass/sass_extensions/sprites/engines.rbc +615 -6
data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc +260 -94
data/lib/compass/sass_extensions/sprites/image.rbc +694 -316
data/lib/compass/sass_extensions/sprites/image_methods.rbc +900 -0
data/lib/compass/sass_extensions/sprites/image_row.rbc +1168 -0
data/lib/compass/sass_extensions/sprites/layout_methods.rbc +3236 -0
data/lib/compass/sass_extensions/sprites/row_fitter.rbc +2067 -0
data/lib/compass/sass_extensions/sprites/sprite_map.rbc +714 -3641
data/lib/compass/sass_extensions/sprites/sprite_methods.rb +1 -1
data/lib/compass/sass_extensions/sprites/sprite_methods.rbc +3190 -0
data/lib/compass/sprite_importer.rbc +1125 -1495
data/lib/compass/util.rbc +19 -11
data/lib/compass/version.rbc +53 -25
data/test/fixtures/extensions/only_stylesheets/compass_init.rb +1 -0
data/test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss +3 -0
data/test/fixtures/stylesheets/compass/css/lists.css +7 -7
data/test/fixtures/stylesheets/compass/css/reset.css +0 -1
data/test/fixtures/stylesheets/compass/css/user-interface.css +5 -0
data/test/fixtures/stylesheets/compass/sass/user-interface.scss +5 -0
data/test/fixtures/stylesheets/envtest/tmp/env.css +2 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb +25 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss +5 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss +3 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/screen.scss +6 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/ie.css +5 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css +3 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css +68 -0
data/test/helpers/command_line.rbc +2820 -0
data/test/helpers/diff.rbc +1104 -0
data/test/helpers/io.rbc +962 -0
data/test/helpers/rails.rbc +1116 -0
data/test/helpers/test_case.rbc +1255 -0
data/test/integrations/compass_test.rbc +6589 -0
data/test/integrations/rails_integration_test.rbc +1342 -0
data/test/integrations/sprites_test.rbc +6192 -0
data/test/test_helper.rbc +1694 -0
data/test/units/actions_test.rbc +644 -0
data/test/units/command_line_test.rbc +1532 -0
data/test/units/compass_png_test.rbc +0 -0
data/test/units/configuration_test.rbc +3833 -0
data/test/units/rails_configuration_test.rbc +1032 -0
data/test/units/sass_extensions_test.rb +5 -0
data/test/units/sass_extensions_test.rbc +3586 -0
data/test/units/sprites/engine_test.rbc +962 -0
data/test/units/sprites/image_row_test.rbc +1578 -0
data/test/units/sprites/image_test.rbc +2836 -0
data/test/units/sprites/importer_test.rbc +2620 -0
data/test/units/sprites/row_fitter_test.rbc +1479 -0
data/test/units/sprites/sprite_command_test.rbc +1147 -0
data/test/units/sprites/sprite_map_test.rbc +6515 -0
metadata +157 -51

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

data/lib/compass/frameworks.rbc CHANGED

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -677,7 +677,7 @@ x
 22
 @stylesheets_directory
 p
-15
+17
 I
 -1
 I
@@ -687,6 +687,10 @@ I
 I
 d
 I
+1b
+I
+d
+I
 1e
 I
 7f
@@ -709,8 +713,8 @@ I
 I
 71
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 4
 x
@@ -852,8 +856,8 @@ I
 I
 d
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -875,8 +879,8 @@ I
 I
 18
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -949,8 +953,8 @@ I
 I
 12
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1123,8 +1127,8 @@ I
 I
 5a
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 2
 x
@@ -1166,8 +1170,8 @@ I
 I
 54
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -1231,7 +1235,7 @@ x
 11
 @registered
 p
-11
+13
 I
 -1
 I
@@ -1253,10 +1257,14 @@ I
 I
 24
 I
+1a
+I
+24
+I
 1f
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -1375,7 +1383,7 @@ x
 2
 <<
 p
-11
+13
 I
 -1
 I
@@ -1397,10 +1405,14 @@ I
 I
 2c
 I
+38
+I
+0
+I
 39
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 3
 x
@@ -1512,8 +1524,8 @@ I
 I
 15
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1535,8 +1547,8 @@ I
 I
 9
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1757,8 +1769,8 @@ I
 I
 1c
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1859,16 +1871,20 @@ x
 2
 []
 p
-3
+5
 I
 0
 I
 37
 I
+2e
+I
+0
+I
 2f
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1952,8 +1968,8 @@ I
 I
 18
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -1963,7 +1979,7 @@ x
 4
 each
 p
-11
+15
 I
 -1
 I
@@ -1973,10 +1989,18 @@ I
 I
 35
 I
+10
+I
+0
+I
 11
 I
 36
 I
+3c
+I
+0
+I
 3d
 I
 37
@@ -1987,8 +2011,8 @@ I
 I
 57
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 2
 x
@@ -2204,8 +2228,8 @@ I
 I
 d
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -2261,16 +2285,20 @@ x
 7
 require
 p
-3
+5
 I
 0
 I
 45
 I
+10
+I
+0
+I
 11
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -2281,7 +2309,7 @@ x
 8
 register
 p
-19
+21
 I
 -1
 I
@@ -2319,10 +2347,14 @@ I
 I
 48
 I
+67
+I
+0
+I
 68
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 4
 x
@@ -2479,7 +2511,7 @@ x
 10
 directory?
 p
-15
+17
 I
 -1
 I
@@ -2505,14 +2537,18 @@ I
 I
 4f
 I
+52
+I
+0
+I
 53
 I
 52
 I
 55
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 3
 x
@@ -2751,7 +2787,7 @@ x
 4
 gsub
 p
-21
+23
 I
 -1
 I
@@ -2793,10 +2829,14 @@ I
 I
 5f
 I
+8e
+I
+0
+I
 8f
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 5
 x
@@ -3046,8 +3086,8 @@ I
 I
 26
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 2
 x
@@ -3079,8 +3119,8 @@ I
 I
 22
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 3
 x
@@ -3369,7 +3409,7 @@ s
 p
-13
+15
 I
 0
 I
@@ -3391,14 +3431,18 @@ I
 I
 73
 I
+46
+I
+0
+I
 47
 I
 76
 I
 51
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 2
 x
@@ -3411,7 +3455,7 @@ x
 4
 each
 p
-11
+15
 I
 0
 I
@@ -3421,6 +3465,10 @@ I
 I
 6e
 I
+25
+I
+0
+I
 26
 I
 6f
@@ -3433,10 +3481,14 @@ I
 I
 71
 I
+4d
+I
+0
+I
 4e
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 1
 x
@@ -3470,8 +3522,8 @@ I
 I
 2e
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 3
 x
@@ -3536,8 +3588,8 @@ I
 I
 b3
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -3552,8 +3604,8 @@ I
 I
 1c
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0
 x
@@ -3582,7 +3634,7 @@ I
 I
 27
 x
-55
-/Users/chris/Projects/compass/lib/compass/frameworks.rb
+57
+/Users/crispee/Projects/compass/lib/compass/frameworks.rb
 p
 0