compass-edge 0.9.5.0 → 0.10.0.pre

data/examples/downloader.rb

@@ -24,8 +24,8 @@ def fetch(uri_str, limit = 10)
   end
 end
 
-def install_from_github(user, project, ext_name, branch = "master", working_directory = Dir.pwd)
-  download_link = "http://github.com/#{user}/#{project}/zipball/#{branch}"
+def install_from_github(user, project, ext_name, working_directory = Dir.pwd)
+  download_link = "http://github.com/#{user}/#{project}/zipball/master"
   extdir = File.join(working_directory,'extensions')
   
   if !File.exists?(extdir)

data/lib/compass/app_integration.rb

@@ -1,24 +1,3 @@
 %w(stand_alone rails merb).each do |lib|
   require "compass/app_integration/#{lib}"
 end
-
-module Compass
-  module AppIntegration
-    module Helpers
-      def lookup(project_type)
-        eval "Compass::AppIntegration::#{camelize(project_type)}"
-      rescue NameError
-        raise Compass::Error, "No application integration exists for #{project_type}"
-      end
-
-      protected
-
-      # Stolen from ActiveSupport
-      def camelize(s)
-        s.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      end
-
-    end
-    extend Helpers
-  end
-end

data/lib/compass/app_integration/rails.rb

@@ -5,22 +5,4 @@ end
 require 'compass/app_integration/rails/runtime' if defined?(ActionController::Base)
 
 
-module Compass
-  module AppIntegration
-    module Rails
-
-      extend self
-
-      def installer(*args)
-        Installer.new(*args)
-      end
-
-      def configuration
-        Compass::Configuration::Data.new('rails').
-          extend(ConfigurationDefaults)
-      end
-
-    end
-  end
-end
 

data/lib/compass/app_integration/rails/configuration_defaults.rb

@@ -3,18 +3,10 @@ module Compass
     module Rails
       module ConfigurationDefaults
 
-        def project_type_without_default
-          :rails
-        end
-
         def default_images_dir
           File.join("public", "images")
         end
 
-        def default_fonts_dir
-          File.join("public", "fonts")
-        end
-
         def default_javascripts_dir
           File.join("public", "javascripts")
         end
@@ -27,18 +19,10 @@ module Compass
           "/javascripts"
         end
 
-        def default_http_fonts_path
-          "/fonts"
-        end
-
         def default_http_stylesheets_path
           "/stylesheets"
         end
 
-        def default_extensions_dir
-          "vendor/plugins/compass/extensions"
-        end
-
       end
     end
   end

data/lib/compass/app_integration/rails/installer.rb

@@ -2,13 +2,15 @@ module Compass
   module Installers
     class Base
     end
-    class ManifestInstaller < Base
-    end
   end
 
   module AppIntegration
     module Rails    
-      class Installer < Compass::Installers::ManifestInstaller
+      class Installer < Compass::Installers::Base
+
+        def default_configuration
+          Compass::Configuration::Data.new.extend(ConfigurationDefaults)
+        end
 
         def completed_configuration
           config = {}
@@ -18,10 +20,8 @@ module Compass
         end
 
         def write_configuration_files(config_file = nil)
-          config_file ||= targetize('config/compass.rb')
-          directory File.dirname(config_file)
+          config_file ||= targetize('config/compass.config')
           write_file config_file, config_contents
-          directory File.dirname(targetize('config/initializers/compass.rb'))
           write_file targetize('config/initializers/compass.rb'), initializer_contents
         end
 

data/lib/compass/app_integration/stand_alone.rb

@@ -1,22 +1,3 @@
 %w(configuration_defaults installer).each do |lib|
   require "compass/app_integration/stand_alone/#{lib}"
-end
-
-module Compass
-  module AppIntegration
-    module StandAlone
-
-      extend self
-
-      def installer(*args)
-        Installer.new(*args)
-      end
-
-      def configuration
-        Compass::Configuration::Data.new('stand_alone').
-          extend(ConfigurationDefaults)
-      end
-
-    end
-  end
-end
+end

data/lib/compass/app_integration/stand_alone/configuration_defaults.rb

@@ -2,10 +2,6 @@ module Compass
   module AppIntegration
     module StandAlone
       module ConfigurationDefaults
-        def default_project_type
-          :stand_alone
-        end
-
         def sass_dir_without_default
           "src"
         end
@@ -25,4 +21,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/app_integration/stand_alone/installer.rb

@@ -2,13 +2,11 @@ module Compass
   module Installers
     class Base
     end
-    class ManifestInstaller < Base
-    end
   end
 
   module AppIntegration
     module StandAlone
-      class Installer < Compass::Installers::ManifestInstaller
+      class Installer < Compass::Installers::Base
 
         def init
           directory targetize("")
