chriseppstein-compass 0.5.5 → 0.5.9

data/lib/compass/exec.rb

@@ -158,6 +158,19 @@ END
           exit
         end
 
+        opts.on('--validate', :NONE, 'Validate your project\'s compiled css') do
+          self.options[:command] = :validate_project
+        end
+
+        opts.on('-p', '--pattern PATTERN', 'Stamp out a pattern into the current project. Must be used in combination with -f.') do |pattern|
+          self.options[:command] = :stamp_pattern
+          self.options[:pattern] = pattern
+        end
+
+        opts.on('-n', '--pattern-name NAME', 'The name to use when stamping a pattern. Must be used in combination with -p.') do |name|
+          self.options[:pattern_name] = name
+        end
+
         opts.on_tail("-?", "-h", "--help", "Show this message") do
           puts opts
           exit
@@ -166,6 +179,16 @@ END
         opts.on_tail("-v", "--version", "Print version") do
           self.options[:command] = :print_version
         end
+
+        opts.on('--grid-img [DIMENSIONS]', 'Generate a background image to test grid alignment. Dimension is given as <column_width>+<gutter_width>. Defaults to 30+10.') do |dimensions|
+          self.options[:grid_dimensions] = dimensions || "30+10"
+          unless self.options[:grid_dimensions] =~ /^\d+\+\d+$/
+            puts "Please enter your dimensions as <column_width>+<gutter_width>. E.g. 20+5 or 30+10."
+            exit
+          end
+          self.options[:command] = :generate_grid_background
+        end
+
       end
       
       def do_command(command)

data/{frameworks/blueprint/lib/blueprint → lib/compass}/grid_builder.rb

@@ -1,3 +1,4 @@
+# This file came from the Blueprint Project
 begin
   require 'rubygems'
   gem 'rmagick'
@@ -5,15 +6,17 @@ begin
 rescue Exception => e
 end
 
-module Blueprint
+module Compass
   # Uses ImageMagick and RMagick to generate grid.png file
   class GridBuilder
+    include Actions
+
     begin
       include Magick
     rescue Exception => e
     end
 
-    attr_reader :column_width, :gutter_width, :output_path, :able_to_generate
+    attr_reader :column_width, :gutter_width, :output_path, :able_to_generate, :options
 
     # ==== Options
     # * <tt>options</tt>
@@ -23,9 +26,14 @@ module Blueprint
     def initialize(options={})
       @able_to_generate = Magick::Long_version rescue false
       return unless @able_to_generate
-      @column_width = options[:column_width] || Blueprint::COLUMN_WIDTH
-      @gutter_width = options[:gutter_width] || Blueprint::GUTTER_WIDTH
-      @output_path  = options[:output_path]  || Blueprint::SOURCE_PATH
+      @column_width = options[:column_width]
+      @gutter_width = options[:gutter_width]
+      @output_path  = options[:output_path]
+      @options = options
+    end
+
+    def working_path
+      options[:working_path]
     end
   
     # generates (overwriting if necessary) grid.png image to be tiled in background
@@ -46,9 +54,19 @@ module Blueprint
           baseline.line(0, (height - 1), total_width, (height- 1)).styles(:fill => "#e9e9e9")
         end
       end
-      
-      FileUtils.mkdir self.output_path unless File.exists? self.output_path
-      rvg.draw.write(File.join(self.output_path, "grid.png"))
+
+      filename = File.join(self.output_path, "grid.png")
+      if File.exists?(filename)
+        if options[:force]
+          overwrite = true
+        else
+          msg = "#{filename} already exists. Overwrite with --force."
+          raise Compass::FilesystemConflict.new(msg)
+        end
+      end
+      directory self.output_path
+      logger.record((overwrite ? :overwrite : :create), basename(filename))
+      rvg.draw.write(filename)
     end
   end
 end

data/lib/compass/installers/base.rb

@@ -26,6 +26,18 @@ module Compass
 
       # Initializes the project to work with compass
       def init
+        dirs = manifest.map do |entry|
+          File.dirname(send("install_location_for_#{entry.type}", entry.to))
+        end
+
+        if manifest.has_stylesheet?
+          dirs << sass_dir
+          dirs << css_dir
+        end
+
+        dirs.uniq.sort.each do |dir|
+          directory targetize(dir)
+        end
       end
 
       # Runs the installer.
@@ -81,6 +93,10 @@ module Compass
         false
       end
 
+      def pattern_name_as_dir
+        "#{options[:pattern_name]}/" if options[:pattern_name]
+      end
+
       def self.installer(type, &locator)
         locator ||= lambda{|to| to}
         loc_method = "install_location_for_#{type}".to_sym
@@ -91,7 +107,7 @@ module Compass
       end
 
       installer :stylesheet do |to|
-        "#{sass_dir}/#{to}"
+        "#{sass_dir}/#{pattern_name_as_dir}#{to}"
       end
 
       installer :image do |to|
@@ -102,7 +118,9 @@ module Compass
         "#{javascripts_dir}/#{to}"
       end
 
-      installer :file
+      installer :file do |to|
+        "#{pattern_name_as_dir}#{to}"
+      end
 
       # returns an absolute path given a path relative to the current installation target.
       # Paths can use unix style "/" and will be corrected for the current platform.

data/lib/compass/installers/manifest.rb

@@ -2,6 +2,7 @@ module Compass
   module Installers
 
     class Manifest
+      include Enumerable
 
       # A Manifest entry
       class Entry < Struct.new(:type, :from, :options)

data/lib/compass/installers/rails.rb

@@ -16,12 +16,11 @@ module Compass
       def init
         set_sass_dir unless sass_dir
         set_css_dir unless css_dir
-        directory targetize(css_dir)
-        directory targetize(sass_dir)
-        write_file targetize('config/initializers/compass.rb'), initializer_contents
+        super
       end
 
       def prepare
+        write_file targetize('config/initializers/compass.rb'), initializer_contents
       end
 
       def finalize(options = {})

data/lib/compass/installers/stand_alone.rb

@@ -14,13 +14,10 @@ module Compass
 
       def init
         directory targetize("")
-        directory targetize(css_dir)
-        directory targetize(sass_dir)
+        super
       end
 
       def prepare
-        directory targetize(images_dir) if manifest.has_image?
-        directory targetize(javascripts_dir) if manifest.has_javascript?
       end
 
       def default_css_dir
@@ -61,10 +58,9 @@ This can be done in one of the following ways:
      compass -u path/to/project
   3. To monitor your project for changes and automatically recompile:
      compass --watch [path/to/project]
-
 NEXTSTEPS
         end
-        puts "To import your new stylesheets add the following lines of HTML (or equivalent) to your webpage:"
+        puts "\nTo import your new stylesheets add the following lines of HTML (or equivalent) to your webpage:"
         puts stylesheet_links
       end
 

data/lib/compass/validator.rb

@@ -1,13 +1,14 @@
 require File.join(File.dirname(__FILE__), 'core_ext')
-require File.join(File.dirname(__FILE__), 'constants')
 
 module Compass
   # Validates generated CSS against the W3 using Java
   class Validator
     VALIDATOR_FILE = File.join(File.dirname(__FILE__), 'validate', 'css-validator.jar')
     attr_reader :error_count
+    attr_reader :css_directory
     
-    def initialize
+    def initialize(css_directory)
+      @css_directory = css_directory
       @error_count = 0
     end
 
@@ -18,12 +19,8 @@ module Compass
     
       output_header
     
-      Dir.new(Compass::Constants::BLUEPRINT_ROOT_PATH).each do |file_name|
-        puts "#{file_name}"
-        if file_name =~ /\.css$/
-          css_file = File.join(Compass::Constants::BLUEPRINT_ROOT_PATH, file_name)
-          @error_count += 1 if !validate_css_file(java_path, css_file)
-        end
+      Dir.glob(File.join(css_directory, "**", "*.css")).each do |file_name|
+        @error_count += 1 if !validate_css_file(java_path, file_name)
       end
     
       output_footer
@@ -31,29 +28,29 @@ module Compass
     
     private
     def validate_css_file(java_path, css_file)
-      puts "\n\n  Testing #{css_file}"
-      puts "  Output ============================================================\n\n"
+      puts "\n\nTesting #{css_file}"
+      puts "Output ============================================================\n\n"
       system("#{java_path} -jar '#{VALIDATOR_FILE}' -e '#{css_file}'")
     end
     
     def output_header
       puts "\n\n"
-      puts "  ************************************************************"
-      puts "  **"
-      puts "  **   Compass CSS Validator"
-      puts "  **   Validates output CSS files"
-      puts "  **"
-      puts "  ************************************************************"
+      puts "************************************************************"
+      puts "**"
+      puts "**   Compass CSS Validator"
+      puts "**   Validates output CSS files"
+      puts "**"
+      puts "************************************************************"
     end
 
     def output_footer
       puts "\n\n"
-      puts "  ************************************************************"
-      puts "  **"
-      puts "  **   Done!"
-      puts "  **   Your CSS files are#{" not" if error_count > 0} valid.#{"  You had #{error_count} error(s) within your files" if error_count > 0}"
-      puts "  **"
-      puts "  ************************************************************"
+      puts "************************************************************"
+      puts "**"
+      puts "**   Done!"
+      puts "**   Your CSS files are#{" not" if error_count > 0} valid.#{"  You had #{error_count} error(s) within your files" if error_count > 0}"
+      puts "**"
+      puts "************************************************************"
     end
   end
 end

