extjs-theme 0.1.2 → 0.1.3

data/README.rdoc

@@ -5,36 +5,48 @@ Generates a Sass version of Ext theme.  Includes methods for colorizing images.
 This Gem depends upon RMagick[http://gemcutter.org/gems/rmagick] and haml-edge[http://gemcutter.org/gems/haml-edge]
 
 == Installation
-	
+
 The Gem is hosted at Gemcutter[http://gemcutter.com].  Install the gem with:
+
+	gem install extjs-theme
+
+or add
+
+	gem 'extjs-theme'
 	
-	sudo gem install extjs-theme
-	
+to you Gemfile and execute
+
+	$ bundle install
+
 == Usage
 
 In the root of your Rails app, first execute the following in your console:
 
-	$ xtheme init <path/to/ext> <path/to/stylesheets>
+	$ bundle exec xtheme init
+
+This creates a YAML config file named config/xtheme.yml in the application root.
 
-This creates a YAML config file named .xthemeconfig in the application root.
+	---
+	theme_dir: app/stylesheets/themes
+	ext_dir: public/javascripts/ext-3.2.0
 
-	--- 
-	theme_dir: public/stylesheets/sass
-	ext_dir: public/javascripts/ext-3.1.0
+or generate a custom configuration file by execute the following in your console:
 
-Every subsequent xtheme command will act up those directories.  If you download a new version of Ext, simply re-execute <code>xtheme init</code> with the new path (TODO: store in Rails <code>/config</code> dir)
+	$ bundle exec xtheme init <path/to/ext> <path/to/stylesheets>
+
+Every subsequent xtheme command will act up those directories.  If you download a new version of Ext, simply re-execute <code>xtheme init</code> with the new path
 
 Example
 
-	$ xtheme init public/javascripts/ext-3.1.0 public/stylesheets
+	$ bundle exec xtheme init public/javascripts/ext-3.3.0
 
 To generate a new Sass theme:
 
-	$ xtheme create my-theme
+	$ bundle exec xtheme create my-theme
 
 In Rails, this will have created a new directory <code>public/stylesheets/sass/my-theme</code>
-	
-The generator creates a main include file called <code>my-theme/init.sass</code> (TODO: change to <code>my-theme/all.sass</code>) which contains <code>@include</code> directives for each individual Ext stylesheet.  You *no longer need* to include the ext-all.css file from the Ext library -- <code>my-theme/init.sass</code> contains all it needs.  In a Rails view, you would include this file in the standard Haml/Sass[http://sass-lang.com/] manner.
+
+The generator creates a main include file called <code>my-theme/all.sass</code> which contains <code>@include</code> directives for each individual Ext stylesheet.  You *no longer need* to include the ext-all.css file from the Ext library -- <code>my-theme/all.sass</code> contains all it needs.  In a Rails view, you would include this file in the standard Haml/Sass[http://sass-lang.com/] manner.
 
 	=stylesheet_link_tag "my-theme/init"
 
@@ -46,10 +58,10 @@ The generator also creates a copy of all the Ext theme images in <code>my-theme/
 
 Another important sass file created is <code>my-theme/defines.sass</code>.  This file contains Sass variable declarations added to each Ext sass file.
 
-	!img_path = ../sass/my-theme/images
+	!img_path = ../themes/my-theme/images
 	!font = tahoma,arial,verdana,sans-serif
 	!hue = -90.0
-	
+
 Form more on Haml and Sass, consult the HAML documentation[http://haml-lang.com/] to learn about including Sass[http://sass-lang.com/] stylesheets.
 
 == Effects
@@ -58,17 +70,17 @@ The Gem includes commands for theme colorization, including image-processing thr
 
 Currently, the only effect available is <code>effects:modulate</code>, for modifying the _hue_, _saturation_ and _lightness_ of a theme according to RMagick[http://www.imagemagick.org/RMagick/doc/image2.html#modulate]:
 
-	$ xtheme effects:modulate <theme-name> <hue> <saturation> <lightness>
-	
+	$ bundle exec xtheme effects:modulate <theme-name> <hue> <saturation> <lightness>
+
 The parameters _hue_, _saturation_ and _lightness_ are defined as {"Float numbers, for example, 0.25 means "25%". All three arguments may be omitted. The default value of each argument is 1.0, that is, 100%"}[http://www.imagemagick.org/RMagick/doc/image2.html#modulate]
-	
+
 Based upon the default blue Ext theme, the following will generate a pink theme:
 
-	$ xtheme effects:modulate my-theme 0.5 1.0 1.0
+	$ bundle exec xtheme effects:modulate my-theme 0.5 1.0 1.0
 
 A green theme:
 
-	$ xtheme effects:modulate my-theme 1.5 1.0 1.0
+	$ bundle exec xtheme effects:modulate my-theme 1.5 1.0 1.0
 
 *Only hue works currently, saturation and lightness are under development*
 

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "christocracy@gmail.com"
     gem.homepage = "http://github.com/extjs/extjs-theme"
     gem.authors = ["Christopher Scott"]
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     gem.add_dependency "rmagick"
-    gem.add_dependency "haml-edge", ">=2.3"
+    gem.add_dependency "haml", ">= 3.0.0.beta"
     gem.files = %w(Rakefile) +
   		Dir.glob("{bin,lib,test}/**/*")
   		

data/lib/extjs-theme.rb

@@ -2,8 +2,8 @@
 # XTheme
 # A module for generating and colorizing ExtJS themes.
 #
-module ExtJS 
-  module Theme    
+module ExtJS
+  module Theme
   end
 end
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/extjs-theme')

data/lib/extjs-theme/command.rb

@@ -1,81 +1,87 @@
+require 'yaml'
 require 'commands/base'
 
 Dir["#{File.dirname(__FILE__)}/commands/*"].each { |c| require c }
 
 module ExtJS::Theme
-	module Command
-		class InvalidCommand < RuntimeError; end
-		class CommandFailed  < RuntimeError; end
-    class InvalidConfig < RuntimeError; end
-    class ConfigNotFound < RuntimeError; end
-    
-		class << self
-			def run(command, args, retries=0)
-				begin
-					run_internal(command, args.dup)
-				rescue InvalidCommand
-					error "Unknown command. Run 'xtheme help' for usage information."
-				rescue CommandFailed => e
-					error e.message
-				rescue InvalidConfig => e
-				  error e.message
-				rescue ConfigNotFound => e
-				  error e.message
-				rescue Interrupt => e
-					error "\n[canceled]"
-				end
-			end
+  module Command
+    class InvalidCommand < RuntimeError;
+    end
+    class CommandFailed  < RuntimeError;
+    end
+    class InvalidConfig < RuntimeError;
+    end
+    class ConfigNotFound < RuntimeError;
+    end
 
-			def run_internal(command, args, heroku=nil)
-			  config = load_config
-			  
-				klass, method = parse(command)
-				
-				unless method == "init"
-				  unless config 
-				    raise ConfigNotFound.new("Could not locate config file .xthemeconfig.\nAre you in your application root?  Have you run xtheme init?")
-  				end
-				  unless config && File.exists?(config[:ext_dir])
-  				  raise InvalidConfig.new("Could not locate ext_dir #{config[:ext_dir]}.\nAre you in your application root?")
-  				end
-  				unless config && File.exists?(config[:theme_dir])
-  				  raise InvalidConfig.new("Could not locate theme_dir #{config[:theme_dir]}.\nAre you in your application root?")
-				  end
-				end
-				
-				runner = klass.new(args, config)
-				raise InvalidCommand unless runner.respond_to?(method)
-				runner.send(method)
-			end
+    class << self
+      def run(command, args, retries=0)
+        begin
+          run_internal(command, args.dup)
+        rescue InvalidCommand
+          error "Unknown command. Run 'xtheme help' for usage information."
+        rescue CommandFailed => e
+          error e.message
+        rescue InvalidConfig => e
+          error e.message
+        rescue ConfigNotFound => e
+          error e.message
+        rescue Interrupt => e
+          error "\n[canceled]"
+        end
+      end
 
-			def error(msg)
-				STDERR.puts(msg)
-				exit 1
-			end
+      def run_internal(command, args, heroku=nil)
+        config = load_config
 
-			def parse(command)
-				parts = command.split(':')
-				case parts.size
-					when 1
-						begin
-							return eval("ExtJS::Theme::Command::#{command.capitalize}"), :index
-						rescue NameError, NoMethodError
-						  return ExtJS::Theme::Command::Theme, command
-						end
-					when 2
-						begin
-							return ExtJS::Theme::Command.const_get(parts[0].capitalize), parts[1]
-						rescue NameError
-							raise InvalidCommand
-						end
-					else
-						raise InvalidCommand
-				end
-			end
-			
-			def load_config
-  	    File.exists?('.xthemeconfig') ? YAML::load(File.open('.xthemeconfig')) : nil
-  	  end
-		end
-	end
+        klass, method = parse(command)
+
+        unless method == "init"
+          unless config
+            raise ConfigNotFound.new("Could not locate config file config/xtheme.yml.\nAre you in your application root?  Have you run xtheme init?")
+          end
+          unless config && File.exists?(config[:ext_dir])
+            raise InvalidConfig.new("Could not locate ext_dir #{config[:ext_dir]}.\nAre you in your application root?")
+          end
+          unless config && File.exists?(config[:theme_dir])
+            raise InvalidConfig.new("Could not locate theme_dir #{config[:theme_dir]}.\nAre you in your application root?")
+          end
+        end
+
+        runner = klass.new(args, config)
+        raise InvalidCommand unless runner.respond_to?(method)
+        runner.send(method)
+      end
+
+      def error(msg)
+        STDERR.puts(msg)
+        exit 1
+      end
+
+      def parse(command)
+        parts = command.split(':')
+        case parts.size
+          when 1
+            begin
+              return eval("ExtJS::Theme::Command::#{command.capitalize}"), :index
+            rescue NameError, NoMethodError
+              return ExtJS::Theme::Command::Theme, command
+            end
+          when 2
+            begin
+              return ExtJS::Theme::Command.const_get(parts[0].capitalize), parts[1]
+            rescue NameError
+              raise InvalidCommand
+            end
+          else
+            raise InvalidCommand
+        end
+      end
+
+      def load_config
+        FileUtils.mv('.xthemeconfig', 'config/xtheme.yml') if File.exists?('.xthemeconfig')
+        File.exists?('config/xtheme.yml') ? YAML::load(File.open('config/xtheme.yml')) : nil
+      end
+    end
+  end
 end

data/lib/extjs-theme/commands/base.rb

@@ -1,74 +1,74 @@
 require 'fileutils'
 
 module ExtJS::Theme::Command
-	class Base
-		#include Heroku::Helpers
+  class Base
+    #include Heroku::Helpers
 
-		attr_accessor :args
-		attr_reader :config
-		
-		def initialize(args, config)
-			@args = args
-			@config = config
-		end
-    
-		def display(msg, newline=true)
-			if newline
-				puts(msg)
-			else
-				print(msg)
-				STDOUT.flush
-			end
-		end
+    attr_accessor :args
+    attr_reader :config
 
-		def error(msg)
-			ExtJS::Theme::Command.error(msg)
-		end
+    def initialize(args, config)
+      @args = args
+      @config = config
+    end
 
-		def ask
-			gets.strip
-		end
+    def display(msg, newline=true)
+      if newline
+        puts(msg)
+      else
+        print(msg)
+        STDOUT.flush
+      end
+    end
 
-		def shell(cmd)
-			FileUtils.cd(Dir.pwd) {|d| return `#{cmd}`}
-		end
+    def error(msg)
+      ExtJS::Theme::Command.error(msg)
+    end
 
-		def heroku
-			#@heroku ||= Heroku::Command.run_internal('auth:client', args)
-		end
+    def ask
+      gets.strip
+    end
 
-		def extract_app(force=true)
-			app = extract_option('--app')
-			unless app
-				app = extract_app_in_dir(Dir.pwd) ||
-				raise(CommandFailed, "No app specified.\nRun this command from app folder or set it adding --app <app name>") if force
-				@autodetected_app = true
-			end
-			app
-		end
+    def shell(cmd)
+      FileUtils.cd(Dir.pwd) {|d| return `#{cmd}`}
+    end
 
-		def extract_app_in_dir(dir)
-			
-		end
+    def heroku
+      #@heroku ||= Heroku::Command.run_internal('auth:client', args)
+    end
 
-		def extract_option(options, default=true)
-			values = options.is_a?(Array) ? options : [options]
-			return unless opt_index = args.select { |a| values.include? a }.first
-			opt_position = args.index(opt_index) + 1
-			if args.size > opt_position && opt_value = args[opt_position]
-				if opt_value.include?('--')
-					opt_value = nil
-				else
-					args.delete_at(opt_position)
-				end
-			end
-			opt_value ||= default
-			args.delete(opt_index)
-			block_given? ? yield(opt_value) : opt_value
-		end
+    def extract_app(force=true)
+      app = extract_option('--app')
+      unless app
+        app = extract_app_in_dir(Dir.pwd) ||
+                raise(CommandFailed, "No app specified.\nRun this command from app folder or set it adding --app <app name>") if force
+        @autodetected_app = true
+      end
+      app
+    end
 
-		def escape(value)
-			heroku.escape(value)
-		end  
-	end
+    def extract_app_in_dir(dir)
+
+    end
+
+    def extract_option(options, default=true)
+      values = options.is_a?(Array) ? options : [options]
+      return unless opt_index = args.select { |a| values.include? a }.first
+      opt_position = args.index(opt_index) + 1
+      if args.size > opt_position && opt_value = args[opt_position]
+        if opt_value.include?('--')
+          opt_value = nil
+        else
+          args.delete_at(opt_position)
+        end
+      end
+      opt_value ||= default
+      args.delete(opt_index)
+      block_given? ? yield(opt_value) : opt_value
+    end
+
+    def escape(value)
+      heroku.escape(value)
+    end
+  end
 end

data/lib/extjs-theme/commands/config.rb

@@ -0,0 +1,57 @@
+module ExtJS::Theme::Command
+  class Config < Base
+    def index
+      #long = args.delete('--long')
+      #vars = heroku.config_vars(app)
+      #display_vars(vars, :long => long)
+      display "index"
+    end
+
+    def add
+      unless args.size > 0 and args.all? { |a| a.include?('=') }
+        raise CommandFailed, "Usage: xtheme config:add <key>=<value> [<key2>=<value2> ...]"
+      end
+
+      #vars = args.inject({}) do |vars, arg|
+      #  key, value = arg.split('=', 2)
+      #  vars[key] = value
+      #  vars
+      #end
+
+      display "Adding config vars:"
+      #display_vars(vars, :indent => 2)
+
+      #display "Restarting app...", false
+      #heroku.add_config_vars(app, vars)
+      #display "done."
+    end
+
+    def remove
+      display "Removing #{args.first} and restarting app..."
+      #heroku.remove_config_var(app, args.first)
+      display "done."
+    end
+
+    alias :rm :remove
+
+    def clear
+      display "Clearing all config vars and restarting app..."
+      #heroku.clear_config_vars(app)
+      display "done."
+    end
+
+    protected
+    def display_vars(vars, options={})
+      max_length = vars.map { |v| v[0].size }.max
+      vars.keys.sort.each do |key|
+        spaces = ' ' * (max_length - key.size)
+        display "#{' ' * (options[:indent] || 0)}#{key}#{spaces} => #{format(vars[key], options)}"
+      end
+    end
+
+    def format(value, options)
+      return value if options[:long] || value.size < 36
+      value[0, 16] + '...' + value[-16, 16]
+    end
+  end
+end

data/lib/extjs-theme/commands/effects.rb

@@ -1,17 +1,15 @@
-require 'launchy'
-
 module ExtJS::Theme::Command
-	class Effects < Base
-	  
-	  def modulate
-	    unless @args.length == 4
-	      display "Usage: xtheme effects:modulate <theme-name> <hue> <saturation> <lightness>"
+  class Effects < Base
+
+    def modulate
+      unless @args.length == 4
+        display "Usage: xtheme effects:modulate <theme-name> <hue> <saturation> <lightness>"
         display " Specify <hue>, <saturation> and <lightness> as Floats, for example,"
-        display " 0.25 means 25%. The default value of each argument is 1.0, that is, 100%"        
+        display " 0.25 means 25%. The default value of each argument is 1.0, that is, 100%"
         return
-	    end
-	    display "Modulating theme images"
-	    ExtJS::Theme::Effects.modulate(@config[:ext_dir], "#{@config[:theme_dir]}/#{@args[0]}", @args[1].to_f, @args[2].to_f, @args[3].to_f)
-	  end
-	end
-end
+      end
+      display "Modulating theme images"
+      ExtJS::Theme::Effects.modulate(@config[:ext_dir], "#{@config[:theme_dir]}/#{@args[0]}", @args[1].to_f, @args[2].to_f, @args[3].to_f)
+    end
+  end
+end

data/lib/extjs-theme/commands/help.rb

@@ -1,83 +1,83 @@
 module ExtJS::Theme::Command
-	class Help < Base
-		class HelpGroup < Array
-			attr_reader :title
+  class Help < Base
+    class HelpGroup < Array
+      attr_reader :title
 
-			def initialize(title)
-				@title = title
-			end
+      def initialize(title)
+        @title = title
+      end
 
-			def command(name, description)
-				self << [name, description]
-			end
+      def command(name, description)
+        self << [name, description]
+      end
 
-			def space
-				self << ['', '']
-			end
-		end
+      def space
+        self << ['', '']
+      end
+    end
 
-		def self.groups
-			@groups ||= []
-		end
+    def self.groups
+      @groups ||= []
+    end
 
-		def self.group(title, &block)
-			groups << begin
-				group = HelpGroup.new(title)
-				group.instance_eval(&block)
-				group
-			end
-		end
+    def self.group(title, &block)
+      groups << begin
+        group = HelpGroup.new(title)
+        group.instance_eval(&block)
+        group
+      end
+    end
 
-		def self.create_default_groups!
-			group('General Commands') do
-				command 'help',                         'show this usage'
-				#command 'version',                      'show the gem version'
-				space
-				#command 'list',                         'list your themes'
-				command 'create [<name>]',              'create a new theme'
-				space
-				#command 'config',                       'display the theme\'s config vars (environment)'
-				#command 'config:add key=val [...]',     'add one or more config vars'
-				#space
-				#command 'destroy [<name>]',             'destroy a theme permanently'
-			end
+    def self.create_default_groups!
+      group('General Commands') do
+        command 'help', 'show this usage'
+        #command 'version',                      'show the gem version'
+        space
+        #command 'list',                         'list your themes'
+        command 'create [<name>]', 'create a new theme'
+        space
+        #command 'config',                       'display the theme\'s config vars (environment)'
+        #command 'config:add key=val [...]',     'add one or more config vars'
+        #space
+        #command 'destroy [<name>]',             'destroy a theme permanently'
+      end
 
-			group('Effects') do
-				command 'effects:modulate [<theme> <hue> <saturation> <lightness>]', 'Apply hue, saturation, lightness to a themes\'s images.  Specify as Floats, where 1.0 means 100%'
-				space
-			end
-		end
+      group('Effects') do
+        command 'effects:modulate [<theme> <hue> <saturation> <lightness>]', 'Apply hue, saturation, lightness to a themes\'s images.  Specify as Floats, where 1.0 means 100%'
+        space
+      end
+    end
 
-		def index
-			display usage
-		end
+    def index
+      display usage
+    end
 
-		def version
-			#display ExtJS::Theme.version
-		end
+    def version
+      #display ExtJS::Theme.version
+    end
 
-		def usage
-			longest_command_length = self.class.groups.map do |group|
-				group.map { |g| g.first.length }
-			end.flatten.max
+    def usage
+      longest_command_length = self.class.groups.map do |group|
+        group.map { |g| g.first.length }
+      end.flatten.max
 
-			self.class.groups.inject(StringIO.new) do |output, group|
-				output.puts "=== %s" % group.title
-				output.puts
+      self.class.groups.inject(StringIO.new) do |output, group|
+        output.puts "=== %s" % group.title
+        output.puts ''
 
-				group.each do |command, description|
-					if command.empty?
-						output.puts
-					else
-						output.puts "%-*s # %s" % [longest_command_length, command, description]
-					end
-				end
+        group.each do |command, description|
+          if command.empty?
+            output.puts ''
+          else
+            output.puts "%-*s # %s" % [longest_command_length, command, description]
+          end
+        end
 
-				output.puts
-				output
-			end.string
-		end
-	end
+        output.puts ''
+        output
+      end.string
+    end
+  end
 end
 
 ExtJS::Theme::Command::Help.create_default_groups!

data/lib/extjs-theme/commands/theme.rb

@@ -1,49 +1,47 @@
-require 'launchy'
+require 'yaml'
 
 module ExtJS::Theme::Command
-	class Theme < Base
-	  
-	  def init
-	    
-	    unless args.length == 2
-	      display "Usage: xtheme init <path/to/ext> <path/to/stylesheets>"
-	      display " - Eg: xtheme init public/javascripts/ext-3.1.0 public/stylesheets"
-	      return
-	    end
-	    
-	    unless File.directory?(args[0])
-	      return display "Error: invalid path/to/ext #{args[0]}"
-	    end
-	    unless File.directory?(args[1])
-	      return display "Error: invalid path/to/stylesheets #{args[1]}"
-	    end
-	    
-      display "Initializing xtheme configuration file .xthemeconfig"
-      
-      File.open(".xthemeconfig", "w+") {|f| 
+  class Theme < Base
+
+    def init
+
+      ext_path = args[0] || 'public/javascripts/ext-3.2.0'
+      theme_path = args[1] || 'app/stylesheets/themes'
+
+      unless File.directory?(ext_path)
+        return display "Error: invalid ext js path: #{ext_path}"
+      end
+
+      unless File.directory?(theme_path)
+        FileUtils.mkdir_p(theme_path)
+        display "Create theme directory #{theme_path}"
+      end
+
+      display "Initializing xtheme configuration file config/xtheme.yml"
+      File.open("config/xtheme.yml", "w+") {|f|
         f << {
-          :ext_dir => args[0],
-          :theme_dir => "#{args[1]}/sass"
+                :ext_dir => ext_path,
+                :theme_dir => theme_path
         }.to_yaml
       }
     end
-	  
-		def list
-			display "Not implemented"
-		end
-
-		def create
-			name    = args.shift.downcase.strip rescue nil
-			if !name
-			  return display "Usage: xtheme create <name>"
-			end
-			ExtJS::Theme::Generator.create(name, @config[:ext_dir], @config[:theme_dir])
-			display "Created #{name}"
-			
-		end
-
-		def destroy
-			display "Not implemented"
-		end
-	end
+
+    def list
+      display "Not implemented"
+    end
+
+    def create
+      name    = args.shift.downcase.strip rescue nil
+      if !name
+        return display "Usage: xtheme create <name>"
+      end
+      ExtJS::Theme::Generator.create(name, @config[:ext_dir], @config[:theme_dir])
+      display "Created #{name}"
+
+    end
+
+    def destroy
+      display "Not implemented"
+    end
+  end
 end

data/lib/extjs-theme/dependencies.rb

@@ -8,7 +8,7 @@ end
 begin
   gem 'rmagick'
   $stderr.puts "Loading rmagick gem."
-  
+
 rescue LoadError
   #pass
 end

data/lib/extjs-theme/effects.rb

@@ -1,13 +1,13 @@
 module ExtJS::Theme
   module Effects
-    
+
     ##
     # performs hsv transformation on Ext theme images and save to Sass theme dir.
     # @param {String} name Theme name
     # @param {String} ext_dir path to Ext directory relative to public/javascripts
     # @param {Float} hue
     # @param {Float} saturation
-    # @param {Float} lightneess
+    # @param {Float} lightness
     #
     def self.modulate(ext_dir, theme_dir, hue=1.0, saturation=1.0, lightness=1.0)
       each_image("#{ext_dir}/resources/images/default") {|img|
@@ -17,10 +17,10 @@ module ExtJS::Theme
       defines = File.read("#{theme_dir}/defines.sass")
       File.open("#{theme_dir}/defines.sass", "w+") {|f| f << defines.gsub(/hue\s?=.*/, "hue = #{(hue-1)*180}") }
     end
-    
+
     private
 
-      ##
+    ##
     # Iterate all theme images
     # @param {String} path
     #
@@ -54,4 +54,4 @@ module ExtJS::Theme
       img.write(outfile)
     end
   end
-end
+end

data/lib/extjs-theme/generator.rb

@@ -10,14 +10,14 @@ module ExtJS
       def self.create(name, ext_dir, theme_dir)
         ext_css_path  = "#{ext_dir}/resources/css"
         theme_path    = "#{theme_dir}/#{name}"
-        
+
         # Create theme directory in /stylesheets/sass
         FileUtils.mkdir_p ["#{theme_path}/visual", "#{theme_path}/structure"]
 
-        # Create the defines.sass file, set img_path variable.          
-        FileUtils.copy("#{File.dirname(__FILE__)}/template/defines.sass", "#{theme_path}/defines.sass")  
+        # Create the defines.sass file, set img_path variable.
+        FileUtils.copy("#{File.dirname(__FILE__)}/template/defines.sass", "#{theme_path}/defines.sass")
         defines = File.read("#{theme_path}/defines.sass")
-        File.open("#{theme_path}/defines.sass", "w+") {|f| f << defines.gsub(/\{\{img_path\}\}/, "../sass/#{name}/images") }
+        File.open("#{theme_path}/defines.sass", "w+") {|f| f << defines.gsub(/\{\{img_path\}\}/, "../themes/#{name}/images") }
         puts " - created #{theme_path}/defines.sass"
 
         sass_files = []
@@ -27,16 +27,16 @@ module ExtJS
           Dir["#{ext_css_path}/#{subdir}/*.css"].each do |file|
             m = /^.*\/(.*)\.css$/.match(file)
             sass_file = "#{theme_path}/#{subdir}/#{m.captures[0]}.sass"
-            puts " - css2sass #{m.captures[0]}.css -> #{sass_file}"
+            puts " - sass-convert #{m.captures[0]}.css -> #{sass_file}"
             sass_files << "@import #{subdir}/#{m.captures[0]}.sass"
-            `css2sass #{file} #{sass_file}`
+            `sass-convert #{file} #{sass_file}`
             write_sass_vars(sass_file)
           end
         end
 
         # Create master sass file, which includes @imports for all other files in theme.
-        puts " - Writing init.sass"
-        f = File.new("#{theme_path}/init.sass", "w")
+        puts " - Writing all.sass"
+        f = File.new("#{theme_path}/all.sass", "w")
         f.puts sass_files.join("\n")
 
         # Copy Ext theme images to new Sass theme dir.
@@ -44,7 +44,7 @@ module ExtJS
       end
 
 
-    private
+      private
 
       ##
       # Iterate all theme images

data/test/config/xtheme.yml

@@ -0,0 +1,3 @@
+--- 
+:ext_dir: public/javascripts/ext-3.x
+:theme_dir: public/stylesheets/themes

data/test/extjs-xtheme_test.rb

@@ -1,7 +1,42 @@
 require 'test_helper'
+FileUtils.cd("test")
 
-class ExtjsXthemeTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+PUBLIC_PATH = "public"
+THEME_PATH = File.join(PUBLIC_PATH, "stylesheets", "themes")
+
+# Remove previously generated config and test theme before starting.
+FileUtils.rm("config/xtheme.yml") if File.exists?("config/xtheme.yml")
+FileUtils.rm_r(File.join(THEME_PATH, "foo")) if File.exists?(File.join(THEME_PATH, "foo"))
+
+class ThemeTest < Test::Unit::TestCase  
+  context "Within a valid Rails-like app" do
+    setup {
+      `xtheme init public/javascripts/ext-3.x #{THEME_PATH}`
+    }
+  
+    should "config/xtheme.yml should exist" do
+      assert File.exists?("config/xtheme.yml"), "Failed to create config/xtheme.yml"
+    end
+    
+    should "generate a theme" do
+      `xtheme create foo`
+      assert (
+        File.exists?(File.join(THEME_PATH, "foo", "all.sass")) &&
+        File.exists?(File.join(THEME_PATH, "foo", "images", "rails.png")) &&
+        File.exists?(File.join(THEME_PATH, "foo", "structure", "structure.sass")) &&
+        File.exists?(File.join(THEME_PATH, "foo", "visual", "visual.sass"))
+      ), "Failed to generate theme"
+    end
+    
+    should "modulate a theme" do
+      # first destroy existing default image.
+      an_image = File.join(THEME_PATH, "foo", "images", "rails.png")
+      FileUtils.rm(an_image)
+      
+      # run the effect, it should create a newly modulated version of image (it should be green but how to tell?).
+      `xtheme effects:modulate foo 1.5 1.0 1.0`
+      
+      assert File.exists?(an_image), "Failed to modulate images"
+    end
   end
 end

data/test/public/javascripts/ext-3.x/resources/css/structure/structure.css

@@ -0,0 +1,3 @@
+body {
+  width: 666px;
+}

data/test/public/javascripts/ext-3.x/resources/css/visual/visual.css

@@ -0,0 +1,6 @@
+body {
+  background: #000;
+}
+h1 {
+  color: #F00;
+}

data/test/public/stylesheets/themes/foo/all.sass

@@ -0,0 +1,2 @@
+@import structure/structure.sass
+@import visual/visual.sass

data/test/public/stylesheets/themes/foo/defines.sass

@@ -0,0 +1,7 @@
+!bg_color = #eee
+!bg_color_ghost = #cbddf3
+!border_color = #0f0
+!color = #333
+!img_path = ../themes/foo/images
+!font = tahoma,arial,verdana,sans-serif
+!hue = 90.0

data/test/public/stylesheets/themes/foo/structure/structure.sass

@@ -0,0 +1,3 @@
+@import ../defines.sass
+body
+  width: 666px

data/test/public/stylesheets/themes/foo/visual/visual.sass

@@ -0,0 +1,6 @@
+@import ../defines.sass
+body
+  background: black
+
+h1
+  color: red

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'extjs-xtheme'
+require 'extjs-theme'
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-theme
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Christopher Scott
@@ -9,39 +14,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -05:00
+date: 2010-04-20 00:00:00 -04:00
 default_executable: xtheme
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: haml-edge
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.3"
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
+        version: 3.0.0.beta
+  type: :runtime
+  version_requirements: *id003
 description: Generates Sass-based Ext themes.  Includes methods for colorizing themes.
 email: christocracy@gmail.com
 executables: 
@@ -50,7 +64,6 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
 - README.rdoc
 files: 
 - Rakefile
@@ -58,7 +71,7 @@ files:
 - lib/extjs-theme.rb
 - lib/extjs-theme/command.rb
 - lib/extjs-theme/commands/base.rb
-- lib/extjs-theme/commands/conifg.rb
+- lib/extjs-theme/commands/config.rb
 - lib/extjs-theme/commands/effects.rb
 - lib/extjs-theme/commands/help.rb
 - lib/extjs-theme/commands/theme.rb
@@ -66,10 +79,18 @@ files:
 - lib/extjs-theme/effects.rb
 - lib/extjs-theme/generator.rb
 - lib/extjs-theme/template/defines.sass
+- test/config/xtheme.yml
 - test/extjs-xtheme_test.rb
+- test/public/javascripts/ext-3.x/resources/css/structure/structure.css
+- test/public/javascripts/ext-3.x/resources/css/visual/visual.css
+- test/public/javascripts/ext-3.x/resources/images/default/rails.png
+- test/public/stylesheets/themes/foo/all.sass
+- test/public/stylesheets/themes/foo/defines.sass
+- test/public/stylesheets/themes/foo/images/rails.png
+- test/public/stylesheets/themes/foo/structure/structure.sass
+- test/public/stylesheets/themes/foo/visual/visual.sass
 - test/test_helper.rb
 - LICENSE
-- README
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/extjs/extjs-theme
@@ -84,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ext theme-generator and colorizer

data/lib/extjs-theme/commands/conifg.rb

@@ -1,56 +0,0 @@
-module ExtJS::Theme::Command
-	class Config < Base
-		def index
-			#long = args.delete('--long')
-			#vars = heroku.config_vars(app)
-			#display_vars(vars, :long => long)
-			display "index"
-		end
-    
-		def add
-			unless args.size > 0 and args.all? { |a| a.include?('=') }
-				raise CommandFailed, "Usage: xtheme config:add <key>=<value> [<key2>=<value2> ...]"
-			end
-
-			#vars = args.inject({}) do |vars, arg|
-			#	key, value = arg.split('=', 2)
-			#	vars[key] = value
-			#	vars
-			#end
-
-			display "Adding config vars:"
-			#display_vars(vars, :indent => 2)
-
-			#display "Restarting app...", false
-			#heroku.add_config_vars(app, vars)
-			#display "done."
-		end
-
-		def remove
-			display "Removing #{args.first} and restarting app...", false
-			#heroku.remove_config_var(app, args.first)
-			display "done."
-		end
-		alias :rm :remove
-
-		def clear
-			display "Clearing all config vars and restarting app...", false
-			#heroku.clear_config_vars(app)
-			display "done."
-		end
-
-		protected
-			def display_vars(vars, options={})
-				max_length = vars.map { |v| v[0].size }.max
-				vars.keys.sort.each do |key|
-					spaces = ' ' * (max_length - key.size)
-					display "#{' ' * (options[:indent] || 0)}#{key}#{spaces} => #{format(vars[key], options)}"
-				end
-			end
-
-			def format(value, options)
-				return value if options[:long] || value.size < 36
-				value[0, 16] + '...' + value[-16, 16]
-			end
-	end
-end