palette 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    palette (0.0.2)
+    palette (0.0.3)
+      sass (= 3.1.0.alpha.23)
 
 GEM
   remote: http://rubygems.org/
@@ -28,6 +29,7 @@ GEM
       rake
     rake (0.8.7)
     rspec (1.3.0)
+    sass (3.1.0.alpha.23)
     term-ansicolor (1.0.5)
 
 PLATFORMS
@@ -40,3 +42,4 @@ DEPENDENCIES
   mocha (= 0.9.8)
   palette!
   rspec (= 1.3.0)
+  sass (= 3.1.0.alpha.23)

data/features/cli.feature

@@ -3,22 +3,80 @@ Feature: Run palette from the command line
   As a user of palette
   I should be able to point palette to a file to generate a color schem
 
-  Scenario: Process a file with valid palette syntax
-    When I run "palette features/fixtures/schemes/valid_scheme"
-    Then the output should contain "colors_name"
+  Scenario: Process a complete valid file
+    Given a file named "valid_scheme" with:
+      """
+      vim_colors "valid_scheme" do
+        author "Josh Clayton"
+        notes  "This is a pretty simple example"
+        reset  true
+        background :light
+
+        black = "000"
+        white = "FFF"
+        Normal     black, white
+        Identifier white, black
+
+        link :rubyDelimiter, :rubyInterpolationDelimiter, :to => :String
+      end
+      """
+    When I run "palette valid_scheme"
+    Then the output should contain:
+      """
+      " Vim color file
+      "   This file was generated by Palette
+      "   http://rubygems.org/gems/palette
+      "
+      " Author: Josh Clayton
+      " Notes:  This is a pretty simple example
+
+      let colors_name="valid_scheme"
+
+      hi clear
+      if version > 580
+          if exists("syntax_on")
+              syntax reset
+          endif
+      endif
+
+      if has("gui_running")
+          set background=light
+      endif
+
+      hi Normal     guifg=#000000 ctermfg=16  guibg=#FFFFFF ctermbg=231
+      hi Identifier guifg=#FFFFFF ctermfg=231 guibg=#000000 ctermbg=16
+
+      hi link rubyDelimiter              String
+      hi link rubyInterpolationDelimiter String
+      """
+
+  Scenario: Process a file with color math
+    Given a file named "valid_scheme" with:
+      """
+      vim_colors "valid_scheme" do
+        Normal     darken("FFF", 40), invert("F00")
+        Identifier lighten("000", 60), complement("F00")
+      end
+      """
+    When I run "palette valid_scheme"
+    Then the output should contain:
+      """
+      hi Normal     guifg=#999999 ctermfg=246 guibg=#00FFFF ctermbg=51
+      hi Identifier guifg=#999999 ctermfg=246 guibg=#00FFFF ctermbg=51
+      """
 
   Scenario: Process a nonexistant file
-    When I run "palette features/fixtures/schemes/missing_scheme"
+    When I run "palette missing_scheme"
     Then the output should not contain "colors_name"
     And the exit status should be 0
 
   Scenario: Process a file with invalid palette syntax
-    Given a file named "features/fixtures/schemes/invalid_scheme" with:
+    Given a file named "invalid_scheme" with:
       """
       vim_colors "bad syntax" do
         totally made up junk
       end
       """
-    When I run "palette features/fixtures/schemes/invalid_scheme"
+    When I run "palette invalid_scheme"
     Then the exit status should be 1
     And the output should contain "Please check the syntax of your palette file"

data/features/support/env.rb

@@ -1,11 +1,3 @@
 Bundler.require
 
 require "aruba"
-
-Before do
-  schemes_origin_dir = File.join(%w(features fixtures schemes))
-  schemes_dir        = File.join(dirs.first, schemes_origin_dir)
-
-  FileUtils.mkdir_p(schemes_dir)
-  FileUtils.cp(Dir.glob(File.join(schemes_origin_dir, "*")), schemes_dir)
-end

data/lib/palette/color_scheme.rb

@@ -1,3 +1,5 @@
+require 'sass'
+
 module Palette
   class ColorScheme
     attr_reader :name
@@ -28,6 +30,29 @@ module Palette
       @rules << Palette::Rule.new(name.to_s, *args)
     end
 