@@ -35,40 +33,30 @@ module Compass
           write_configuration_files unless config_files_exist? || !@manifest.generate_config?
         end
 
+        def default_configuration
+          Compass::Configuration::Data.new.extend(Compass::AppIntegration::StandAlone::ConfigurationDefaults)
+        end
+
         def completed_configuration
           nil
         end
 
         def finalize(options = {})
-          if options[:create] && !manifest.welcome_message_options[:replace]
+          if options[:create]
             puts <<-NEXTSTEPS
 
-*********************************************************************
-Congratulations! Your compass project has been created.
-
-You may now add and edit sass stylesheets in the #{Compass.configuration.sass_dir} subdirectory of your project.
-
-Sass files beginning with an underscore are called partials and won't be
-compiled to CSS, but they can be imported into other sass stylesheets.
-
-You can configure your project by editing the config.rb configuration file.
-
-You must compile your sass stylesheets into CSS when they change.
-This can be done in one of the following ways:
-  1. To compile on demand:
-     compass compile [path/to/project]
-  2. To monitor your project for changes and automatically recompile:
-     compass watch [path/to/project]
-
-More Resources:
-  * Wiki: http://wiki.github.com/chriseppstein/compass
-  * Sass: http://sass-lang.com
-  * Community: http://groups.google.com/group/compass-users/
-
-NEXTSTEPS
+  Congratulations! Your compass project has been created.
+  You must recompile your sass stylesheets when they change.
+  This can be done in one of the following ways:
+    1. From within your project directory run:
+       compass
+    2. From any directory run:
+       compass -u path/to/project
+    3. To monitor your project for changes and automatically recompile:
+       compass --watch [path/to/project]
+  NEXTSTEPS
           end
-          puts manifest.welcome_message if manifest.welcome_message
-          if manifest.has_stylesheet? && !manifest.welcome_message_options[:replace]
+          if manifest.has_stylesheet?
             puts "\nTo import your new stylesheets add the following lines of HTML (or equivalent) to your webpage:"
             puts stylesheet_links
           end

data/lib/compass/commands.rb

@@ -5,7 +5,7 @@ require 'compass/commands/registry'
 
 %w(base generate_grid_background help list_frameworks project_base
    update_project watch_project create_project installer_command
-   print_version project_stats stamp_pattern validate_project
-   write_configuration interactive).each do |lib|
+   print_version stamp_pattern validate_project
+   write_configuration).each do |lib|
   require "compass/commands/#{lib}"
 end

data/lib/compass/commands/create_project.rb

@@ -15,10 +15,6 @@ module Compass
 
             Options:
           }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
-
-          opts.on_tail("--bare", "Don't generate any Sass or CSS files.") do
-            self.options[:bare] = true
-          end
         else
           opts.banner = %Q{
             Usage: compass init project_type path/to/project [options]
@@ -68,15 +64,10 @@ module Compass
           end
         end
 
-        def primary; true; end
-
         def parse!(arguments)
           parser = option_parser(arguments)
           parse_options!(parser, arguments)
           parse_arguments!(parser, arguments)
-          if parser.options[:framework] && parser.options[:bare]
-            raise Compass::Error, "A bare project cannot be created when a framework is specified."
-          end
           set_default_arguments(parser)
           parser.options
         end
@@ -101,7 +92,7 @@ module Compass
           if arguments.size == 1
             parser.options[:project_name] = arguments.shift
           elsif arguments.size == 0
-            # default to the current directory.
+            raise Compass::Error, "Please specify a path to the project."
           else
             raise Compass::Error, "Too many arguments were specified."
           end

data/lib/compass/commands/generate_grid_background.rb

@@ -66,7 +66,7 @@ Options:
       def initialize(working_path, options)
         super
         assert_project_directory_exists!
-        Compass.add_configuration(options, 'command_line')
+        Compass.add_configuration(options)
       end
 
       def perform

data/lib/compass/commands/help.rb

@@ -11,45 +11,20 @@ Description:
 
 To get help on a particular command please specify the command.
 
-}
-        
-        primary_commands = Compass::Commands.all.select do |c|
-          cmd = Compass::Commands[c]
-          cmd.respond_to?(:primary) && cmd.primary
-        end
-        other_commands = Compass::Commands.all - primary_commands
+Available commands:
 
-        banner << command_list("Primary Commands:", primary_commands)
-        banner << command_list("Other Commands:", other_commands)
- 
-        banner << "\nAvailable Frameworks & Patterns:\n\n"
-        Compass::Frameworks::ALL.each do |framework|
-          banner << "  * #{framework.name}\n"
-          framework.template_directories.each do |pattern|
-            banner << "    - #{framework.name}/#{pattern}"
-            if description = framework.manifest(pattern).description
-              banner << "\t- #{description}"
-            end
-            banner << "\n"
+}
+        Compass::Commands.all.sort_by{|c| c.to_s}.each do |command|
+          banner << "  * #{command}"
+          if Compass::Commands[command].respond_to? :description
+            banner << "\t- #{Compass::Commands[command].description(command)}"
           end
