palette 0.0.6 → 0.0.7

data/features/cli.feature

@@ -44,9 +44,9 @@ Feature: Run palette from the command line
           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 Comment    guifg=NONE    ctermfg=NONE guibg=NONE    ctermbg=NONE
+      hi Normal     guifg=#000000 ctermfg=16   guibg=#FFFFFF ctermbg=231  gui=NONE cterm=NONE
+      hi Identifier guifg=#FFFFFF ctermfg=231  guibg=#000000 ctermbg=16   gui=NONE cterm=NONE
+      hi Comment    guifg=NONE    ctermfg=NONE guibg=NONE    ctermbg=NONE gui=NONE cterm=NONE
 
       hi link rubyDelimiter              String
       hi link rubyInterpolationDelimiter String
@@ -63,8 +63,8 @@ Feature: Run palette from the command line
     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   gui=NONE cterm=NONE
+      hi Identifier guifg=#999999 ctermfg=246  guibg=#00FFFF ctermbg=51   gui=NONE cterm=NONE
       """
 
   Scenario: Process a nonexistant file
@@ -94,8 +94,8 @@ Feature: Run palette from the command line
     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 String guifg=#000000 ctermfg=16   guibg=#FFFFFF ctermbg=231  gui=NONE cterm=NONE
+      hi Float  guifg=#FFFFFF ctermfg=231  guibg=#000000 ctermbg=16   gui=NONE cterm=NONE
       """
 
   Scenario: Process a file where links are self-referential

data/lib/palette/color_scheme.rb

@@ -5,7 +5,13 @@ module Palette
     attr_reader :name
 
     def initialize(color_name)
-      @name = color_name
+      @name        = color_name
+      @notes       = nil
+      @links       = []
+      @rules       = []
+      @reset       = false
+      @background  = nil
+      @author_name = nil
     end
 
     def author(author_name)
@@ -26,7 +32,6 @@ module Palette
     end
 
     def method_missing(name, *args)
-      @rules ||= []
       @rules << Palette::Rule.new(name.to_s, *args)
     end
 
@@ -48,7 +53,6 @@ module Palette
 
     %w(String Float).each do |constant|
       define_method(constant) do |*args|
-        @rules ||= []
         @rules << Palette::Rule.new(constant, *args)
       end
     end
@@ -76,7 +80,6 @@ module Palette
     def link(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
 
-      @links ||= []
       args.each do |arg|
         @links << Link.new(arg, options[:to])
       end

data/lib/palette/rule.rb

@@ -31,11 +31,13 @@ module Palette
         output << %{ctermbg=#{sprintf("%-4s", color.to_cterm)}}
       end
 
-      if gui
-        output << %{gui=#{gui}}
-        if gui !~ /italic/
-          output << %{cterm=#{gui}}
-        end
+      @gui ||= "none"
+
+      output << %{gui=#{gui.upcase}}
+      if gui =~ /italic/
+        output << %{cterm=NONE}
+      else
+        output << %{cterm=#{gui.upcase}}
       end
 
       output.join(" ").strip

data/lib/palette/version.rb

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

data/spec/rule_spec.rb

@@ -19,7 +19,7 @@ describe Palette::Rule, "with a foreground" do
     subject { Palette::Rule.new("Awesome", fg) }
 
     it "highlights the correct colors" do
-      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}"
+      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}  gui=NONE cterm=NONE"
     end
 
     it "converts the correct colors" do
@@ -34,7 +34,7 @@ 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=NONE    ctermfg=NONE"
+    subject.to_s.should == "hi Awesome guifg=NONE    ctermfg=NONE gui=NONE cterm=NONE"
   end
 end
 
@@ -43,7 +43,7 @@ describe Palette::Rule, "with a foreground and background" do
     subject { Palette::Rule.new("Awesome", fg, bg) }
 
     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=##{hex} ctermfg=#{cterm}  guibg=##{hex} ctermbg=#{cterm}  gui=NONE cterm=NONE"
     end
 
     it "converts the correct colors" do
@@ -59,7 +59,7 @@ describe Palette::Rule, "with a hash passed" 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}"
+      subject.to_s.should == "hi Awesome guifg=##{hex} ctermfg=#{cterm}  guibg=##{hex} ctermbg=#{cterm}  gui=NONE cterm=NONE"
     end
 
     it "converts the correct colors" do
@@ -74,7 +74,7 @@ describe Palette::Rule, "with a gui" do
   subject { Palette::Rule.new("Awesome", :gui => "bold") }
 
   it "sets the gui correctly" do
-    subject.to_s.should == "hi Awesome gui=bold cterm=bold"
+    subject.to_s.should == "hi Awesome gui=BOLD cterm=BOLD"
   end
 end
 
@@ -82,7 +82,7 @@ describe Palette::Rule, "with a gui as italic" do
   subject { Palette::Rule.new("Awesome", :gui => "italic") }
 
   it "sets the gui correctly" do
-    subject.to_s.should == "hi Awesome gui=italic"
+    subject.to_s.should == "hi Awesome gui=ITALIC cterm=NONE"
   end
 end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: palette
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Josh Clayton
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -04:00
+date: 2011-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
         version: 3.1.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   version_requirements: *id003
@@ -74,10 +54,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   version_requirements: *id004
@@ -89,11 +65,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
   type: :development
   version_requirements: *id005
@@ -105,11 +76,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
         version: 0.4.5
   type: :development
   version_requirements: *id006
@@ -158,18 +124,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []