chriseppstein-compass 0.3.9 → 0.4.0

data/lib/compass/installers.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), 'installers', 'manifest')
+require File.join(File.dirname(__FILE__), 'installers', 'base')
+require File.join(File.dirname(__FILE__), 'installers', 'stand_alone')
+require File.join(File.dirname(__FILE__), 'installers', 'rails')
+

data/lib/compass/logger.rb

@@ -0,0 +1,34 @@
+module Compass
+  class Logger
+
+    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile]
+
+    attr_accessor :actions, :options
+
+    def initialize(*actions)
+      self.options = actions.last.is_a?(Hash) ? actions.pop : {}
+      @actions = DEFAULT_ACTIONS.dup
+      @actions += actions
+    end
+
+    # Record an action that has occurred
+    def record(action, *arguments)
+      log "#{action_padding(action)}#{action} #{arguments.join(' ')}"
+    end
+
+    # Emit a log message
+    def log(msg)
+      puts msg
+    end
+
+    # add padding to the left of an action that was performed.
+    def action_padding(action)
+      ' ' * [(max_action_length - action.to_s.length), 0].max
+    end
+
+    # the maximum length of all the actions known to the logger.
+    def max_action_length
+      @max_action_length ||= actions.inject(0){|memo, a| [memo, a.to_s.length].max}
+    end
+  end
+end

data/lib/compass/version.rb

@@ -11,38 +11,56 @@ module Compass
     def version
       return @version if defined?(@version)
 
+      read_version_file
+      parse_version
+
+      if r = revision
+        @version[:rev] = r
+        @version[:string] << " [#{r[0...7]}]"
+      end
+
+      @version
+    end
+
+    protected
+
+    def scope(file) # :nodoc:
+      File.join(File.dirname(__FILE__), '..', '..', file)
+    end
+
+    def read_version_file
       @version = {
         :string => File.read(scope('VERSION')).strip
       }
-      dotted_string, label = @version[:string].split(/-/, 2)
+    end
+
+    def parse_version
+      dotted_string, @version[:label] = @version[:string].split(/-/, 2)
       numbers = dotted_string.split('.').map { |n| n.to_i }
-      @version[:major] = numbers[0]
-      @version[:minor] = numbers[1]
-      @version[:teeny] = numbers[2]
-      @version[:label] = label
+      [:major, :minor, :teeny].zip(numbers).each do |attr, value|
+        @version[attr] = value
+      end
+    end
+
+    def revision
+      revision_from_git || revision_from_file
+    end
 
+    def revision_from_file
       if File.exists?(scope('REVISION'))
         rev = File.read(scope('REVISION')).strip
         rev = nil if rev !~ /[a-f0-9]+/
       end
+    end
 
-      if rev.nil? && File.exists?(scope('.git/HEAD'))
+    def revision_from_git
+      if File.exists?(scope('.git/HEAD'))
         rev = File.read(scope('.git/HEAD')).strip
         if rev =~ /^ref: (.*)$/
           rev = File.read(scope(".git/#{$1}")).strip
         end
       end
-
-      if rev
-        @version[:rev] = rev
-        @version[:string] << " [#{rev[0...7]}]"
-      end
-
-      @version
-    end
-    
-    def scope(file) # :nodoc:
-      File.join(File.dirname(__FILE__), '..', '..', file)
     end
+
   end
 end

data/lib/compass.rb

@@ -25,7 +25,10 @@ module Compass
   def base_directory
     File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end
-  module_function :base_directory
+  def lib_directory
+    File.expand_path(File.join(File.dirname(__FILE__)))
+  end
+  module_function :base_directory, :lib_directory
 end
 
 require File.join(File.dirname(__FILE__), 'compass', 'frameworks')

data/test/command_line_test.rb

@@ -6,6 +6,11 @@ require 'timeout'
 
 class CommandLineTest < Test::Unit::TestCase
   include Compass::TestCaseHelper
+
+  def teardown
+    Compass.configuration.reset!
+  end
+
   def test_basic_install
     within_tmp_directory do
       compass "basic"
@@ -38,7 +43,7 @@ class CommandLineTest < Test::Unit::TestCase
       Dir.chdir "basic" do
         compass
         assert_action_performed :compile, "src/screen.sass"
-        assert_action_performed :overwrite, "stylesheets/screen.css"
+        assert_action_performed :identical, "stylesheets/screen.css"
       end
     end
   end
@@ -47,15 +52,13 @@ class CommandLineTest < Test::Unit::TestCase
     within_tmp_directory do
       generate_rails_app("compass_rails")
       Dir.chdir "compass_rails" do
-        compass "--rails" do |responder|
+        compass("--rails", ".") do |responder|
           responder.respond_to "Is this OK? (Y/n) ", :with => "Y"
-          responder.respond_to "Emit compiled stylesheets to public/stylesheets/compiled? (Y/n) ", :with => "Y"
+          responder.respond_to "Emit compiled stylesheets to public/stylesheets/compiled/? (Y/n) ", :with => "Y"
         end
         # puts @last_result
