palette 0.0.5 → 0.0.6

data/.gitignore

@@ -1,6 +1,8 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock
 *.DS_Store
 *.sw[nop]
 tmp
+.rvmrc

data/Rakefile

@@ -1,17 +1,10 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-Bundler.require
-
-require "spec/rake/spectask"
+require "rspec/core/rake_task"
 require "cucumber/rake/task"
 
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-end
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format pretty"
-end
+RSpec::Core::RakeTask.new(:rspec)
+Cucumber::Rake::Task.new(:features)
 
-task :default => [:spec, :features]
+task :default => [:rspec, :features]

data/bin/palette

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require "palette/cli"
+require "palette"
 Palette::Cli.new(*ARGV)

data/features/cli.feature

@@ -16,11 +16,12 @@ Feature: Run palette from the command line
         white = "FFF"
         Normal     black, white
         Identifier white, black
+        Comment    none, none
 
         link :rubyDelimiter, :rubyInterpolationDelimiter, :to => :String
       end
       """
-    When I run "palette valid_scheme"
+    When I run `palette valid_scheme`
     Then the output should contain:
       """
       " Vim color file
@@ -30,8 +31,6 @@ Feature: Run palette from the command line
       " Author: Josh Clayton
       " Notes:  This is a pretty simple example
 
-      let colors_name="valid_scheme"
-
       hi clear
       if version > 580
           if exists("syntax_on")
@@ -39,12 +38,15 @@ Feature: Run palette from the command line
           endif
       endif
 
+      let colors_name="valid_scheme"
+
       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 Normal     guifg=#000000 ctermfg=16   guibg=#FFFFFF ctermbg=231
+      hi Identifier guifg=#FFFFFF ctermfg=231  guibg=#000000 ctermbg=16
+      hi Comment    guifg=NONE    ctermfg=NONE guibg=NONE    ctermbg=NONE
 
       hi link rubyDelimiter              String
       hi link rubyInterpolationDelimiter String
@@ -58,15 +60,15 @@ Feature: Run palette from the command line
         Identifier lighten("000", 60), complement("F00")
       end
       """
-    When I run "palette valid_scheme"
+    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
+      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 missing_scheme"
+    When I run `palette missing_scheme`
     Then the output should not contain "colors_name"
     And the exit status should be 0
 
@@ -77,7 +79,7 @@ Feature: Run palette from the command line
         totally made up junk
       end
       """
-    When I run "palette 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"
 
@@ -89,9 +91,25 @@ Feature: Run palette from the command line
         Float  "FFF", "000"
       end
       """
-    When I run "palette valid_theme"
+    When I run `palette valid_theme`
+    Then the output should contain:
+      """
+      hi String guifg=#000000 ctermfg=16   guibg=#FFFFFF ctermbg=231
+      hi Float  guifg=#FFFFFF ctermfg=231  guibg=#000000 ctermbg=16
+      """
+
+  Scenario: Process a file where links are self-referential
+    Given a file named "valid_theme" with:
+      """
+      vim_colors "self-referential links" do
+        link :htmlTag, :to => :Type
+        link :htmlEndTag, :htmlTagName, :to => :htmlTag
+      end
+      """
+    When I run `palette valid_theme`
     Then the output should contain:
       """