+          banner << "\n"
         end
-
         opts.banner = banner
 
         super
       end
-
-      def command_list(header, commands)
-        list = "#{header}\n"
-        commands.sort_by{|c| c.to_s}.each do |command|
-          list << "  * #{command}"
-          if Compass::Commands[command].respond_to? :description
-            list << "\t- #{Compass::Commands[command].description(command)}"
-          end
-          list << "\n"
-        end
-        list
-      end
     end
     class Help < Base
       register :help
@@ -78,8 +53,6 @@ To get help on a particular command please specify the command.
           $command = options[:help_command]
           puts Compass::Commands[options[:help_command]].usage
           $command = "help"
-        elsif Compass::Frameworks.template_exists? options[:help_command]
-          puts Compass::Frameworks.template_usage(options[:help_command])
         else
           raise OptionParser::ParseError, "No such command: #{options[:help_command]}"
         end

data/lib/compass/commands/installer_command.rb

@@ -6,28 +6,24 @@ module Compass
       include Compass::Installers
 
       def configure!
-        if respond_to?(:is_project_creation?) && is_project_creation?
-          Compass.add_configuration(options.delete(:project_type) || :stand_alone)
-        else
-          Compass.add_project_configuration(:project_type => options.delete(:project_type))
-        end
-        Compass.add_configuration(options, 'command_line')
+        Compass.add_configuration(installer.default_configuration)
+        Compass.add_project_configuration
+        Compass.add_configuration(options)
+        Compass.add_configuration(installer.completed_configuration)
         if File.exists?(Compass.configuration.extensions_path)
           Compass::Frameworks.discover(Compass.configuration.extensions_path)
         end
-        Compass.add_configuration(installer.completed_configuration, 'installer')
       end
 
-      def app
-        @app ||= Compass::AppIntegration.lookup(Compass.configuration.project_type)
+      def installer
+        project_type = options[:project_type] || Compass.configuration.project_type
+        installer_class = "Compass::AppIntegration::#{camelize(project_type)}::Installer"
+        @installer = eval("#{installer_class}.new *installer_args")
       end
 
-      def installer
-        @installer ||= if options[:bare]
-          Compass::Installers::BareInstaller.new(*installer_args)
-        else
-          app.installer(*installer_args)
-        end
+      # Stolen from ActiveSupport
+      def camelize(s)
+        s.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
       end
 
       def installer_args

data/lib/compass/commands/project_base.rb

@@ -11,7 +11,7 @@ module Compass
       def initialize(working_path, options = {})
         super(working_path, options)
         self.project_name = determine_project_name(working_path, options)
-        Compass.add_configuration({:project_path => determine_project_directory(working_path, options)}, "implied")
+        Compass.configuration.project_path = determine_project_directory(working_path, options)
         configure!
       end
 
@@ -89,4 +89,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/commands/update_project.rb

@@ -3,25 +3,8 @@ require 'compass/compiler'
 
 module Compass
   module Commands
-    module CompileProjectOptionsParser
-      def set_options(opts)
-        opts.banner = %Q{
-          Usage: compass compile [path/to/project] [options]
-
-          Description:
-          compile project at the path specified or the current director if not specified.
-
-          Options:
-        }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
-
-        super
-      end
-    end
-
     class UpdateProject < ProjectBase
-
-      register :compile
-
+      
       def initialize(working_path, options)
         super
         assert_project_directory_exists! unless dry_run?
@@ -50,39 +33,6 @@ module Compass
                                             :force => options[:force]).merge(additional_options))
       end
 
-      class << self
-        def option_parser(arguments)
-          parser = Compass::Exec::CommandOptionParser.new(arguments)
-          parser.extend(Compass::Exec::GlobalOptionsParser)
-          parser.extend(Compass::Exec::ProjectOptionsParser)
-          parser.extend(CompileProjectOptionsParser)
-        end
-
-        def usage
-          option_parser([]).to_s
-        end
-
-        def primary; true; end
-
-        def description(command)
-          "Compile Sass stylesheets to CSS"
-        end
-
-        def parse!(arguments)
-          parser = option_parser(arguments)
-          parser.parse!
-          parse_arguments!(parser, arguments)
-          parser.options
-        end
-
-        def parse_arguments!(parser, arguments)
-          if arguments.size == 1
-            parser.options[:project_name] = arguments.shift
-          elsif arguments.size > 1
-            raise Compass::Error, "Too many arguments were specified."
-          end
-        end
-      end
     end
   end
 end