-        assert_action_performed :create, "app/stylesheets/screen.sass"
-        assert_action_performed :create, "config/initializers/compass.rb"
-        assert_action_performed :create, "app/views/layouts/application.html.haml"
-        assert_action_performed :create, "config/initializers/compass.rb"
+        assert_action_performed :create, "./app/stylesheets/screen.sass"
+        assert_action_performed :create, "./config/initializers/compass.rb"
       end
     end
   rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-06 00:00:00 -08:00
+date: 2009-02-08 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,17 +38,26 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/compass
+- lib/compass/actions.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/create_project.rb
-- lib/compass/commands/install_rails.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
@@ -137,6 +146,7 @@ files:
 - 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
@@ -165,8 +175,8 @@ files:
 - 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/grid.png
 - 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
@@ -175,19 +185,29 @@ files:
 - 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/install_rails.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

data/lib/compass/commands/install_rails.rb

@@ -1,97 +0,0 @@
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'create_project')
-
-module Compass
-  module Commands
-    class InstallRails < CreateProject
-      def initialize(*args)
-        super        
-      end
-
-      def perform
-        set_install_location
-        set_output_location
-        directory options[:stylesheets_location]
-        framework_templates.each do |t|
-          template "project/#{t}", "#{options[:stylesheets_location]}/#{t}", options
-        end
-        write_file 'config/initializers/compass.rb', initializer_contents
-        if has_application_layout?
-          next_steps
-        else
-          write_file 'app/views/layouts/application.html.haml', application_layout_contents
-        end
-      end
-      
-      def initializer_contents
-        %Q{require 'compass'
-# If you have any compass plugins, require them here.
-Sass::Plugin.options[:template_location] = {
-  "\#{RAILS_ROOT}#{File::SEPARATOR}#{options[:stylesheets_location]}" => "\#{RAILS_ROOT}#{File::SEPARATOR}#{options[:css_location]}"
-}
-Compass::Frameworks::ALL.each do |framework|
-  Sass::Plugin.options[:template_location][framework.stylesheets_directory] = "\#{RAILS_ROOT}#{File::SEPARATOR}#{options[:css_location]}"
-end
-}
-      end
-
-      def application_layout_contents
-        %Q{!!! XML
-!!!
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
-  %head
-    %meta{'http-equiv' => "content-type", :content => "text/html;charset=UTF-8"}
-    %title= @browser_title || 'Default Browser Title'
-    = stylesheet_link_tag '#{stylesheet_prefix}screen.css', :media => 'screen, projection'
-    = stylesheet_link_tag '#{stylesheet_prefix}print.css', :media => 'print'
-    /[if IE]
-      = stylesheet_link_tag '#{stylesheet_prefix}ie.css', :media => 'screen, projection'
-  %body
-    %h1 Welcome to Compass
-    = yield
-}
-      end
-
-      def next_steps
-        puts <<NEXTSTEPS
-
-Congratulations! Your project has been configured to use Compass.
-Next add these lines to the head of your application.html.haml:
-
-%head 
-  = stylesheet_link_tag '#{stylesheet_prefix}screen.css', :media => 'screen, projection'
-  = stylesheet_link_tag '#{stylesheet_prefix}print.css', :media => 'print'
-  /[if IE]
-    = stylesheet_link_tag '#{stylesheet_prefix}ie.css', :media => 'screen, projection'
-
-(you are using haml, aren't you?)
-NEXTSTEPS
-      end
-
-      def has_application_layout?
-        File.exists?(projectize('app/views/layouts/application.rhtml')) ||
-        File.exists?(projectize('app/views/layouts/application.html.erb')) ||
-        File.exists?(projectize('app/views/layouts/application.html.haml'))
-      end
-
-      def stylesheet_prefix
-        if options[:css_location].length >= 19
-          "#{options[:css_location][19..-1]}/"
-        else
-          nil
-        end
-      end
-
-      def set_install_location
-        print "Compass recommends that you keep your stylesheets in app/stylesheets/ instead of the Sass default location of public/stylesheets/sass/.\nIs this OK? (Y/n) "
-        answer = gets
-        self.options[:stylesheets_location] = separate(answer.downcase[0] == ?n ? 'public/stylesheets/sass' : 'app/stylesheets')
-      end
-      def set_output_location
-        print "\nCompass recommends that you keep your compiled css in public/stylesheets/compiled/ instead the Sass default of public/stylesheets/.\nHowever, if you're exclusively using Sass, then public/stylesheets/ is recommended.\nEmit compiled stylesheets to public/stylesheets/compiled? (Y/n) "
-        answer = gets
-        self.options[:css_location] = separate(answer.downcase[0] == ?n ? 'public/stylesheets' : 'public/stylesheets/compiled')
-      end
-    end
-  end
-end