-      hi String guifg=#000000 ctermfg=16  guibg=#FFFFFF ctermbg=231
-      hi Float  guifg=#FFFFFF ctermfg=231 guibg=#000000 ctermbg=16
+      hi link htmlTag     Type
+      hi link htmlEndTag  htmlTag
+      hi link htmlTagName htmlTag
       """

data/features/support/env.rb

@@ -1,3 +1,4 @@
-Bundler.require
+require "bundler/setup"
+Bundler.require(:development)
 
-require "aruba"
+require "aruba/cucumber"

data/lib/palette/cli.rb

@@ -1,14 +1,13 @@
-require "palette"
 module Palette
   class Cli
     def initialize(*args)
       if File.exist?(path = File.expand_path(args.first))
         begin
-          puts Palette::Dsl.run lambda {
+          puts Palette::Dsl.run {
             eval(IO.read(path), binding, path)
           }
-        rescue
-          p "Please check the syntax of your palette file"
+        rescue Exception => e
+          puts "Please check the syntax of your palette file\n  #{e}"
           exit 1
         end
       end

data/lib/palette/color.rb

@@ -13,21 +13,33 @@ module Palette
     end
 
     def to_cterm
-      self.class.color_map.index(closest_cterm_hex)
+      return "NONE" if @hex == "NONE"
+      cterm_of_closest_cterm_hex
     end
 
     private
 
     def self.parse(hex)
       if hex.upcase =~ /^[A-F\d]{3}$/
-        hex.split(//).map {|code| code * 2 }.join
+        "##{hex.split(//).map {|code| code * 2 }.join}"
       elsif hex.upcase =~ /^[A-F\d]{6}$/
-        hex
+        "##{hex}"
+      elsif hex.upcase == "NONE"
+        "NONE"
       else
         raise "invalid hex value: #{hex}"
       end.upcase
     end
 
+    def cterm_of_closest_cterm_hex
+      color_map = self.class.color_map
+      if color_map.respond_to?(:key)
+        color_map.key(closest_cterm_hex)
+      else
+        color_map.index(closest_cterm_hex)
+      end
+    end
+
     def closest_cterm_hex
       all_colors = self.class.color_map.values.map do |hexcode|
         original_r, original_g, original_b = self.class.hex_to_decimal(@hex)
@@ -68,7 +80,7 @@ module Palette
     end
 
     def self.hex_to_decimal(hex)
-      hex.scan(/../).map {|x| ("%2d" % "0x#{x}").to_i }
+      hex.gsub("#", "").scan(/../).map {|x| ("%2d" % "0x#{x}").to_i }
     end
   end
 end

data/lib/palette/color_scheme.rb

@@ -1,4 +1,4 @@
-require 'sass'
+require "sass"
 
 module Palette
   class ColorScheme
@@ -53,14 +53,18 @@ module Palette
       end
     end
 
+    def none
+      "NONE"
+    end
+
     def to_s
       output = []
       output << header
       output << ""
-      output << color_scheme_name
-      output << ""
       output << generate_reset
       output << ""
+      output << color_scheme_name
+      output << ""
       output << generate_background
       output << ""
       output << @rules

data/lib/palette/dsl.rb

@@ -1,6 +1,6 @@
 module Palette
   class Dsl
-    def self.run(block)
+    def self.run(&block)
       new.instance_eval(&block)
     end
 

data/lib/palette/rule.rb

@@ -21,14 +21,14 @@ module Palette
 
       if fg
         color = Palette::Color.new(fg)
-        output << %{guifg=##{color.to_hex}}
-        output << %{ctermfg=#{sprintf("%-3s", color.to_cterm)}}
+        output << %{guifg=#{sprintf("%-7s", color.to_hex)}}
+        output << %{ctermfg=#{sprintf("%-4s", color.to_cterm)}}
       end
 
       if bg
         color = Palette::Color.new(bg)
-        output << %{guibg=##{color.to_hex}}
-        output << %{ctermbg=#{sprintf("%-3s", color.to_cterm)}}
+        output << %{guibg=#{sprintf("%-7s", color.to_hex)}}
+        output << %{ctermbg=#{sprintf("%-4s", color.to_cterm)}}
       end
 
       if gui

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 module Palette
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/palette.rb

@@ -1,10 +1,12 @@
-require "palette/cli"
-require "palette/dsl"
-require "palette/color_scheme"
-require "palette/color"
-require "palette/rule"
-require "palette/link"
-require "palette/version"
+require "bundler/setup"
+Bundler.require(:default)
 
 module Palette
+  autoload :Cli,         "palette/cli"
+  autoload :Color,       "palette/color"
+  autoload :ColorScheme, "palette/color_scheme"
+  autoload :Dsl,         "palette/dsl"
+  autoload :Link,        "palette/link"
+  autoload :Rule,        "palette/rule"
+  autoload :Version,     "palette/version"
 end

data/spec/color_scheme_spec.rb

@@ -89,14 +89,14 @@ describe Palette::ColorScheme, "rule generation" do
   before { Palette::Rule.stubs(:new => "Custom rule") }
 
   it "creates simple rules" do
-    Palette::ColorScheme.run "one", lambda {
+    Palette::ColorScheme.run "one", proc {
       Comment "ABCDEF", :gui => "bold"
     }
     Palette::Rule.should have_received(:new).with("Comment", "ABCDEF", :gui => "bold")
   end
 
   it "creates multiple rules" do
-    Palette::ColorScheme.run "one", lambda {
+    Palette::ColorScheme.run "one", proc {
       Comment "ABCDEF", :gui => "bold"
       Regexp  :gui => "bold"
     }
@@ -104,15 +104,22 @@ describe Palette::ColorScheme, "rule generation" do
     Palette::Rule.should have_received(:new).with("Regexp", :gui => "bold")
   end
 
+  it "handles none" do
+    Palette::ColorScheme.run "one", proc {
+      Comment none, none
+    }
+    Palette::Rule.should have_received(:new).with("Comment", "NONE", "NONE")
+  end
+
   it "handles Ruby naming conflicts" do
-    Palette::ColorScheme.run "one", lambda {
+    Palette::ColorScheme.run "one", proc {
       String "ABCDEF"
     }
     Palette::Rule.should have_received(:new).with("String", "ABCDEF")
   end
 
   it "outputs rules" do
-    output = Palette::ColorScheme.run "one", lambda {
+    output = Palette::ColorScheme.run "one", proc {
       Comment "ABCDEF", :gui => "bold"
       String "ABCDEF"
     }
@@ -125,14 +132,14 @@ describe Palette::ColorScheme, "linking" do
   before { Palette::Link.stubs(:new => "Custom link") }
 
   it "handles simple linking" do
-    Palette::ColorScheme.run "one", lambda {
+    Palette::ColorScheme.run "one", proc {
       link :Something, :to => :Another
     }
     Palette::Link.should have_received(:new).with(:Something, :Another)
   end
 
   it "handles complex linking" do
-    Palette::ColorScheme.run "one", lambda {
+    Palette::ColorScheme.run "one", proc {
       link :Something, :Else, :to => :Another
       link :Red, :to => :Black
     }
@@ -142,7 +149,7 @@ describe Palette::ColorScheme, "linking" do
   end
 
   it "outputs links" do
-    output = Palette::ColorScheme.run "one", lambda {
+    output = Palette::ColorScheme.run "one", proc {
       link :Something, :Else, :to => :Another
       link :Red, :to => :Black
     }
@@ -166,7 +173,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}/m
+    subject.to_s.should =~ /#{header}.*#{reset}.*#{color_scheme_name}.*#{background}/m
   end
 end
 
@@ -182,7 +189,7 @@ describe Palette::ColorScheme, ".run" do
   end
 
   it "creates a new color scheme with the correct name" do
-    Palette::ColorScheme.run "Great", lambda {
+    Palette::ColorScheme.run "Great", proc {
       great
     }
     Palette::ColorScheme.should have_received(:new).with("Great")

data/spec/color_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 
 describe Palette::Color, "color conversion" do
   it "generates hex from three hex digits" do
-    Palette::Color.new("AAA").to_hex.should == "AAAAAA"
+    Palette::Color.new("AAA").to_hex.should == "#AAAAAA"
   end
 
   it "generates hex from six hex digits" do
-    Palette::Color.new("FAFAFA").to_hex.should == "FAFAFA"
+    Palette::Color.new("FAFAFA").to_hex.should == "#FAFAFA"
   end
 
   it "generates cterm colors from three hex digits" do
@@ -23,6 +23,11 @@ describe Palette::Color, "color conversion" do
     Palette::Color.new("fffffa").to_cterm.should == 231
   end
 
+  it "returns NONE when color is none" do
+    Palette::Color.new("none").to_hex.should   == "NONE"
+    Palette::Color.new("none").to_cterm.should == "NONE"
+  end
+
   it "raises an error if a bad color is passed" do
     expect { Palette::Color.new("abcdfg") }.to raise_error
     expect { Palette::Color.new("abcdf") }.to raise_error

data/spec/dsl_spec.rb

@@ -11,9 +11,9 @@ describe Palette::Dsl do
 
   it "runs schemes" do
     Palette::ColorScheme.stubs(:run)
-    Palette::Dsl.run lambda {
+    Palette::Dsl.run do
       vim_colors("awesome") {}
-    }
+    end
     Palette::ColorScheme.should have_received(:run)
   end
 end

data/spec/rule_spec.rb

@@ -7,7 +7,7 @@ shared_examples_for "rule with colors" do
   let(:cterm) { 123 }
   let(:color) do
     mock("color").tap do |color|
-      color.stubs(:to_hex => hex, :to_cterm => cterm)
+      color.stubs(:to_hex => "##{hex}", :to_cterm => cterm)
     end
   end
 
@@ -15,47 +15,58 @@ shared_examples_for "rule with colors" do
 end
 
 describe Palette::Rule, "with a foreground" do
-  it_should_behave_like "rule with colors"
-  subject { Palette::Rule.new("Awesome", fg) }
+  it_should_behave_like "rule with colors" do
+    subject { Palette::Rule.new("Awesome", fg) }
 
-  it "highlights the correct colors" do
-    subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}"
-  end
+    it "highlights the correct colors" do
+      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}"
+    end
 
-  it "converts the correct colors" do
-    subject.to_s
-    Palette::Color.should have_received(:new).with(fg)
-    Palette::Color.should_not have_received(:new).with(bg)
+    it "converts the correct colors" do
+      subject.to_s
+      Palette::Color.should have_received(:new).with(fg)
+      Palette::Color.should_not have_received(:new).with(bg)
+    end
   end
 end
 
-describe Palette::Rule, "with a foreground and background" do
-  it_should_behave_like "rule with colors"
-  subject { Palette::Rule.new("Awesome", fg, bg) }
+describe Palette::Rule, "with a foreground set to none" do
+  subject { Palette::Rule.new("Awesome", "none") }
 
   it "highlights the correct colors" do
-    subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm} guibg=##{hex} ctermbg=#{cterm}"
+    subject.to_s.should == "hi Awesome guifg=NONE    ctermfg=NONE"
   end
+end
+
+describe Palette::Rule, "with a foreground and background" do
+  it_should_behave_like "rule with colors" do
+    subject { Palette::Rule.new("Awesome", fg, bg) }
 
-  it "converts the correct colors" do
-    subject.to_s
-    Palette::Color.should have_received(:new).with(fg)
-    Palette::Color.should have_received(:new).with(bg)
+    it "highlights the correct colors" do
+      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}  guibg=##{hex} ctermbg=#{cterm}"
+    end
+
+    it "converts the correct colors" do
+      subject.to_s
+      Palette::Color.should have_received(:new).with(fg)
+      Palette::Color.should have_received(:new).with(bg)
+    end
   end
 end
 
 describe Palette::Rule, "with a hash passed" do
-  it_should_behave_like "rule with colors"
-  subject { Palette::Rule.new("Awesome", :fg => fg, :bg => bg) }
+  it_should_behave_like "rule with colors" do
+    subject { Palette::Rule.new("Awesome", :fg => fg, :bg => bg) }
 
-  it "highlights the correct colors" do
-    subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm} guibg=##{hex} ctermbg=#{cterm}"
-  end
+    it "highlights the correct colors" do
+      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}  guibg=##{hex} ctermbg=#{cterm}"
+    end
 
-  it "converts the correct colors" do
-    subject.to_s
-    Palette::Color.should have_received(:new).with(fg)
-    Palette::Color.should have_received(:new).with(bg)
+    it "converts the correct colors" do
+      subject.to_s
+      Palette::Color.should have_received(:new).with(fg)
+      Palette::Color.should have_received(:new).with(bg)
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require "spec"
-require "mocha"
 require "palette"
-require "bourne"
+require "bundler/setup"
+Bundler.require(:development)
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 
   Mocha::Configuration.warn_when(:stubbing_non_existant_method)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: palette
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Josh Clayton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -05:00
+date: 2011-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -3702664446
+        hash: 1
         segments: 
         - 3
         - 1
-        - 0
-        - alpha
-        - 23
-        version: 3.1.0.alpha.23
+        - 1
+        version: 3.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
-        - 1
-        - 3
+        - 2
+        - 6
         - 0
-        version: 1.3.0
+        version: 2.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,12 +89,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 9
-        - 3
-        version: 0.9.3
+        - 2
+        version: 1.0.2
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -107,12 +105,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 5
         segments: 
         - 0
-        - 2
         - 4
-        version: 0.2.4
+        - 5
+        version: 0.4.5
   type: :development
   version_requirements: *id006
 description: Palette provides an easy way to build Vim color schemes
@@ -127,7 +125,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
 - bin/palette
@@ -177,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Build Vim colorschemes with ease

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    palette (0.0.4)
-      sass (= 3.1.0.alpha.23)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    aruba (0.2.4)
-      background_process
-      cucumber (~> 0.9.3)
-    background_process (1.2)
-    bourne (1.0)
-      mocha (= 0.9.8)
-    builder (2.1.2)
-    cucumber (0.9.3)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    json (1.4.6)
-    mocha (0.9.8)
-      rake
-    rake (0.8.7)
-    rspec (1.3.0)
-    sass (3.1.0.alpha.23)
-    term-ansicolor (1.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (= 0.2.4)
-  bourne (= 1.0)
-  cucumber (= 0.9.3)
-  mocha (= 0.9.8)
-  palette!
-  rspec (= 1.3.0)
-  sass (= 3.1.0.alpha.23)