data/test/fixtures/stylesheets/blueprint/css/typography.css

@@ -53,10 +53,12 @@ h2 img, h3 img, h4 img, h5 img, h6 img {
 p {
   margin: 0 0 1.5em; }
   p img {
+    display: inline;
     float: left;
     margin: 1.5em 1.5em 1.5em 0;
     padding: 0; }
     p img.right {
+      display: inline;
       float: right;
       margin: 1.5em 0 1.5em 1.5em; }
 

data/test/fixtures/stylesheets/compass/css/utilities.css

@@ -1,6 +1,17 @@
 .clearfix {
-  overflow: auto;
-  overflow: -moz-scrollbars-none;
+  overflow: hidden;
   display: inline-block; }
   .clearfix {
     display: block; }
+
+.pie-clearfix {
+  display: inline-block; }
+  .pie-clearfix:after {
+    content: " ";
+    display: block;
+    height: 0;
+    clear: both;
+    overflow: hidden;
+    visibility: hidden; }
+  .pie-clearfix {
+    display: block; }

data/test/fixtures/stylesheets/compass/sass/utilities.sass

@@ -1,5 +1,6 @@
 @import compass/utilities.sass
 
-
 .clearfix
-  +clearfix
+  +clearfix
+.pie-clearfix
+  +pie-clearfix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.9
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-03 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,10 +43,13 @@ extra_rdoc_files:
 - lib/compass/actions.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/create_project.rb
+- lib/compass/commands/generate_grid_background.rb
 - lib/compass/commands/list_frameworks.rb
 - lib/compass/commands/print_version.rb
 - lib/compass/commands/project_base.rb
+- lib/compass/commands/stamp_pattern.rb
 - lib/compass/commands/update_project.rb
+- lib/compass/commands/validate_project.rb
 - lib/compass/commands/watch_project.rb
 - lib/compass/commands/write_configuration.rb
 - lib/compass/compiler.rb
@@ -55,6 +58,7 @@ extra_rdoc_files:
 - lib/compass/errors.rb
 - lib/compass/exec.rb
 - lib/compass/frameworks.rb
+- lib/compass/grid_builder.rb
 - lib/compass/installers/base.rb
 - lib/compass/installers/manifest.rb
 - lib/compass/installers/rails.rb
@@ -71,7 +75,6 @@ extra_rdoc_files:
 - 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
@@ -91,11 +94,16 @@ files:
 - examples/blueprint_default/src/images/grid.png
 - examples/blueprint_default/src/print.sass
 - examples/blueprint_default/src/screen.sass
+- examples/blueprint_plugins/images/buttons/cross.png
+- examples/blueprint_plugins/images/buttons/key.png
+- examples/blueprint_plugins/images/buttons/tick.png
 - examples/blueprint_plugins/index.html
+- examples/blueprint_plugins/parts/buttons.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/src/buttons.sass
 - examples/blueprint_plugins/src/ie.sass
 - examples/blueprint_plugins/src/images/grid.png
 - examples/blueprint_plugins/src/print.sass
@@ -135,12 +143,11 @@ files:
 - 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/_buttons.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass
@@ -151,6 +158,11 @@ files:
 - frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass
+- frameworks/blueprint/templates/buttons/buttons/cross.png
+- frameworks/blueprint/templates/buttons/buttons/key.png
+- frameworks/blueprint/templates/buttons/buttons/tick.png
+- frameworks/blueprint/templates/buttons/buttons.sass
+- frameworks/blueprint/templates/buttons/manifest.rb
 - frameworks/blueprint/templates/project/grid.png
 - frameworks/blueprint/templates/project/ie.sass
 - frameworks/blueprint/templates/project/manifest.rb
@@ -170,6 +182,8 @@ files:
 - 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/_float.sass
+- frameworks/compass/stylesheets/compass/utilities/general/_hacks.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
@@ -201,10 +215,13 @@ files:
 - lib/compass/actions.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/create_project.rb
+- lib/compass/commands/generate_grid_background.rb
 - lib/compass/commands/list_frameworks.rb
 - lib/compass/commands/print_version.rb
 - lib/compass/commands/project_base.rb
+- lib/compass/commands/stamp_pattern.rb
 - lib/compass/commands/update_project.rb
+- lib/compass/commands/validate_project.rb
 - lib/compass/commands/watch_project.rb
 - lib/compass/commands/write_configuration.rb
 - lib/compass/compiler.rb
@@ -213,6 +230,7 @@ files:
 - lib/compass/errors.rb
 - lib/compass/exec.rb
 - lib/compass/frameworks.rb
+- lib/compass/grid_builder.rb
 - lib/compass/installers/base.rb
 - lib/compass/installers/manifest.rb
 - lib/compass/installers/rails.rb
@@ -229,7 +247,6 @@ files:
 - 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