+    %w(darken lighten saturate desaturate).each do |sass_method|
+      class_eval <<-EOM
+        def #{sass_method}(hex, number)
+          rgb = Palette::Color.hex_to_decimal(Palette::Color.parse(hex))
+          sass_context.#{sass_method}(Sass::Script::Color.new(rgb),
+                      Sass::Script::Number.new(number)).tap{|c| c.options = {}}.inspect.gsub(/#/, "")
+        end
+      EOM
+    end
+
+    %w(grayscale complement invert).each do |sass_method|
+      class_eval <<-EOM
+        def #{sass_method}(hex)
+          rgb = Palette::Color.hex_to_decimal(Palette::Color.parse(hex))
+          sass_context.#{sass_method}(Sass::Script::Color.new(rgb)).tap{|c| c.options = {}}.inspect.gsub(/#/, "")
+        end
+      EOM
+    end
+
+    def sass_context
+      @context ||= Sass::Script::Functions::EvaluationContext.new({})
+    end
+
     def String(*args)
       @rules ||= []
       @rules << Palette::Rule.new("String", *args)
@@ -36,10 +61,15 @@ module Palette
     def to_s
       output = []
       output << header
+      output << ""
       output << color_scheme_name
+      output << ""
       output << generate_reset
+      output << ""
       output << generate_background
+      output << ""
       output << @rules
+      output << ""
       output << @links
       output.compact.join("\n")
     end
@@ -60,7 +90,7 @@ module Palette
 "   http://rubygems.org/gems/palette
 "
 " Author: #{@author_name}
-#{%{" #{@notes}} if @notes}
+#{%{" Notes:  #{@notes}} if @notes}
       }.strip
     end
 

data/lib/palette/rule.rb

@@ -1,11 +1,15 @@
 module Palette
   class Rule
+    @@max_length = 0
     attr_reader :name, :fg, :bg, :gui
 
     def initialize(name, *args)
       options = args.last.is_a?(Hash) ? args.pop : {}
 
       @name = name.to_s
+
+      @@max_length = @name.length if @name.length > @@max_length
+
       @fg   = options[:fg]  || args.first
       @bg   = options[:bg]  || (args.length > 1 ? args.last : nil)
       @gui  = options[:gui]
@@ -13,18 +17,18 @@ module Palette
 
     def to_s
       return "" if fg.nil? && bg.nil? && gui.nil?
-      output = ["hi", name]
+      output = ["hi #{sprintf("%-#{@@max_length}s", name)}"]
 
       if fg
         color = Palette::Color.new(fg)
         output << %{guifg=##{color.to_hex}}
-        output << %{ctermfg=#{color.to_cterm}}
+        output << %{ctermfg=#{sprintf("%-3s", color.to_cterm)}}
       end
 
       if bg
         color = Palette::Color.new(bg)
         output << %{guibg=##{color.to_hex}}
-        output << %{ctermbg=#{color.to_cterm}}
+        output << %{ctermbg=#{sprintf("%-3s", color.to_cterm)}}
       end
 
       if gui
@@ -34,7 +38,7 @@ module Palette
         end
       end
 
-      output.join(" ")
+      output.join(" ").strip
     end
   end
 end

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 module Palette
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/color_scheme_spec.rb

@@ -166,7 +166,7 @@ describe Palette::ColorScheme, "output order" do
   end
 
   it "generates the color file in the correct order" do
-    subject.to_s.should == [header, color_scheme_name, reset, background].join("\n")
+    subject.to_s.should =~ /#{header}.*#{color_scheme_name}.*#{reset}.*#{background}/m
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: palette
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Josh Clayton
@@ -15,13 +15,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sass
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -3702664446
+        segments: 
+        - 3
+        - 1
+        - 0
+        - alpha
+        - 23
+        version: 3.1.0.alpha.23
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -33,11 +51,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -49,11 +67,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bourne
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,11 +82,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,11 +98,11 @@ dependencies:
         - 3
         version: 0.9.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,7 +114,7 @@ dependencies:
         - 4
         version: 0.2.4
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Palette provides an easy way to build Vim color schemes
 email: 
 - joshua.clayton@gmail.com
@@ -122,7 +140,6 @@ files:
 - lib/palette/rule.rb
 - lib/palette/version.rb
 - features/cli.feature
-- features/fixtures/schemes/valid_scheme
 - features/support/env.rb
 - spec/color_scheme_spec.rb
 - spec/color_spec.rb
@@ -166,7 +183,6 @@ specification_version: 3
 summary: Build Vim colorschemes with ease
 test_files: 
 - features/cli.feature
-- features/fixtures/schemes/valid_scheme
 - features/support/env.rb
 - spec/color_scheme_spec.rb
 - spec/color_spec.rb

data/features/fixtures/schemes/valid_scheme

@@ -1,12 +0,0 @@
-vim_colors "sweet" do
-  author "Josh Clayton"
-  notes  "My really sweet theme"
-
-  reset      true
-  background :light
-
-  Normal "222", "f8f8ff"
-
-  Folded "808080", "ECECEC", :gui => "bold"
-  link :vimFold, :FoldColumn, :to => :Folded
-end